[clang] [llvm] [clang][AArch64] Add getHostCPUFeatures to query for enabled features in cpu info (PR #97749)
Elvina Yakubova via cfe-commits
cfe-commits at lists.llvm.org
Mon Oct 7 15:10:28 PDT 2024
https://github.com/ElvinaYakubova updated https://github.com/llvm/llvm-project/pull/97749
>From 6ba67c2f67d6f5039b3f9dbfc283c0c17ba34c89 Mon Sep 17 00:00:00 2001
From: Neil Hickey <nhickey at nvidia.com>
Date: Wed, 3 Jul 2024 07:22:46 -0700
Subject: [PATCH 1/2] [AArch64] Add getHostCPUFeatures to query for enabled
features in cpuinfo
---
clang/lib/Driver/ToolChains/Arch/AArch64.cpp | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/clang/lib/Driver/ToolChains/Arch/AArch64.cpp b/clang/lib/Driver/ToolChains/Arch/AArch64.cpp
index f083e40df13144..1e2ac4e501bafd 100644
--- a/clang/lib/Driver/ToolChains/Arch/AArch64.cpp
+++ b/clang/lib/Driver/ToolChains/Arch/AArch64.cpp
@@ -135,15 +135,21 @@ getAArch64ArchFeaturesFromMarch(const Driver &D, StringRef March,
return true;
}
-static bool
-getAArch64ArchFeaturesFromMcpu(const Driver &D, StringRef Mcpu,
- const ArgList &Args,
- llvm::AArch64::ExtensionSet &Extensions) {
+static bool getAArch64ArchFeaturesFromMcpu(
+ const Driver &D, StringRef Mcpu, const ArgList &Args,
+ llvm::AArch64::ExtensionSet &Extensions, std::vector<StringRef> &Features) {
StringRef CPU;
std::string McpuLowerCase = Mcpu.lower();
if (!DecodeAArch64Mcpu(D, McpuLowerCase, CPU, Extensions))
return false;
+ if (Mcpu == "native") {
+ llvm::StringMap<bool> HostFeatures = llvm::sys::getHostCPUFeatures();
+ for (auto &[Feature, Enabled] : HostFeatures) {
+ Features.push_back(Args.MakeArgString((Enabled ? "+" : "-") + Feature));
+ }
+ }
+
return true;
}
@@ -210,11 +216,11 @@ void aarch64::getAArch64TargetFeatures(const Driver &D,
success =
getAArch64ArchFeaturesFromMarch(D, A->getValue(), Args, Extensions);
else if ((A = Args.getLastArg(options::OPT_mcpu_EQ)))
- success =
- getAArch64ArchFeaturesFromMcpu(D, A->getValue(), Args, Extensions);
+ success = getAArch64ArchFeaturesFromMcpu(D, A->getValue(), Args, Extensions,
+ Features);
else if (isCPUDeterminedByTriple(Triple))
success = getAArch64ArchFeaturesFromMcpu(
- D, getAArch64TargetCPU(Args, Triple, A), Args, Extensions);
+ D, getAArch64TargetCPU(Args, Triple, A), Args, Extensions, Features);
else
// Default to 'A' profile if the architecture is not specified.
success = getAArch64ArchFeaturesFromMarch(D, "armv8-a", Args, Extensions);
>From db66fb7a218d1362e20143f5e1f3f40509e8abb5 Mon Sep 17 00:00:00 2001
From: Elvina Yakubova <eyakubova at nvidia.com>
Date: Mon, 23 Sep 2024 03:00:19 -0700
Subject: [PATCH 2/2] [clang][AArch64] Add LLVM_CPUINFO environment variable
Add LLVM_CPUINFO environment variable to test mock /proc/cpuinfo
files for -mcpu=native
---
clang/test/Driver/Inputs/cpunative/cortex-a57 | 8 +
clang/test/Driver/Inputs/cpunative/cortex-a72 | 8 +
clang/test/Driver/Inputs/cpunative/cortex-a76 | 8 +
.../test/Driver/Inputs/cpunative/neoverse-n1 | 8 +
.../test/Driver/Inputs/cpunative/neoverse-v2 | 8 +
clang/test/Driver/aarch64-mcpu-native.c | 137 ++++++++++++++++++
llvm/lib/TargetParser/Host.cpp | 4 +
7 files changed, 181 insertions(+)
create mode 100644 clang/test/Driver/Inputs/cpunative/cortex-a57
create mode 100644 clang/test/Driver/Inputs/cpunative/cortex-a72
create mode 100644 clang/test/Driver/Inputs/cpunative/cortex-a76
create mode 100644 clang/test/Driver/Inputs/cpunative/neoverse-n1
create mode 100644 clang/test/Driver/Inputs/cpunative/neoverse-v2
create mode 100644 clang/test/Driver/aarch64-mcpu-native.c
diff --git a/clang/test/Driver/Inputs/cpunative/cortex-a57 b/clang/test/Driver/Inputs/cpunative/cortex-a57
new file mode 100644
index 00000000000000..e1903012ab79cc
--- /dev/null
+++ b/clang/test/Driver/Inputs/cpunative/cortex-a57
@@ -0,0 +1,8 @@
+processor : 0
+BogoMIPS : 200.00
+Features : fp asimd evtstrm crc32 cpuid
+CPU implementer : 0x41
+CPU architecture: 8
+CPU variant : 0x1
+CPU part : 0xd07
+CPU revision : 1
diff --git a/clang/test/Driver/Inputs/cpunative/cortex-a72 b/clang/test/Driver/Inputs/cpunative/cortex-a72
new file mode 100644
index 00000000000000..7aed4a6fa73236
--- /dev/null
+++ b/clang/test/Driver/Inputs/cpunative/cortex-a72
@@ -0,0 +1,8 @@
+processor : 0
+BogoMIPS : 250.00
+Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 cpuid asimdrdm
+CPU implementer : 0x41
+CPU architecture: 8
+CPU variant : 0x0
+CPU part : 0xd08
+CPU revision : 2
diff --git a/clang/test/Driver/Inputs/cpunative/cortex-a76 b/clang/test/Driver/Inputs/cpunative/cortex-a76
new file mode 100644
index 00000000000000..21822cfcec60b0
--- /dev/null
+++ b/clang/test/Driver/Inputs/cpunative/cortex-a76
@@ -0,0 +1,8 @@
+processor : 0
+BogoMIPS : 500.00
+Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics cpuid asimdrdm ssbs jscvt fcma
+CPU implementer : 0x41
+CPU architecture: 8
+CPU variant : 0x1
+CPU part : 0xd0b
+CPU revision : 2
diff --git a/clang/test/Driver/Inputs/cpunative/neoverse-n1 b/clang/test/Driver/Inputs/cpunative/neoverse-n1
new file mode 100644
index 00000000000000..571e8840b09f08
--- /dev/null
+++ b/clang/test/Driver/Inputs/cpunative/neoverse-n1
@@ -0,0 +1,8 @@
+processor : 0
+BogoMIPS : 50.00
+Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics fphp asimdhp cpuid asimdrdm lrcpc dcpop asimddp ssbs
+CPU implementer : 0x41
+CPU architecture: 8
+CPU variant : 0x3
+CPU part : 0xd0c
+CPU revision : 1
diff --git a/clang/test/Driver/Inputs/cpunative/neoverse-v2 b/clang/test/Driver/Inputs/cpunative/neoverse-v2
new file mode 100644
index 00000000000000..c3c8433415d7a0
--- /dev/null
+++ b/clang/test/Driver/Inputs/cpunative/neoverse-v2
@@ -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/aarch64-mcpu-native.c b/clang/test/Driver/aarch64-mcpu-native.c
new file mode 100644
index 00000000000000..00435a12912843
--- /dev/null
+++ b/clang/test/Driver/aarch64-mcpu-native.c
@@ -0,0 +1,137 @@
+// 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
+
+// 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_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
+
+// 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
+
+// CHECK-FEAT-NN1: Extensions enabled for the given AArch64 target
+// CHECK-FEAT-NN1-EMPTY:
+// CHECK-FEAT-NN1: Architecture Feature(s) Description
+// CHECK-FEAT-NN1: FEAT_AES, FEAT_PMULL Enable AES support
+// CHECK-FEAT-NN1: FEAT_AdvSIMD Enable Advanced SIMD instructions
+// CHECK-FEAT-NN1: FEAT_CRC32 Enable Armv8.0-A CRC-32 checksum instructions
+// CHECK-FEAT-NN1: FEAT_DPB Enable Armv8.2-A data Cache Clean to Point of Persistence
+// CHECK-FEAT-NN1: FEAT_DotProd Enable dot product support
+// CHECK-FEAT-NN1: FEAT_FP Enable Armv8.0-A Floating Point Extensions
+// CHECK-FEAT-NN1: FEAT_FP16 Enable half-precision floating-point data processing
+// CHECK-FEAT-NN1: FEAT_LOR Enable Armv8.1-A Limited Ordering Regions extension
+// CHECK-FEAT-NN1: FEAT_LRCPC Enable support for RCPC extension
+// CHECK-FEAT-NN1: FEAT_LSE Enable Armv8.1-A Large System Extension (LSE) atomic instructions
+// CHECK-FEAT-NN1: FEAT_PAN Enable Armv8.1-A Privileged Access-Never extension
+// CHECK-FEAT-NN1: FEAT_PAN2 Enable Armv8.2-A PAN s1e1R and s1e1W Variants
+// CHECK-FEAT-NN1: FEAT_PMUv3 Enable Armv8.0-A PMUv3 Performance Monitors extension
+// CHECK-FEAT-NN1: FEAT_RAS, FEAT_RASv1p1 Enable Armv8.0-A Reliability, Availability and Serviceability Extensions
+// CHECK-FEAT-NN1: FEAT_RDM Enable Armv8.1-A Rounding Double Multiply Add/Subtract instructions
+// CHECK-FEAT-NN1: FEAT_SHA1, FEAT_SHA256 Enable SHA1 and SHA256 support
+// CHECK-FEAT-NN1: FEAT_SPE Enable Statistical Profiling extension
+// CHECK-FEAT-NN1: FEAT_SSBS, FEAT_SSBS2 Enable Speculative Store Bypass Safe bit
+// CHECK-FEAT-NN1: FEAT_UAO Enable Armv8.2-A UAO PState
+// CHECK-FEAT-NN1: FEAT_VHE Enable Armv8.1-A Virtual Host extension
+
+
+// RUN: export LLVM_CPUINFO=%S/Inputs/cpunative/cortex-a57
+// RUN: %clang --target=aarch64 --print-enabled-extensions -mcpu=native | FileCheck --strict-whitespace --check-prefix=CHECK-FEAT-CA57 --implicit-check-not=FEAT_ %s
+
+// CHECK-FEAT-CA57: Extensions enabled for the given AArch64 target
+// CHECK-FEAT-CA57-EMPTY:
+// CHECK-FEAT-CA57: Architecture Feature(s) Description
+// CHECK-FEAT-CA57: FEAT_AES, FEAT_PMULL Enable AES support
+// CHECK-FEAT-CA57: FEAT_AdvSIMD Enable Advanced SIMD instructions
+// CHECK-FEAT-CA57: FEAT_CRC32 Enable Armv8.0-A CRC-32 checksum instructions
+// CHECK-FEAT-CA57: FEAT_FP Enable Armv8.0-A Floating Point Extensions
+// CHECK-FEAT-CA57: FEAT_PMUv3 Enable Armv8.0-A PMUv3 Performance Monitors extension
+// CHECK-FEAT-CA57: FEAT_SHA1, FEAT_SHA256 Enable SHA1 and SHA256 support
+
+// RUN: export LLVM_CPUINFO=%S/Inputs/cpunative/cortex-a72
+// RUN: %clang --target=aarch64 --print-enabled-extensions -mcpu=native | FileCheck --strict-whitespace --check-prefix=CHECK-FEAT-CA72 --implicit-check-not=FEAT_ %s
+
+// CHECK-FEAT-CA72: Extensions enabled for the given AArch64 target
+// CHECK-EMPTY:
+// CHECK-FEAT-CA72: Architecture Feature(s) Description
+// CHECK-FEAT-CA72: FEAT_AES, FEAT_PMULL Enable AES support
+// CHECK-FEAT-CA72: FEAT_AdvSIMD Enable Advanced SIMD instructions
+// CHECK-FEAT-CA72: FEAT_CRC32 Enable Armv8.0-A CRC-32 checksum instructions
+// CHECK-FEAT-CA72: FEAT_FP Enable Armv8.0-A Floating Point Extensions
+// CHECK-FEAT-CA72: FEAT_PMUv3 Enable Armv8.0-A PMUv3 Performance Monitors extension
+// CHECK-FEAT-CA72: FEAT_SHA1, FEAT_SHA256 Enable SHA1 and SHA256 support
+
+// RUN: export LLVM_CPUINFO=%S/Inputs/cpunative/cortex-a76
+// RUN: %clang --target=aarch64 --print-enabled-extensions -mcpu=native | FileCheck --strict-whitespace --check-prefix=CHECK-FEAT-CA76 --implicit-check-not=FEAT_ %s
+
+// CHECK-FEAT-CA76: Extensions enabled for the given AArch64 target
+// CHECK-FEAT-CA76-EMPTY:
+// CHECK-FEAT-CA76: Architecture Feature(s) Description
+// CHECK-FEAT-CA76: FEAT_AES, FEAT_PMULL Enable AES support
+// CHECK-FEAT-CA76: FEAT_AdvSIMD Enable Advanced SIMD instructions
+// CHECK-FEAT-CA76: FEAT_CRC32 Enable Armv8.0-A CRC-32 checksum instructions
+// CHECK-FEAT-CA76: FEAT_DPB Enable Armv8.2-A data Cache Clean to Point of Persistence
+// CHECK-FEAT-CA76: FEAT_DotProd Enable dot product support
+// CHECK-FEAT-CA76: FEAT_FP Enable Armv8.0-A Floating Point Extensions
+// CHECK-FEAT-CA76: FEAT_FP16 Enable half-precision floating-point data processing
+// CHECK-FEAT-CA76: FEAT_LOR Enable Armv8.1-A Limited Ordering Regions extension
+// CHECK-FEAT-CA76: FEAT_LRCPC Enable support for RCPC extension
+// CHECK-FEAT-CA76: FEAT_LSE Enable Armv8.1-A Large System Extension (LSE) atomic instructions
+// CHECK-FEAT-CA76: FEAT_PAN Enable Armv8.1-A Privileged Access-Never extension
+// CHECK-FEAT-CA76: FEAT_PAN2 Enable Armv8.2-A PAN s1e1R and s1e1W Variants
+// CHECK-FEAT-CA76: FEAT_PMUv3 Enable Armv8.0-A PMUv3 Performance Monitors extension
+// CHECK-FEAT-CA76: FEAT_RAS, FEAT_RASv1p1 Enable Armv8.0-A Reliability, Availability and Serviceability Extensions
+// CHECK-FEAT-CA76: FEAT_RDM Enable Armv8.1-A Rounding Double Multiply Add/Subtract instructions
+// CHECK-FEAT-CA76: FEAT_SHA1, FEAT_SHA256 Enable SHA1 and SHA256 support
+// CHECK-FEAT-CA76: FEAT_SSBS, FEAT_SSBS2 Enable Speculative Store Bypass Safe bit
+// CHECK-FEAT-CA76: FEAT_UAO Enable Armv8.2-A UAO PState
+// CHECK-FEAT-CA76: FEAT_VHE Enable Armv8.1-A Virtual Host extension
diff --git a/llvm/lib/TargetParser/Host.cpp b/llvm/lib/TargetParser/Host.cpp
index 6e1f4b6052bda8..b19bbf64f25825 100644
--- a/llvm/lib/TargetParser/Host.cpp
+++ b/llvm/lib/TargetParser/Host.cpp
@@ -70,6 +70,10 @@ static std::unique_ptr<llvm::MemoryBuffer>
LLVM_ATTRIBUTE_UNUSED getProcCpuinfoContent() {
llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> Text =
llvm::MemoryBuffer::getFileAsStream("/proc/cpuinfo");
+ if (const char* cpuinfoIntercept = std::getenv("LLVM_CPUINFO")) {
+ Text = llvm::MemoryBuffer::getFileAsStream(cpuinfoIntercept);
+ }
+
if (std::error_code EC = Text.getError()) {
llvm::errs() << "Can't read "
<< "/proc/cpuinfo: " << EC.message() << "\n";
More information about the cfe-commits
mailing list