Merge commit '6ecc67fb3223' from llvm.org/main into next

Author: git apple-llvm automerger

llvm/test/tools/llvm-exegesis/X86/mcpu_not_set_during_cross_compilation.s

@@ -0,0 +1,3 @@
+# RUN: not llvm-exegesis -mtriple=riscv64-unknown-linux-gnu -mode=latency --benchmark-phase=assemble-measured-code -opcode-name=ADD 2>&1 | FileCheck %s
+
+# CHECK: llvm-exegesis error: A CPU must be explicitly specified when cross compiling. To see all possible options for riscv64-unknown-linux-gnu triple use -mcpu=help

llvm/tools/llvm-exegesis/lib/LlvmState.cpp

@@ -42,8 +42,17 @@ Expected<LLVMState> LLVMState::Create(std::string TripleName,
   // Update Triple with the updated triple from the target lookup.
   TripleName = TheTriple.str();
 
-  if (CpuName == "native")
+  if (CpuName == "native") {
+    // case for cross generating, when native arch and target mismatch
+    if ((Triple(sys::getProcessTriple()).getArch() !=
+         Triple(TripleName).getArch()))
+      return make_error<StringError>(
+          "A CPU must be explicitly specified when cross compiling. To see all "
+          "possible options for " +
+              TripleName + " triple use -mcpu=help",
+          inconvertibleErrorCode());
     CpuName = std::string(sys::getHostCPUName());
+  }
 
   std::unique_ptr<MCSubtargetInfo> STI(
       TheTarget->createMCSubtargetInfo(TripleName, CpuName, ""));