<div dir="ltr">I reverted this, the test fails for me locally. Does -arch work on non-Mac targets?</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Nov 18, 2019 at 10:39 AM Francis Visoiu Mistrih via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><br>
Author: Francis Visoiu Mistrih<br>
Date: 2019-11-18T10:38:10-08:00<br>
New Revision: b4e2b112b58154a89171df39dae80044865ff4ff<br>
<br>
URL: <a href="https://github.com/llvm/llvm-project/commit/b4e2b112b58154a89171df39dae80044865ff4ff" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/b4e2b112b58154a89171df39dae80044865ff4ff</a><br>
DIFF: <a href="https://github.com/llvm/llvm-project/commit/b4e2b112b58154a89171df39dae80044865ff4ff.diff" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/b4e2b112b58154a89171df39dae80044865ff4ff.diff</a><br>
<br>
LOG: [Remarks][Driver] Use different remark files when targeting multiple architectures<br>
<br>
When the driver is targeting multiple architectures at once, for things<br>
like Universal Mach-Os, we need to emit different remark files for each<br>
cc1 invocation to avoid overwriting the files from a different<br>
invocation.<br>
<br>
For example:<br>
<br>
$ clang -c -o foo.o -fsave-optimization-record -arch x86_64 -arch x86_64h<br>
<br>
will create two remark files:<br>
<br>
* foo-x86_64.opt.yaml<br>
* foo-x86_64h.opt.yaml<br>
<br>
Added: <br>
<br>
<br>
Modified: <br>
    clang/lib/Driver/ToolChains/Clang.cpp<br>
    clang/test/Driver/opt-record.c<br>
<br>
Removed: <br>
<br>
<br>
<br>
################################################################################<br>
diff  --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp<br>
index 2b1c24275e3d..f5591c48d4e0 100644<br>
--- a/clang/lib/Driver/ToolChains/Clang.cpp<br>
+++ b/clang/lib/Driver/ToolChains/Clang.cpp<br>
@@ -5403,6 +5403,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,<br>
     if (A) {<br>
       CmdArgs.push_back(A->getValue());<br>
     } else {<br>
+      bool hasMultipleArchs =<br>
+          Args.getAllArgValues(options::OPT_arch).size() > 1;<br>
       SmallString<128> F;<br>
<br>
       if (Args.hasArg(options::OPT_c) || Args.hasArg(options::OPT_S)) {<br>
@@ -5427,6 +5429,22 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,<br>
         }<br>
       }<br>
<br>
+      // If we're having more than one "-arch", we should name the files<br>
+      // <br>
diff erently so that every cc1 invocation writes to a <br>
diff erent file.<br>
+      // We're doing that by appending "-<arch>" with "<arch>" being the arch<br>
+      // name from the triple.<br>
+      if (hasMultipleArchs) {<br>
+        // First, remember the extension.<br>
+        SmallString<64> OldExtension = llvm::sys::path::extension(F);<br>
+        // then, remove it.<br>
+        llvm::sys::path::replace_extension(F, "");<br>
+        // attach -<arch> to it.<br>
+        F += "-";<br>
+        F += Triple.getArchName();<br>
+        // put back the extension.<br>
+        llvm::sys::path::replace_extension(F, OldExtension);<br>
+      }<br>
+<br>
       std::string Extension = "opt.";<br>
       if (const Arg *A =<br>
               Args.getLastArg(options::OPT_fsave_optimization_record_EQ))<br>
<br>
diff  --git a/clang/test/Driver/opt-record.c b/clang/test/Driver/opt-record.c<br>
index 062d0acc17da..d8d2aa53ed40 100644<br>
--- a/clang/test/Driver/opt-record.c<br>
+++ b/clang/test/Driver/opt-record.c<br>
@@ -18,6 +18,7 @@<br>
 // RUN: %clang -### -S -o FOO -fsave-optimization-record -fsave-optimization-record=some-format %s 2>&1 | FileCheck %s -check-prefix=CHECK-EQ-FORMAT<br>
 // RUN: %clang -### -S -o FOO -fsave-optimization-record=some-format %s 2>&1 | FileCheck %s -check-prefix=CHECK-EQ-FORMAT<br>
 // RUN: %clang -### -S -o FOO -fsave-optimization-record=some-format -fno-save-optimization-record %s 2>&1 | FileCheck %s --check-prefix=CHECK-FOPT-DISABLE-FORMAT<br>
+// RUN: %clang -### -S -o FOO -fsave-optimization-record -arch x86_64 -arch x86_64h %s 2>&1 | FileCheck %s --check-prefix=CHECK-MULTIPLE-ARCH<br>
 //<br>
 // CHECK: "-cc1"<br>
 // CHECK: "-opt-record-file" "FOO.opt.yaml"<br>
@@ -41,3 +42,8 @@<br>
 // CHECK-EQ-FORMAT: "-opt-record-format" "some-format"<br>
<br>
 // CHECK-FOPT-DISABLE-FORMAT-NOT: "-fno-save-optimization-record"<br>
+<br>
+// CHECK-MULTIPLE-ARCH: "-cc1"<br>
+// CHECK-MULTIPLE-ARCH: "-opt-record-file" "FOO-x86_64.opt.yaml"<br>
+// CHECK-MULTIPLE-ARCH: "-cc1"<br>
+// CHECK-MULTIPLE-ARCH: "-opt-record-file" "FOO-x86_64h.opt.yaml"<br>
<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div>