Skip to content

Commit 4c29499

Browse files
ElvinaYakubovaElvinaYakubova
committed
[AArch64] Add optional extensions enabled on Grace
Enable optional ISA extensions on Grace when mcpu=grace is used: aes, sha2, sve2-sm4, sve2-aes, sve2-sha3. Grace is no longer an alias, but a separate CPU definition.
1 parent 059f044 commit 4c29499

File tree

5 files changed

+69
-4
lines changed

5 files changed

+69
-4
lines changed

‎clang/test/Driver/aarch64-mcpu.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
// COBALT-100: "-cc1"{{.*}} "-triple" "aarch64{{.*}}" "-target-cpu" "neoverse-n2"
9393

9494
// RUN: %clang --target=aarch64 -mcpu=grace -### -c %s 2>&1 | FileCheck -check-prefix=GRACE %s
95-
// GRACE: "-cc1"{{.*}} "-triple" "aarch64{{.*}}" "-target-cpu" "neoverse-v2"
95+
// GRACE: "-cc1"{{.*}} "-triple" "aarch64{{.*}}" "-target-cpu" "grace"
9696

9797
// ================== Check whether -mcpu and -mtune accept mixed-case values.
9898
// RUN: %clang --target=aarch64 -mcpu=Cortex-a53 -### -c %s 2>&1 | FileCheck -check-prefix=CASE-INSENSITIVE-CA53 %s

