[RISCV] Remove 'sx' when parsing arch string to match the latest ISA manual

[joshua-arch1]

Summary

As is mentioned in https://reviews.llvm.org/D148315, in order to match the latest ISA manual, we also need to remove sx prefix.

[joshua-arch1]

Ping.

[asb]

LGTM, thanks.

Note that the community norm is to ping on a patch after a week (ref). Less than 24 hours is certainly too short.

clang/test/Driver/riscv-arch.c

 // RV32-B: error: invalid arch name 'rv32ib',
 // RV32-B: unsupported standard user-level extension 'b'
 
 // RUN: %clang --target=riscv32-unknown-elf -march=rv32xabc -### %s \
 // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32X %s
 // RV32X: error: invalid arch name 'rv32xabc',
 // RV32X: first letter should be 'e', 'i' or 'g'
 
-// RUN: %clang --target=riscv32-unknown-elf -march=rv32sxabc -### %s \
-// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32SX %s
-// RV32SX: error: invalid arch name 'rv32sxabc',
-// RV32SX: first letter should be 'e', 'i' or 'g'
-
 // RUN: %clang --target=riscv32-unknown-elf -march=rv32sabc -### %s \
 // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32S %s
 // RV32S: error: invalid arch name 'rv32sabc',
 // RV32S: first letter should be 'e', 'i' or 'g'
 
 // RUN: %clang --target=riscv32-unknown-elf -march=rv32ix -### %s \
 // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32X-NAME %s
 // RV32X-NAME: error: invalid arch name 'rv32ix',
 // RV32X-NAME: non-standard user-level extension name missing after 'x'
 
-// RUN: %clang --target=riscv32-unknown-elf -march=rv32isx -### %s \
-// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32SX-NAME %s
-// RV32SX-NAME: error: invalid arch name 'rv32isx',
-// RV32SX-NAME: non-standard supervisor-level extension
-// RV32SX-NAME: name missing after 'sx'
-
 // RUN: %clang --target=riscv32-unknown-elf -march=rv32is -### %s \
 // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32S-NAME %s
 // RV32S-NAME: error: invalid arch name 'rv32is',
 // RV32S-NAME: standard supervisor-level extension
 // RV32S-NAME: name missing after 's'
 
-// RUN: %clang --target=riscv32-unknown-elf -march=rv32ix_s_sx -### %s \
+// RUN: %clang --target=riscv32-unknown-elf -march=rv32ix_s -### %s \
 // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32ALL-NAME %s
-// RV32ALL-NAME: error: invalid arch name 'rv32ix_s_sx',
+// RV32ALL-NAME: error: invalid arch name 'rv32ix_s',
 // RV32ALL-NAME: non-standard user-level extension
 // RV32ALL-NAME: name missing after 'x'
 
 // RUN: %clang --target=riscv32-unknown-elf -march=rv32ixabc -### %s \
 // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32X-UNS %s
 // RV32X-UNS: error: invalid arch name 'rv32ixabc',
 // RV32X-UNS: unsupported non-standard user-level extension 'xabc'
 
 // RUN: %clang --target=riscv32-unknown-elf -march=rv32isa -### %s \
 // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32S-UNS %s
 // RV32S-UNS: error: invalid arch name 'rv32isa',
 // RV32S-UNS: unsupported standard supervisor-level extension 'sa'
 
-// RUN: %clang --target=riscv32-unknown-elf -march=rv32isxabc -### %s \
-// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32SX-UNS %s
-// RV32SX-UNS: error: invalid arch name 'rv32isxabc',
-// RV32SX-UNS: unsupported non-standard supervisor-level extension 'sxabc'
-
-// RUN: %clang --target=riscv32-unknown-elf -march=rv32isp_xabc_sxlw -### %s \
+// RUN: %clang --target=riscv32-unknown-elf -march=rv32isp_xabc -### %s \
 // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32ALL %s
-// RV32ALL: error: invalid arch name 'rv32isp_xabc_sxlw',
+// RV32ALL: error: invalid arch name 'rv32isp_xabc',
 // RV32ALL: unsupported standard supervisor-level extension 'sp'
 
 // RUN: %clang --target=riscv32-unknown-elf -march=rv32i20 -### %s \
 // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-IVER %s
 // RV32-IVER: error: invalid arch name 'rv32i20', unsupported
 // RV32-IVER: version number 20 for extension 'i'
 
 // RUN: %clang --target=riscv32-unknown-elf -march=rv32imc5 -### %s \

 // RV32-XMINOR-MISS: error: invalid arch name 'rv32ixt2p',
 // RV32-XMINOR-MISS: minor version number missing after 'p' for extension 'xt'
 
 // RUN: %clang --target=riscv32-unknown-elf -march=rv32ist2p0 -### %s \
 // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-SMINOR0 %s
 // RV32-SMINOR0: error: invalid arch name 'rv32ist2p0',
 // RV32-SMINOR0: unsupported version number 2.0 for extension 'st'
 
