llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-mc Author: T-Tie (T-Tie) <details> <summary>Changes</summary> --- Full diff: https://github.com/llvm/llvm-project/pull/111837.diff 7 Files Affected: - (modified) clang/test/Preprocessor/riscv-target-features.c (+18) - (modified) llvm/docs/RISCVUsage.rst (+2) - (modified) llvm/docs/ReleaseNotes.md (+1) - (modified) llvm/lib/Target/RISCV/RISCVFeatures.td (+7) - (modified) llvm/test/CodeGen/RISCV/attributes.ll (+8) - (modified) llvm/test/MC/RISCV/attribute-arch.s (+6) - (modified) llvm/unittests/TargetParser/RISCVISAInfoTest.cpp (+2) ``````````diff diff --git a/clang/test/Preprocessor/riscv-target-features.c b/clang/test/Preprocessor/riscv-target-features.c index 05a8534ba13da1..d25f96b66a052a 100644 --- a/clang/test/Preprocessor/riscv-target-features.c +++ b/clang/test/Preprocessor/riscv-target-features.c @@ -29,6 +29,7 @@ // CHECK-NOT: __riscv_smaia {{.*$}} // CHECK-NOT: __riscv_smcdeleg {{.*$}} // CHECK-NOT: __riscv_smcsrind {{.*$}} +// CHECK-NOT: __riscv_smdbltrp {{.*$}} // CHECK-NOT: __riscv_smepmp {{.*$}} // CHECK-NOT: __riscv_smstateen {{.*$}} // CHECK-NOT: __riscv_ssaia {{.*$}} @@ -37,6 +38,7 @@ // CHECK-NOT: __riscv_sscofpmf {{.*$}} // CHECK-NOT: __riscv_sscounterenw {{.*$}} // CHECK-NOT: __riscv_sscsrind {{.*$}} +// CHECK-NOT: __riscv_ssdbltrp {{.*$}} // CHECK-NOT: __riscv_ssqosid{{.*$}} // CHECK-NOT: __riscv_ssstateen {{.*$}} // CHECK-NOT: __riscv_ssstrict {{.*$}} @@ -1425,6 +1427,22 @@ // RUN: -o - | FileCheck --check-prefix=CHECK-SSCSRIND-EXT %s // CHECK-SSCSRIND-EXT: __riscv_sscsrind 1000000{{$}} +// RUN: %clang --target=riscv32 \ +// RUN: -march=rv32ismdbltrp1p0 -E -dM %s \ +// RUN: -o - | FileCheck --check-prefix=CHECK-SMDBLTRP-EXT %s +// RUN: %clang --target=riscv64 \ +// RUN: -march=rv64ismdbltrp1p0 -E -dM %s \ +// RUN: -o | FileCheck --check-prefix=CHECK-SMDBLTRP-EXT %s +// CHECK-SMDBLTRP-EXT: __riscv_smdbltrp 1000000{{$}} + +// RUN: %clang --target=riscv32 \ +// RUN: -march=rv32issdbltrp1p0 -E -dM %s \ +// RUN: -o - | FileCheck --check-prefix=CHECK-SSDBLTRP-EXT %s +// RUN: %clang --target=riscv64 \ +// RUN: -march=rv64issdbltrp1p0 -E -dM %s \ +// RUN: -o - | FileCheck --check-prefix=CHECK-SSDBLTRP-EXT %s +// CHECK-SSDBLTRP-EXT: __riscv_ssdbltrp 1000000{{$}} + // RUN: %clang --target=riscv32 \ // RUN: -march=rv32i_ssqosid1p0 -E -dM %s \ // RUN: -o - | FileCheck --check-prefix=CHECK-SSQOSID-EXT %s diff --git a/llvm/docs/RISCVUsage.rst b/llvm/docs/RISCVUsage.rst index 5736f3807f131b..4780c20416c165 100644 --- a/llvm/docs/RISCVUsage.rst +++ b/llvm/docs/RISCVUsage.rst @@ -128,6 +128,7 @@ on support follow. ``Smaia`` Supported ``Smcdeleg`` Supported ``Smcsrind`` Supported + ``Smdbltrp`` Supported ``Smepmp`` Supported ``Smstateen`` Assembly Support ``Ssaia`` Supported @@ -136,6 +137,7 @@ on support follow. ``Sscofpmf`` Assembly Support ``Sscounterenw`` Assembly Support (`See note <#riscv-profiles-extensions-note>`__) ``Sscsrind`` Supported + ``Ssdbltrp`` Supported ``Ssqosid`` Assembly Support ``Ssstateen`` Assembly Support (`See note <#riscv-profiles-extensions-note>`__) ``Ssstrict`` Assembly Support (`See note <#riscv-profiles-extensions-note>`__) diff --git a/llvm/docs/ReleaseNotes.md b/llvm/docs/ReleaseNotes.md index 8ac5900a7e532e..5b77afe148713a 100644 --- a/llvm/docs/ReleaseNotes.md +++ b/llvm/docs/ReleaseNotes.md @@ -158,6 +158,7 @@ Changes to the RISC-V Backend * Added `Smctr` and `Ssctr` extensions. * `-mcpu=syntacore-scr7` was added. * The `Zacas` extension is no longer marked as experimental. +* Added Smdbltrp, Ssdbltrp extensions to -march. Changes to the WebAssembly Backend ---------------------------------- diff --git a/llvm/lib/Target/RISCV/RISCVFeatures.td b/llvm/lib/Target/RISCV/RISCVFeatures.td index 3d0e1dae801d39..fc93f7c3e1fea1 100644 --- a/llvm/lib/Target/RISCV/RISCVFeatures.td +++ b/llvm/lib/Target/RISCV/RISCVFeatures.td @@ -927,6 +927,13 @@ def FeatureStdExtSscsrind : RISCVExtension<"sscsrind", 1, 0, "'Sscsrind' (Indirect CSR Access Supervisor Level)">; +def FeatureStdExtSmdbltrp + : RISCVExtension<"smdbltrp", 1, 0, + "'Smdbltrp' (Double Trap Machine Level)">; +def FeatureStdExtSsdbltrp + : RISCVExtension<"ssdbltrp", 1, 0, + "'Ssdbltrp' (Double Trap Supervisor Level)">; + def FeatureStdExtSmepmp : RISCVExtension<"smepmp", 1, 0, "'Smepmp' (Enhanced Physical Memory Protection)">; diff --git a/llvm/test/CodeGen/RISCV/attributes.ll b/llvm/test/CodeGen/RISCV/attributes.ll index 86ce368bc1db66..b8f97ae0930a15 100644 --- a/llvm/test/CodeGen/RISCV/attributes.ll +++ b/llvm/test/CodeGen/RISCV/attributes.ll @@ -115,6 +115,8 @@ ; RUN: llc -mtriple=riscv32 -mattr=+ssaia %s -o - | FileCheck --check-prefixes=CHECK,RV32SSAIA %s ; RUN: llc -mtriple=riscv32 -mattr=+smcsrind %s -o - | FileCheck --check-prefixes=CHECK,RV32SMCSRIND %s ; RUN: llc -mtriple=riscv32 -mattr=+sscsrind %s -o - | FileCheck --check-prefixes=CHECK,RV32SSCSRIND %s +; RUN: llc -mtriple=riscv32 -mattr=+smdbltrp %s -o - | FileCheck --check-prefixes=CHECK,RV32SMDBLTRP %s +; RUN: llc -mtriple=riscv32 -mattr=+ssdbltrp %s -o - | FileCheck --check-prefixes=CHECK,RV32SSDBLTRP %s ; RUN: llc -mtriple=riscv32 -mattr=+ssqosid %s -o - | FileCheck --check-prefix=RV32SSQOSID %s ; RUN: llc -mtriple=riscv32 -mattr=+smcdeleg %s -o - | FileCheck --check-prefixes=CHECK,RV32SMCDELEG %s ; RUN: llc -mtriple=riscv32 -mattr=+smepmp %s -o - | FileCheck --check-prefixes=CHECK,RV32SMEPMP %s @@ -258,6 +260,8 @@ ; RUN: llc -mtriple=riscv64 -mattr=+ssaia %s -o - | FileCheck --check-prefixes=CHECK,RV64SSAIA %s ; RUN: llc -mtriple=riscv64 -mattr=+smcsrind %s -o - | FileCheck --check-prefixes=CHECK,RV64SMCSRIND %s ; RUN: llc -mtriple=riscv64 -mattr=+sscsrind %s -o - | FileCheck --check-prefixes=CHECK,RV64SSCSRIND %s +; RUN: llc -mtriple=riscv64 -mattr=+smdbltrp %s -o - | FileCheck --check-prefixes=CHECK,RV64SMDBLTRP %s +; RUN: llc -mtriple=riscv64 -mattr=+ssdbltrp %s -o - | FileCheck --check-prefixes=CHECK,RV64SSDBLTRP %s ; RUN: llc -mtriple=riscv64 -mattr=+ssqosid %s -o - | FileCheck --check-prefix=RV64SSQOSID %s ; RUN: llc -mtriple=riscv64 -mattr=+smcdeleg %s -o - | FileCheck --check-prefixes=CHECK,RV64SMCDELEG %s ; RUN: llc -mtriple=riscv64 -mattr=+smepmp %s -o - | FileCheck --check-prefixes=CHECK,RV64SMEPMP %s @@ -407,6 +411,8 @@ ; RV32SSAIA: .attribute 5, "rv32i2p1_ssaia1p0" ; RV32SMCSRIND: .attribute 5, "rv32i2p1_smcsrind1p0" ; RV32SSCSRIND: .attribute 5, "rv32i2p1_sscsrind1p0" +; RV32SMDBLTRP: .attribute 5, "rv32i2p1_smdbltrp1p0" +; RV32SSDBLTRP: .attribute 5, "rv32i2p1_ssdbltrp1p0" ; RV32SSQOSID: .attribute 5, "rv32i2p1_ssqosid1p0" ; RV32SMCDELEG: .attribute 5, "rv32i2p1_smcdeleg1p0" ; RV32SMEPMP: .attribute 5, "rv32i2p1_smepmp1p0" @@ -548,6 +554,8 @@ ; RV64SSAIA: .attribute 5, "rv64i2p1_ssaia1p0" ; RV64SMCSRIND: .attribute 5, "rv64i2p1_smcsrind1p0" ; RV64SSCSRIND: .attribute 5, "rv64i2p1_sscsrind1p0" +; RV64SMDBLTRP: .attribute 5, "rv64i2p1_smdbltrp1p0" +; RV64SSDBLTRP: .attribute 5, "rv64i2p1_ssdbltrp1p0" ; RV64SSQOSID: .attribute 5, "rv64i2p1_ssqosid1p0" ; RV64SMCDELEG: .attribute 5, "rv64i2p1_smcdeleg1p0" ; RV64SMEPMP: .attribute 5, "rv64i2p1_smepmp1p0" diff --git a/llvm/test/MC/RISCV/attribute-arch.s b/llvm/test/MC/RISCV/attribute-arch.s index 1c0b2a59d0693f..8d9d3ac7132431 100644 --- a/llvm/test/MC/RISCV/attribute-arch.s +++ b/llvm/test/MC/RISCV/attribute-arch.s @@ -321,6 +321,12 @@ .attribute arch, "rv32i_sscsrind1p0" # CHECK: attribute 5, "rv32i2p1_sscsrind1p0" +.attribute arch, "rv32i_smdbltrp1p0" +# CHECK: attribute 5, "rv32i2p1_smdbltrp1p0" + +.attribute arch, "rv32i_ssdbltrp1p0" +# CHECK: attribute 5, "rv32i2p1_ssdbltrp1p0" + .attribute arch, "rv32i_smcdeleg1p0" # CHECK: attribute 5, "rv32i2p1_smcdeleg1p0" diff --git a/llvm/unittests/TargetParser/RISCVISAInfoTest.cpp b/llvm/unittests/TargetParser/RISCVISAInfoTest.cpp index 33944b64dc1577..f2e16ac0ac93fb 100644 --- a/llvm/unittests/TargetParser/RISCVISAInfoTest.cpp +++ b/llvm/unittests/TargetParser/RISCVISAInfoTest.cpp @@ -1064,6 +1064,7 @@ R"(All available -march extensions for RISC-V smaia 1.0 smcdeleg 1.0 smcsrind 1.0 + smdbltrp 1.0 smepmp 1.0 smstateen 1.0 ssaia 1.0 @@ -1072,6 +1073,7 @@ R"(All available -march extensions for RISC-V sscofpmf 1.0 sscounterenw 1.0 sscsrind 1.0 + ssdbltrp 1.0 ssqosid 1.0 ssstateen 1.0 ssstrict 1.0 `````````` </details> https://github.com/llvm/llvm-project/pull/111837 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
