[LLVMgold.so] -plugin-opt=save-temps: save combined module to .lto.o instead of .o

[MaskRay]

Summary

This matches LLD and fixes https://sourceware.org/bugzilla/show_bug.cgi?id=26262#c1

.o is a bad choice for save-temps output because it is easy to override the bitcode file (*.o)

 # Use bfd for the example, -fuse-ld=gold is similar.
clang -flto -c a.c  # generate bitcode file a.o
clang -fuse-ld=bfd -flto a.o -o a -Wl,-plugin-opt=save-temps  # override a.o

 # The user repeats the command but get surprised, because a.o is now a combined module.
clang -fuse-ld=bfd -flto a.o -o a -Wl,-plugin-opt=save-temps

[tejohnson]

LGTM with minor test fix needed.

llvm/test/tools/gold/X86/parallel.ll

2

Filename in rm needs update too.

[MaskRay]

Fix rm filenames

[MaskRay]

@hans Is this ok for release/11.x ? 😳

[hans]

In D84132#2162701, @MaskRay wrote:

@hans Is this ok for release/11.x ? 😳

Sounds good to me, go ahead :)

[bjope]

Having some problems with failing stage 2 tests, that I suspect is related to this change (since the missing files do exist but with ".lto" being part of the name when looking in my test directory after a failed test run). I guess on need to add ".lto" at some more places?

These are the tests that failed:

Failed Tests (3):
  LLVM :: tools/gold/X86/cache.ll
  LLVM :: tools/gold/X86/emit-llvm.ll
  LLVM :: tools/gold/X86/relax-relocs.ll

Here are some logs:

: 'RUN: at line 70';   ls /build/stage2/test/tools/gold/X86/Output/cache.ll.tmp4.o.o1
: 'RUN: at line 71';   ls /build/stage2/test/tools/gold/X86/Output/cache.ll.tmp4.o.o2
--
Exit Code: 2

Command Output (stderr):
--
ls: cannot access /build/stage2/test/tools/gold/X86/Output/cache.ll.tmp4.o.o1: No such file or directory

Exit Code: 2

Command Output (stderr):
--
/build/stage2/bin/llvm-nm: error: /build/stage2/test/tools/gold/X86/Output/emit-llvm.ll.tmp3.o.o: No such file or directory.
FileCheck error: '<stdin>' is empty.
FileCheck command line:  /build/stage2/bin/FileCheck --check-prefix=NM /llvm-project/llvm/test/tools/gold/X86/emit-llvm.ll

Exit Code: 2

Command Output (stderr):
--
/build/stage2/bin/llvm-readobj: error: '/build/stage2/test/tools/gold/X86/Output/relax-relocs.ll.tmp.so.o': No such file or directory
FileCheck error: '<stdin>' is empty.
FileCheck command line:  /build/stage2/bin/FileCheck /llvm-project/llvm/test/tools/gold/X86/relax-relocs.ll

[MaskRay]

In D84132#2164644, @bjope wrote:

Having some problems with failing stage 2 tests, that I suspect is related to this change (since the missing files do exist but with ".lto" being part of the name when looking in my test directory after a failed test run). I guess on need to add ".lto" at some more places?

These are the tests that failed:

Failed Tests (3):
  LLVM :: tools/gold/X86/cache.ll
  LLVM :: tools/gold/X86/emit-llvm.ll
  LLVM :: tools/gold/X86/relax-relocs.ll

Here are some logs:

: 'RUN: at line 70';   ls /build/stage2/test/tools/gold/X86/Output/cache.ll.tmp4.o.o1
: 'RUN: at line 71';   ls /build/stage2/test/tools/gold/X86/Output/cache.ll.tmp4.o.o2
--
Exit Code: 2

Command Output (stderr):
--
ls: cannot access /build/stage2/test/tools/gold/X86/Output/cache.ll.tmp4.o.o1: No such file or directory

Exit Code: 2

Command Output (stderr):
--
/build/stage2/bin/llvm-nm: error: /build/stage2/test/tools/gold/X86/Output/emit-llvm.ll.tmp3.o.o: No such file or directory.
FileCheck error: '<stdin>' is empty.
FileCheck command line:  /build/stage2/bin/FileCheck --check-prefix=NM /llvm-project/llvm/test/tools/gold/X86/emit-llvm.ll

Exit Code: 2

Command Output (stderr):
--
/build/stage2/bin/llvm-readobj: error: '/build/stage2/test/tools/gold/X86/Output/relax-relocs.ll.tmp.so.o': No such file or directory
FileCheck error: '<stdin>' is empty.
FileCheck command line:  /build/stage2/bin/FileCheck /llvm-project/llvm/test/tools/gold/X86/relax-relocs.ll