‎clang/test/Driver/print-enabled-extensions/aarch64-grace.c‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
// REQUIRES: aarch64-registered-target
2+
// RUN: %clang --target=aarch64 --print-enabled-extensions -mcpu=grace | FileCheck --strict-whitespace --implicit-check-not=FEAT_ %s
3+
4+
// CHECK: Extensions enabled for the given AArch64 target
5+
// CHECK-EMPTY:
6+
// CHECK-NEXT: Architecture Feature(s) Description
7+
// CHECK-NEXT: FEAT_AES, FEAT_PMULL Enable AES support
8+
// CHECK-NEXT: FEAT_AMUv1 Enable Armv8.4-A Activity Monitors extension
9+
// CHECK-NEXT: FEAT_AdvSIMD Enable Advanced SIMD instructions
10+
// CHECK-NEXT: FEAT_BF16 Enable BFloat16 Extension
11+
// CHECK-NEXT: FEAT_BTI Enable Branch Target Identification
12+
// CHECK-NEXT: FEAT_CCIDX Enable Armv8.3-A Extend of the CCSIDR number of sets
13+
// CHECK-NEXT: FEAT_CRC32 Enable Armv8.0-A CRC-32 checksum instructions
14+
// CHECK-NEXT: FEAT_CSV2_2 Enable architectural speculation restriction
15+
// CHECK-NEXT: FEAT_DIT Enable Armv8.4-A Data Independent Timing instructions
16+
// CHECK-NEXT: FEAT_DPB Enable Armv8.2-A data Cache Clean to Point of Persistence
17+
// CHECK-NEXT: FEAT_DPB2 Enable Armv8.5-A Cache Clean to Point of Deep Persistence
18+
// CHECK-NEXT: FEAT_DotProd Enable dot product support
19+
// CHECK-NEXT: FEAT_ETE Enable Embedded Trace Extension
20+
// CHECK-NEXT: FEAT_FCMA Enable Armv8.3-A Floating-point complex number support
21+
// CHECK-NEXT: FEAT_FHM Enable FP16 FML instructions
22+
// CHECK-NEXT: FEAT_FP Enable Armv8.0-A Floating Point Extensions
23+
// CHECK-NEXT: FEAT_FP16 Enable half-precision floating-point data processing
24+
// CHECK-NEXT: FEAT_FRINTTS Enable FRInt[32|64][Z|X] instructions that round a floating-point number to an integer (in FP format) forcing it to fit into a 32- or 64-bit int
25+
// CHECK-NEXT: FEAT_FlagM Enable Armv8.4-A Flag Manipulation instructions
26+
// CHECK-NEXT: FEAT_FlagM2 Enable alternative NZCV format for floating point comparisons
27+
// CHECK-NEXT: FEAT_I8MM Enable Matrix Multiply Int8 Extension
28+
// CHECK-NEXT: FEAT_JSCVT Enable Armv8.3-A JavaScript FP conversion instructions
29+
// CHECK-NEXT: FEAT_LOR Enable Armv8.1-A Limited Ordering Regions extension
30+
// CHECK-NEXT: FEAT_LRCPC Enable support for RCPC extension
31+
// CHECK-NEXT: FEAT_LRCPC2 Enable Armv8.4-A RCPC instructions with Immediate Offsets
32+
// CHECK-NEXT: FEAT_LSE Enable Armv8.1-A Large System Extension (LSE) atomic instructions
33+
// CHECK-NEXT: FEAT_LSE2 Enable Armv8.4-A Large System Extension 2 (LSE2) atomicity rules
34+
// CHECK-NEXT: FEAT_MPAM Enable Armv8.4-A Memory system Partitioning and Monitoring extension
35+
// CHECK-NEXT: FEAT_MTE, FEAT_MTE2 Enable Memory Tagging Extension
36+
// CHECK-NEXT: FEAT_NV, FEAT_NV2 Enable Armv8.4-A Nested Virtualization Enchancement
37+
// CHECK-NEXT: FEAT_PAN Enable Armv8.1-A Privileged Access-Never extension
38+
// CHECK-NEXT: FEAT_PAN2 Enable Armv8.2-A PAN s1e1R and s1e1W Variants
39+
// CHECK-NEXT: FEAT_PAuth Enable Armv8.3-A Pointer Authentication extension
40+
// CHECK-NEXT: FEAT_PMUv3 Enable Armv8.0-A PMUv3 Performance Monitors extension
41+
// CHECK-NEXT: FEAT_RAS, FEAT_RASv1p1 Enable Armv8.0-A Reliability, Availability and Serviceability Extensions
42+
// CHECK-NEXT: FEAT_RDM Enable Armv8.1-A Rounding Double Multiply Add/Subtract instructions
43+
// CHECK-NEXT: FEAT_RNG Enable Random Number generation instructions
44+
// CHECK-NEXT: FEAT_SB Enable Armv8.5-A Speculation Barrier
45+
// CHECK-NEXT: FEAT_SEL2 Enable Armv8.4-A Secure Exception Level 2 extension
46+
// CHECK-NEXT: FEAT_SHA1, FEAT_SHA256 Enable SHA1 and SHA256 support
47+
// CHECK-NEXT: FEAT_SHA3, FEAT_SHA512 Enable SHA512 and SHA3 support
48+
// CHECK-NEXT: FEAT_SM4, FEAT_SM3 Enable SM3 and SM4 support
49+
// CHECK-NEXT: FEAT_SPE Enable Statistical Profiling extension
50+
// CHECK-NEXT: FEAT_SPECRES Enable Armv8.5-A execution and data prediction invalidation instructions
51+
// CHECK-NEXT: FEAT_SSBS, FEAT_SSBS2 Enable Speculative Store Bypass Safe bit
52+
// CHECK-NEXT: FEAT_SVE Enable Scalable Vector Extension (SVE) instructions
53+
// CHECK-NEXT: FEAT_SVE2 Enable Scalable Vector Extension 2 (SVE2) instructions
54+
// CHECK-NEXT: FEAT_SVE_AES, FEAT_SVE_PMULL128 Enable SVE AES and quadword SVE polynomial multiply instructions
55+
// CHECK-NEXT: FEAT_SVE_BitPerm Enable bit permutation SVE2 instructions
56+
// CHECK-NEXT: FEAT_SVE_SHA3 Enable SHA3 SVE2 instructions
57+
// CHECK-NEXT: FEAT_SVE_SM4 Enable SM4 SVE2 instructions
58+
// CHECK-NEXT: FEAT_TLBIOS, FEAT_TLBIRANGE Enable Armv8.4-A TLB Range and Maintenance instructions
59+
// CHECK-NEXT: FEAT_TRBE Enable Trace Buffer Extension
60+
// CHECK-NEXT: FEAT_TRF Enable Armv8.4-A Trace extension
61+
// CHECK-NEXT: FEAT_UAO Enable Armv8.2-A UAO PState
62+
// CHECK-NEXT: FEAT_VHE Enable Armv8.1-A Virtual Host extension

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,7 +1059,6 @@ def ProcessorFeatures {
10591059
FeatureJS, FeatureLSE, FeaturePAuth, FeatureRAS, FeatureRCPC,
10601060
FeatureCCIDX,
10611061
FeatureRDM];
1062-
10631062
list<SubtargetFeature> Oryon = [HasV8_6aOps, FeatureNEON, FeaturePerfMon,
10641063
FeatureRandGen,
10651064
FeaturePAuth, FeatureSM4, FeatureSHA2,
@@ -1068,6 +1067,8 @@ def ProcessorFeatures {
10681067
FeatureDotProd, FeatureFPARMv8, FeatureMatMulInt8,
10691068
FeatureSSBS, FeatureCCIDX,
10701069
FeatureJS, FeatureLSE, FeatureRAS, FeatureRCPC, FeatureRDM];
1070+
list<SubtargetFeature> Grace = !listconcat(NeoverseV2, [FeatureAES, FeatureSHA2, FeatureSVE2SM4,
1071+
FeatureSVEAES, FeatureSVE2SHA3]);
10711072

10721073
// ETE and TRBE are future architecture extensions. We temporarily enable them
10731074
// by default for users targeting generic AArch64. The extensions do not
@@ -1151,6 +1152,8 @@ def : ProcessorModel<"cortex-x4", NeoverseV2Model, ProcessorFeatures.X4,
11511152
[TuneX4]>;
11521153
def : ProcessorModel<"cortex-x925", NeoverseV2Model, ProcessorFeatures.X925,
11531154
[TuneX925]>;
1155+
def : ProcessorModel<"grace", NeoverseV2Model, ProcessorFeatures.Grace,
1156+
[TuneNeoverseV2]>;
11541157
def : ProcessorModel<"neoverse-e1", CortexA53Model,
11551158
ProcessorFeatures.NeoverseE1, [TuneNeoverseE1]>;
11561159
def : ProcessorModel<"neoverse-n1", NeoverseN1Model,
@@ -1166,7 +1169,6 @@ def : ProcessorModel<"neoverse-v1", NeoverseV1Model,
11661169
ProcessorFeatures.NeoverseV1, [TuneNeoverseV1]>;
11671170
def : ProcessorModel<"neoverse-v2", NeoverseV2Model,
11681171
ProcessorFeatures.NeoverseV2, [TuneNeoverseV2]>;
1169-
def : ProcessorAlias<"grace", "neoverse-v2">;
11701172
def : ProcessorModel<"neoverse-v3", NeoverseV2Model,
11711173
ProcessorFeatures.NeoverseV3, [TuneNeoverseV3]>;
11721174
def : ProcessorModel<"neoverse-v3ae", NeoverseV2Model,

‎llvm/test/CodeGen/AArch64/cpus.ll‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
; RUN: llc < %s -mtriple=arm64-unknown-unknown -mcpu=cortex-a77 2>&1 | FileCheck %s
1919
; RUN: llc < %s -mtriple=arm64-unknown-unknown -mcpu=cortex-a78 2>&1 | FileCheck %s
2020
; RUN: llc < %s -mtriple=arm64-unknown-unknown -mcpu=cortex-x1 2>&1 | FileCheck %s
21+
; RUN: llc < %s -mtriple=arm64-unknown-unknown -mcpu=grace 2>&1 | FileCheck %s
2122
; RUN: llc < %s -mtriple=arm64-unknown-unknown -mcpu=neoverse-e1 2>&1 | FileCheck %s
2223
; RUN: llc < %s -mtriple=arm64-unknown-unknown -mcpu=neoverse-n1 2>&1 | FileCheck %s
2324
; RUN: llc < %s -mtriple=arm64-unknown-unknown -mcpu=neoverse-n2 2>&1 | FileCheck %s

‎llvm/unittests/TargetParser/TargetParserTest.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1167,6 +1167,7 @@ INSTANTIATE_TEST_SUITE_P(
11671167
AArch64CPUTestParams("a64fx", "armv8.2-a"),
11681168
AArch64CPUTestParams("fujitsu-monaka", "armv9.3-a"),
11691169
AArch64CPUTestParams("carmel", "armv8.2-a"),
1170+
AArch64CPUTestParams("grace", "armv9-a"),
11701171
AArch64CPUTestParams("saphira", "armv8.4-a"),
11711172
AArch64CPUTestParams("oryon-1", "armv8.6-a")),
11721173
AArch64CPUTestParams::PrintToStringParamName);
@@ -1247,7 +1248,6 @@ TEST_P(AArch64CPUAliasTestFixture, testCPUAlias) {
12471248
INSTANTIATE_TEST_SUITE_P(
12481249
AArch64CPUAliasTests, AArch64CPUAliasTestFixture,
12491250
::testing::Values(AArch64CPUAliasTestParams({"neoverse-n2", "cobalt-100"}),
1250-
AArch64CPUAliasTestParams({"neoverse-v2", "grace"}),
12511251
AArch64CPUAliasTestParams({"apple-a7", "cyclone",
12521252
"apple-a8", "apple-a9"}),
12531253
AArch64CPUAliasTestParams({"apple-a12", "apple-s4",

0 commit comments

Comments
 (0)