Author: Hsiangkai Wang Date: 2020-12-03T09:16:44+08:00 New Revision: 432d05174ed00a217c0ad37e2e823154624c1311
URL: https://github.com/llvm/llvm-project/commit/432d05174ed00a217c0ad37e2e823154624c1311 DIFF: https://github.com/llvm/llvm-project/commit/432d05174ed00a217c0ad37e2e823154624c1311.diff LOG: [RISCV] Handle zfh in the arch string. Differential Revision: https://reviews.llvm.org/D91315 Added: Modified: clang/lib/Basic/Targets/RISCV.cpp clang/lib/Basic/Targets/RISCV.h clang/lib/Driver/ToolChains/Arch/RISCV.cpp clang/test/Driver/riscv-arch.c clang/test/Preprocessor/riscv-target-features.c Removed: ################################################################################ diff --git a/clang/lib/Basic/Targets/RISCV.cpp b/clang/lib/Basic/Targets/RISCV.cpp index 37e688d14b4a..2b076c9c16f2 100644 --- a/clang/lib/Basic/Targets/RISCV.cpp +++ b/clang/lib/Basic/Targets/RISCV.cpp @@ -135,6 +135,9 @@ void RISCVTargetInfo::getTargetDefines(const LangOptions &Opts, if (HasB) Builder.defineMacro("__riscv_bitmanip"); + + if (HasZfh) + Builder.defineMacro("__riscv_zfh"); } /// Return true if has this feature, need to sync with handleTargetFeatures. @@ -150,6 +153,7 @@ bool RISCVTargetInfo::hasFeature(StringRef Feature) const { .Case("d", HasD) .Case("c", HasC) .Case("experimental-b", HasB) + .Case("experimental-zfh", HasZfh) .Default(false); } @@ -169,6 +173,8 @@ bool RISCVTargetInfo::handleTargetFeatures(std::vector<std::string> &Features, HasC = true; else if (Feature == "+experimental-b") HasB = true; + else if (Feature == "+experimental-zfh") + HasZfh = true; } return true; diff --git a/clang/lib/Basic/Targets/RISCV.h b/clang/lib/Basic/Targets/RISCV.h index a4e6777a11e2..20a7b1c73175 100644 --- a/clang/lib/Basic/Targets/RISCV.h +++ b/clang/lib/Basic/Targets/RISCV.h @@ -31,11 +31,12 @@ class RISCVTargetInfo : public TargetInfo { bool HasD; bool HasC; bool HasB; + bool HasZfh; public: RISCVTargetInfo(const llvm::Triple &Triple, const TargetOptions &) - : TargetInfo(Triple), HasM(false), HasA(false), HasF(false), - HasD(false), HasC(false), HasB(false) { + : TargetInfo(Triple), HasM(false), HasA(false), HasF(false), HasD(false), + HasC(false), HasB(false), HasZfh(false) { LongDoubleWidth = 128; LongDoubleAlign = 128; LongDoubleFormat = &llvm::APFloat::IEEEquad(); diff --git a/clang/lib/Driver/ToolChains/Arch/RISCV.cpp b/clang/lib/Driver/ToolChains/Arch/RISCV.cpp index 7ca05a1f3a39..aa1a5d8c803f 100644 --- a/clang/lib/Driver/ToolChains/Arch/RISCV.cpp +++ b/clang/lib/Driver/ToolChains/Arch/RISCV.cpp @@ -64,6 +64,8 @@ isExperimentalExtension(StringRef Ext) { return RISCVExtensionVersion{"0", "92"}; if (Ext == "v") return RISCVExtensionVersion{"0", "9"}; + if (Ext == "zfh") + return RISCVExtensionVersion{"0", "1"}; return None; } diff --git a/clang/test/Driver/riscv-arch.c b/clang/test/Driver/riscv-arch.c index 8b630b1846c9..533f1cff42af 100644 --- a/clang/test/Driver/riscv-arch.c +++ b/clang/test/Driver/riscv-arch.c @@ -383,3 +383,12 @@ // RUN: %clang -target riscv32-unknown-elf -march=rv32iv0p9 -menable-experimental-extensions -### %s -c 2>&1 | \ // RUN: FileCheck -check-prefix=RV32-EXPERIMENTAL-V-GOODVERS %s // RV32-EXPERIMENTAL-V-GOODVERS: "-target-feature" "+experimental-v" + +// RUN: %clang -target riscv32-unknown-elf -march=rv32izfh -### %s \ +// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-EXPERIMENTAL-ZFH-NOFLAG %s +// RV32-EXPERIMENTAL-ZFH-NOFLAG: error: invalid arch name 'rv32izfh' +// RV32-EXPERIMENTAL-ZFH-NOFLAG: requires '-menable-experimental-extensions' + +// RUN: %clang -target riscv32-unknown-elf -march=rv32izfh0p1 -menable-experimental-extensions -### %s \ +// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-EXPERIMENTAL-ZFH %s +// RV32-EXPERIMENTAL-ZFH: "-target-feature" "+experimental-zfh" diff --git a/clang/test/Preprocessor/riscv-target-features.c b/clang/test/Preprocessor/riscv-target-features.c index d8c18f76e53b..c0ffd83bc7e2 100644 --- a/clang/test/Preprocessor/riscv-target-features.c +++ b/clang/test/Preprocessor/riscv-target-features.c @@ -78,3 +78,9 @@ // CHECK-DOUBLE: __riscv_float_abi_double 1 // CHECK-DOUBLE-NOT: __riscv_float_abi_soft // CHECK-DOUBLE-NOT: __riscv_float_abi_single + +// RUN: %clang -target riscv32-unknown-linux-gnu -menable-experimental-extensions -march=rv32izfh0p1 -x c -E -dM %s \ +// RUN: -o - | FileCheck --check-prefix=CHECK-ZFH-EXT %s +// RUN: %clang -target riscv64-unknown-linux-gnu -menable-experimental-extensions -march=rv64izfh0p1 -x c -E -dM %s \ +// RUN: -o - | FileCheck --check-prefix=CHECK-ZFH-EXT %s +// CHECK-ZFH-EXT: __riscv_zfh 1 _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits