[PATCH] D81188: [RISCV] Support experimental v extensions.
This revision was automatically updated to reflect the committed changes. Closed by commit rGd698ff92a59c: [RISCV] Support experimental v extensions. (authored by HsiangKai). Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D81188/new/ https://reviews.llvm.org/D81188 Files: clang/lib/Driver/ToolChains/Arch/RISCV.cpp clang/test/Driver/riscv-arch.c Index: clang/test/Driver/riscv-arch.c === --- clang/test/Driver/riscv-arch.c +++ clang/test/Driver/riscv-arch.c @@ -360,3 +360,22 @@ // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-EXPERIMENTAL-ZBB-ZBP %s // RV32-EXPERIMENTAL-ZBB-ZBP: "-target-feature" "+experimental-zbb" // RV32-EXPERIMENTAL-ZBB-ZBP: "-target-feature" "+experimental-zbp" + +// RUN: %clang -target riscv32-unknown-elf -march=rv32iv -### %s -c 2>&1 | \ +// RUN: FileCheck -check-prefix=RV32-EXPERIMENTAL-V-NOFLAG %s +// RV32-EXPERIMENTAL-V-NOFLAG: error: invalid arch name 'rv32iv' +// RV32-EXPERIMENTAL-V-NOFLAG: requires '-menable-experimental-extensions' + +// RUN: %clang -target riscv32-unknown-elf -march=rv32iv -menable-experimental-extensions -### %s -c 2>&1 | \ +// RUN: FileCheck -check-prefix=RV32-EXPERIMENTAL-V-NOVERS %s +// RV32-EXPERIMENTAL-V-NOVERS: error: invalid arch name 'rv32iv' +// RV32-EXPERIMENTAL-V-NOVERS: experimental extension requires explicit version number + +// RUN: %clang -target riscv32-unknown-elf -march=rv32iv0p1 -menable-experimental-extensions -### %s -c 2>&1 | \ +// RUN: FileCheck -check-prefix=RV32-EXPERIMENTAL-V-BADVERS %s +// RV32-EXPERIMENTAL-V-BADVERS: error: invalid arch name 'rv32iv0p1' +// RV32-EXPERIMENTAL-V-BADVERS: unsupported version number 0.1 for experimental extension + +// RUN: %clang -target riscv32-unknown-elf -march=rv32iv0p8 -menable-experimental-extensions -### %s -c 2>&1 | \ +// RUN: FileCheck -check-prefix=RV32-EXPERIMENTAL-V-GOODVERS %s +// RV32-EXPERIMENTAL-V-GOODVERS: "-target-feature" "+experimental-v" Index: clang/lib/Driver/ToolChains/Arch/RISCV.cpp === --- clang/lib/Driver/ToolChains/Arch/RISCV.cpp +++ clang/lib/Driver/ToolChains/Arch/RISCV.cpp @@ -62,6 +62,8 @@ Ext == "zbf" || Ext == "zbm" || Ext == "zbp" || Ext == "zbr" || Ext == "zbs" || Ext == "zbt" || Ext == "zbproposedc") return RISCVExtensionVersion{"0", "92"}; + if (Ext == "v") +return RISCVExtensionVersion{"0", "8"}; return None; } @@ -399,6 +401,9 @@ case 'b': Features.push_back("+experimental-b"); break; +case 'v': + Features.push_back("+experimental-v"); + break; } // Consume full extension name and version, including any optional '_' Index: clang/test/Driver/riscv-arch.c === --- clang/test/Driver/riscv-arch.c +++ clang/test/Driver/riscv-arch.c @@ -360,3 +360,22 @@ // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-EXPERIMENTAL-ZBB-ZBP %s // RV32-EXPERIMENTAL-ZBB-ZBP: "-target-feature" "+experimental-zbb" // RV32-EXPERIMENTAL-ZBB-ZBP: "-target-feature" "+experimental-zbp" + +// RUN: %clang -target riscv32-unknown-elf -march=rv32iv -### %s -c 2>&1 | \ +// RUN: FileCheck -check-prefix=RV32-EXPERIMENTAL-V-NOFLAG %s +// RV32-EXPERIMENTAL-V-NOFLAG: error: invalid arch name 'rv32iv' +// RV32-EXPERIMENTAL-V-NOFLAG: requires '-menable-experimental-extensions' + +// RUN: %clang -target riscv32-unknown-elf -march=rv32iv -menable-experimental-extensions -### %s -c 2>&1 | \ +// RUN: FileCheck -check-prefix=RV32-EXPERIMENTAL-V-NOVERS %s +// RV32-EXPERIMENTAL-V-NOVERS: error: invalid arch name 'rv32iv' +// RV32-EXPERIMENTAL-V-NOVERS: experimental extension requires explicit version number + +// RUN: %clang -target riscv32-unknown-elf -march=rv32iv0p1 -menable-experimental-extensions -### %s -c 2>&1 | \ +// RUN: FileCheck -check-prefix=RV32-EXPERIMENTAL-V-BADVERS %s +// RV32-EXPERIMENTAL-V-BADVERS: error: invalid arch name 'rv32iv0p1' +// RV32-EXPERIMENTAL-V-BADVERS: unsupported version number 0.1 for experimental extension + +// RUN: %clang -target riscv32-unknown-elf -march=rv32iv0p8 -menable-experimental-extensions -### %s -c 2>&1 | \ +// RUN: FileCheck -check-prefix=RV32-EXPERIMENTAL-V-GOODVERS %s +// RV32-EXPERIMENTAL-V-GOODVERS: "-target-feature" "+experimental-v" Index: clang/lib/Driver/ToolChains/Arch/RISCV.cpp === --- clang/lib/Driver/ToolChains/Arch/RISCV.cpp +++ clang/lib/Driver/ToolChains/Arch/RISCV.cpp @@ -62,6 +62,8 @@ Ext == "zbf" || Ext == "zbm" || Ext == "zbp" || Ext == "zbr" || Ext == "zbs" || Ext == "zbt" || Ext == "zbproposedc") return RISCVExtensionVersion{"0", "92"}; + if (Ext == "v") +return RISCVExtensionVersion{"0", "8"}; return None; } @@ -399,6 +401,9 @@ case 'b': Features.push_back("+experimental-b");
[PATCH] D81188: [RISCV] Support experimental v extensions.
MaskRay accepted this revision. MaskRay added a comment. This revision is now accepted and ready to land. LGTM. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D81188/new/ https://reviews.llvm.org/D81188 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D81188: [RISCV] Support experimental v extensions.
HsiangKai updated this revision to Diff 268642. HsiangKai added a comment. Address @MaskRay's comments. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D81188/new/ https://reviews.llvm.org/D81188 Files: clang/lib/Driver/ToolChains/Arch/RISCV.cpp clang/test/Driver/riscv-arch.c Index: clang/test/Driver/riscv-arch.c === --- clang/test/Driver/riscv-arch.c +++ clang/test/Driver/riscv-arch.c @@ -360,3 +360,22 @@ // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-EXPERIMENTAL-ZBB-ZBP %s // RV32-EXPERIMENTAL-ZBB-ZBP: "-target-feature" "+experimental-zbb" // RV32-EXPERIMENTAL-ZBB-ZBP: "-target-feature" "+experimental-zbp" + +// RUN: %clang -target riscv32-unknown-elf -march=rv32iv -### %s -c 2>&1 | \ +// RUN: FileCheck -check-prefix=RV32-EXPERIMENTAL-V-NOFLAG %s +// RV32-EXPERIMENTAL-V-NOFLAG: error: invalid arch name 'rv32iv' +// RV32-EXPERIMENTAL-V-NOFLAG: requires '-menable-experimental-extensions' + +// RUN: %clang -target riscv32-unknown-elf -march=rv32iv -menable-experimental-extensions -### %s -c 2>&1 | \ +// RUN: FileCheck -check-prefix=RV32-EXPERIMENTAL-V-NOVERS %s +// RV32-EXPERIMENTAL-V-NOVERS: error: invalid arch name 'rv32iv' +// RV32-EXPERIMENTAL-V-NOVERS: experimental extension requires explicit version number + +// RUN: %clang -target riscv32-unknown-elf -march=rv32iv0p1 -menable-experimental-extensions -### %s -c 2>&1 | \ +// RUN: FileCheck -check-prefix=RV32-EXPERIMENTAL-V-BADVERS %s +// RV32-EXPERIMENTAL-V-BADVERS: error: invalid arch name 'rv32iv0p1' +// RV32-EXPERIMENTAL-V-BADVERS: unsupported version number 0.1 for experimental extension + +// RUN: %clang -target riscv32-unknown-elf -march=rv32iv0p8 -menable-experimental-extensions -### %s -c 2>&1 | \ +// RUN: FileCheck -check-prefix=RV32-EXPERIMENTAL-V-GOODVERS %s +// RV32-EXPERIMENTAL-V-GOODVERS: "-target-feature" "+experimental-v" Index: clang/lib/Driver/ToolChains/Arch/RISCV.cpp === --- clang/lib/Driver/ToolChains/Arch/RISCV.cpp +++ clang/lib/Driver/ToolChains/Arch/RISCV.cpp @@ -62,6 +62,8 @@ Ext == "zbf" || Ext == "zbm" || Ext == "zbp" || Ext == "zbr" || Ext == "zbs" || Ext == "zbt" || Ext == "zbproposedc") return RISCVExtensionVersion{"0", "92"}; + if (Ext == "v") +return RISCVExtensionVersion{"0", "8"}; return None; } @@ -399,6 +401,9 @@ case 'b': Features.push_back("+experimental-b"); break; +case 'v': + Features.push_back("+experimental-v"); + break; } // Consume full extension name and version, including any optional '_' Index: clang/test/Driver/riscv-arch.c === --- clang/test/Driver/riscv-arch.c +++ clang/test/Driver/riscv-arch.c @@ -360,3 +360,22 @@ // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-EXPERIMENTAL-ZBB-ZBP %s // RV32-EXPERIMENTAL-ZBB-ZBP: "-target-feature" "+experimental-zbb" // RV32-EXPERIMENTAL-ZBB-ZBP: "-target-feature" "+experimental-zbp" + +// RUN: %clang -target riscv32-unknown-elf -march=rv32iv -### %s -c 2>&1 | \ +// RUN: FileCheck -check-prefix=RV32-EXPERIMENTAL-V-NOFLAG %s +// RV32-EXPERIMENTAL-V-NOFLAG: error: invalid arch name 'rv32iv' +// RV32-EXPERIMENTAL-V-NOFLAG: requires '-menable-experimental-extensions' + +// RUN: %clang -target riscv32-unknown-elf -march=rv32iv -menable-experimental-extensions -### %s -c 2>&1 | \ +// RUN: FileCheck -check-prefix=RV32-EXPERIMENTAL-V-NOVERS %s +// RV32-EXPERIMENTAL-V-NOVERS: error: invalid arch name 'rv32iv' +// RV32-EXPERIMENTAL-V-NOVERS: experimental extension requires explicit version number + +// RUN: %clang -target riscv32-unknown-elf -march=rv32iv0p1 -menable-experimental-extensions -### %s -c 2>&1 | \ +// RUN: FileCheck -check-prefix=RV32-EXPERIMENTAL-V-BADVERS %s +// RV32-EXPERIMENTAL-V-BADVERS: error: invalid arch name 'rv32iv0p1' +// RV32-EXPERIMENTAL-V-BADVERS: unsupported version number 0.1 for experimental extension + +// RUN: %clang -target riscv32-unknown-elf -march=rv32iv0p8 -menable-experimental-extensions -### %s -c 2>&1 | \ +// RUN: FileCheck -check-prefix=RV32-EXPERIMENTAL-V-GOODVERS %s +// RV32-EXPERIMENTAL-V-GOODVERS: "-target-feature" "+experimental-v" Index: clang/lib/Driver/ToolChains/Arch/RISCV.cpp === --- clang/lib/Driver/ToolChains/Arch/RISCV.cpp +++ clang/lib/Driver/ToolChains/Arch/RISCV.cpp @@ -62,6 +62,8 @@ Ext == "zbf" || Ext == "zbm" || Ext == "zbp" || Ext == "zbr" || Ext == "zbs" || Ext == "zbt" || Ext == "zbproposedc") return RISCVExtensionVersion{"0", "92"}; + if (Ext == "v") +return RISCVExtensionVersion{"0", "8"}; return None; } @@ -399,6 +401,9 @@ case 'b': Features.push_back("+experimental-b"); break; +case 'v': +
[PATCH] D81188: [RISCV] Support experimental v extensions.
MaskRay added inline comments. Comment at: clang/test/Driver/riscv-arch.c:364 + +// RUN: %clang -target riscv32-unknown-elf -march=rv32iv -### %s \ +// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-EXPERIMENTAL-V-NOFLAG %s For the RUN lines, I'd prefer the suggestion in https://reviews.llvm.org/D80838?id=267971#inline-744878 You replace -fsyntax-only to -c if it is too long. Comment at: clang/test/Driver/riscv-arch.c:379 + +// RUN: %clang -target riscv32-unknown-elf -march=rv32iv0p8 -menable-experimental-extensions -### %s \ +// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-EXPERIMENTAL-V-GOODVERS %s Should there be a p7 test? Along with a p8 test, we can know that p8 is the split line. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D81188/new/ https://reviews.llvm.org/D81188 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D81188: [RISCV] Support experimental v extensions.
HsiangKai created this revision. HsiangKai added reviewers: MaskRay, rogfer01. Herald added subscribers: cfe-commits, evandro, luismarques, apazos, sameer.abuasal, pzheng, s.egerton, lenary, Jim, benna, psnobl, jocewei, PkmX, rkruppe, the_o, brucehoult, MartinMosbeck, edward-jones, zzheng, jrtc27, shiva0217, kito-cheng, niosHD, sabuasal, simoncook, johnrusso, rbar, asb. Herald added a project: clang. This follows the design as discussed on the mailing lists in the following RFC: http://lists.llvm.org/pipermail/llvm-dev/2020-January/138364.html Support for the vector 'v' extension v0.8. Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D81188 Files: clang/lib/Driver/ToolChains/Arch/RISCV.cpp clang/test/Driver/riscv-arch.c Index: clang/test/Driver/riscv-arch.c === --- clang/test/Driver/riscv-arch.c +++ clang/test/Driver/riscv-arch.c @@ -360,3 +360,22 @@ // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-EXPERIMENTAL-ZBB-ZBP %s // RV32-EXPERIMENTAL-ZBB-ZBP: "-target-feature" "+experimental-zbb" // RV32-EXPERIMENTAL-ZBB-ZBP: "-target-feature" "+experimental-zbp" + +// RUN: %clang -target riscv32-unknown-elf -march=rv32iv -### %s \ +// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-EXPERIMENTAL-V-NOFLAG %s +// RV32-EXPERIMENTAL-V-NOFLAG: error: invalid arch name 'rv32iv' +// RV32-EXPERIMENTAL-V-NOFLAG: requires '-menable-experimental-extensions' + +// RUN: %clang -target riscv32-unknown-elf -march=rv32iv -menable-experimental-extensions -### %s \ +// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-EXPERIMENTAL-V-NOVERS %s +// RV32-EXPERIMENTAL-V-NOVERS: error: invalid arch name 'rv32iv' +// RV32-EXPERIMENTAL-V-NOVERS: experimental extension requires explicit version number + +// RUN: %clang -target riscv32-unknown-elf -march=rv32iv0p1 -menable-experimental-extensions -### %s \ +// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-EXPERIMENTAL-V-BADVERS %s +// RV32-EXPERIMENTAL-V-BADVERS: error: invalid arch name 'rv32iv0p1' +// RV32-EXPERIMENTAL-V-BADVERS: unsupported version number 0.1 for experimental extension + +// RUN: %clang -target riscv32-unknown-elf -march=rv32iv0p8 -menable-experimental-extensions -### %s \ +// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-EXPERIMENTAL-V-GOODVERS %s +// RV32-EXPERIMENTAL-V-GOODVERS: "-target-feature" "+experimental-v" Index: clang/lib/Driver/ToolChains/Arch/RISCV.cpp === --- clang/lib/Driver/ToolChains/Arch/RISCV.cpp +++ clang/lib/Driver/ToolChains/Arch/RISCV.cpp @@ -62,6 +62,8 @@ Ext == "zbf" || Ext == "zbm" || Ext == "zbp" || Ext == "zbr" || Ext == "zbs" || Ext == "zbt" || Ext == "zbproposedc") return RISCVExtensionVersion{"0", "92"}; + if (Ext == "v") +return RISCVExtensionVersion{"0", "8"}; return None; } @@ -399,6 +401,9 @@ case 'b': Features.push_back("+experimental-b"); break; +case 'v': + Features.push_back("+experimental-v"); + break; } // Consume full extension name and version, including any optional '_' Index: clang/test/Driver/riscv-arch.c === --- clang/test/Driver/riscv-arch.c +++ clang/test/Driver/riscv-arch.c @@ -360,3 +360,22 @@ // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-EXPERIMENTAL-ZBB-ZBP %s // RV32-EXPERIMENTAL-ZBB-ZBP: "-target-feature" "+experimental-zbb" // RV32-EXPERIMENTAL-ZBB-ZBP: "-target-feature" "+experimental-zbp" + +// RUN: %clang -target riscv32-unknown-elf -march=rv32iv -### %s \ +// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-EXPERIMENTAL-V-NOFLAG %s +// RV32-EXPERIMENTAL-V-NOFLAG: error: invalid arch name 'rv32iv' +// RV32-EXPERIMENTAL-V-NOFLAG: requires '-menable-experimental-extensions' + +// RUN: %clang -target riscv32-unknown-elf -march=rv32iv -menable-experimental-extensions -### %s \ +// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-EXPERIMENTAL-V-NOVERS %s +// RV32-EXPERIMENTAL-V-NOVERS: error: invalid arch name 'rv32iv' +// RV32-EXPERIMENTAL-V-NOVERS: experimental extension requires explicit version number + +// RUN: %clang -target riscv32-unknown-elf -march=rv32iv0p1 -menable-experimental-extensions -### %s \ +// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-EXPERIMENTAL-V-BADVERS %s +// RV32-EXPERIMENTAL-V-BADVERS: error: invalid arch name 'rv32iv0p1' +// RV32-EXPERIMENTAL-V-BADVERS: unsupported version number 0.1 for experimental extension + +// RUN: %clang -target riscv32-unknown-elf -march=rv32iv0p8 -menable-experimental-extensions -### %s \ +// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-EXPERIMENTAL-V-GOODVERS %s +// RV32-EXPERIMENTAL-V-GOODVERS: "-target-feature" "+experimental-v" Index: clang/lib/Driver/ToolChains/Arch/RISCV.cpp === ---