[RISCV] Update subset naming convertion for the latest spec

[Jim]

Summary

Update arch string rules for the latest spec 20191213. It introduced
new multi-letter extension prefix with 'h' and 'z', and drop sx.
And the canonical order is 's', 'h', 'z' and 'x'.

[Jim]

GCC has been updated from https://github.com/gcc-mirror/gcc/commit/ca1a9763a1f635d2687ebd5009dd61d4fd0ab5fb#diff-622e89d94803bb804711d5d492a5d4dfa60399bd7a5a7e70a49155534aa6a81f

[khchen]

clang/lib/Driver/ToolChains/Arch/RISCV.cpp

180

If we want to update the arch string rules to ISA 20191213, should we also need to handle Zicsr, Zifencei, Zam and Ztso?

294

nit: Table 27.1 in RISC-V User-Level ISA 20191213

clang/lib/Driver/ToolChains/Arch/RISCV.cpp

 // Represents the major and version number components of a RISC-V extension
 struct RISCVExtensionVersion {
   StringRef Major;
   StringRef Minor;
 };
 } // end anonymous namespace
 
 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("h"))
+    return "standard hypervisor-level extension";
   if (Ext.startswith("z"))
-    return "standard user-level extension";
+    return "standard machine-level extension";
+  if (Ext.startswith("x"))
+    return "non-standard 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("h"))
+    return "h";
   if (Ext.startswith("z"))
     return "z";
+  if (Ext.startswith("x"))
+    return "x";
   return StringRef();
 }
 
 // If the extension is supported as experimental, return the version of that
 // extension that the compiler currently supports.
 static Optional<RISCVExtensionVersion>
 isExperimentalExtension(StringRef Ext) {
   if (Ext == "b" || Ext == "zba" || Ext == "zbb" || Ext == "zbc" ||
       Ext == "zbe" || Ext == "zbf" || Ext == "zbm" || Ext == "zbp" ||
       Ext == "zbr" || Ext == "zbs" || Ext == "zbt" || Ext == "zbproposedc")
     return RISCVExtensionVersion{"0", "93"};
   if (Ext == "v" || Ext == "zvamo" || Ext == "zvlsseg")
     return RISCVExtensionVersion{"0", "10"};
   if (Ext == "zfh")
     return RISCVExtensionVersion{"0", "1"};
   return None;
 }
 
 static bool isSupportedExtension(StringRef Ext) {
   // LLVM supports "z" extensions which are marked as experimental.
   if (isExperimentalExtension(Ext))
     return true;
 
-  // LLVM does not support "sx", "s" nor "x" extensions.
+  // LLVM does not support "s", "h" nor "x" extensions.
   return false;
 }
 
 // Extensions may have a version number, and may be separated by
 // an underscore '_' e.g.: rv32i2_m2.
 // Version number is divided into major and minor version numbers,
 // separated by a 'p'. If the minor version is 0 then 'p0' can be
 // omitted from the version string. E.g., rv32i2p0, rv32i2, rv32i2p1.
static bool getExtensionVersion(const Driver &D, const ArgList &Args,
   Error += " for extension";
   D.Diag(diag::err_drv_invalid_riscv_ext_arch_name) << MArch << Error << Ext;
 
   return false;
 }
 
 // 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', 'x', 's', 'sx' prefixes, follow a