Thanks for reporting the problem. Fixed by aa830e9768303ff8d27c015759294c4ce704d50c (I should have been more careful. Not many build bots build binutils-gdb headers and test LLVMgold.so)

[bjope]

In D84132#2164675, @MaskRay wrote:

In D84132#2164644, @bjope wrote:

Having some problems with failing stage 2 tests, that I suspect is related to this change (since the missing files do exist but with ".lto" being part of the name when looking in my test directory after a failed test run). I guess on need to add ".lto" at some more places?

These are the tests that failed:

Failed Tests (3):
  LLVM :: tools/gold/X86/cache.ll
  LLVM :: tools/gold/X86/emit-llvm.ll
  LLVM :: tools/gold/X86/relax-relocs.ll

Here are some logs:

: 'RUN: at line 70';   ls /build/stage2/test/tools/gold/X86/Output/cache.ll.tmp4.o.o1
: 'RUN: at line 71';   ls /build/stage2/test/tools/gold/X86/Output/cache.ll.tmp4.o.o2
--
Exit Code: 2

Command Output (stderr):
--
ls: cannot access /build/stage2/test/tools/gold/X86/Output/cache.ll.tmp4.o.o1: No such file or directory

Exit Code: 2

Command Output (stderr):
--
/build/stage2/bin/llvm-nm: error: /build/stage2/test/tools/gold/X86/Output/emit-llvm.ll.tmp3.o.o: No such file or directory.
FileCheck error: '<stdin>' is empty.
FileCheck command line:  /build/stage2/bin/FileCheck --check-prefix=NM /llvm-project/llvm/test/tools/gold/X86/emit-llvm.ll

Exit Code: 2

Command Output (stderr):
--
/build/stage2/bin/llvm-readobj: error: '/build/stage2/test/tools/gold/X86/Output/relax-relocs.ll.tmp.so.o': No such file or directory
FileCheck error: '<stdin>' is empty.
FileCheck command line:  /build/stage2/bin/FileCheck /llvm-project/llvm/test/tools/gold/X86/relax-relocs.ll

Thanks for reporting the problem. Fixed by aa830e9768303ff8d27c015759294c4ce704d50c (I should have been more careful. Not many build bots build binutils-gdb headers and test LLVMgold.so)

