Skip to content

Commit ec6f646

Browse files
committed
Fix FMV dependencies and respond to review comments
1 parent 4520ec4 commit ec6f646

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

clang/test/CodeGen/aarch64-fmv-dependencies.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ int caller() {
201201
// CHECK: attributes #[[ssbs]] = { {{.*}} "target-features"="+fp-armv8,+neon,+outline-atomics,+ssbs,+v8a"
202202
// CHECK: attributes #[[sve]] = { {{.*}} "target-features"="+fp-armv8,+fullfp16,+neon,+outline-atomics,+sve,+v8a"
203203
// CHECK: attributes #[[sve2]] = { {{.*}} "target-features"="+fp-armv8,+fullfp16,+neon,+outline-atomics,+sve,+sve2,+v8a"
204-
// CHECK: attributes #[[sve2_aes]] = { {{.*}} "target-features"="+aes,+fp-armv8,+fullfp16,+neon,+outline-atomics,+sve,+sve2,+sve2-aes,+v8a"
204+
// CHECK: attributes #[[sve2_aes]] = { {{.*}} "target-features"="+aes,+fp-armv8,+fullfp16,+neon,+outline-atomics,+sve,+sve-aes,+sve2,+v8a"
205205
// CHECK: attributes #[[sve2_bitperm]] = { {{.*}} "target-features"="+fp-armv8,+fullfp16,+neon,+outline-atomics,+sve,+sve2,+sve2-bitperm,+v8a"
206206
// CHECK: attributes #[[sve2_sha3]] = { {{.*}} "target-features"="+fp-armv8,+fullfp16,+neon,+outline-atomics,+sve,+sve2,+sve2-sha3,+v8a"
207207
// CHECK: attributes #[[sve2_sm4]] = { {{.*}} "target-features"="+fp-armv8,+fullfp16,+neon,+outline-atomics,+sve,+sve2,+sve2-sm4,+v8a"

clang/test/Driver/print-supported-extensions-aarch64.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@
8282
// CHECK-NEXT: ssve-fp8dot4 FEAT_SSVE_FP8DOT4 Enable SVE2 FP8 4-way dot product instructions
8383
// CHECK-NEXT: ssve-fp8fma FEAT_SSVE_FP8FMA Enable SVE2 FP8 multiply-add instructions
8484
// CHECK-NEXT: sve FEAT_SVE Enable Scalable Vector Extension (SVE) instructions
85-
// CHECK-NEXT: sve-aes FEAT_SVE_AES, FEAT_SVE_PMULL128 Enable SVE AES and 128-bit PMULL instructions
86-
// CHECK-NEXT: sve-aes2 FEAT_SVE_AES2 Enable Armv9.6-A SVE multi-vector AES and 128-bit PMULL instructions
85+
// CHECK-NEXT: sve-aes FEAT_SVE_AES, FEAT_SVE_PMULL128 Enable SVE AES and quadword PMULL instructions
86+
// CHECK-NEXT: sve-aes2 FEAT_SVE_AES2 Enable Armv9.6-A SVE multi-vector AES and quadword PMULL instructions
8787
// CHECK-NEXT: sve-b16b16 FEAT_SVE_B16B16 Enable SVE2 non-widening and SME2 Z-targeting non-widening BFloat16 instructions
8888
// CHECK-NEXT: sve-bfscale FEAT_SVE_BFSCALE Enable Armv9.6-A SVE BFloat16 scaling instructions
8989
// CHECK-NEXT: sve-f16f32mm FEAT_SVE_F16F32MM Enable Armv9.6-A FP16 to FP32 Matrix Multiply

lldb/test/Shell/Commands/command-disassemble-aarch64-extensions.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ fn:
5555
mrs x2, ssbs // AEK_SSBS
5656
abs z31.h, p7/m, z31.h // AEK_SVE
5757
sqdmlslbt z0.d, z1.s, z31.s // AEK_SVE2
58-
aesd z0.b, z0.b, z31.b // AEK_SVE2AES
58+
aesd z0.b, z0.b, z31.b // AEK_SVEAES
5959
bdep z0.b, z1.b, z31.b // AEK_SVE2BITPERM
6060
rax1 z0.d, z0.d, z0.d // AEK_SVE2SHA3
6161
sm4e z0.s, z0.s, z0.s // AEK_SVE2SM4

llvm/lib/Target/AArch64/AArch64FMV.td

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def : FMVExtension<"sme2", "FEAT_SME2", "+sme2,+sme,+bf16", 580>;
8282
def : FMVExtension<"ssbs", "FEAT_SSBS2", "+ssbs", 490>;
8383
def : FMVExtension<"sve", "FEAT_SVE", "+sve,+fullfp16,+fp-armv8,+neon", 310>;
8484
def : FMVExtension<"sve2", "FEAT_SVE2", "+sve2,+sve,+fullfp16,+fp-armv8,+neon", 370>;
85-
def : FMVExtension<"sve2-aes", "FEAT_SVE_PMULL128", "+sve2,+sve,+aes,+sve2-aes,+fullfp16,+fp-armv8,+neon", 380>;
85+
def : FMVExtension<"sve2-aes", "FEAT_SVE_PMULL128", "+sve2,+sve,+aes,+sve-aes,+fullfp16,+fp-armv8,+neon", 380>;
8686
def : FMVExtension<"sve2-bitperm", "FEAT_SVE_BITPERM", "+sve2,+sve,+sve2-bitperm,+fullfp16,+fp-armv8,+neon", 400>;
8787
def : FMVExtension<"sve2-sha3", "FEAT_SVE_SHA3", "+sve2,+sve,+sve2-sha3,+fullfp16,+fp-armv8,+neon", 410>;
8888
def : FMVExtension<"sve2-sm4", "FEAT_SVE_SM4", "+sve2,+sve,+sve2-sm4,+fullfp16,+fp-armv8,+neon", 420>;

llvm/lib/Target/AArch64/AArch64Features.td

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -371,9 +371,9 @@ def FeatureSVE2 : ExtensionWithMArch<"sve2", "SVE2", "FEAT_SVE2",
371371

372372
def FeatureSVEAES : ExtensionWithMArch<"sve-aes", "SVEAES",
373373
"FEAT_SVE_AES, FEAT_SVE_PMULL128",
374-
"Enable SVE AES and 128-bit PMULL instructions", [FeatureAES]>;
374+
"Enable SVE AES and quadword PMULL instructions", [FeatureAES]>;
375375

376-
def FeatureSVE2AES : ExtensionWithMArch<"sve2-aes", "SVE2AES", "",
376+
def AliasSVE2AES : ExtensionWithMArch<"sve2-aes", "ALIAS_SVE2AES", "",
377377
"An alias of +sve2+sve-aes", [FeatureSVE2, FeatureSVEAES]>;
378378

379379
def FeatureSVE2SM4 : ExtensionWithMArch<"sve2-sm4", "SVE2SM4", "FEAT_SVE_SM4",
@@ -551,7 +551,7 @@ def FeatureSVE2p2 : ExtensionWithMArch<"sve2p2", "SVE2p2", "FEAT_SVE2p2",
551551
"Enable Armv9.6-A Scalable Vector Extension 2.2 instructions", [FeatureSVE2p1]>;
552552

553553
def FeatureSVEAES2: ExtensionWithMArch<"sve-aes2", "SVE_AES2", "FEAT_SVE_AES2",
554-
"Enable Armv9.6-A SVE multi-vector AES and 128-bit PMULL instructions">;
554+
"Enable Armv9.6-A SVE multi-vector AES and quadword PMULL instructions">;
555555

556556
def FeatureSVEBFSCALE: ExtensionWithMArch<"sve-bfscale", "SVE_BFSCALE", "FEAT_SVE_BFSCALE",
557557
"Enable Armv9.6-A SVE BFloat16 scaling instructions">;

llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3736,7 +3736,7 @@ static const struct Extension {
37363736
{"sve-b16b16", {AArch64::FeatureSVEB16B16}},
37373737
{"sve-aes", {AArch64::FeatureSVEAES}},
37383738
{"sve2", {AArch64::FeatureSVE2}},
3739-
{"sve2-aes", {AArch64::FeatureSVE2AES}},
3739+
{"sve2-aes", {AArch64::AliasSVE2AES}},
37403740
{"sve2-sm4", {AArch64::FeatureSVE2SM4}},
37413741
{"sve2-sha3", {AArch64::FeatureSVE2SHA3}},
37423742
{"sve2-bitperm", {AArch64::FeatureSVE2BitPerm}},

llvm/unittests/TargetParser/TargetParserTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1297,7 +1297,7 @@ TEST(TargetParserTest, AArch64ExtensionFeatures) {
12971297
AArch64::AEK_SIMD, AArch64::AEK_FP16,
12981298
AArch64::AEK_FP16FML, AArch64::AEK_PROFILE,
12991299
AArch64::AEK_RAS, AArch64::AEK_SVE,
1300-
AArch64::AEK_SVE2, AArch64::AEK_SVE2AES,
1300+
AArch64::AEK_SVE2, AArch64::AEK_ALIAS_SVE2AES,
13011301
AArch64::AEK_SVE2SM4, AArch64::AEK_SVE2SHA3,
13021302
AArch64::AEK_SVE2BITPERM, AArch64::AEK_RCPC,
13031303
AArch64::AEK_RAND, AArch64::AEK_MTE,

0 commit comments

Comments
 (0)