Skip to content

Commit aa9e586

Browse files
SpencerAbsonSpencerAbson
committed
Update predication of effected instructions
1 parent f269958 commit aa9e586

15 files changed

+48
-48
lines changed

‎llvm/lib/Target/AArch64/AArch64.td‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def SVE2p1Unsupported : AArch64Unsupported;
6363

6464
def SVE2Unsupported : AArch64Unsupported {
6565
let F = !listconcat([HasSVE2, HasSVE2orSME, HasSVE2orSME2, HasSSVE_FP8FMA, HasSMEF8F16,
66-
HasSMEF8F32, HasSVE2AES, HasSVE2SHA3, HasSVE2SM4, HasSVE2BitPerm,
66+
HasSMEF8F32, HasSVEAES, HasSVE2SHA3, HasSVE2SM4, HasSVE2BitPerm,
6767
HasSVEB16B16],
6868
SVE2p1Unsupported.F);
6969
}

‎llvm/lib/Target/AArch64/AArch64InstrInfo.td‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ def HasSVE2 : Predicate<"Subtarget->isSVEAvailable() && Subtarget->hasS
149149
AssemblerPredicateWithAll<(all_of FeatureSVE2), "sve2">;
150150
def HasSVE2p1 : Predicate<"Subtarget->isSVEAvailable() && Subtarget->hasSVE2p1()">,
151151
AssemblerPredicateWithAll<(all_of FeatureSVE2p1), "sve2p1">;
152-
def HasSVE2AES : Predicate<"Subtarget->isSVEAvailable() && Subtarget->hasSVE2AES()">,
153-
AssemblerPredicateWithAll<(all_of FeatureSVE2AES), "sve2-aes">;
152+
def HasSVEAES : Predicate<"Subtarget->hasSVEAES()">,
153+
AssemblerPredicateWithAll<(all_of FeatureSVEAES), "sve-aes">;
154154
def HasSVE2SM4 : Predicate<"Subtarget->isSVEAvailable() && Subtarget->hasSVE2SM4()">,
155155
AssemblerPredicateWithAll<(all_of FeatureSVE2SM4), "sve2-sm4">;
156156
def HasSVE2SHA3 : Predicate<"Subtarget->isSVEAvailable() && Subtarget->hasSVE2SHA3()">,

‎llvm/lib/Target/AArch64/AArch64SVEInstrInfo.td‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3887,7 +3887,7 @@ let Predicates = [HasSVE2orSME] in {
38873887
defm WHILERW_PXX : sve2_int_while_rr<0b1, "whilerw", "int_aarch64_sve_whilerw">;
38883888
} // End HasSVE2orSME
38893889