Ok, thanks! It did not cause a big problem for me though. I was just checking our downstream bots and happened to notice some failures (and maybe those bots are a bit "pedantic" because I don't think we currently use that setup in production).

llvm/test/tools/gold/X86/parallel.ll

 ; RUN: llvm-as -o %t.bc %s
-; RUN: rm -f %t.0.5.precodegen.bc %t.1.5.precodegen.bc %t.o %t.o1
+; RUN: rm -f %t.0.5.precodegen.bc %t.1.5.precodegen.bc %t.lto.o %t.lto.o1
 ; RUN: env LD_PRELOAD=%llvmshlibdir/LLVMgold%shlibext %gold -plugin %llvmshlibdir/LLVMgold%shlibext -u foo -u bar -plugin-opt lto-partitions=2 -plugin-opt save-temps -m elf_x86_64 -o %t %t.bc
 ; RUN: llvm-dis %t.0.5.precodegen.bc -o - | FileCheck --check-prefix=CHECK-BC0 %s
 ; RUN: llvm-dis %t.1.5.precodegen.bc -o - | FileCheck --check-prefix=CHECK-BC1 %s
-; RUN: llvm-nm %t.o | FileCheck --check-prefix=CHECK0 %s
-; RUN: llvm-nm %t.o1 | FileCheck --check-prefix=CHECK1 %s
+; RUN: llvm-nm %t.lto.o | FileCheck --check-prefix=CHECK0 %s
+; RUN: llvm-nm %t.lto.o1 | FileCheck --check-prefix=CHECK1 %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 ; CHECK-BC0: define dso_local void @foo
 ; CHECK-BC0: declare dso_local void @bar
 ; CHECK0-NOT: bar
 ; CHECK0: T foo

llvm/test/tools/gold/X86/relocation-model-pic.ll

 ; RUN: cat %s >%t.pic.ll
 ; RUN: echo '!llvm.module.flags = !{!0}' >>%t.pic.ll
 ; RUN: echo '!0 = !{i32 1, !"PIC Level", i32 2}' >>%t.pic.ll
 
 ; RUN: llvm-as %s -o %t.o
 ; RUN: llvm-as %t.pic.ll -o %t.pic.o
 
 ;; Non-PIC source.
 
 ; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --shared \
 ; RUN:    --plugin-opt=save-temps %t.o -o %t-out
-; RUN: llvm-readobj -r %t-out.o | FileCheck %s --check-prefix=PIC
+; RUN: llvm-readobj -r %t-out.lto.o | FileCheck %s --check-prefix=PIC
 
 ; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --export-dynamic --noinhibit-exec -pie \
 ; RUN:    --plugin-opt=save-temps %t.o -o %t-out
-; RUN: llvm-readobj -r %t-out.o | FileCheck %s --check-prefix=PIC
+; RUN: llvm-readobj -r %t-out.lto.o | FileCheck %s --check-prefix=PIC
 
 ; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --export-dynamic --noinhibit-exec \
 ; RUN:    --plugin-opt=save-temps %t.o -o %t-out
-; RUN: llvm-readobj -r %t-out.o | FileCheck %s --check-prefix=STATIC
+; RUN: llvm-readobj -r %t-out.lto.o | FileCheck %s --check-prefix=STATIC
 
 ; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    -r \
 ; RUN:    --plugin-opt=save-temps %t.o -o %t-out
-; RUN: llvm-readobj -r %t-out.o | FileCheck %s --check-prefix=STATIC
+; RUN: llvm-readobj -r %t-out.lto.o | FileCheck %s --check-prefix=STATIC
 
 ;; PIC source.
 
 ; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --shared \
 ; RUN:    --plugin-opt=save-temps %t.pic.o -o %t-out
-; RUN: llvm-readobj -r %t-out.o | FileCheck %s --check-prefix=PIC
+; RUN: llvm-readobj -r %t-out.lto.o | FileCheck %s --check-prefix=PIC
 
 ; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --export-dynamic --noinhibit-exec -pie \
 ; RUN:    --plugin-opt=save-temps %t.pic.o -o %t-out
-; RUN: llvm-readobj -r %t-out.o | FileCheck %s --check-prefix=PIC
+; RUN: llvm-readobj -r %t-out.lto.o | FileCheck %s --check-prefix=PIC
 
 ; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --export-dynamic --noinhibit-exec \
 ; RUN:    --plugin-opt=save-temps %t.pic.o -o %t-out
-; RUN: llvm-readobj -r %t-out.o | FileCheck %s --check-prefix=STATIC
+; RUN: llvm-readobj -r %t-out.lto.o | FileCheck %s --check-prefix=STATIC
 
 ; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    -r \
 ; RUN:    --plugin-opt=save-temps %t.pic.o -o %t-out
-; RUN: llvm-readobj -r %t-out.o | FileCheck %s --check-prefix=PIC
+; RUN: llvm-readobj -r %t-out.lto.o | FileCheck %s --check-prefix=PIC
 
 
 ; PIC: R_X86_64_GOTPCREL foo
 ; STATIC: R_X86_64_PC32 foo
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 @foo = external global i32
 define i32 @main() {
   %t = load i32, i32* @foo
   ret i32 %t
 }

llvm/test/tools/gold/X86/thinlto.ll

 ; RUN:    -m elf_x86_64 \
 ; RUN:    --plugin-opt=save-temps \
 ; RUN:    --plugin-opt=thinlto \
 ; RUN:    --plugin-opt=jobs=1 \
 ; RUN:    -shared %t.o %t2.o -o %t4
 ; RUN: llvm-bcanalyzer -dump %t4.index.bc | FileCheck %s --check-prefix=COMBINED
 ; RUN: llvm-nm %t4 | FileCheck %s --check-prefix=NM
 ; Ensure ld does not emit empty combined module in default.
-; RUN: ls %t4.o* | count 2
+; RUN: ls %t4.lto.o* | count 2
 
 ; Check with --no-map-whole-files
 ; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    -m elf_x86_64 \
 ; RUN:    --plugin-opt=save-temps \
 ; RUN:    --plugin-opt=thinlto \
 ; RUN:    --plugin-opt=jobs=1 \
 ; RUN:    --no-map-whole-files \

llvm/tools/gold/gold-plugin.cpp

for (claimed_file &F : Modules) {
     }
   }
 
   SmallString<128> Filename;
   // Note that getOutputFileName will append a unique ID for each task
   if (!options::obj_path.empty())
     Filename = options::obj_path;
   else if (options::TheOutputType == options::OT_SAVE_TEMPS)
-    Filename = output_name + ".o";
+    Filename = output_name + ".lto.o";
   else if (options::TheOutputType == options::OT_ASM_ONLY)
     Filename = output_name;
   bool SaveTemps = !Filename.empty();
 
   size_t MaxTasks = Lto->getMaxTasks();
   std::vector<std::pair<SmallString<128>, bool>> Files(MaxTasks);
 
   auto AddStream =