-// RUN: %clang --target=riscv32-unknown-elf -march=rv32isxt2p1 -### %s \
-// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-SXMINOR1 %s
-// RV32-SXMINOR1: error: invalid arch name 'rv32isxt2p1', unsupported
-// RV32-SXMINOR1: version number 2.1 for extension 'sxt'
-
 // RUN: %clang --target=riscv32-unknown-elf -march=rv32ixabc_ -### %s \
 // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-XSEP %s
 // RV32-XSEP: error: invalid arch name 'rv32ixabc_',
 // RV32-XSEP: extension name missing after separator '_'
 
 // RUN: %clang --target=riscv32-unknown-elf -march=rv32ixabc_a -### %s \
 // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-PREFIX %s
 // RV32-PREFIX: error: invalid arch name 'rv32ixabc_a',
 // RV32-PREFIX: invalid extension prefix 'a'
 
 // RUN: %clang --target=riscv32-unknown-elf -march=rv32ixdef_sabc -### %s \
 // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-X-ORDER %s
 // RV32-X-ORDER: error: invalid arch name 'rv32ixdef_sabc',
 // RV32-X-ORDER: standard supervisor-level extension not given
 // RV32-X-ORDER: in canonical order 'sabc'
 
-// RUN: %clang --target=riscv32-unknown-elf -march=rv32isxabc_sdef -### %s \
-// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-S-ORDER %s
-// RV32-S-ORDER: error: invalid arch name 'rv32isxabc_sdef',
-// RV32-S-ORDER: standard supervisor-level extension not given
-// RV32-S-ORDER: in canonical order 'sdef'
-
 // RUN: %clang --target=riscv32-unknown-elf -march=rv32ixabc_xabc -### %s \
 // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-XDUP %s
 // RV32-XDUP: error: invalid arch name 'rv32ixabc_xabc',
 // RV32-XDUP: duplicated non-standard user-level extension 'xabc'
 
 // RUN: %clang --target=riscv32-unknown-elf -march=rv32ixabc_xdef -### %s \
 // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-X-X-INVAL %s
 // RV32-X-X-INVAL: error: invalid arch name 'rv32ixabc_xdef', unsupported
 // RV32-X-X-INVAL: non-standard user-level extension 'xabc'
 
-// RUN: %clang --target=riscv32-unknown-elf -march=rv32isdef_xabc_sxghi -### %s \
-// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-X-S-SX-INVAL %s
-// RV32-X-S-SX-INVAL: error: invalid arch name 'rv32isdef_xabc_sxghi',
-// RV32-X-S-SX-INVAL: unsupported standard supervisor-level extension 'sdef'
+// RUN: %clang --target=riscv32-unknown-elf -march=rv32isdef_xabc -### %s \
+// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-X-S-INVAL %s
+// RV32-X-S-INVAL: error: invalid arch name 'rv32isdef_xabc',
+// RV32-X-S-INVAL: unsupported standard supervisor-level extension 'sdef'
 
 // RUN: %clang --target=riscv32-unknown-elf -march=rv32i -### %s \
 // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-TARGET %s
 // RUN: %clang --target=riscv64-unknown-elf -march=rv32i -### %s \
 // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-TARGET %s
 // RV32-TARGET: "-triple" "riscv32-unknown-unknown-elf"
 
 // RUN: %clang --target=riscv32-unknown-elf -march=rv64i -### %s \

llvm/lib/Support/RISCVISAInfo.cpp

void RISCVISAInfo::addExtension(StringRef ExtName, unsigned MajorVersion,
                                 unsigned MinorVersion) {
   RISCVExtensionInfo Ext;
   Ext.MajorVersion = MajorVersion;
   Ext.MinorVersion = MinorVersion;
   Exts[ExtName.str()] = Ext;
 }
 
 static StringRef getExtensionTypeDesc(StringRef Ext) {
-  if (Ext.startswith("sx"))
-    return "non-standard supervisor-level extension";
   if (Ext.startswith("s"))
     return "standard supervisor-level extension";
   if (Ext.startswith("x"))
     return "non-standard user-level extension";
   if (Ext.startswith("z"))
     return "standard user-level extension";
   return StringRef();
 }
 
 static StringRef getExtensionType(StringRef Ext) {
-  if (Ext.startswith("sx"))
-    return "sx";
   if (Ext.startswith("s"))
     return "s";
   if (Ext.startswith("x"))
     return "x";
   if (Ext.startswith("z"))
     return "z";
   return StringRef();
 }