3890-
let Predicates = [HasSVE2AES] in {
3890+
let Predicates = [HasSVE2, HasSVEAES] in {
38913891
// SVE2 crypto destructive binary operations
38923892
defm AESE_ZZZ_B : sve2_crypto_des_bin_op<0b00, "aese", ZPR8, int_aarch64_sve_aese, nxv16i8>;
38933893
defm AESD_ZZZ_B : sve2_crypto_des_bin_op<0b01, "aesd", ZPR8, int_aarch64_sve_aesd, nxv16i8>;

‎llvm/test/MC/AArch64/SVE2/aesd.s‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
// RUN: llvm-mc -triple=aarch64 -show-encoding -mattr=+sve2-aes < %s \
1+
// RUN: llvm-mc -triple=aarch64 -show-encoding -mattr=+sve2,+sve-aes < %s \
22
// RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
33
// RUN: not llvm-mc -triple=aarch64 -show-encoding < %s 2>&1 \
44
// RUN: | FileCheck %s --check-prefix=CHECK-ERROR
55
// RUN: not llvm-mc -triple=aarch64 -show-encoding -mattr=+sme < %s 2>&1 \
66
// RUN: | FileCheck %s --check-prefix=CHECK-ERROR
7-
// RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+sve2-aes < %s \
8-
// RUN: | llvm-objdump -d --mattr=+sve2-aes - | FileCheck %s --check-prefix=CHECK-INST
9-
// RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+sve2-aes < %s \
7+
// RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+sve2,+sve-aes < %s \
8+
// RUN: | llvm-objdump -d --mattr=+sve2,+sve-aes - | FileCheck %s --check-prefix=CHECK-INST
9+
// RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+sve2,+sve-aes < %s \
1010
// RUN: | llvm-objdump -d --mattr=-sve2 - | FileCheck %s --check-prefix=CHECK-UNKNOWN
1111

1212

1313
aesd z0.b, z0.b, z31.b
1414
// CHECK-INST: aesd z0.b, z0.b, z31.b
1515
// CHECK-ENCODING: [0xe0,0xe7,0x22,0x45]
16-
// CHECK-ERROR: instruction requires: sve2-aes
16+
// CHECK-ERROR: instruction requires: sve2 sve-aes
1717
// CHECK-UNKNOWN: 4522e7e0 <unknown>

‎llvm/test/MC/AArch64/SVE2/aese.s‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
// RUN: llvm-mc -triple=aarch64 -show-encoding -mattr=+sve2-aes < %s \
1+
// RUN: llvm-mc -triple=aarch64 -show-encoding -mattr=+sve2,+sve-aes < %s \
22
// RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
33
// RUN: not llvm-mc -triple=aarch64 -show-encoding < %s 2>&1 \
44
// RUN: | FileCheck %s --check-prefix=CHECK-ERROR
55
// RUN: not llvm-mc -triple=aarch64 -show-encoding -mattr=+sme < %s 2>&1 \
66
// RUN: | FileCheck %s --check-prefix=CHECK-ERROR
7-
// RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+sve2-aes < %s \
8-
// RUN: | llvm-objdump -d --mattr=+sve2-aes - | FileCheck %s --check-prefix=CHECK-INST
9-
// RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+sve2-aes < %s \
7+
// RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+sve2,+sve-aes < %s \
8+
// RUN: | llvm-objdump -d --mattr=+sve2,+sve-aes - | FileCheck %s --check-prefix=CHECK-INST
9+
// RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+sve2,+sve-aes < %s \
1010
// RUN: | llvm-objdump -d --mattr=-sve2 - | FileCheck %s --check-prefix=CHECK-UNKNOWN
1111

1212

1313
aese z0.b, z0.b, z31.b
1414
// CHECK-INST: aese z0.b, z0.b, z31.b
1515
// CHECK-ENCODING: [0xe0,0xe3,0x22,0x45]
16-
// CHECK-ERROR: instruction requires: sve2-aes
16+
// CHECK-ERROR: instruction requires: sve2 sve-aes
1717
// CHECK-UNKNOWN: 4522e3e0 <unknown>

‎llvm/test/MC/AArch64/SVE2/aesimc.s‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
// RUN: llvm-mc -triple=aarch64 -show-encoding -mattr=+sve2-aes < %s \
1+
// RUN: llvm-mc -triple=aarch64 -show-encoding -mattr=+sve2,+sve-aes < %s \
22
// RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
33
// RUN: not llvm-mc -triple=aarch64 -show-encoding < %s 2>&1 \
44
// RUN: | FileCheck %s --check-prefix=CHECK-ERROR
55
// RUN: not llvm-mc -triple=aarch64 -show-encoding -mattr=+sme < %s 2>&1 \
66
// RUN: | FileCheck %s --check-prefix=CHECK-ERROR
7-
// RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+sve2-aes < %s \
8-
// RUN: | llvm-objdump -d --mattr=+sve2-aes - | FileCheck %s --check-prefix=CHECK-INST
9-
// RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+sve2-aes < %s \
7+
// RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+sve2,+sve-aes < %s \
8+
// RUN: | llvm-objdump -d --mattr=+sve2,+sve-aes - | FileCheck %s --check-prefix=CHECK-INST
9+
// RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+sve2,+sve-aes < %s \
1010
// RUN: | llvm-objdump -d --mattr=-sve2 - | FileCheck %s --check-prefix=CHECK-UNKNOWN
1111

1212

1313
aesimc z0.b, z0.b
1414
// CHECK-INST: aesimc z0.b, z0.b
1515
// CHECK-ENCODING: [0x00,0xe4,0x20,0x45]
16-
// CHECK-ERROR: instruction requires: sve2-aes
16+
// CHECK-ERROR: instruction requires: sve2 sve-aes
1717
// CHECK-UNKNOWN: 4520e400 <unknown>
1818

1919
aesimc z31.b, z31.b
2020
// CHECK-INST: aesimc z31.b, z31.b
2121
// CHECK-ENCODING: [0x1f,0xe4,0x20,0x45]
22-
// CHECK-ERROR: instruction requires: sve2-aes
22+
// CHECK-ERROR: instruction requires: sve2 sve-aes
2323
// CHECK-UNKNOWN: 4520e41f <unknown>

‎llvm/test/MC/AArch64/SVE2/aesmc.s‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
// RUN: llvm-mc -triple=aarch64 -show-encoding -mattr=+sve2-aes < %s \
1+
// RUN: llvm-mc -triple=aarch64 -show-encoding -mattr=+sve2,+sve-aes < %s \
22
// RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
33
// RUN: not llvm-mc -triple=aarch64 -show-encoding < %s 2>&1 \
44
// RUN: | FileCheck %s --check-prefix=CHECK-ERROR
55
// RUN: not llvm-mc -triple=aarch64 -show-encoding -mattr=+sme < %s 2>&1 \
66
// RUN: | FileCheck %s --check-prefix=CHECK-ERROR
7-
// RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+sve2-aes < %s \
8-
// RUN: | llvm-objdump -d --mattr=+sve2-aes - | FileCheck %s --check-prefix=CHECK-INST
9-
// RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+sve2-aes < %s \
7+
// RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+sve2,+sve-aes < %s \
8+
// RUN: | llvm-objdump -d --mattr=+sve2,+sve-aes - | FileCheck %s --check-prefix=CHECK-INST
9+
// RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+sve2,+sve-aes < %s \
1010
// RUN: | llvm-objdump -d --mattr=-sve2 - | FileCheck %s --check-prefix=CHECK-UNKNOWN
1111

1212

1313
aesmc z0.b, z0.b
1414
// CHECK-INST: aesmc z0.b, z0.b
1515
// CHECK-ENCODING: [0x00,0xe0,0x20,0x45]
16-
// CHECK-ERROR: instruction requires: sve2-aes
16+
// CHECK-ERROR: instruction requires: sve2 sve-aes
1717
// CHECK-UNKNOWN: 4520e000 <unknown>
1818

1919
aesmc z31.b, z31.b
2020
// CHECK-INST: aesmc z31.b, z31.b
2121
// CHECK-ENCODING: [0x1f,0xe0,0x20,0x45]
22-
// CHECK-ERROR: instruction requires: sve2-aes
22+
// CHECK-ERROR: instruction requires: sve2 sve-aes
2323
// CHECK-UNKNOWN: 4520e01f <unknown>

‎llvm/test/MC/AArch64/SVE2/directive-arch-negative.s‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ tbx z0.b, z1.b, z2.b
66
// CHECK: error: instruction requires: sve2 or sme
77
// CHECK-NEXT: tbx z0.b, z1.b, z2.b
88

9-
.arch armv9-a+sve2-aes
10-
.arch armv9-a+nosve2-aes
9+
.arch armv9-a+sve-aes
10+
.arch armv9-a+nosve-aes
1111
aesd z23.b, z23.b, z13.b
12-
// CHECK: error: instruction requires: sve2-aes
12+
// CHECK: error: instruction requires: sve-aes
1313
// CHECK-NEXT: aesd z23.b, z23.b, z13.b
1414

1515
.arch armv9-a+sve2-sm4

‎llvm/test/MC/AArch64/SVE2/directive-arch.s‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
tbx z0.b, z1.b, z2.b
55
// CHECK: tbx z0.b, z1.b, z2.b
66

7-
.arch armv9-a+sve2-aes
7+
.arch armv9-a+sve-aes
88
aesd z23.b, z23.b, z13.b
99
// CHECK: aesd z23.b, z23.b, z13.b
1010

‎llvm/test/MC/AArch64/SVE2/directive-arch_extension-negative.s‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ tbx z0.b, z1.b, z2.b
66
// CHECK: error: instruction requires: sve2 or sme
77
// CHECK-NEXT: tbx z0.b, z1.b, z2.b
88

9-
.arch_extension sve2-aes
10-
.arch_extension nosve2-aes
9+
.arch_extension sve-aes
10+
.arch_extension nosve-aes
1111
aesd z23.b, z23.b, z13.b
12-
// CHECK: error: instruction requires: sve2-aes
12+
// CHECK: error: instruction requires: sve2 sve-aes
1313
// CHECK-NEXT: aesd z23.b, z23.b, z13.b
1414

1515
.arch_extension sve2-sm4

0 commit comments

Comments
 (0)