https://github.com/CarolineConcatto updated https://github.com/llvm/llvm-project/pull/140591
>From 22e44648ce4ec1c747406f7d98ae7c736d0e441c Mon Sep 17 00:00:00 2001 From: CarolineConcatto <caroline.conca...@arm.com> Date: Mon, 19 May 2025 18:21:28 +0000 Subject: [PATCH 1/2] [Clang][AArch64]Add FP8 ACLE macros implementation This patch implements the macros described in the ACLE[1] [1] https://github.com/ARM-software/acle/blob/main/main/acle.md#modal-8-bit-floating-point-extensions --- clang/lib/Basic/Targets/AArch64.cpp | 59 +++++++++++++++++++ clang/lib/Basic/Targets/AArch64.h | 9 +++ .../Preprocessor/aarch64-target-features.c | 31 ++++++++++ 3 files changed, 99 insertions(+) diff --git a/clang/lib/Basic/Targets/AArch64.cpp b/clang/lib/Basic/Targets/AArch64.cpp index e1f6c7b834dc7..7267b17704a41 100644 --- a/clang/lib/Basic/Targets/AArch64.cpp +++ b/clang/lib/Basic/Targets/AArch64.cpp @@ -596,6 +596,33 @@ void AArch64TargetInfo::getTargetDefines(const LangOptions &Opts, if (HasSMEB16B16) Builder.defineMacro("__ARM_FEATURE_SME_B16B16", "1"); + if (HasFP8) + Builder.defineMacro("__ARM_FEATURE_FP8", "1"); + + if (HasFP8FMA) + Builder.defineMacro("__ARM_FEATURE_FP8FMA", "1"); + + if (HasFP8DOT2) + Builder.defineMacro("__ARM_FEATURE_FP8DOT2", "1"); + + if (HasFP8DOT4) + Builder.defineMacro("__ARM_FEATURE_FP8DOT4", "1"); + + if (HasSSVE_FP8DOT2) + Builder.defineMacro("__ARM_FEATURE_SSVE_FP8DOT2", "1"); + + if (HasSSVE_FP8DOT4) + Builder.defineMacro("__ARM_FEATURE_SSVE_FP8DOT4", "1"); + + if (HasSSVE_FP8FMA) + Builder.defineMacro("__ARM_FEATURE_SSVE_FP8FMA", "1"); + + if (HasSME_F8F32) + Builder.defineMacro("__ARM_FEATURE_SME_F8F32", "1"); + + if (HasSME_F8F16) + Builder.defineMacro("__ARM_FEATURE_SME_F8F16", "1"); + if (HasCRC) Builder.defineMacro("__ARM_FEATURE_CRC32", "1"); @@ -885,6 +912,15 @@ bool AArch64TargetInfo::hasFeature(StringRef Feature) const { .Cases("ls64", "ls64_v", "ls64_accdata", HasLS64) .Case("wfxt", HasWFxT) .Case("rcpc3", HasRCPC3) + .Case("fp8", HasFP8) + .Case("fp8fma", HasFP8FMA) + .Case("fp8dot2", HasFP8DOT2) + .Case("fp8dot4", HasFP8DOT4) + .Case("ssve-fp8dot2", HasSSVE_FP8DOT2) + .Case("ssve-fp8dot4", HasSSVE_FP8DOT4) + .Case("ssve-fp8fma", HasSSVE_FP8FMA) + .Case("sme-f8f32", HasSME_F8F32) + .Case("sme-f8f16", HasSME_F8F16) .Default(false); } @@ -1046,6 +1082,29 @@ bool AArch64TargetInfo::handleTargetFeatures(std::vector<std::string> &Features, HasSVEB16B16 = true; HasSMEB16B16 = true; } + + if (Feature == "+fp8") + HasFP8 = true; + if (Feature == "+fp8fma") + HasFP8FMA = true; + if (Feature == "+fp8dot2") + HasFP8DOT2 = true; + if (Feature == "+fp8dot4") + HasFP8DOT4 = true; + if (Feature == "+ssve-fp8dot2") + HasSSVE_FP8DOT2 = true; + if (Feature == "+ssve-fp8dot4") + HasSSVE_FP8DOT4 = true; + if (Feature == "+ssve-fp8fma") + HasSSVE_FP8FMA = true; + if (Feature == "+sme-f8f32") { + HasSME2 = true; + HasSME_F8F32 = true; + } + if (Feature == "+sme-f8f16") { + HasSME2 = true; + HasSME_F8F16 = true; + } if (Feature == "+sb") HasSB = true; if (Feature == "+predres") diff --git a/clang/lib/Basic/Targets/AArch64.h b/clang/lib/Basic/Targets/AArch64.h index 6eeac69af20df..7230f22d5bb86 100644 --- a/clang/lib/Basic/Targets/AArch64.h +++ b/clang/lib/Basic/Targets/AArch64.h @@ -106,6 +106,15 @@ class LLVM_LIBRARY_VISIBILITY AArch64TargetInfo : public TargetInfo { bool HasSMEF16F16 = false; bool HasSMEB16B16 = false; bool HasSME2p1 = false; + bool HasFP8 = false; + bool HasFP8FMA = false; + bool HasFP8DOT2 = false; + bool HasFP8DOT4 = false; + bool HasSSVE_FP8DOT2 = false; + bool HasSSVE_FP8DOT4 = false; + bool HasSSVE_FP8FMA = false; + bool HasSME_F8F32 = false; + bool HasSME_F8F16 = false; bool HasSB = false; bool HasPredRes = false; bool HasSSBS = false; diff --git a/clang/test/Preprocessor/aarch64-target-features.c b/clang/test/Preprocessor/aarch64-target-features.c index 3f801c4344940..52045d216262f 100644 --- a/clang/test/Preprocessor/aarch64-target-features.c +++ b/clang/test/Preprocessor/aarch64-target-features.c @@ -744,3 +744,34 @@ // CHECK-SMEB16B16: __ARM_FEATURE_SME2 1 // CHECK-SMEB16B16: __ARM_FEATURE_SME_B16B16 1 // CHECK-SMEB16B16: __ARM_FEATURE_SVE_B16B16 1 +// +// RUN: %clang --target=aarch64 -march=armv9-a+fp8 -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-FP8 %s +// CHECK-FP8: __ARM_FEATURE_FP8 1 + +// RUN: %clang --target=aarch64 -march=armv9-a+fp8fma -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-FP8FMA %s +// CHECK-FP8FMA: __ARM_FEATURE_FP8FMA 1 + +// RUN: %clang --target=aarch64 -march=armv9-a+fp8dot2 -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-FP8DOT2 %s +// CHECK-FP8DOT2: __ARM_FEATURE_FP8DOT2 1 + +// RUN: %clang --target=aarch64 -march=armv9-a+fp8dot4 -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-FP8DOT4 %s +// CHECK-FP8DOT4: __ARM_FEATURE_FP8DOT4 1 + +// RUN: %clang --target=aarch64 -march=armv9-a+ssve-fp8dot2 -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-SSVE-FP8DOT2 %s +// CHECK-SSVE-FP8DOT2: __ARM_FEATURE_SSVE_FP8DOT2 1 + +// RUN: %clang --target=aarch64 -march=armv9-a+ssve-fp8dot4 -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-SSVE-FP8DOT4 %s +// CHECK-SSVE-FP8DOT4: __ARM_FEATURE_SSVE_FP8DOT4 1 + +// RUN: %clang --target=aarch64 -march=armv9-a+ssve-fp8fma -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-SSVE-FP8FMA %s +// CHECK-SSVE-FP8FMA: __ARM_FEATURE_SSVE_FP8FMA 1 + +// RUN: %clang --target=aarch64 -march=armv9-a+sme-f8f32 -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-SMEF8F32 %s +// CHECK-SMEF8F32: __ARM_FEATURE_LOCALLY_STREAMING 1 +// CHECK-SMEF8F32: __ARM_FEATURE_SME2 1 +// CHECK-SMEF8F32: __ARM_FEATURE_SME_F8F32 1 + +// RUN: %clang --target=aarch64 -march=armv9-a+sme-f8f16 -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-SMEF8F16 %s +// CHECK-SMEF8F16: __ARM_FEATURE_LOCALLY_STREAMING 1 +// CHECK-SMEF8F16: __ARM_FEATURE_SME2 1 +// CHECK-SMEF8F16: __ARM_FEATURE_SME_F8F16 1 >From 6a099ad7c37e711bb37a1b5b5add15f309322ecb Mon Sep 17 00:00:00 2001 From: CarolineConcatto <caroline.conca...@arm.com> Date: Wed, 21 May 2025 08:56:46 +0000 Subject: [PATCH 2/2] Remove redundancy set in handleTargetFeatures It looks like other features are set by default, following the dependendy in Features. We only need to set the new ones. --- clang/lib/Basic/Targets/AArch64.cpp | 8 ++------ clang/test/Preprocessor/aarch64-target-features.c | 8 ++++++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/clang/lib/Basic/Targets/AArch64.cpp b/clang/lib/Basic/Targets/AArch64.cpp index 7267b17704a41..1195c9293f3ea 100644 --- a/clang/lib/Basic/Targets/AArch64.cpp +++ b/clang/lib/Basic/Targets/AArch64.cpp @@ -1097,14 +1097,10 @@ bool AArch64TargetInfo::handleTargetFeatures(std::vector<std::string> &Features, HasSSVE_FP8DOT4 = true; if (Feature == "+ssve-fp8fma") HasSSVE_FP8FMA = true; - if (Feature == "+sme-f8f32") { - HasSME2 = true; + if (Feature == "+sme-f8f32") HasSME_F8F32 = true; - } - if (Feature == "+sme-f8f16") { - HasSME2 = true; + if (Feature == "+sme-f8f16") HasSME_F8F16 = true; - } if (Feature == "+sb") HasSB = true; if (Feature == "+predres") diff --git a/clang/test/Preprocessor/aarch64-target-features.c b/clang/test/Preprocessor/aarch64-target-features.c index 52045d216262f..da2b6beff542a 100644 --- a/clang/test/Preprocessor/aarch64-target-features.c +++ b/clang/test/Preprocessor/aarch64-target-features.c @@ -749,29 +749,33 @@ // CHECK-FP8: __ARM_FEATURE_FP8 1 // RUN: %clang --target=aarch64 -march=armv9-a+fp8fma -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-FP8FMA %s +// CHECK-FP8FMA: __ARM_FEATURE_FP8 1 // CHECK-FP8FMA: __ARM_FEATURE_FP8FMA 1 // RUN: %clang --target=aarch64 -march=armv9-a+fp8dot2 -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-FP8DOT2 %s +// CHECK-FP8DOT2: __ARM_FEATURE_FP8 1 // CHECK-FP8DOT2: __ARM_FEATURE_FP8DOT2 1 // RUN: %clang --target=aarch64 -march=armv9-a+fp8dot4 -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-FP8DOT4 %s +// CHECK-FP8DOT4: __ARM_FEATURE_FP8 1 // CHECK-FP8DOT4: __ARM_FEATURE_FP8DOT4 1 // RUN: %clang --target=aarch64 -march=armv9-a+ssve-fp8dot2 -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-SSVE-FP8DOT2 %s +// CHECK-SSVE-FP8DOT2: __ARM_FEATURE_SME2 1 // CHECK-SSVE-FP8DOT2: __ARM_FEATURE_SSVE_FP8DOT2 1 // RUN: %clang --target=aarch64 -march=armv9-a+ssve-fp8dot4 -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-SSVE-FP8DOT4 %s +// CHECK-SSVE-FP8DOT4: __ARM_FEATURE_SME2 1 // CHECK-SSVE-FP8DOT4: __ARM_FEATURE_SSVE_FP8DOT4 1 // RUN: %clang --target=aarch64 -march=armv9-a+ssve-fp8fma -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-SSVE-FP8FMA %s +// CHECK-SSVE-FP8FMA: __ARM_FEATURE_SME2 1 // CHECK-SSVE-FP8FMA: __ARM_FEATURE_SSVE_FP8FMA 1 // RUN: %clang --target=aarch64 -march=armv9-a+sme-f8f32 -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-SMEF8F32 %s -// CHECK-SMEF8F32: __ARM_FEATURE_LOCALLY_STREAMING 1 // CHECK-SMEF8F32: __ARM_FEATURE_SME2 1 // CHECK-SMEF8F32: __ARM_FEATURE_SME_F8F32 1 // RUN: %clang --target=aarch64 -march=armv9-a+sme-f8f16 -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-SMEF8F16 %s -// CHECK-SMEF8F16: __ARM_FEATURE_LOCALLY_STREAMING 1 // CHECK-SMEF8F16: __ARM_FEATURE_SME2 1 // CHECK-SMEF8F16: __ARM_FEATURE_SME_F8F16 1 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