RISCVISAInfo::parseArchString(StringRef Arch, bool EnableExperimentalExtension,
   if (Arch.back() == '_')
     return createStringError(errc::invalid_argument,
                              "extension name missing after separator '_'");
 
   // Skip rvxxx
   StringRef Exts = Arch.substr(5);
 
   // Remove multi-letter standard extensions, non-standard extensions and
-  // supervisor-level extensions. They have 'z', 'x', 's', 'sx' prefixes.
+  // supervisor-level extensions. They have 'z', 'x', 's' prefixes.
   // Parse them at the end.
   // Find the very first occurrence of 's', 'x' or 'z'.
   StringRef OtherExts;
   size_t Pos = Exts.find_first_of("zsx");
   if (Pos != StringRef::npos) {
     OtherExts = Exts.substr(Pos);
     Exts = Exts.substr(0, Pos);
   }
for (auto I = Exts.begin(), E = Exts.end(); I != E;) {
     GoToNextExt(I, ConsumeLength);
   }
 
   // Handle other types of extensions other than the standard
   // general purpose and standard user-level extensions.
   // Parse the ISA string containing non-standard user-level
   // extensions, standard supervisor-level extensions and
   // non-standard supervisor-level extensions.
-  // These extensions start with 'z', 's', 'x', 'sx' prefixes, follow a
+  // These extensions start with 'z', 's', 'x' prefixes, follow a
   // canonical order, might have a version number (major, minor)
   // and are separated by a single underscore '_'.
   // Set the hardware features for the extensions that are supported.
 
   // Multi-letter extensions are seperated by a single underscore
   // as described in RISC-V User-Level ISA V2.2.
   SmallVector<StringRef, 8> Split;
   OtherExts.split(Split, '_');
 
   SmallVector<StringRef, 8> AllExts;
-  std::array<StringRef, 4> Prefix{"z", "s", "x", "sx"};
+  std::array<StringRef, 4> Prefix{"z", "s", "x"};
   auto I = Prefix.begin();
   auto E = Prefix.end();
   if (Split.size() > 1 || Split[0] != "") {
     for (StringRef Ext : Split) {
       if (Ext.empty())
         return createStringError(errc::invalid_argument,
                                  "extension name missing after separator '_'");
 

llvm/unittests/Support/RISCVISAInfoTest.cpp

EXPECT_EQ(
           RISCVISAInfo::parseArchString("rv32i_zmadeup", true).takeError()),
       "unsupported standard user-level extension 'zmadeup'");
   EXPECT_EQ(
       toString(
           RISCVISAInfo::parseArchString("rv64g_smadeup", true).takeError()),
       "unsupported standard supervisor-level extension 'smadeup'");
   EXPECT_EQ(
       toString(
-          RISCVISAInfo::parseArchString("rv64g_sxmadeup", true).takeError()),
-      "unsupported non-standard supervisor-level extension 'sxmadeup'");
-  EXPECT_EQ(
-      toString(
           RISCVISAInfo::parseArchString("rv64g_xmadeup", true).takeError()),
       "unsupported non-standard user-level extension 'xmadeup'");
 }
 
 TEST(ParseArchString, IgnoresUnrecognizedExtensionNamesWithIgnoreUnknown) {
-  for (StringRef Input : {"rv32ib", "rv32i_zmadeup", "rv64i_smadeup",
-                          "rv32i_sxmadeup", "rv64i_xmadeup"}) {
+  for (StringRef Input : {"rv32ib", "rv32i_zmadeup",
+                          "rv64i_smadeup", "rv64i_xmadeup"}) {
     auto MaybeISAInfo = RISCVISAInfo::parseArchString(Input, true, false, true);
     ASSERT_THAT_EXPECTED(MaybeISAInfo, Succeeded());
     RISCVISAInfo &Info = **MaybeISAInfo;
     RISCVISAInfo::OrderedExtensionMap Exts = Info.getExtensions();
     EXPECT_EQ(Exts.size(), 1UL);
     EXPECT_TRUE(Exts.at("i") == (RISCVExtensionInfo{2, 1}));
   }