https://github.com/ElvinaYakubova updated
https://github.com/llvm/llvm-project/pull/146323
>From e65f50b8c1e549a693d5e1f1dd597ed5bca40ffd Mon Sep 17 00:00:00 2001
From: Elvina Yakubova <eyakub...@nvidia.com>
Date: Thu, 26 Jun 2025 09:07:23 -0700
Subject: [PATCH 1/3] [clang][AArch64] Parse more features in
getHostCPUFeatures
---
clang/test/Driver/Inputs/cpunative/grace | 8 ++++++++
clang/test/Driver/Inputs/cpunative/neoverse-v2 | 2 +-
.../test/Driver/print-enabled-extensions/aarch64-grace.c | 2 ++
llvm/lib/TargetParser/Host.cpp | 5 +++++
4 files changed, 16 insertions(+), 1 deletion(-)
create mode 100644 clang/test/Driver/Inputs/cpunative/grace
diff --git a/clang/test/Driver/Inputs/cpunative/grace
b/clang/test/Driver/Inputs/cpunative/grace
new file mode 100644
index 0000000000000..c3c8433415d7a
--- /dev/null
+++ b/clang/test/Driver/Inputs/cpunative/grace
@@ -0,0 +1,8 @@
+processor : 0
+BogoMIPS : 2000.00
+Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics fphp
asimdhp cpuid asimdrdm jscvt fcma lrcpc dcpop sha3 sm3 sm4 asimddp sha512 sve
asimdfhm dit uscat ilrcpc flagm ssbs sb paca pacg dcpodp sve2 sveaes svepmull
svebitperm svesha3 svesm4 flagm2 frint svei8mm svebf16 i8mm bf16 dgh bti
+CPU implementer : 0x41
+CPU architecture: 8
+CPU variant : 0x0
+CPU part : 0xd4f
+CPU revision : 0
diff --git a/clang/test/Driver/Inputs/cpunative/neoverse-v2
b/clang/test/Driver/Inputs/cpunative/neoverse-v2
index c3c8433415d7a..e5494c33de0df 100644
--- a/clang/test/Driver/Inputs/cpunative/neoverse-v2
+++ b/clang/test/Driver/Inputs/cpunative/neoverse-v2
@@ -1,6 +1,6 @@
processor : 0
BogoMIPS : 2000.00
-Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics fphp
asimdhp cpuid asimdrdm jscvt fcma lrcpc dcpop sha3 sm3 sm4 asimddp sha512 sve
asimdfhm dit uscat ilrcpc flagm ssbs sb paca pacg dcpodp sve2 sveaes svepmull
svebitperm svesha3 svesm4 flagm2 frint svei8mm svebf16 i8mm bf16 dgh bti
+Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics fphp
asimdhp cpuid asimdrdm jscvt fcma lrcpc dcpop asimddp sve asimdfhm dit uscat
ilrcpc flagm ssbs sb paca pacg dcpodp sve2 svepmull svebitperm flagm2 frint
svei8mm svebf16 i8mm bf16 dgh bti
CPU implementer : 0x41
CPU architecture: 8
CPU variant : 0x0
diff --git a/clang/test/Driver/print-enabled-extensions/aarch64-grace.c
b/clang/test/Driver/print-enabled-extensions/aarch64-grace.c
index bb24dfbbc0702..dab8cdd7b3817 100644
--- a/clang/test/Driver/print-enabled-extensions/aarch64-grace.c
+++ b/clang/test/Driver/print-enabled-extensions/aarch64-grace.c
@@ -1,5 +1,7 @@
// REQUIRES: aarch64-registered-target
// RUN: %clang --target=aarch64 --print-enabled-extensions -mcpu=grace |
FileCheck --strict-whitespace --implicit-check-not=FEAT_ %s
+// RUN: export LLVM_CPUINFO=%S/../Inputs/cpunative/grace
+// RUN: %clang --target=aarch64 --print-enabled-extensions -mcpu=native |
FileCheck --strict-whitespace --implicit-check-not=FEAT_ %s
// CHECK: Extensions enabled for the given AArch64 target
// CHECK-EMPTY:
diff --git a/llvm/lib/TargetParser/Host.cpp b/llvm/lib/TargetParser/Host.cpp
index 5957e1befe2da..7791e36210451 100644
--- a/llvm/lib/TargetParser/Host.cpp
+++ b/llvm/lib/TargetParser/Host.cpp
@@ -2082,8 +2082,13 @@ const StringMap<bool> sys::getHostCPUFeatures() {
.Case("fp", "fp-armv8")
.Case("crc32", "crc")
.Case("atomics", "lse")
+ .Case("sha3", "sha3")
+ .Case("sm4", "sm4")
.Case("sve", "sve")
.Case("sve2", "sve2")
+ .Case("sveaes", "sve-aes")
+ .Case("svesha3", "sve-sha3")
+ .Case("svesm4", "sve2-sm4")
#else
.Case("half", "fp16")
.Case("neon", "neon")
>From 9b08902302a72263ba2c746a8e5d886d41feee11 Mon Sep 17 00:00:00 2001
From: Elvina Yakubova <eyakub...@nvidia.com>
Date: Mon, 30 Jun 2025 03:32:21 -0700
Subject: [PATCH 2/3] Adressing comments
---
clang/test/Driver/print-enabled-extensions/aarch64-grace.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/clang/test/Driver/print-enabled-extensions/aarch64-grace.c
b/clang/test/Driver/print-enabled-extensions/aarch64-grace.c
index dab8cdd7b3817..2fa8eb2998d82 100644
--- a/clang/test/Driver/print-enabled-extensions/aarch64-grace.c
+++ b/clang/test/Driver/print-enabled-extensions/aarch64-grace.c
@@ -1,7 +1,6 @@
-// REQUIRES: aarch64-registered-target
+// REQUIRES: aarch64-registered-target,aarch64-host,system-linux
// RUN: %clang --target=aarch64 --print-enabled-extensions -mcpu=grace |
FileCheck --strict-whitespace --implicit-check-not=FEAT_ %s
-// RUN: export LLVM_CPUINFO=%S/../Inputs/cpunative/grace
-// RUN: %clang --target=aarch64 --print-enabled-extensions -mcpu=native |
FileCheck --strict-whitespace --implicit-check-not=FEAT_ %s
+// RUN: env LLVM_CPUINFO=%S/../Inputs/cpunative/grace %clang --target=aarch64
--print-enabled-extensions -mcpu=native | FileCheck --strict-whitespace
--implicit-check-not=FEAT_ %s
// CHECK: Extensions enabled for the given AArch64 target
// CHECK-EMPTY:
>From 347d0395598ef7faf0350dc514382944b9e03721 Mon Sep 17 00:00:00 2001
From: Elvina Yakubova <eyakub...@nvidia.com>
Date: Mon, 30 Jun 2025 05:40:35 -0700
Subject: [PATCH 3/3] Replace neoverse-v2 test with grace
---
.../test/Driver/Inputs/cpunative/neoverse-v2 | 8 --
clang/test/Driver/aarch64-mcpu-native.c | 119 +++++++++---------
2 files changed, 62 insertions(+), 65 deletions(-)
delete mode 100644 clang/test/Driver/Inputs/cpunative/neoverse-v2
diff --git a/clang/test/Driver/Inputs/cpunative/neoverse-v2
b/clang/test/Driver/Inputs/cpunative/neoverse-v2
deleted file mode 100644
index e5494c33de0df..0000000000000
--- a/clang/test/Driver/Inputs/cpunative/neoverse-v2
+++ /dev/null
@@ -1,8 +0,0 @@
-processor : 0
-BogoMIPS : 2000.00
-Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics fphp
asimdhp cpuid asimdrdm jscvt fcma lrcpc dcpop asimddp sve asimdfhm dit uscat
ilrcpc flagm ssbs sb paca pacg dcpodp sve2 svepmull svebitperm flagm2 frint
svei8mm svebf16 i8mm bf16 dgh bti
-CPU implementer : 0x41
-CPU architecture: 8
-CPU variant : 0x0
-CPU part : 0xd4f
-CPU revision : 0
diff --git a/clang/test/Driver/aarch64-mcpu-native.c
b/clang/test/Driver/aarch64-mcpu-native.c
index a349a8e9827b8..e2cb2d949a117 100644
--- a/clang/test/Driver/aarch64-mcpu-native.c
+++ b/clang/test/Driver/aarch64-mcpu-native.c
@@ -1,62 +1,67 @@
// REQUIRES: aarch64-registered-target,system-linux,aarch64-host
-// RUN: export LLVM_CPUINFO=%S/Inputs/cpunative/neoverse-v2
-// RUN: %clang --target=aarch64 --print-enabled-extensions -mcpu=native |
FileCheck --strict-whitespace --check-prefix=CHECK-FEAT-NV2
--implicit-check-not=FEAT_ %s
+// RUN: export LLVM_CPUINFO=%S/Inputs/cpunative/grace
+// RUN: %clang --target=aarch64 --print-enabled-extensions -mcpu=native |
FileCheck --strict-whitespace --check-prefix=CHECK-FEAT-GRACE
--implicit-check-not=FEAT_ %s
-// CHECK-FEAT-NV2: Extensions enabled for the given AArch64 target
-// CHECK-FEAT-NV2-EMPTY:
-// CHECK-FEAT-NV2: Architecture Feature(s)
Description
-// CHECK-FEAT-NV2: FEAT_AES, FEAT_PMULL
Enable AES support
-// CHECK-FEAT-NV2: FEAT_AMUv1
Enable Armv8.4-A Activity Monitors extension
-// CHECK-FEAT-NV2: FEAT_AdvSIMD
Enable Advanced SIMD instructions
-// CHECK-FEAT-NV2: FEAT_BF16
Enable BFloat16 Extension
-// CHECK-FEAT-NV2: FEAT_BTI
Enable Branch Target Identification
-// CHECK-FEAT-NV2: FEAT_CCIDX
Enable Armv8.3-A Extend of the CCSIDR number of sets
-// CHECK-FEAT-NV2: FEAT_CRC32
Enable Armv8.0-A CRC-32 checksum instructions
-// CHECK-FEAT-NV2: FEAT_CSV2_2
Enable architectural speculation restriction
-// CHECK-FEAT-NV2: FEAT_DIT
Enable Armv8.4-A Data Independent Timing instructions
-// CHECK-FEAT-NV2: FEAT_DPB
Enable Armv8.2-A data Cache Clean to Point of Persistence
-// CHECK-FEAT-NV2: FEAT_DPB2
Enable Armv8.5-A Cache Clean to Point of Deep Persistence
-// CHECK-FEAT-NV2: FEAT_DotProd
Enable dot product support
-// CHECK-FEAT-NV2: FEAT_ETE
Enable Embedded Trace Extension
-// CHECK-FEAT-NV2: FEAT_FCMA
Enable Armv8.3-A Floating-point complex number support
-// CHECK-FEAT-NV2: FEAT_FHM
Enable FP16 FML instructions
-// CHECK-FEAT-NV2: FEAT_FP
Enable Armv8.0-A Floating Point Extensions
-// CHECK-FEAT-NV2: FEAT_FP16
Enable half-precision floating-point data processing
-// CHECK-FEAT-NV2: FEAT_FPAC
Enable Armv8.3-A Pointer Authentication Faulting enhancement
-// CHECK-FEAT-NV2: 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
-// CHECK-FEAT-NV2: FEAT_FlagM
Enable Armv8.4-A Flag Manipulation instructions
-// CHECK-FEAT-NV2: FEAT_FlagM2
Enable alternative NZCV format for floating point comparisons
-// CHECK-FEAT-NV2: FEAT_I8MM
Enable Matrix Multiply Int8 Extension
-// CHECK-FEAT-NV2: FEAT_JSCVT
Enable Armv8.3-A JavaScript FP conversion instructions
-// CHECK-FEAT-NV2: FEAT_LOR
Enable Armv8.1-A Limited Ordering Regions extension
-// CHECK-FEAT-NV2: FEAT_LRCPC
Enable support for RCPC extension
-// CHECK-FEAT-NV2: FEAT_LRCPC2
Enable Armv8.4-A RCPC instructions with Immediate Offsets
-// CHECK-FEAT-NV2: FEAT_LSE
Enable Armv8.1-A Large System Extension (LSE) atomic instructions
-// CHECK-FEAT-NV2: FEAT_LSE2
Enable Armv8.4-A Large System Extension 2 (LSE2) atomicity rules
-// CHECK-FEAT-NV2: FEAT_MPAM
Enable Armv8.4-A Memory system Partitioning and Monitoring extension
-// CHECK-FEAT-NV2: FEAT_MTE, FEAT_MTE2
Enable Memory Tagging Extension
-// CHECK-FEAT-NV2: FEAT_NV, FEAT_NV2
Enable Armv8.4-A Nested Virtualization Enchancement
-// CHECK-FEAT-NV2: FEAT_PAN
Enable Armv8.1-A Privileged Access-Never extension
-// CHECK-FEAT-NV2: FEAT_PAN2
Enable Armv8.2-A PAN s1e1R and s1e1W Variants
-// CHECK-FEAT-NV2: FEAT_PAuth
Enable Armv8.3-A Pointer Authentication extension
-// CHECK-FEAT-NV2: FEAT_PMUv3
Enable Armv8.0-A PMUv3 Performance Monitors extension
-// CHECK-FEAT-NV2: FEAT_RAS, FEAT_RASv1p1
Enable Armv8.0-A Reliability, Availability and Serviceability Extensions
-// CHECK-FEAT-NV2: FEAT_RDM
Enable Armv8.1-A Rounding Double Multiply Add/Subtract instructions
-// CHECK-FEAT-NV2: FEAT_RNG
Enable Random Number generation instructions
-// CHECK-FEAT-NV2: FEAT_SB
Enable Armv8.5-A Speculation Barrier
-// CHECK-FEAT-NV2: FEAT_SEL2
Enable Armv8.4-A Secure Exception Level 2 extension
-// CHECK-FEAT-NV2: FEAT_SHA1, FEAT_SHA256
Enable SHA1 and SHA256 support
-// CHECK-FEAT-NV2: FEAT_SPE
Enable Statistical Profiling extension
-// CHECK-FEAT-NV2: FEAT_SPECRES
Enable Armv8.5-A execution and data prediction invalidation instructions
-// CHECK-FEAT-NV2: FEAT_SSBS, FEAT_SSBS2
Enable Speculative Store Bypass Safe bit
-// CHECK-FEAT-NV2: FEAT_SVE
Enable Scalable Vector Extension (SVE) instructions
-// CHECK-FEAT-NV2: FEAT_SVE2
Enable Scalable Vector Extension 2 (SVE2) instructions
-// CHECK-FEAT-NV2: FEAT_SVE_BitPerm
Enable bit permutation SVE2 instructions
-// CHECK-FEAT-NV2: FEAT_TLBIOS, FEAT_TLBIRANGE
Enable Armv8.4-A TLB Range and Maintenance instructions
-// CHECK-FEAT-NV2: FEAT_TRBE
Enable Trace Buffer Extension
-// CHECK-FEAT-NV2: FEAT_TRF
Enable Armv8.4-A Trace extension
-// CHECK-FEAT-NV2: FEAT_UAO
Enable Armv8.2-A UAO PState
-// CHECK-FEAT-NV2: FEAT_VHE
Enable Armv8.1-A Virtual Host extension
+// CHECK-FEAT-GRACE: Extensions enabled for the given AArch64 target
+// CHECK-FEAT-GRACE-EMPTY:
+// CHECK-FEAT-GRACE: Architecture Feature(s)
Description
+// CHECK-FEAT-GRACE: FEAT_AES, FEAT_PMULL
Enable AES support
+// CHECK-FEAT-GRACE: FEAT_AMUv1
Enable Armv8.4-A Activity Monitors extension
+// CHECK-FEAT-GRACE: FEAT_AdvSIMD
Enable Advanced SIMD instructions
+// CHECK-FEAT-GRACE: FEAT_BF16
Enable BFloat16 Extension
+// CHECK-FEAT-GRACE: FEAT_BTI
Enable Branch Target Identification
+// CHECK-FEAT-GRACE: FEAT_CCIDX
Enable Armv8.3-A Extend of the CCSIDR number of sets
+// CHECK-FEAT-GRACE: FEAT_CRC32
Enable Armv8.0-A CRC-32 checksum instructions
+// CHECK-FEAT-GRACE: FEAT_CSV2_2
Enable architectural speculation restriction
+// CHECK-FEAT-GRACE: FEAT_DIT
Enable Armv8.4-A Data Independent Timing instructions
+// CHECK-FEAT-GRACE: FEAT_DPB
Enable Armv8.2-A data Cache Clean to Point of Persistence
+// CHECK-FEAT-GRACE: FEAT_DPB2
Enable Armv8.5-A Cache Clean to Point of Deep Persistence
+// CHECK-FEAT-GRACE: FEAT_DotProd
Enable dot product support
+// CHECK-FEAT-GRACE: FEAT_ETE
Enable Embedded Trace Extension
+// CHECK-FEAT-GRACE: FEAT_FCMA
Enable Armv8.3-A Floating-point complex number support
+// CHECK-FEAT-GRACE: FEAT_FHM
Enable FP16 FML instructions
+// CHECK-FEAT-GRACE: FEAT_FP
Enable Armv8.0-A Floating Point Extensions
+// CHECK-FEAT-GRACE: FEAT_FP16
Enable half-precision floating-point data processing
+// CHECK-FEAT-GRACE: FEAT_FPAC
Enable Armv8.3-A Pointer Authentication Faulting enhancement
+// CHECK-FEAT-GRACE: 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
+// CHECK-FEAT-GRACE: FEAT_FlagM
Enable Armv8.4-A Flag Manipulation instructions
+// CHECK-FEAT-GRACE: FEAT_FlagM2
Enable alternative NZCV format for floating point comparisons
+// CHECK-FEAT-GRACE: FEAT_I8MM
Enable Matrix Multiply Int8 Extension
+// CHECK-FEAT-GRACE: FEAT_JSCVT
Enable Armv8.3-A JavaScript FP conversion instructions
+// CHECK-FEAT-GRACE: FEAT_LOR
Enable Armv8.1-A Limited Ordering Regions extension
+// CHECK-FEAT-GRACE: FEAT_LRCPC
Enable support for RCPC extension
+// CHECK-FEAT-GRACE: FEAT_LRCPC2
Enable Armv8.4-A RCPC instructions with Immediate Offsets
+// CHECK-FEAT-GRACE: FEAT_LSE
Enable Armv8.1-A Large System Extension (LSE) atomic instructions
+// CHECK-FEAT-GRACE: FEAT_LSE2
Enable Armv8.4-A Large System Extension 2 (LSE2) atomicity rules
+// CHECK-FEAT-GRACE: FEAT_MPAM
Enable Armv8.4-A Memory system Partitioning and Monitoring extension
+// CHECK-FEAT-GRACE: FEAT_MTE, FEAT_MTE2
Enable Memory Tagging Extension
+// CHECK-FEAT-GRACE: FEAT_NV, FEAT_NV2
Enable Armv8.4-A Nested Virtualization Enchancement
+// CHECK-FEAT-GRACE: FEAT_PAN
Enable Armv8.1-A Privileged Access-Never extension
+// CHECK-FEAT-GRACE: FEAT_PAN2
Enable Armv8.2-A PAN s1e1R and s1e1W Variants
+// CHECK-FEAT-GRACE: FEAT_PAuth
Enable Armv8.3-A Pointer Authentication extension
+// CHECK-FEAT-GRACE: FEAT_PMUv3
Enable Armv8.0-A PMUv3 Performance Monitors extension
+// CHECK-FEAT-GRACE: FEAT_RAS, FEAT_RASv1p1
Enable Armv8.0-A Reliability, Availability and Serviceability Extensions
+// CHECK-FEAT-GRACE: FEAT_RDM
Enable Armv8.1-A Rounding Double Multiply Add/Subtract instructions
+// CHECK-FEAT-GRACE: FEAT_RNG
Enable Random Number generation instructions
+// CHECK-FEAT-GRACE: FEAT_SB
Enable Armv8.5-A Speculation Barrier
+// CHECK-FEAT-GRACE: FEAT_SEL2
Enable Armv8.4-A Secure Exception Level 2 extension
+// CHECK-FEAT-GRACE: FEAT_SHA1, FEAT_SHA256
Enable SHA1 and SHA256 support
+// CHECK-FEAT-GRACE: FEAT_SHA3, FEAT_SHA512
Enable SHA512 and SHA3 support
+// CHECK-FEAT-GRACE: FEAT_SM4, FEAT_SM3
Enable SM3 and SM4 support
+// CHECK-FEAT-GRACE: FEAT_SPE
Enable Statistical Profiling extension
+// CHECK-FEAT-GRACE: FEAT_SPECRES
Enable Armv8.5-A execution and data prediction invalidation instructions
+// CHECK-FEAT-GRACE: FEAT_SSBS, FEAT_SSBS2
Enable Speculative Store Bypass Safe bit
+// CHECK-FEAT-GRACE: FEAT_SVE
Enable Scalable Vector Extension (SVE) instructions
+// CHECK-FEAT-GRACE: FEAT_SVE2
Enable Scalable Vector Extension 2 (SVE2) instructions
+// CHECK-FEAT-GRACE: FEAT_SVE_AES, FEAT_SVE_PMULL128
Enable SVE AES and quadword SVE polynomial multiply instructions
+// CHECK-FEAT-GRACE: FEAT_SVE_BitPerm
Enable bit permutation SVE2 instructions
+// CHECK-FEAT-GRACE: FEAT_SVE_SHA3
Enable SVE SHA3 instructions
+// CHECK-FEAT-GRACE: FEAT_SVE_SM4
Enable SM4 SVE2 instructions
+// CHECK-FEAT-GRACE: FEAT_TLBIOS, FEAT_TLBIRANGE
Enable Armv8.4-A TLB Range and Maintenance instructions
+// CHECK-FEAT-GRACE: FEAT_TRBE
Enable Trace Buffer Extension
+// CHECK-FEAT-GRACE: FEAT_TRF
Enable Armv8.4-A Trace extension
+// CHECK-FEAT-GRACE: FEAT_UAO
Enable Armv8.2-A UAO PState
+// CHECK-FEAT-GRACE: FEAT_VHE
Enable Armv8.1-A Virtual Host extension
// RUN: export LLVM_CPUINFO=%S/Inputs/cpunative/neoverse-n1
// RUN: %clang --target=aarch64 --print-enabled-extensions -mcpu=native |
FileCheck --strict-whitespace --check-prefix=CHECK-FEAT-NN1
--implicit-check-not=FEAT_ %s
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
