[llvm] [LLVM][AArch64] Remove aliases of LSUI instructions (PR #126072)
Kerry McLaughlin via llvm-commits
llvm-commits at lists.llvm.org
Tue Feb 11 06:38:00 PST 2025
https://github.com/kmclaughlin-arm updated https://github.com/llvm/llvm-project/pull/126072
>From f68a4152206026d0c0f330937ad34cb4287c1c57 Mon Sep 17 00:00:00 2001
From: Kerry McLaughlin <kerry.mclaughlin at arm.com>
Date: Thu, 6 Feb 2025 10:45:36 +0000
Subject: [PATCH 1/3] [LLVM][AArch64] Replace MnemonicAlias with InstAlias for
CAS* instructions
Replaces the MnemonicAliases added for compare and swap instructions
to use InstAlias. This ensures we don't try to map to instructions
where the operands do not match when both the LSE & LSUI features
are available.
---
llvm/lib/Target/AArch64/AArch64InstrInfo.td | 20 +++++----
llvm/test/MC/AArch64/armv8.1a-lse.s | 47 +++++++++++++++++++++
llvm/test/MC/AArch64/lse-lsui-diagnostics.s | 40 ++++++++++++++++++
3 files changed, 99 insertions(+), 8 deletions(-)
create mode 100644 llvm/test/MC/AArch64/lse-lsui-diagnostics.s
diff --git a/llvm/lib/Target/AArch64/AArch64InstrInfo.td b/llvm/lib/Target/AArch64/AArch64InstrInfo.td
index a0928b9095fccdd..99ac26dff4b2210 100644
--- a/llvm/lib/Target/AArch64/AArch64InstrInfo.td
+++ b/llvm/lib/Target/AArch64/AArch64InstrInfo.td
@@ -2665,10 +2665,10 @@ defm CASLT : CompareAndSwapUnprivileged<0b11, 0, 1, "l">;
defm CASAT : CompareAndSwapUnprivileged<0b11, 1, 0, "a">;
defm CASALT : CompareAndSwapUnprivileged<0b11, 1, 1, "al">;
-def : MnemonicAlias<"cas", "cast">;
-def : MnemonicAlias<"casl", "caslt">;
-def : MnemonicAlias<"casa", "casat">;
-def : MnemonicAlias<"casal", "casalt">;
+def : InstAlias<"cast $Rs, $Rt, [$Rn]", (CASX GPR64:$Rs, GPR64:$Rt, GPR64sp0:$Rn)>;
+def : InstAlias<"caslt $Rs, $Rt, [$Rn]", (CASLX GPR64:$Rs, GPR64:$Rt, GPR64sp0:$Rn)>;
+def : InstAlias<"casat $Rs, $Rt, [$Rn]", (CASAX GPR64:$Rs, GPR64:$Rt, GPR64sp0:$Rn)>;
+def : InstAlias<"casalt $Rs, $Rt, [$Rn]", (CASALX GPR64:$Rs, GPR64:$Rt, GPR64sp0:$Rn)>;
// v9.6-a atomic CASPT
defm CASPT : CompareAndSwapPairUnprivileged<0b01, 0, 0, "">;
@@ -2676,10 +2676,14 @@ defm CASPLT : CompareAndSwapPairUnprivileged<0b01, 0, 1, "l">;
defm CASPAT : CompareAndSwapPairUnprivileged<0b01, 1, 0, "a">;
defm CASPALT : CompareAndSwapPairUnprivileged<0b01, 1, 1, "al">;
-def : MnemonicAlias<"casp", "caspt">;
-def : MnemonicAlias<"caspl", "casplt">;
-def : MnemonicAlias<"caspa", "caspat">;
-def : MnemonicAlias<"caspal", "caspalt">;
+def : InstAlias<"caspt $Rs, $Rt, [$Rn]",
+ (CASPX XSeqPairClassOperand:$Rs, XSeqPairClassOperand:$Rt, GPR64sp0:$Rn)>;
+def : InstAlias<"casplt $Rs, $Rt, [$Rn]",
+ (CASPLX XSeqPairClassOperand:$Rs, XSeqPairClassOperand:$Rt, GPR64sp0:$Rn)>;
+def : InstAlias<"caspat $Rs, $Rt, [$Rn]",
+ (CASPAX XSeqPairClassOperand:$Rs, XSeqPairClassOperand:$Rt, GPR64sp0:$Rn)>;
+def : InstAlias<"caspalt $Rs, $Rt, [$Rn]",
+ (CASPALX XSeqPairClassOperand:$Rs, XSeqPairClassOperand:$Rt, GPR64sp0:$Rn)>;
}
// v8.1 atomic SWP
diff --git a/llvm/test/MC/AArch64/armv8.1a-lse.s b/llvm/test/MC/AArch64/armv8.1a-lse.s
index b5bbbe66c6ae26b..f78bb50b6a4ae86 100644
--- a/llvm/test/MC/AArch64/armv8.1a-lse.s
+++ b/llvm/test/MC/AArch64/armv8.1a-lse.s
@@ -7,6 +7,8 @@
// RUN: not llvm-mc -triple aarch64-none-linux-gnu -mcpu=tsv110 -show-encoding < %s 2> %t | FileCheck %s
// RUN: FileCheck -check-prefix=CHECK-ERROR < %t %s
// RUN: not llvm-mc -triple aarch64-none-linux-gnu -mattr=+v8r -show-encoding < %s 2> %t | FileCheck %s
+// RUN: FileCheck -check-prefix=CHECK-ERROR < %t %s
+// RUN: not llvm-mc -triple aarch64-none-linux-gnu -mattr=+v8.1a,+lse,+lsui -show-encoding < %s 2> %t | FileCheck %s -check-prefix=CHECK-FEAT-LSUI
// RUN: FileCheck -check-prefix=CHECK-ERROR < %t %s
.text
@@ -78,6 +80,15 @@
// CHECK: casal x0, x1, [x2] // encoding: [0x41,0xfc,0xe0,0xc8]
// CHECK: casal x2, x3, [sp] // encoding: [0xe3,0xff,0xe2,0xc8]
+ // CHECK-FEAT-LSUI: cast x0, x1, [x2] // encoding: [0x41,0x7c,0xa0,0xc8]
+ // CHECK-FEAT-LSUI: cast x2, x3, [sp] // encoding: [0xe3,0x7f,0xa2,0xc8]
+ // CHECK-FEAT-LSUI: casat x0, x1, [x2] // encoding: [0x41,0x7c,0xe0,0xc8]
+ // CHECK-FEAT-LSUI: casat x2, x3, [sp] // encoding: [0xe3,0x7f,0xe2,0xc8]
+ // CHECK-FEAT-LSUI: caslt x0, x1, [x2] // encoding: [0x41,0xfc,0xa0,0xc8]
+ // CHECK-FEAT-LSUI: caslt x2, x3, [sp] // encoding: [0xe3,0xff,0xa2,0xc8]
+ // CHECK-FEAT-LSUI: casalt x0, x1, [x2] // encoding: [0x41,0xfc,0xe0,0xc8]
+ // CHECK-FEAT-LSUI: casalt x2, x3, [sp] // encoding: [0xe3,0xff,0xe2,0xc8]
+
swp w0, w1, [x2]
swp w2, w3, [sp]
swpa w0, w1, [x2]
@@ -95,6 +106,15 @@
// CHECK: swpal w0, w1, [x2] // encoding: [0x41,0x80,0xe0,0xb8]
// CHECK: swpal w2, w3, [sp] // encoding: [0xe3,0x83,0xe2,0xb8]
+ // CHECK-FEAT-LSUI: swpt w0, w1, [x2] // encoding: [0x41,0x84,0x20,0x19]
+ // CHECK-FEAT-LSUI: swpt w2, w3, [sp] // encoding: [0xe3,0x87,0x22,0x19]
+ // CHECK-FEAT-LSUI: swpta w0, w1, [x2] // encoding: [0x41,0x84,0xa0,0x19]
+ // CHECK-FEAT-LSUI: swpta w2, w3, [sp] // encoding: [0xe3,0x87,0xa2,0x19]
+ // CHECK-FEAT-LSUI: swptl w0, w1, [x2] // encoding: [0x41,0x84,0x60,0x19]
+ // CHECK-FEAT-LSUI: swptl w2, w3, [sp] // encoding: [0xe3,0x87,0x62,0x19]
+ // CHECK-FEAT-LSUI: swptal w0, w1, [x2] // encoding: [0x41,0x84,0xe0,0x19]
+ // CHECK-FEAT-LSUI: swptal w2, w3, [sp] // encoding: [0xe3,0x87,0xe2,0x19]
+
swpb w0, w1, [x2]
swpb w2, w3, [sp]
swph w0, w1, [x2]
@@ -112,6 +132,15 @@
// CHECK: swplb w0, w1, [x2] // encoding: [0x41,0x80,0x60,0x38]
// CHECK: swplb w2, w3, [sp] // encoding: [0xe3,0x83,0x62,0x38]
+ // CHECK-FEAT-LSUI: swpt x0, x1, [x2] // encoding: [0x41,0x84,0x20,0x59]
+ // CHECK-FEAT-LSUI: swpt x2, x3, [sp] // encoding: [0xe3,0x87,0x22,0x59]
+ // CHECK-FEAT-LSUI: swpta x0, x1, [x2] // encoding: [0x41,0x84,0xa0,0x59]
+ // CHECK-FEAT-LSUI: swpta x2, x3, [sp] // encoding: [0xe3,0x87,0xa2,0x59]
+ // CHECK-FEAT-LSUI: swptl x0, x1, [x2] // encoding: [0x41,0x84,0x60,0x59]
+ // CHECK-FEAT-LSUI: swptl x2, x3, [sp] // encoding: [0xe3,0x87,0x62,0x59]
+ // CHECK-FEAT-LSUI: swptal x0, x1, [x2] // encoding: [0x41,0x84,0xe0,0x59]
+ // CHECK-FEAT-LSUI: swptal x2, x3, [sp] // encoding: [0xe3,0x87,0xe2,0x59]
+
swpalb w0, w1, [x2]
swpalb w2, w3, [sp]
swpah w0, w1, [x2]
@@ -163,6 +192,15 @@
// CHECK: caspa x0, x1, x2, x3, [x2] // encoding: [0x42,0x7c,0x60,0x48]
// CHECK: caspa x4, x5, x6, x7, [sp] // encoding: [0xe6,0x7f,0x64,0x48]
+ // CHECK-FEAT-LSUI: casp w0, w1, w2, w3, [x5] // encoding: [0xa2,0x7c,0x20,0x08]
+ // CHECK-FEAT-LSUI: casp w4, w5, w6, w7, [sp] // encoding: [0xe6,0x7f,0x24,0x08]
+ // CHECK-FEAT-LSUI: caspt x0, x1, x2, x3, [x2] // encoding: [0x42,0x7c,0x20,0x48]
+ // CHECK-FEAT-LSUI: caspt x4, x5, x6, x7, [sp] // encoding: [0xe6,0x7f,0x24,0x48]
+ // CHECK-FEAT-LSUI: caspa w0, w1, w2, w3, [x5] // encoding: [0xa2,0x7c,0x60,0x08]
+ // CHECK-FEAT-LSUI: caspa w4, w5, w6, w7, [sp] // encoding: [0xe6,0x7f,0x64,0x08]
+ // CHECK-FEAT-LSUI: caspat x0, x1, x2, x3, [x2] // encoding: [0x42,0x7c,0x60,0x48]
+ // CHECK-FEAT-LSUI: caspat x4, x5, x6, x7, [sp] // encoding: [0xe6,0x7f,0x64,0x48]
+
caspl w0, w1, w2, w3, [x5]
caspl w4, w5, w6, w7, [sp]
caspl x0, x1, x2, x3, [x2]
@@ -180,6 +218,15 @@
// CHECK: caspal x0, x1, x2, x3, [x2] // encoding: [0x42,0xfc,0x60,0x48]
// CHECK: caspal x4, x5, x6, x7, [sp] // encoding: [0xe6,0xff,0x64,0x48]
+ // CHECK-FEAT-LSUI: caspl w0, w1, w2, w3, [x5] // encoding: [0xa2,0xfc,0x20,0x08]
+ // CHECK-FEAT-LSUI: caspl w4, w5, w6, w7, [sp] // encoding: [0xe6,0xff,0x24,0x08]
+ // CHECK-FEAT-LSUI: casplt x0, x1, x2, x3, [x2] // encoding: [0x42,0xfc,0x20,0x48]
+ // CHECK-FEAT-LSUI: casplt x4, x5, x6, x7, [sp] // encoding: [0xe6,0xff,0x24,0x48]
+ // CHECK-FEAT-LSUI: caspal w0, w1, w2, w3, [x5] // encoding: [0xa2,0xfc,0x60,0x08]
+ // CHECK-FEAT-LSUI: caspal w4, w5, w6, w7, [sp] // encoding: [0xe6,0xff,0x64,0x08]
+ // CHECK-FEAT-LSUI: caspalt x0, x1, x2, x3, [x2] // encoding: [0x42,0xfc,0x60,0x48]
+ // CHECK-FEAT-LSUI: caspalt x4, x5, x6, x7, [sp] // encoding: [0xe6,0xff,0x64,0x48]
+
ldadd w0, w1, [x2]
ldadd w2, w3, [sp]
ldadda w0, w1, [x2]
diff --git a/llvm/test/MC/AArch64/lse-lsui-diagnostics.s b/llvm/test/MC/AArch64/lse-lsui-diagnostics.s
new file mode 100644
index 000000000000000..75202cface97083
--- /dev/null
+++ b/llvm/test/MC/AArch64/lse-lsui-diagnostics.s
@@ -0,0 +1,40 @@
+// RUN: llvm-mc -triple aarch64 -mattr=+lse -mattr=+lsui -show-encoding %s | FileCheck %s
+// RUN: not llvm-mc -triple aarch64 -mattr=+lsui -show-encoding %s 2>&1 | FileCheck %s --check-prefix=ERROR
+
+_func:
+// CHECK: _func:
+
+//------------------------------------------------------------------------------
+// CAS(P)T instructions
+//------------------------------------------------------------------------------
+cas w26, w28, [x21]
+// CHECK: cas w26, w28, [x21]
+// ERROR: error: instruction requires: lse
+
+casl w26, w28, [x21]
+// CHECK: casl w26, w28, [x21]
+// ERROR: error: instruction requires: lse
+
+casa w26, w28, [x21]
+// CHECK: casa w26, w28, [x21]
+// ERROR: error: instruction requires: lse
+
+casal w26, w28, [x21]
+// CHECK: casal w26, w28, [x21]
+// ERROR: error: instruction requires: lse
+
+casp w26, w27, w28, w29, [x21]
+// CHECK: casp w26, w27, w28, w29, [x21]
+// ERROR: error: instruction requires: lse
+
+caspl w26, w27, w28, w29, [x21]
+// CHECK: caspl w26, w27, w28, w29, [x21]
+// ERROR: error: instruction requires: lse
+
+caspa w26, w27, w28, w29, [x21]
+// CHECK: caspa w26, w27, w28, w29, [x21]
+// ERROR: error: instruction requires: lse
+
+caspal w26, w27, w28, w29, [x21]
+// CHECK: caspal w26, w27, w28, w29, [x21]
+// ERROR: error: instruction requires: lse
>From 703af74b10059a5c496ed734d6f958e548e2860d Mon Sep 17 00:00:00 2001
From: Kerry McLaughlin <kerry.mclaughlin at arm.com>
Date: Tue, 11 Feb 2025 13:42:42 +0000
Subject: [PATCH 2/3] - Remove InstAliases for the LSUI instructions
---
.../lib/Target/AArch64/AArch64InstrFormats.td | 23 ++--
llvm/lib/Target/AArch64/AArch64InstrInfo.td | 27 -----
llvm/test/MC/AArch64/armv8.1a-lse.s | 47 +-------
llvm/test/MC/AArch64/armv9.6a-lsui.s | 102 +++---------------
4 files changed, 21 insertions(+), 178 deletions(-)
diff --git a/llvm/lib/Target/AArch64/AArch64InstrFormats.td b/llvm/lib/Target/AArch64/AArch64InstrFormats.td
index 3bb5d3cb4d09def..c2eea836fb14fbc 100644
--- a/llvm/lib/Target/AArch64/AArch64InstrFormats.td
+++ b/llvm/lib/Target/AArch64/AArch64InstrFormats.td
@@ -12529,26 +12529,19 @@ multiclass STOPregister<string asm, string instr> {
!cast<Instruction>(instr # "X")>;
}
+let Predicates = [HasLSUI] in
class BaseSTOPregisterLSUI<string asm, RegisterClass OP, Register Reg,
Instruction inst> :
- InstAlias<asm # "\t$Rs, [$Rn]", (inst Reg, OP:$Rs, GPR64sp:$Rn)>;
+ InstAlias<asm # "\t$Rs, [$Rn]", (inst Reg, OP:$Rs, GPR64sp:$Rn), 0>;
multiclass STOPregisterLSUI<string asm, string instr> {
- def : BaseSTOPregisterLSUI<asm # "a", GPR32, WZR,
- !cast<Instruction>(instr # "W")>;
- def : BaseSTOPregisterLSUI<asm # "a", GPR64, XZR,
- !cast<Instruction>(instr # "X")>;
- def : BaseSTOPregisterLSUI<asm # "l", GPR32, WZR,
- !cast<Instruction>(instr # "W")>;
- def : BaseSTOPregisterLSUI<asm # "l", GPR64, XZR,
- !cast<Instruction>(instr # "X")>;
- def : BaseSTOPregisterLSUI<asm # "al", GPR32, WZR,
- !cast<Instruction>(instr # "W")>;
- def : BaseSTOPregisterLSUI<asm # "al", GPR64, XZR,
- !cast<Instruction>(instr # "X")>;
- def : BaseSTOPregisterLSUI<asm, GPR32, WZR,
+ def : BaseSTOPregisterLSUI<asm # "l", GPR32, WZR,
+ !cast<Instruction>(instr # "LW")>;
+ def : BaseSTOPregisterLSUI<asm # "l", GPR64, XZR,
+ !cast<Instruction>(instr # "LX")>;
+ def : BaseSTOPregisterLSUI<asm, GPR32, WZR,
!cast<Instruction>(instr # "W")>;
- def : BaseSTOPregisterLSUI<asm, GPR64, XZR,
+ def : BaseSTOPregisterLSUI<asm, GPR64, XZR,
!cast<Instruction>(instr # "X")>;
}
diff --git a/llvm/lib/Target/AArch64/AArch64InstrInfo.td b/llvm/lib/Target/AArch64/AArch64InstrInfo.td
index 99ac26dff4b2210..58c829243adbd1f 100644
--- a/llvm/lib/Target/AArch64/AArch64InstrInfo.td
+++ b/llvm/lib/Target/AArch64/AArch64InstrInfo.td
@@ -2665,25 +2665,11 @@ defm CASLT : CompareAndSwapUnprivileged<0b11, 0, 1, "l">;
defm CASAT : CompareAndSwapUnprivileged<0b11, 1, 0, "a">;
defm CASALT : CompareAndSwapUnprivileged<0b11, 1, 1, "al">;
-def : InstAlias<"cast $Rs, $Rt, [$Rn]", (CASX GPR64:$Rs, GPR64:$Rt, GPR64sp0:$Rn)>;
-def : InstAlias<"caslt $Rs, $Rt, [$Rn]", (CASLX GPR64:$Rs, GPR64:$Rt, GPR64sp0:$Rn)>;
-def : InstAlias<"casat $Rs, $Rt, [$Rn]", (CASAX GPR64:$Rs, GPR64:$Rt, GPR64sp0:$Rn)>;
-def : InstAlias<"casalt $Rs, $Rt, [$Rn]", (CASALX GPR64:$Rs, GPR64:$Rt, GPR64sp0:$Rn)>;
-
// v9.6-a atomic CASPT
defm CASPT : CompareAndSwapPairUnprivileged<0b01, 0, 0, "">;
defm CASPLT : CompareAndSwapPairUnprivileged<0b01, 0, 1, "l">;
defm CASPAT : CompareAndSwapPairUnprivileged<0b01, 1, 0, "a">;
defm CASPALT : CompareAndSwapPairUnprivileged<0b01, 1, 1, "al">;
-
-def : InstAlias<"caspt $Rs, $Rt, [$Rn]",
- (CASPX XSeqPairClassOperand:$Rs, XSeqPairClassOperand:$Rt, GPR64sp0:$Rn)>;
-def : InstAlias<"casplt $Rs, $Rt, [$Rn]",
- (CASPLX XSeqPairClassOperand:$Rs, XSeqPairClassOperand:$Rt, GPR64sp0:$Rn)>;
-def : InstAlias<"caspat $Rs, $Rt, [$Rn]",
- (CASPAX XSeqPairClassOperand:$Rs, XSeqPairClassOperand:$Rt, GPR64sp0:$Rn)>;
-def : InstAlias<"caspalt $Rs, $Rt, [$Rn]",
- (CASPALX XSeqPairClassOperand:$Rs, XSeqPairClassOperand:$Rt, GPR64sp0:$Rn)>;
}
// v8.1 atomic SWP
@@ -2698,11 +2684,6 @@ let Predicates = [HasLSUI] in {
defm SWPTA : SwapLSUI<1, 0, "a">;
defm SWPTL : SwapLSUI<0, 1, "l">;
defm SWPTAL : SwapLSUI<1, 1, "al">;
-
- def : MnemonicAlias<"swp", "swpt">;
- def : MnemonicAlias<"swpa", "swpta">;
- def : MnemonicAlias<"swpl", "swptl">;
- def : MnemonicAlias<"swpal", "swptal">;
}
// v9.6-a unprivileged atomic LD<OP> (FEAT_LSUI)
@@ -4867,22 +4848,14 @@ let Predicates = [HasLSUI] in {
defm LDTXRW : LoadUnprivilegedLSUI<0b10, GPR32, "ldtxr">;
defm LDTXRX : LoadUnprivilegedLSUI<0b11, GPR64, "ldtxr">;
-def : MnemonicAlias<"ldxr", "ldtxr">;
-
def LDATXRW : LoadExclusiveLSUI <0b10, 1, 1, GPR32, "ldatxr">;
def LDATXRX : LoadExclusiveLSUI <0b11, 1, 1, GPR64, "ldatxr">;
-def : MnemonicAlias<"ldaxr", "ldatxr">;
-
defm STTXRW : StoreUnprivilegedLSUI<0b10, GPR32, "sttxr">;
defm STTXRX : StoreUnprivilegedLSUI<0b11, GPR64, "sttxr">;
-def : MnemonicAlias<"stxr", "sttxr">;
-
def STLTXRW : StoreExclusiveLSUI<0b10, 0, 1, GPR32, "stltxr">;
def STLTXRX : StoreExclusiveLSUI<0b11, 0, 1, GPR64, "stltxr">;
-
-def : MnemonicAlias<"stlxr", "stltxr">;
}
//===----------------------------------------------------------------------===//
diff --git a/llvm/test/MC/AArch64/armv8.1a-lse.s b/llvm/test/MC/AArch64/armv8.1a-lse.s
index f78bb50b6a4ae86..eb9a30dea9e6b2e 100644
--- a/llvm/test/MC/AArch64/armv8.1a-lse.s
+++ b/llvm/test/MC/AArch64/armv8.1a-lse.s
@@ -8,7 +8,7 @@
// RUN: FileCheck -check-prefix=CHECK-ERROR < %t %s
// RUN: not llvm-mc -triple aarch64-none-linux-gnu -mattr=+v8r -show-encoding < %s 2> %t | FileCheck %s
// RUN: FileCheck -check-prefix=CHECK-ERROR < %t %s
-// RUN: not llvm-mc -triple aarch64-none-linux-gnu -mattr=+v8.1a,+lse,+lsui -show-encoding < %s 2> %t | FileCheck %s -check-prefix=CHECK-FEAT-LSUI
+// RUN: not llvm-mc -triple aarch64-none-linux-gnu -mattr=+v8.1a,+lse,+lsui -show-encoding < %s 2> %t | FileCheck %s
// RUN: FileCheck -check-prefix=CHECK-ERROR < %t %s
.text
@@ -80,15 +80,6 @@
// CHECK: casal x0, x1, [x2] // encoding: [0x41,0xfc,0xe0,0xc8]
// CHECK: casal x2, x3, [sp] // encoding: [0xe3,0xff,0xe2,0xc8]
- // CHECK-FEAT-LSUI: cast x0, x1, [x2] // encoding: [0x41,0x7c,0xa0,0xc8]
- // CHECK-FEAT-LSUI: cast x2, x3, [sp] // encoding: [0xe3,0x7f,0xa2,0xc8]
- // CHECK-FEAT-LSUI: casat x0, x1, [x2] // encoding: [0x41,0x7c,0xe0,0xc8]
- // CHECK-FEAT-LSUI: casat x2, x3, [sp] // encoding: [0xe3,0x7f,0xe2,0xc8]
- // CHECK-FEAT-LSUI: caslt x0, x1, [x2] // encoding: [0x41,0xfc,0xa0,0xc8]
- // CHECK-FEAT-LSUI: caslt x2, x3, [sp] // encoding: [0xe3,0xff,0xa2,0xc8]
- // CHECK-FEAT-LSUI: casalt x0, x1, [x2] // encoding: [0x41,0xfc,0xe0,0xc8]
- // CHECK-FEAT-LSUI: casalt x2, x3, [sp] // encoding: [0xe3,0xff,0xe2,0xc8]
-
swp w0, w1, [x2]
swp w2, w3, [sp]
swpa w0, w1, [x2]
@@ -106,15 +97,6 @@
// CHECK: swpal w0, w1, [x2] // encoding: [0x41,0x80,0xe0,0xb8]
// CHECK: swpal w2, w3, [sp] // encoding: [0xe3,0x83,0xe2,0xb8]
- // CHECK-FEAT-LSUI: swpt w0, w1, [x2] // encoding: [0x41,0x84,0x20,0x19]
- // CHECK-FEAT-LSUI: swpt w2, w3, [sp] // encoding: [0xe3,0x87,0x22,0x19]
- // CHECK-FEAT-LSUI: swpta w0, w1, [x2] // encoding: [0x41,0x84,0xa0,0x19]
- // CHECK-FEAT-LSUI: swpta w2, w3, [sp] // encoding: [0xe3,0x87,0xa2,0x19]
- // CHECK-FEAT-LSUI: swptl w0, w1, [x2] // encoding: [0x41,0x84,0x60,0x19]
- // CHECK-FEAT-LSUI: swptl w2, w3, [sp] // encoding: [0xe3,0x87,0x62,0x19]
- // CHECK-FEAT-LSUI: swptal w0, w1, [x2] // encoding: [0x41,0x84,0xe0,0x19]
- // CHECK-FEAT-LSUI: swptal w2, w3, [sp] // encoding: [0xe3,0x87,0xe2,0x19]
-
swpb w0, w1, [x2]
swpb w2, w3, [sp]
swph w0, w1, [x2]
@@ -132,15 +114,6 @@
// CHECK: swplb w0, w1, [x2] // encoding: [0x41,0x80,0x60,0x38]
// CHECK: swplb w2, w3, [sp] // encoding: [0xe3,0x83,0x62,0x38]
- // CHECK-FEAT-LSUI: swpt x0, x1, [x2] // encoding: [0x41,0x84,0x20,0x59]
- // CHECK-FEAT-LSUI: swpt x2, x3, [sp] // encoding: [0xe3,0x87,0x22,0x59]
- // CHECK-FEAT-LSUI: swpta x0, x1, [x2] // encoding: [0x41,0x84,0xa0,0x59]
- // CHECK-FEAT-LSUI: swpta x2, x3, [sp] // encoding: [0xe3,0x87,0xa2,0x59]
- // CHECK-FEAT-LSUI: swptl x0, x1, [x2] // encoding: [0x41,0x84,0x60,0x59]
- // CHECK-FEAT-LSUI: swptl x2, x3, [sp] // encoding: [0xe3,0x87,0x62,0x59]
- // CHECK-FEAT-LSUI: swptal x0, x1, [x2] // encoding: [0x41,0x84,0xe0,0x59]
- // CHECK-FEAT-LSUI: swptal x2, x3, [sp] // encoding: [0xe3,0x87,0xe2,0x59]
-
swpalb w0, w1, [x2]
swpalb w2, w3, [sp]
swpah w0, w1, [x2]
@@ -192,15 +165,6 @@
// CHECK: caspa x0, x1, x2, x3, [x2] // encoding: [0x42,0x7c,0x60,0x48]
// CHECK: caspa x4, x5, x6, x7, [sp] // encoding: [0xe6,0x7f,0x64,0x48]
- // CHECK-FEAT-LSUI: casp w0, w1, w2, w3, [x5] // encoding: [0xa2,0x7c,0x20,0x08]
- // CHECK-FEAT-LSUI: casp w4, w5, w6, w7, [sp] // encoding: [0xe6,0x7f,0x24,0x08]
- // CHECK-FEAT-LSUI: caspt x0, x1, x2, x3, [x2] // encoding: [0x42,0x7c,0x20,0x48]
- // CHECK-FEAT-LSUI: caspt x4, x5, x6, x7, [sp] // encoding: [0xe6,0x7f,0x24,0x48]
- // CHECK-FEAT-LSUI: caspa w0, w1, w2, w3, [x5] // encoding: [0xa2,0x7c,0x60,0x08]
- // CHECK-FEAT-LSUI: caspa w4, w5, w6, w7, [sp] // encoding: [0xe6,0x7f,0x64,0x08]
- // CHECK-FEAT-LSUI: caspat x0, x1, x2, x3, [x2] // encoding: [0x42,0x7c,0x60,0x48]
- // CHECK-FEAT-LSUI: caspat x4, x5, x6, x7, [sp] // encoding: [0xe6,0x7f,0x64,0x48]
-
caspl w0, w1, w2, w3, [x5]
caspl w4, w5, w6, w7, [sp]
caspl x0, x1, x2, x3, [x2]
@@ -218,15 +182,6 @@
// CHECK: caspal x0, x1, x2, x3, [x2] // encoding: [0x42,0xfc,0x60,0x48]
// CHECK: caspal x4, x5, x6, x7, [sp] // encoding: [0xe6,0xff,0x64,0x48]
- // CHECK-FEAT-LSUI: caspl w0, w1, w2, w3, [x5] // encoding: [0xa2,0xfc,0x20,0x08]
- // CHECK-FEAT-LSUI: caspl w4, w5, w6, w7, [sp] // encoding: [0xe6,0xff,0x24,0x08]
- // CHECK-FEAT-LSUI: casplt x0, x1, x2, x3, [x2] // encoding: [0x42,0xfc,0x20,0x48]
- // CHECK-FEAT-LSUI: casplt x4, x5, x6, x7, [sp] // encoding: [0xe6,0xff,0x24,0x48]
- // CHECK-FEAT-LSUI: caspal w0, w1, w2, w3, [x5] // encoding: [0xa2,0xfc,0x60,0x08]
- // CHECK-FEAT-LSUI: caspal w4, w5, w6, w7, [sp] // encoding: [0xe6,0xff,0x64,0x08]
- // CHECK-FEAT-LSUI: caspalt x0, x1, x2, x3, [x2] // encoding: [0x42,0xfc,0x60,0x48]
- // CHECK-FEAT-LSUI: caspalt x4, x5, x6, x7, [sp] // encoding: [0xe6,0xff,0x64,0x48]
-
ldadd w0, w1, [x2]
ldadd w2, w3, [sp]
ldadda w0, w1, [x2]
diff --git a/llvm/test/MC/AArch64/armv9.6a-lsui.s b/llvm/test/MC/AArch64/armv9.6a-lsui.s
index b48db1f9b5570cc..d4a5e1f9805606f 100644
--- a/llvm/test/MC/AArch64/armv9.6a-lsui.s
+++ b/llvm/test/MC/AArch64/armv9.6a-lsui.s
@@ -313,42 +313,16 @@ _func:
// ERROR: instruction requires: lsui
sttaddl w0, [x2]
-// CHECK: ldtadd w0, wzr, [x2] // encoding: [0x5f,0x04,0x20,0x19]
+// CHECK: ldtaddl w0, wzr, [x2] // encoding: [0x5f,0x04,0x60,0x19]
// ERROR: instruction requires: lsui
sttaddl w2, [sp]
-// CHECK: ldtadd w2, wzr, [sp] // encoding: [0xff,0x07,0x22,0x19]
+// CHECK: ldtaddl w2, wzr, [sp] // encoding: [0xff,0x07,0x62,0x19]
// ERROR: instruction requires: lsui
sttaddl x0, [x2]
-// CHECK: ldtadd x0, xzr, [x2] // encoding: [0x5f,0x04,0x20,0x59]
+// CHECK: ldtaddl x0, xzr, [x2] // encoding: [0x5f,0x04,0x60,0x59]
// ERROR: instruction requires: lsui
sttaddl x2, [sp]
-// CHECK: ldtadd x2, xzr, [sp] // encoding: [0xff,0x07,0x22,0x59]
-// ERROR: instruction requires: lsui
-
- sttadda w0, [x2]
-// CHECK: ldtadd w0, wzr, [x2] // encoding: [0x5f,0x04,0x20,0x19]
-// ERROR: instruction requires: lsui
- sttadda w2, [sp]
-// CHECK: ldtadd w2, wzr, [sp] // encoding: [0xff,0x07,0x22,0x19]
-// ERROR: instruction requires: lsui
- sttadda x0, [x2]
-// CHECK: ldtadd x0, xzr, [x2] // encoding: [0x5f,0x04,0x20,0x59]
-// ERROR: instruction requires: lsui
- sttadda x2, [sp]
-// CHECK: ldtadd x2, xzr, [sp] // encoding: [0xff,0x07,0x22,0x59]
-// ERROR: instruction requires: lsui
-
- sttaddal w0, [x2]
-// CHECK: ldtadd w0, wzr, [x2] // encoding: [0x5f,0x04,0x20,0x19]
-// ERROR: instruction requires: lsui
- sttaddal w2, [sp]
-// CHECK: ldtadd w2, wzr, [sp] // encoding: [0xff,0x07,0x22,0x19]
-// ERROR: instruction requires: lsui
- sttaddal x0, [x2]
-// CHECK: ldtadd x0, xzr, [x2] // encoding: [0x5f,0x04,0x20,0x59]
-// ERROR: instruction requires: lsui
- sttaddal x2, [sp]
-// CHECK: ldtadd x2, xzr, [sp] // encoding: [0xff,0x07,0x22,0x59]
+// CHECK: ldtaddl x2, xzr, [sp] // encoding: [0xff,0x07,0x62,0x59]
// ERROR: instruction requires: lsui
sttclr w0, [x2]
@@ -362,45 +336,19 @@ _func:
// ERROR: instruction requires: lsui
sttclr x2, [sp]
// CHECK: ldtclr x2, xzr, [sp] // encoding: [0xff,0x17,0x22,0x59]
-// ERROR: instruction requires: lsui
-
- sttclra w0, [x2]
-// CHECK: ldtclr w0, wzr, [x2] // encoding: [0x5f,0x14,0x20,0x19]
-// ERROR: instruction requires: lsui
- sttclra w2, [sp]
-// CHECK: ldtclr w2, wzr, [sp] // encoding: [0xff,0x17,0x22,0x19]
-// ERROR: instruction requires: lsui
- sttclra x0, [x2]
-// CHECK: ldtclr x0, xzr, [x2] // encoding: [0x5f,0x14,0x20,0x59]
-// ERROR: instruction requires: lsui
- sttclra x2, [sp]
-// CHECK: ldtclr x2, xzr, [sp] // encoding: [0xff,0x17,0x22,0x59]
// ERROR: instruction requires: lsui
sttclrl w0, [x2]
-// CHECK: ldtclr w0, wzr, [x2] // encoding: [0x5f,0x14,0x20,0x19]
+// CHECK: ldtclrl w0, wzr, [x2] // encoding: [0x5f,0x14,0x60,0x19]
// ERROR: instruction requires: lsui
sttclrl w2, [sp]
-// CHECK: ldtclr w2, wzr, [sp] // encoding: [0xff,0x17,0x22,0x19]
+// CHECK: ldtclrl w2, wzr, [sp] // encoding: [0xff,0x17,0x62,0x19]
// ERROR: instruction requires: lsui
sttclrl x0, [x2]
-// CHECK: ldtclr x0, xzr, [x2] // encoding: [0x5f,0x14,0x20,0x59]
+// CHECK: ldtclrl x0, xzr, [x2] // encoding: [0x5f,0x14,0x60,0x59]
// ERROR: instruction requires: lsui
sttclrl x2, [sp]
-// CHECK: ldtclr x2, xzr, [sp] // encoding: [0xff,0x17,0x22,0x59]
-// ERROR: instruction requires: lsui
-
- sttclral w0, [x2]
-// CHECK: ldtclr w0, wzr, [x2] // encoding: [0x5f,0x14,0x20,0x19]
-// ERROR: instruction requires: lsui
- sttclral x2, [sp]
-// CHECK: ldtclr x2, xzr, [sp] // encoding: [0xff,0x17,0x22,0x59]
-// ERROR: instruction requires: lsui
- sttclral x0, [x2]
-// CHECK: ldtclr x0, xzr, [x2] // encoding: [0x5f,0x14,0x20,0x59]
-// ERROR: instruction requires: lsui
- sttclral x2, [sp]
-// CHECK: ldtclr x2, xzr, [sp] // encoding: [0xff,0x17,0x22,0x59]
+// CHECK: ldtclrl x2, xzr, [sp] // encoding: [0xff,0x17,0x62,0x59]
// ERROR: instruction requires: lsui
sttset w0, [x2]
@@ -414,45 +362,19 @@ _func:
// ERROR: instruction requires: lsui
sttset x2, [sp]
// CHECK: ldtset x2, xzr, [sp] // encoding: [0xff,0x37,0x22,0x59]
-// ERROR: instruction requires: lsui
-
- sttseta w0, [x2]
-// CHECK: ldtset w0, wzr, [x2] // encoding: [0x5f,0x34,0x20,0x19]
-// ERROR: instruction requires: lsui
- sttseta w2, [sp]
-// CHECK: ldtset w2, wzr, [sp] // encoding: [0xff,0x37,0x22,0x19]
-// ERROR: instruction requires: lsui
- sttseta x0, [x2]
-// CHECK: ldtset x0, xzr, [x2] // encoding: [0x5f,0x34,0x20,0x59]
-// ERROR: instruction requires: lsui
- sttseta x2, [sp]
-// CHECK: ldtset x2, xzr, [sp] // encoding: [0xff,0x37,0x22,0x59]
// ERROR: instruction requires: lsui
sttsetl w0, [x2]
-// CHECK: ldtset w0, wzr, [x2] // encoding: [0x5f,0x34,0x20,0x19]
+// CHECK: ldtsetl w0, wzr, [x2] // encoding: [0x5f,0x34,0x60,0x19]
// ERROR: instruction requires: lsui
sttsetl w2, [sp]
-// CHECK: ldtset w2, wzr, [sp] // encoding: [0xff,0x37,0x22,0x19]
+// CHECK: ldtsetl w2, wzr, [sp] // encoding: [0xff,0x37,0x62,0x19]
// ERROR: instruction requires: lsui
sttsetl x0, [x2]
-// CHECK: ldtset x0, xzr, [x2] // encoding: [0x5f,0x34,0x20,0x59]
+// CHECK: ldtsetl x0, xzr, [x2] // encoding: [0x5f,0x34,0x60,0x59]
// ERROR: instruction requires: lsui
sttsetl x2, [sp]
-// CHECK: ldtset x2, xzr, [sp] // encoding: [0xff,0x37,0x22,0x59]
-// ERROR: instruction requires: lsui
-
- sttsetal w0, [x2]
-// CHECK: ldtset w0, wzr, [x2] // encoding: [0x5f,0x34,0x20,0x19]
-// ERROR: instruction requires: lsui
- sttsetal x2, [sp]
-// CHECK: ldtset x2, xzr, [sp] // encoding: [0xff,0x37,0x22,0x59]
-// ERROR: instruction requires: lsui
- sttsetal x0, [x2]
-// CHECK: ldtset x0, xzr, [x2] // encoding: [0x5f,0x34,0x20,0x59]
-// ERROR: instruction requires: lsui
- sttsetal x2, [sp]
-// CHECK: ldtset x2, xzr, [sp] // encoding: [0xff,0x37,0x22,0x59]
+// CHECK: ldtsetl x2, xzr, [sp] // encoding: [0xff,0x37,0x62,0x59]
// ERROR: instruction requires: lsui
//------------------------------------------------------------------------------
>From 20e19c5feaeff2c51f44dcd982409cd604a51398 Mon Sep 17 00:00:00 2001
From: Kerry McLaughlin <kerry.mclaughlin at arm.com>
Date: Tue, 11 Feb 2025 14:20:20 +0000
Subject: [PATCH 3/3] - Removed lse-lsui-diagnostics.s, since there are no
longer aliases between the +lse and +lsui instructions.
---
llvm/test/MC/AArch64/lse-lsui-diagnostics.s | 40 ---------------------
1 file changed, 40 deletions(-)
delete mode 100644 llvm/test/MC/AArch64/lse-lsui-diagnostics.s
diff --git a/llvm/test/MC/AArch64/lse-lsui-diagnostics.s b/llvm/test/MC/AArch64/lse-lsui-diagnostics.s
deleted file mode 100644
index 75202cface97083..000000000000000
--- a/llvm/test/MC/AArch64/lse-lsui-diagnostics.s
+++ /dev/null
@@ -1,40 +0,0 @@
-// RUN: llvm-mc -triple aarch64 -mattr=+lse -mattr=+lsui -show-encoding %s | FileCheck %s
-// RUN: not llvm-mc -triple aarch64 -mattr=+lsui -show-encoding %s 2>&1 | FileCheck %s --check-prefix=ERROR
-
-_func:
-// CHECK: _func:
-
-//------------------------------------------------------------------------------
-// CAS(P)T instructions
-//------------------------------------------------------------------------------
-cas w26, w28, [x21]
-// CHECK: cas w26, w28, [x21]
-// ERROR: error: instruction requires: lse
-
-casl w26, w28, [x21]
-// CHECK: casl w26, w28, [x21]
-// ERROR: error: instruction requires: lse
-
-casa w26, w28, [x21]
-// CHECK: casa w26, w28, [x21]
-// ERROR: error: instruction requires: lse
-
-casal w26, w28, [x21]
-// CHECK: casal w26, w28, [x21]
-// ERROR: error: instruction requires: lse
-
-casp w26, w27, w28, w29, [x21]
-// CHECK: casp w26, w27, w28, w29, [x21]
-// ERROR: error: instruction requires: lse
-
-caspl w26, w27, w28, w29, [x21]
-// CHECK: caspl w26, w27, w28, w29, [x21]
-// ERROR: error: instruction requires: lse
-
-caspa w26, w27, w28, w29, [x21]
-// CHECK: caspa w26, w27, w28, w29, [x21]
-// ERROR: error: instruction requires: lse
-
-caspal w26, w27, w28, w29, [x21]
-// CHECK: caspal w26, w27, w28, w29, [x21]
-// ERROR: error: instruction requires: lse
More information about the llvm-commits
mailing list