+// Parse the ISA string containing standard supervisor-level
+// extensions, standard hypervisor-level extensions,
+// standard machine-level extensions and non-standard extensions.
+// These extensions start with 's', 'h', 'z', '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.
 static void getExtensionFeatures(const Driver &D,
                                  const ArgList &Args,
                                  std::vector<StringRef> &Features,
                                  StringRef &MArch, StringRef &Exts) {
   if (Exts.empty())
     return;
 
   // Multi-letter extensions are seperated by a single underscore
-  // as described in RISC-V User-Level ISA V2.2.
+  // as described in RISC-V User-Level ISA 20191213.
   SmallVector<StringRef, 8> Split;
   Exts.split(Split, StringRef("_"));
 
-  SmallVector<StringRef, 4> Prefix{"z", "x", "s", "sx"};
+  SmallVector<StringRef, 4> Prefix{"s", "h", "z", "x"};
   auto I = Prefix.begin();
   auto E = Prefix.end();
 
   SmallVector<StringRef, 8> AllExts;
 
   for (StringRef Ext : Split) {
     if (Ext.empty()) {
       D.Diag(diag::err_drv_invalid_riscv_arch_name) << MArch
if (!(MArch.startswith("rv32") || MArch.startswith("rv64")) ||
     D.Diag(diag::err_drv_invalid_riscv_arch_name)
         << MArch << "string must begin with rv32{i,e,g} or rv64{i,g}";
     return false;
   }
 
   bool HasRV64 = MArch.startswith("rv64");
 
   // The canonical order specified in ISA manual.
   // Ref: Table 22.1 in RISC-V User-Level ISA V2.2
   StringRef StdExts = "mafdqlcbjtpvn";
   bool HasF = false, HasD = false;
   char Baseline = MArch[4];
 
   // First letter should be 'e', 'i' or 'g'.
   switch (Baseline) {
   default:
     D.Diag(diag::err_drv_invalid_riscv_arch_name)
case 'g':
     HasF = true;
     HasD = true;
     break;
   }
 
   // Skip rvxxx
   StringRef Exts = MArch.substr(5);
 
-  // Remove multi-letter standard extensions, non-standard extensions and
-  // supervisor-level extensions. They have 'z', 'x', 's', 'sx' prefixes.
+  // Remove multi-letter supervisor-level extensions, hypervisor-level
+  // extensions, machine-level extensions and non-standard extensions.
+  // They have 's', 'h', 'z', 'x' prefixes.
   // Parse them at the end.
-  // Find the very first occurrence of 's', 'x' or 'z'.
+  // Find the very first occurrence of 's', 'h', 'z' or 'x'.
   StringRef OtherExts;
-  size_t Pos = Exts.find_first_of("zsx");
+  size_t Pos = Exts.find_first_of("shzx");
   if (Pos != StringRef::npos) {
     OtherExts = Exts.substr(Pos);
     Exts = Exts.substr(0, Pos);
   }
 
   std::string Major, Minor;
   if (!getExtensionVersion(D, Args, MArch, std::string(1, Baseline), Exts,
                            Major, Minor))

clang/test/Driver/riscv-arch.c

 // RV32-STD-INVAL: error: invalid arch name 'rv32imw',
 // RV32-STD-INVAL: invalid standard user-level extension 'w'
 
 // RUN: %clang -target riscv32-unknown-elf -march=rv32imqc -### %s \
 // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-STD %s
 // RV32-STD: error: invalid arch name 'rv32imqc',
 // RV32-STD: unsupported standard user-level extension 'q'
 
-// 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=rv32habc -### %s \
+// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32H %s
+// RV32H: error: invalid arch name 'rv32habc',
+// RV32H: first letter should be 'e', 'i' or 'g'
+
+// RUN: %clang -target riscv32-unknown-elf -march=rv32zabc -### %s \
+// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32Z %s
+// RV32Z: error: invalid arch name 'rv32zabc',
+// RV32Z: first letter should be 'e', 'i' or 'g'
 
-// 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=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=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: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32ALL-NAME %s
-// RV32ALL-NAME: error: invalid arch name 'rv32ix_s_sx',
-// RV32ALL-NAME: non-standard user-level extension
-// RV32ALL-NAME: name missing after 'x'
+// RUN: %clang -target riscv32-unknown-elf -march=rv32ih -### %s \
+// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32H-NAME %s
+// RV32H-NAME: error: invalid arch name 'rv32ih',
+// RV32H-NAME: standard hypervisor-level extension
+// RV32H-NAME: name missing after 'h'
+
+// RUN: %clang -target riscv32-unknown-elf -march=rv32iz -### %s \
+// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32Z-NAME %s
+// RV32Z-NAME: error: invalid arch name 'rv32iz',
+// RV32Z-NAME: standard machine-level extension
+// RV32Z-NAME: name missing after 'z'
 
-// 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=rv32ix -### %s \
+// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32X-NAME %s
+// RV32X-NAME: error: invalid arch name 'rv32ix',
+// RV32X-NAME: non-standard extension name missing after 'x'
+
+// RUN: %clang -target riscv32-unknown-elf -march=rv32is_h_z_x -### %s \
+// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32ALL-NAME %s
+// RV32ALL-NAME: error: invalid arch name 'rv32is_h_z_x',
+// RV32ALL-NAME: standard supervisor-level extension
+// RV32ALL-NAME: name missing after 's'
 
 // 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=rv32ihab -### %s \
+// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32H-UNS %s
+// RV32H-UNS: error: invalid arch name 'rv32ihab',
+// RV32H-UNS: unsupported standard hypervisor-level extension 'hab'
+
+// RUN: %clang -target riscv32-unknown-elf -march=rv32izabc -### %s \
+// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32Z-UNS %s
+// RV32Z-UNS: error: invalid arch name 'rv32izabc',
+// RV32Z-UNS: unsupported standard machine-level extension 'zabc'
+
+// RUN: %clang -target riscv32-unknown-elf -march=rv32ixabcd -### %s \
+// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32X-UNS %s
+// RV32X-UNS: error: invalid arch name 'rv32ixabcd',
+// RV32X-UNS: unsupported non-standard extension 'xabcd'
 
-// RUN: %clang -target riscv32-unknown-elf -march=rv32ixabc_sp_sxlw -### %s \
+// RUN: %clang -target riscv32-unknown-elf -march=rv32isabc_hp_zxlw_xno -### %s \
 // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32ALL %s
-// RV32ALL: error: invalid arch name 'rv32ixabc_sp_sxlw',
-// RV32ALL: unsupported non-standard user-level extension 'xabc'
+// RV32ALL: error: invalid arch name 'rv32isabc_hp_zxlw_xno',
+// RV32ALL: unsupported standard supervisor-level extension 'sabc'
 
 // 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 \
 // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-CVER %s

 // RV32-IMINOR0: error: invalid arch name 'rv32i2p0',
 // RV32-IMINOR0: unsupported version number 2.0 for extension 'i'
 
 // RUN: %clang -target riscv32-unknown-elf -march=rv32i2p1 -### %s \
 // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-IMINOR1 %s
 // RV32-IMINOR1: error: invalid arch name 'rv32i2p1', unsupported
 // RV32-IMINOR1: version number 2.1 for extension 'i'
 
-// RUN: %clang -target riscv32-unknown-elf -march=rv32ixt2p -### %s \
-// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-XMINOR-MISS %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=rv32ist2p -### %s \
+// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-SMINOR-MISS %s
+// RV32-SMINOR-MISS: error: invalid arch name 'rv32ist2p',
+// RV32-SMINOR-MISS: minor version number missing after 'p' for extension 'st'
+
+// RUN: %clang -target riscv32-unknown-elf -march=rv32iht2p -### %s \
+// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-HMINOR-MISS %s
+// RV32-HMINOR-MISS: error: invalid arch name 'rv32iht2p',
+// RV32-HMINOR-MISS: minor version number missing after 'p' for extension 'ht'
+
+// RUN: %clang -target riscv32-unknown-elf -march=rv32izt2p0 -### %s \
+// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-ZMINOR0 %s
+// RV32-ZMINOR0: error: invalid arch name 'rv32izt2p0',
+// RV32-ZMINOR0: unsupported version number 2.0 for extension 'zt'
+
+// RUN: %clang -target riscv32-unknown-elf -march=rv32ixt2p1 -### %s \
+// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-XMINOR1 %s
+// RV32-XMINOR1: error: invalid arch name 'rv32ixt2p1', unsupported
+// RV32-XMINOR1: version number 2.1 for extension 'xt'
 
 // 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=rv32isabc_xdef -### %s \
-// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-X-ORDER %s
-// RV32-X-ORDER: error: invalid arch name 'rv32isabc_xdef',
-// RV32-X-ORDER: non-standard user-level extension not given
-// RV32-X-ORDER: in canonical order 'xdef'
-
-// RUN: %clang -target riscv32-unknown-elf -march=rv32isxabc_sdef -### %s \
+// RUN: %clang -target riscv32-unknown-elf -march=rv32ihabc_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: error: invalid arch name 'rv32ihabc_sdef',
 // RV32-S-ORDER: standard supervisor-level extension not given
 // RV32-S-ORDER: in canonical order 'sdef'
 
+// RUN: %clang -target riscv32-unknown-elf -march=rv32izabc_hdef -### %s \
+// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-H-ORDER %s
+// RV32-H-ORDER: error: invalid arch name 'rv32izabc_hdef',
+// RV32-H-ORDER: standard hypervisor-level extension not given
+// RV32-H-ORDER: in canonical order 'hdef'
+
+// RUN: %clang -target riscv32-unknown-elf -march=rv32ixabc_zdef -### %s \
+// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-Z-ORDER %s
+// RV32-Z-ORDER: error: invalid arch name 'rv32ixabc_zdef',
+// RV32-Z-ORDER: standard machine-level extension not given
+// RV32-Z-ORDER: in canonical order 'zdef'
+
 // 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'
+// RV32-XDUP: duplicated non-standard 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'
+// RV32-X-X-INVAL: non-standard extension 'xabc'
 
-// RUN: %clang -target riscv32-unknown-elf -march=rv32ixabc_sdef_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 'rv32ixabc_sdef_sxghi',
-// RV32-X-S-SX-INVAL: unsupported non-standard user-level extension 'xabc'
+// RUN: %clang -target riscv32-unknown-elf -march=rv32isabc_hdef_zghi_xjkl -### %s \
+// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-S-H-Z-X-INVAL %s
+// RV32-S-H-Z-X-INVAL: error: invalid arch name 'rv32isabc_hdef_zghi_xjkl',
+// RV32-S-H-Z-X-INVAL: unsupported standard supervisor-level extension 'sabc'
 
 // 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 \