fixup! address review comments

Author: topperc

llvm/lib/TargetParser/RISCVISAInfo.cpp

@@ -748,7 +748,7 @@ Error RISCVISAInfo::checkDependency() {
       {"xqcicm"},  {"xqcics"}, {"xqcicsr"}, {"xqciint"},
       {"xqcilia"}, {"xqcilo"}, {"xqcilsm"}, {"xqcisls"}};
   static constexpr StringLiteral ZcdOverlaps[] = {
-      {"zcmt"}, {"zcmp"}, {"xqciac"}, {"xqcicm"}};
+      {"zcmt"}, {"zcmp"}, {"xqccmp"}, {"xqciac"}, {"xqcicm"}};
 
   if (HasI && HasE)
     return getIncompatibleError("i", "e");

llvm/unittests/TargetParser/RISCVISAInfoTest.cpp

@@ -663,30 +663,11 @@ TEST(ParseArchString, RejectsConflictingExtensions) {
         ::testing::EndsWith(" is only supported for 'rv32'"));
   }
 
-  for (StringRef Input : {"rv32idc_xqciac0p3"}) {
-    EXPECT_EQ(toString(RISCVISAInfo::parseArchString(Input, true).takeError()),
-              "'xqciac' extension is incompatible with 'c' extension when 'd' "
-              "extension is enabled");
-  }
-
-  for (StringRef Input : {"rv32i_zcd_xqciac0p3"}) {
-    EXPECT_EQ(
-        toString(RISCVISAInfo::parseArchString(Input, true).takeError()),
-        "'xqciac' extension is incompatible with 'zcd' extension when 'd' "
-        "extension is enabled");
-  }
-
-  for (StringRef Input : {"rv32idc_xqcicm0p2"}) {
-    EXPECT_EQ(toString(RISCVISAInfo::parseArchString(Input, true).takeError()),
-              "'xqcicm' extension is incompatible with 'c' extension when 'd' "
-              "extension is enabled");
-  }
-
-  for (StringRef Input : {"rv32i_zcd_xqcicm0p2"}) {
-    EXPECT_EQ(
+  for (StringRef Input : {"rv32idc_xqciac0p3", "rv32i_zcd_xqciac0p3", "rv32idc_xqcicm0p2",
+                          "rv32i_zcd_xqcicm0p2"}) {
+    EXPECT_THAT(
         toString(RISCVISAInfo::parseArchString(Input, true).takeError()),
-        "'xqcicm' extension is incompatible with 'zcd' extension when 'd' "
-        "extension is enabled");
+        ::testing::EndsWith("extension when 'd' extension is enabled"));
   }
 
   for (StringRef Input : {"rv32i_zcmp_xqccmp0p1", "rv64i_zcmp_xqccmp0p1"}) {