[CHERIoT] Use a more general check for xcheriot in the clang driver.

Author: resistor

clang/lib/Driver/ToolChains/BareMetal.cpp

@@ -12,9 +12,9 @@
 #include "clang/Driver/CommonArgs.h"
 #include "clang/Driver/InputInfo.h"
 
-#include "Arch/Mips.h"
 #include "Arch/AArch64.h"
 #include "Arch/ARM.h"
+#include "Arch/Mips.h"
 #include "Arch/RISCV.h"
 #include "clang/Driver/Compilation.h"
 #include "clang/Driver/Driver.h"
@@ -24,6 +24,7 @@
 #include "llvm/Option/ArgList.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/VirtualFileSystem.h"
+#include "llvm/TargetParser/RISCVISAInfo.h"
 
 #include <sstream>
 
@@ -275,13 +276,15 @@ BareMetal::BareMetal(const Driver &D, const llvm::Triple &Triple,
     }
   }
 
-  if (Triple.getOS() == llvm::Triple::CheriotRTOS ||
-      Args.getLastArgValue(options::OPT_mcpu_EQ) == "cheriot" ||
-      Args.getLastArgValue(options::OPT_mabi_EQ) == "cheriot" ||
-      Args.getLastArgValue(options::OPT_mabi_EQ) == "cheriot-baremetal")
-    IsCheriot = true;
-  else
-    IsCheriot = false;
+  IsCheriot = false;
+  if (Triple.isRISCV()) {
+    std::string Arch = riscv::getRISCVArch(Args, Triple);
+    // Canonicalize arch for easier matching
+    auto ISAInfo = llvm::RISCVISAInfo::parseArchString(
+        Arch, /*EnableExperimentalExtensions*/ true);
+    if (!llvm::errorToBool(ISAInfo.takeError()))
+      IsCheriot = (*ISAInfo)->hasExtension("xcheriot");
+  }
 }
 
 static void

llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-lower-all.ll

@@ -1,6 +1,9 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --check-globals all --version 5
 ; RUN: opt < %s -passes=amdgpu-sw-lower-lds -S -amdgpu-asan-instrument-lds=false -mtriple=amdgcn-amd-amdhsa | FileCheck %s
-; XFAIL: *
+
+; CHERIOT-FIXME: Disabled due to non-deterministic failures.
+; UNSUPPORTED: true
+
 ; Test to check if static LDS accesses in kernels without sanitize_address attribute are lowered if
 ; other kernels in module have sanitize_address attribute.
 @lds_1 = internal addrspace(3) global [1 x i8] poison, align 4