[PATCH] D153159: [RISCV] Add errors for mixing Zcmp with C/Zcd and D.
Craig Topper via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Wed Jun 21 00:11:02 PDT 2023
This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG61e91988bc38: [RISCV] Add errors for mixing Zcmp with C/Zcd and D. (authored by craig.topper).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D153159/new/
https://reviews.llvm.org/D153159
Files:
llvm/lib/Support/RISCVISAInfo.cpp
llvm/unittests/Support/RISCVISAInfoTest.cpp
Index: llvm/unittests/Support/RISCVISAInfoTest.cpp
===================================================================
--- llvm/unittests/Support/RISCVISAInfoTest.cpp
+++ llvm/unittests/Support/RISCVISAInfoTest.cpp
@@ -447,6 +447,30 @@
EXPECT_EQ(toString(RISCVISAInfo::parseArchString(Input, true).takeError()),
"'f' and 'zfinx' extensions are incompatible");
}
+
+ for (StringRef Input : {"rv32idc_zcmp1p0", "rv64idc_zcmp1p0"}) {
+ EXPECT_EQ(toString(RISCVISAInfo::parseArchString(Input, true).takeError()),
+ "'zcmp' extension is incompatible with 'c' extension when 'd' "
+ "extension is enabled");
+ }
+
+ for (StringRef Input : {"rv32id_zcd1p0_zcmp1p0", "rv64id_zcd1p0_zcmp1p0"}) {
+ EXPECT_EQ(toString(RISCVISAInfo::parseArchString(Input, true).takeError()),
+ "'zcmp' extension is incompatible with 'zcd' extension when 'd' "
+ "extension is enabled");
+ }
+
+ for (StringRef Input : {"rv32idc_zcmt1p0", "rv64idc_zcmt1p0"}) {
+ EXPECT_EQ(toString(RISCVISAInfo::parseArchString(Input, true).takeError()),
+ "'zcmt' extension is incompatible with 'c' extension when 'd' "
+ "extension is enabled");
+ }
+
+ for (StringRef Input : {"rv32id_zcd1p0_zcmt1p0", "rv64id_zcd1p0_zcmt1p0"}) {
+ EXPECT_EQ(toString(RISCVISAInfo::parseArchString(Input, true).takeError()),
+ "'zcmt' extension is incompatible with 'zcd' extension when 'd' "
+ "extension is enabled");
+ }
}
TEST(ToFeatureVector, IIsDroppedAndExperimentalExtensionsArePrefixed) {
Index: llvm/lib/Support/RISCVISAInfo.cpp
===================================================================
--- llvm/lib/Support/RISCVISAInfo.cpp
+++ llvm/lib/Support/RISCVISAInfo.cpp
@@ -860,13 +860,11 @@
Error RISCVISAInfo::checkDependency() {
bool HasC = Exts.count("c") != 0;
- bool HasD = Exts.count("d") != 0;
bool HasF = Exts.count("f") != 0;
bool HasZfinx = Exts.count("zfinx") != 0;
bool HasVector = Exts.count("zve32x") != 0;
bool HasZvl = MinVLen != 0;
bool HasZcmt = Exts.count("zcmt") != 0;
- bool HasZcd = Exts.count("zcd") != 0;
if (HasF && HasZfinx)
return createStringError(errc::invalid_argument,
@@ -899,15 +897,13 @@
errc::invalid_argument,
"'zvknhb' requires 'v' or 'zve64*' extension to also be specified");
- if (HasZcmt && HasD && HasC)
+ if ((HasZcmt || Exts.count("zcmp")) && Exts.count("d") &&
+ (HasC || Exts.count("zcd")))
return createStringError(
errc::invalid_argument,
- "'zcmt' is incompatible with 'c' extension when 'd' extension is set");
-
- if (HasZcmt && HasD && HasZcd)
- return createStringError(errc::invalid_argument,
- "'zcmt' is incompatible with 'zcd' extension when "
- "'d' extension is set");
+ Twine("'") + (HasZcmt ? "zcmt" : "zcmp") +
+ "' extension is incompatible with '" + (HasC ? "c" : "zcd") +
+ "' extension when 'd' extension is enabled");
// Additional dependency checks.
// TODO: The 'q' extension requires rv64.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D153159.533154.patch
Type: text/x-patch
Size: 3137 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20230621/3e33e813/attachment.bin>
More information about the llvm-commits
mailing list