Skip to content

Commit 45f57ee

Browse files
jthackrayjthackray
authored
[AArch64] Fix FEAT_SVE_AES2 instructions to depend on SVE2 not SVE2P1 (#142389)
Change instructions to only require `(SVE2 or SSVE-AES) and SVE-AES2` to be consistent with the fact that `+ssve-aes` only implies `+sme2` and not `+sme2p1`.
1 parent c450dd7 commit 45f57ee

File tree

11 files changed

+46
-45
lines changed

11 files changed

+46
-45
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,16 @@ let F = [HasSME2p2, HasSVE2p2_or_SME2p2, HasNonStreamingSVE_or_SME2p2,
7878
def SME2p2Unsupported : AArch64Unsupported;
7979

8080
def SME2p1Unsupported : AArch64Unsupported {
81-
let F = !listconcat([HasSME2p1, HasSVE2p1_or_SME2p1, HasNonStreamingSVE2p1_or_SSVE_AES,
81+
let F = !listconcat([HasSME2p1, HasSVE2p1_or_SME2p1,
8282
HasSME_MOP4, HasSME_TMOP, HasNonStreamingSVE_or_SSVE_FEXPA,
8383
HasNonStreamingSVE2_or_SSVE_BitPerm],
8484
SME2p2Unsupported.F);
8585
}
8686

8787
def SME2Unsupported : AArch64Unsupported {
8888
let F = !listconcat([HasSME2, HasSVE2_or_SME2, HasSVE2p1_or_SME2, HasSSVE_FP8FMA,
89-
HasSMEF8F16, HasSMEF8F32, HasSMEF16F16_or_SMEF8F16, HasSMEB16B16],
89+
HasSMEF8F16, HasSMEF8F32, HasSMEF16F16_or_SMEF8F16, HasSMEB16B16,
90+
HasNonStreamingSVE2_or_SSVE_AES],
9091
SME2p1Unsupported.F);
9192
}
9293

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4099,7 +4099,7 @@ let Predicates = [HasSVEBitPerm, HasNonStreamingSVE2_or_SSVE_BitPerm] in {
40994099
defm BGRP_ZZZ : sve2_misc_bitwise<0b1110, "bgrp", int_aarch64_sve_bgrp_x>;
41004100
}
41014101

4102-
let Predicates = [HasSVEAES2, HasNonStreamingSVE2p1_or_SSVE_AES] in {
4102+
let Predicates = [HasSVEAES2, HasNonStreamingSVE2_or_SSVE_AES] in {
41034103
// SVE_AES2 multi-vector instructions (x2)
41044104
def AESE_2ZZI_B : sve_crypto_binary_multi2<0b000, "aese">;
41054105
def AESD_2ZZI_B : sve_crypto_binary_multi2<0b010, "aesd">;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ bfadd za.h[w8, 3], {z20.h-z21.h}
2121
.arch armv9-a+sve-aes2+ssve-aes
2222
.arch armv9-a+nossve-aes
2323
aesdimc {z0.b-z3.b}, {z0.b-z3.b}, z0.q[0]
24-
// CHECK: error: instruction requires: sve2p1 or ssve-aes sve-aes2
25-
// CHECK: aesdimc {z0.b-z3.b}, {z0.b-z3.b}, z0.q[0]
24+
// CHECK: error: instruction requires: sve-aes2
25+
// CHECK: aesdimc {z0.b-z3.b}, {z0.b-z3.b}, z0.q[0]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ bfadd za.h[w8, 3], {z20.h-z21.h}
2323
.arch_extension ssve-aes
2424
.arch_extension nossve-aes
2525
aesdimc {z0.b-z3.b}, {z0.b-z3.b}, z0.q[0]
26-
// CHECK: error: instruction requires: sve2p1 or ssve-aes
27-
// CHECK: aesdimc {z0.b-z3.b}, {z0.b-z3.b}, z0.q[0]
26+
// CHECK: error: instruction requires: sve2 or ssve-aes
27+
// CHECK: aesdimc {z0.b-z3.b}, {z0.b-z3.b}, z0.q[0]

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,36 +18,36 @@
1818
aesd {z0.b-z1.b}, {z0.b-z1.b}, z0.q[0] // 01000101-00100010-11101100-00000000
1919
// CHECK-INST: aesd { z0.b, z1.b }, { z0.b, z1.b }, z0.q[0]
2020
// CHECK-ENCODING: [0x00,0xec,0x22,0x45]
21-
// CHECK-ERROR: instruction requires: sve2p1 or ssve-aes sve-aes2
21+
// CHECK-ERROR: instruction requires: sve2 or ssve-aes sve-aes2
2222
// CHECK-UNKNOWN: 4522ec00 <unknown>
2323

2424
aesd {z20.b-z21.b}, {z20.b-z21.b}, z10.q[2] // 01000101-00110010-11101101-01010100
2525
// CHECK-INST: aesd { z20.b, z21.b }, { z20.b, z21.b }, z10.q[2]
2626
// CHECK-ENCODING: [0x54,0xed,0x32,0x45]
27-
// CHECK-ERROR: instruction requires: sve2p1 or ssve-aes sve-aes2
27+
// CHECK-ERROR: instruction requires: sve2 or ssve-aes sve-aes2
2828
// CHECK-UNKNOWN: 4532ed54 <unknown>
2929

3030
aesd {z30.b-z31.b}, {z30.b-z31.b}, z31.q[3] // 01000101-00111010-11101111-11111110
3131
// CHECK-INST: aesd { z30.b, z31.b }, { z30.b, z31.b }, z31.q[3]
3232
// CHECK-ENCODING: [0xfe,0xef,0x3a,0x45]
33-
// CHECK-ERROR: instruction requires: sve2p1 or ssve-aes sve-aes2
33+
// CHECK-ERROR: instruction requires: sve2 or ssve-aes sve-aes2
3434
// CHECK-UNKNOWN: 453aeffe <unknown>
3535

3636
// x4
3737
aesd {z0.b-z3.b}, {z0.b-z3.b}, z0.q[0] // 01000101-00100110-11101100-00000000
3838
// CHECK-INST: aesd { z0.b - z3.b }, { z0.b - z3.b }, z0.q[0]
3939
// CHECK-ENCODING: [0x00,0xec,0x26,0x45]
40-
// CHECK-ERROR: instruction requires: sve2p1 or ssve-aes sve-aes2
40+
// CHECK-ERROR: instruction requires: sve2 or ssve-aes sve-aes2
4141
// CHECK-UNKNOWN: 4526ec00 <unknown>
4242

4343
aesd {z20.b-z23.b}, {z20.b-z23.b}, z13.q[1] // 01000101-00101110-11101101-10110100
4444
// CHECK-INST: aesd { z20.b - z23.b }, { z20.b - z23.b }, z13.q[1]
4545
// CHECK-ENCODING: [0xb4,0xed,0x2e,0x45]
46-
// CHECK-ERROR: instruction requires: sve2p1 or ssve-aes sve-aes2
46+
// CHECK-ERROR: instruction requires: sve2 or ssve-aes sve-aes2
4747
// CHECK-UNKNOWN: 452eedb4 <unknown>
4848

4949
aesd {z28.b-z31.b}, {z28.b-z31.b}, z31.q[3] // 01000101-00111110-11101111-11111100
5050
// CHECK-INST: aesd { z28.b - z31.b }, { z28.b - z31.b }, z31.q[3]
5151
// CHECK-ENCODING: [0xfc,0xef,0x3e,0x45]
52-
// CHECK-ERROR: instruction requires: sve2p1 or ssve-aes sve-aes2
53-
// CHECK-UNKNOWN: 453eeffc <unknown>
52+
// CHECK-ERROR: instruction requires: sve2 or ssve-aes sve-aes2
53+
// CHECK-UNKNOWN: 453eeffc <unknown>

‎llvm/test/MC/AArch64/SVE2p1/aesdimc.s‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,36 +19,36 @@
1919
aesdimc {z0.b-z1.b}, {z0.b-z1.b}, z0.q[0] // 01000101-00100011-11101100-00000000
2020
// CHECK-INST: aesdimc { z0.b, z1.b }, { z0.b, z1.b }, z0.q[0]
2121
// CHECK-ENCODING: [0x00,0xec,0x23,0x45]
22-
// CHECK-ERROR: instruction requires: sve2p1 or ssve-aes sve-aes2
22+
// CHECK-ERROR: instruction requires: sve2 or ssve-aes sve-aes2
2323
// CHECK-UNKNOWN: 4523ec00 <unknown>
2424

2525
aesdimc {z20.b-z21.b}, {z20.b-z21.b}, z10.q[2] // 01000101-00110011-11101101-01010100
2626
// CHECK-INST: aesdimc { z20.b, z21.b }, { z20.b, z21.b }, z10.q[2]
2727
// CHECK-ENCODING: [0x54,0xed,0x33,0x45]
28-
// CHECK-ERROR: instruction requires: sve2p1 or ssve-aes sve-aes2
28+
// CHECK-ERROR: instruction requires: sve2 or ssve-aes sve-aes2
2929
// CHECK-UNKNOWN: 4533ed54 <unknown>
3030

3131
aesdimc {z30.b-z31.b}, {z30.b-z31.b}, z31.q[3] // 01000101-00111011-11101111-11111110
3232
// CHECK-INST: aesdimc { z30.b, z31.b }, { z30.b, z31.b }, z31.q[3]
3333
// CHECK-ENCODING: [0xfe,0xef,0x3b,0x45]
34-
// CHECK-ERROR: instruction requires: sve2p1 or ssve-aes sve-aes2
34+
// CHECK-ERROR: instruction requires: sve2 or ssve-aes sve-aes2
3535
// CHECK-UNKNOWN: 453beffe <unknown>
3636

3737
// x4
3838
aesdimc {z0.b-z3.b}, {z0.b-z3.b}, z0.q[0] // 01000101-00100111-11101100-00000000
3939
// CHECK-INST: aesdimc { z0.b - z3.b }, { z0.b - z3.b }, z0.q[0]
4040
// CHECK-ENCODING: [0x00,0xec,0x27,0x45]
41-
// CHECK-ERROR: instruction requires: sve2p1 or ssve-aes sve-aes2
41+
// CHECK-ERROR: instruction requires: sve2 or ssve-aes sve-aes2
4242
// CHECK-UNKNOWN: 4527ec00 <unknown>
4343

4444
aesdimc {z20.b-z23.b}, {z20.b-z23.b}, z13.q[1] // 01000101-00101111-11101101-10110100
4545
// CHECK-INST: aesdimc { z20.b - z23.b }, { z20.b - z23.b }, z13.q[1]
4646
// CHECK-ENCODING: [0xb4,0xed,0x2f,0x45]
47-
// CHECK-ERROR: instruction requires: sve2p1 or ssve-aes sve-aes2
47+
// CHECK-ERROR: instruction requires: sve2 or ssve-aes sve-aes2
4848
// CHECK-UNKNOWN: 452fedb4 <unknown>
4949

5050
aesdimc {z28.b-z31.b}, {z28.b-z31.b}, z31.q[3] // 01000101-00111111-11101111-11111100
5151
// CHECK-INST: aesdimc { z28.b - z31.b }, { z28.b - z31.b }, z31.q[3]
5252
// CHECK-ENCODING: [0xfc,0xef,0x3f,0x45]
53-
// CHECK-ERROR: instruction requires: sve2p1 or ssve-aes sve-aes2
54-
// CHECK-UNKNOWN: 453feffc <unknown>
53+
// CHECK-ERROR: instruction requires: sve2 or ssve-aes sve-aes2
54+
// CHECK-UNKNOWN: 453feffc <unknown>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,36 +18,36 @@
1818
aese {z0.b-z1.b}, {z0.b-z1.b}, z0.q[0] // 01000101-00100010-11101000-00000000
1919
// CHECK-INST: aese { z0.b, z1.b }, { z0.b, z1.b }, z0.q[0]
2020
// CHECK-ENCODING: [0x00,0xe8,0x22,0x45]
21-
// CHECK-ERROR: instruction requires: sve2p1 or ssve-aes sve-aes2
21+
// CHECK-ERROR: instruction requires: sve2 or ssve-aes sve-aes2
2222
// CHECK-UNKNOWN: 4522e800 <unknown>
2323

2424
aese {z20.b-z21.b}, {z20.b-z21.b}, z10.q[2] // 01000101-00110010-11101001-01010100
2525
// CHECK-INST: aese { z20.b, z21.b }, { z20.b, z21.b }, z10.q[2]
2626
// CHECK-ENCODING: [0x54,0xe9,0x32,0x45]
27-
// CHECK-ERROR: instruction requires: sve2p1 or ssve-aes sve-aes2
27+
// CHECK-ERROR: instruction requires: sve2 or ssve-aes sve-aes2
2828
// CHECK-UNKNOWN: 4532e954 <unknown>
2929

3030
aese {z30.b-z31.b}, {z30.b-z31.b}, z31.q[3] // 01000101-00111010-11101011-11111110
3131
// CHECK-INST: aese { z30.b, z31.b }, { z30.b, z31.b }, z31.q[3]
3232
// CHECK-ENCODING: [0xfe,0xeb,0x3a,0x45]
33-
// CHECK-ERROR: instruction requires: sve2p1 or ssve-aes sve-aes2
33+
// CHECK-ERROR: instruction requires: sve2 or ssve-aes sve-aes2
3434
// CHECK-UNKNOWN: 453aebfe <unknown>
3535

3636
// x4
3737
aese {z0.b-z3.b}, {z0.b-z3.b}, z0.q[0] // 01000101-00100110-11101000-00000000
3838
// CHECK-INST: aese { z0.b - z3.b }, { z0.b - z3.b }, z0.q[0]
3939
// CHECK-ENCODING: [0x00,0xe8,0x26,0x45]
40-
// CHECK-ERROR: instruction requires: sve2p1 or ssve-aes sve-aes2
40+
// CHECK-ERROR: instruction requires: sve2 or ssve-aes sve-aes2
4141
// CHECK-UNKNOWN: 4526e800 <unknown>
4242

4343
aese {z20.b-z23.b}, {z20.b-z23.b}, z13.q[1] // 01000101-00101110-11101001-10110100
4444
// CHECK-INST: aese { z20.b - z23.b }, { z20.b - z23.b }, z13.q[1]
4545
// CHECK-ENCODING: [0xb4,0xe9,0x2e,0x45]
46-
// CHECK-ERROR: instruction requires: sve2p1 or ssve-aes sve-aes2
46+
// CHECK-ERROR: instruction requires: sve2 or ssve-aes sve-aes2
4747
// CHECK-UNKNOWN: 452ee9b4 <unknown>
4848

4949
aese {z28.b-z31.b}, {z28.b-z31.b}, z31.q[3] // 01000101-00111110-11101011-11111100
5050
// CHECK-INST: aese { z28.b - z31.b }, { z28.b - z31.b }, z31.q[3]
5151
// CHECK-ENCODING: [0xfc,0xeb,0x3e,0x45]
52-
// CHECK-ERROR: instruction requires: sve2p1 or ssve-aes sve-aes2
53-
// CHECK-UNKNOWN: 453eebfc <unknown>
52+
// CHECK-ERROR: instruction requires: sve2 or ssve-aes sve-aes2
53+
// CHECK-UNKNOWN: 453eebfc <unknown>

‎llvm/test/MC/AArch64/SVE2p1/aesemc.s‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,36 +18,36 @@
1818
aesemc {z0.b-z1.b}, {z0.b-z1.b}, z0.q[0] // 01000101-00100011-11101000-00000000
1919
// CHECK-INST: aesemc { z0.b, z1.b }, { z0.b, z1.b }, z0.q[0]
2020
// CHECK-ENCODING: [0x00,0xe8,0x23,0x45]
21-
// CHECK-ERROR: instruction requires: sve2p1 or ssve-aes sve-aes2
21+
// CHECK-ERROR: instruction requires: sve2 or ssve-aes sve-aes2
2222
// CHECK-UNKNOWN: 4523e800 <unknown>
2323

2424
aesemc {z22.b-z23.b}, {z22.b-z23.b}, z13.q[1] // 01000101-00101011-11101001-10110110
2525
// CHECK-INST: aesemc { z22.b, z23.b }, { z22.b, z23.b }, z13.q[1]
2626
// CHECK-ENCODING: [0xb6,0xe9,0x2b,0x45]
27-
// CHECK-ERROR: instruction requires: sve2p1 or ssve-aes sve-aes2
27+
// CHECK-ERROR: instruction requires: sve2 or ssve-aes sve-aes2
2828
// CHECK-UNKNOWN: 452be9b6 <unknown>
2929

3030
aesemc {z30.b-z31.b}, {z30.b-z31.b}, z31.q[3] // 01000101-00111011-11101011-11111110
3131
// CHECK-INST: aesemc { z30.b, z31.b }, { z30.b, z31.b }, z31.q[3]
3232
// CHECK-ENCODING: [0xfe,0xeb,0x3b,0x45]
33-
// CHECK-ERROR: instruction requires: sve2p1 or ssve-aes sve-aes2
33+
// CHECK-ERROR: instruction requires: sve2 or ssve-aes sve-aes2
3434
// CHECK-UNKNOWN: 453bebfe <unknown>
3535

3636
// x4
3737
aesemc {z0.b-z3.b}, {z0.b-z3.b}, z0.q[0] // 01000101-00100111-11101000-00000000
3838
// CHECK-INST: aesemc { z0.b - z3.b }, { z0.b - z3.b }, z0.q[0]
3939
// CHECK-ENCODING: [0x00,0xe8,0x27,0x45]
40-
// CHECK-ERROR: instruction requires: sve2p1 or ssve-aes sve-aes2
40+
// CHECK-ERROR: instruction requires: sve2 or ssve-aes sve-aes2
4141
// CHECK-UNKNOWN: 4527e800 <unknown>
4242

4343
aesemc {z20.b-z23.b}, {z20.b-z23.b}, z10.q[2] // 01000101-00110111-11101001-01010100
4444
// CHECK-INST: aesemc { z20.b - z23.b }, { z20.b - z23.b }, z10.q[2]
4545
// CHECK-ENCODING: [0x54,0xe9,0x37,0x45]
46-
// CHECK-ERROR: instruction requires: sve2p1 or ssve-aes sve-aes2
46+
// CHECK-ERROR: instruction requires: sve2 or ssve-aes sve-aes2
4747
// CHECK-UNKNOWN: 4537e954 <unknown>
4848

4949
aesemc {z28.b-z31.b}, {z28.b-z31.b}, z31.q[3] // 01000101-00111111-11101011-11111100
5050
// CHECK-INST: aesemc { z28.b - z31.b }, { z28.b - z31.b }, z31.q[3]
5151
// CHECK-ENCODING: [0xfc,0xeb,0x3f,0x45]
52-
// CHECK-ERROR: instruction requires: sve2p1 or ssve-aes sve-aes2
53-
// CHECK-UNKNOWN: 453febfc <unknown>
52+
// CHECK-ERROR: instruction requires: sve2 or ssve-aes sve-aes2
53+
// CHECK-UNKNOWN: 453febfc <unknown>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ bfadd z23.h, p3/m, z23.h, z13.h
1515
.arch armv9-a+sve2p1+sve-aes2
1616
.arch armv9-a+nosve-aes2
1717
aesdimc {z0.b-z3.b}, {z0.b-z3.b}, z0.q[0]
18-
// CHECK: error: instruction requires: sve2p1 or ssve-aes sve-aes2
19-
// CHECK: aesdimc {z0.b-z3.b}, {z0.b-z3.b}, z0.q[0]
18+
// CHECK: error: instruction requires: sve-aes2
19+
// CHECK: aesdimc {z0.b-z3.b}, {z0.b-z3.b}, z0.q[0]

‎llvm/test/MC/AArch64/SVE2p1/pmlal.s‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
pmlal {z0.q-z1.q}, z0.d, z0.d // 01000101-00100000-11111100-00000000
1818
// CHECK-INST: pmlal { z0.q, z1.q }, z0.d, z0.d
1919
// CHECK-ENCODING: [0x00,0xfc,0x20,0x45]
20-
// CHECK-ERROR: instruction requires: sve2p1 or ssve-aes sve-aes2
20+
// CHECK-ERROR: instruction requires: sve2 or ssve-aes sve-aes2
2121
// CHECK-UNKNOWN: 4520fc00 <unknown>
2222

2323
pmlal {z22.q-z23.q}, z13.d, z8.d // 01000101-00101000-11111101-10110110
2424
// CHECK-INST: pmlal { z22.q, z23.q }, z13.d, z8.d
2525
// CHECK-ENCODING: [0xb6,0xfd,0x28,0x45]
26-
// CHECK-ERROR: instruction requires: sve2p1 or ssve-aes sve-aes2
26+
// CHECK-ERROR: instruction requires: sve2 or ssve-aes sve-aes2
2727
// CHECK-UNKNOWN: 4528fdb6 <unknown>
2828

2929
pmlal {z30.q-z31.q}, z31.d, z31.d // 01000101-00111111-11111111-11111110
3030
// CHECK-INST: pmlal { z30.q, z31.q }, z31.d, z31.d
3131
// CHECK-ENCODING: [0xfe,0xff,0x3f,0x45]
32-
// CHECK-ERROR: instruction requires: sve2p1 or ssve-aes sve-aes2
33-
// CHECK-UNKNOWN: 453ffffe <unknown>
32+
// CHECK-ERROR: instruction requires: sve2 or ssve-aes sve-aes2
33+
// CHECK-UNKNOWN: 453ffffe <unknown>

0 commit comments

Comments
 (0)