[ELF] --reproduce should include lto sample profile

[christylee]

Removed debug comment.

[christylee]

lld/ELF/Driver.cpp

499

At this point config->ltoSampleProfile hasn't been initialized yet so we have to read in the argument value. However, this seems like the most logical place to append extra stuff to the link repro tar.

[MaskRay]

lld/test/ELF/reproduce.s

8

Add the test to reproduce-lto.s

[christylee]

Moved test case to reproduce-lto.s

[MaskRay]

lld/ELF/Driver.cpp

507

Just move this line above so that we can use config->ltoSampleProfile

lld/test/ELF/reproduce-lto.s

5 ↗

(On Diff #280645)

-triple=x86_64

6 ↗

(On Diff #280645)

echo > %t.dir/build1/empty_profile.txt

8 ↗

(On Diff #280645)

Delete --hash-style=gnu

Use -o /dev/null

[christylee]

lld/ELF/Driver.cpp

507

If we move config->ltoSampleProfile up to before getReproduceOptions(args), then symbol ordering file, dynamic list, and version script will be consumed before the tar object is created, so they won't be included in the repro.tar. Would it be better if I move this to where we parse LTO options?

[MaskRay]

LGTM.

[christylee]

Addressed comments, fixed unittest.

[wenlei]

Committed on behalf of @christylee while she tries to recover commit access.

lld/ELF/Driver.cpp

if (args.hasArg(OPT_v) || args.hasArg(OPT_version))
     message(getLLDVersion() + " (compatible with GNU linkers)");
 
   if (const char *path = getReproduceOption(args)) {
     // Note that --reproduce is a debug option so you can ignore it
     // if you are trying to understand the whole picture of the code.
     Expected<std::unique_ptr<TarWriter>> errOrWriter =
         TarWriter::create(path, path::stem(path));
     if (errOrWriter) {
+      printf("errOrWriter\n");
       tar = std::move(*errOrWriter);
       tar->append("response.txt", createResponseFile(args));
       tar->append("version.txt", getLLDVersion() + "\n");
+      StringRef ltoSampleProfile = args.getLastArgValue(OPT_lto_sample_profile);
+      if (!ltoSampleProfile.empty())
+        readFile(ltoSampleProfile);
     } else {
       error("--reproduce: " + toString(errOrWriter.takeError()));
     }
   }
 
   readConfigs(args);
 
   // The behavior of -v or --version is a bit strange, but this is
   // needed for compatibility with GNU linkers.
   if (args.hasArg(OPT_v) && !args.hasArg(OPT_INPUT))
     return;
   if (args.hasArg(OPT_version))
     return;
 

lld/test/ELF/reproduce.s

 # REQUIRES: x86
 
 # RUN: rm -rf %t.dir
 # RUN: mkdir -p %t.dir/build1
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.dir/build1/foo.o
+# RUN: echo "# empty lto sample profile" > %t.dir/build1/empty_profile.txt
 # RUN: cd %t.dir
-# RUN: ld.lld --hash-style=gnu build1/foo.o -o bar -shared --as-needed --reproduce repro1.tar
+# RUN: ld.lld --hash-style=gnu build1/foo.o -o bar -shared --as-needed --reproduce repro1.tar --lto-sample-profile=%t.dir/build1/empty_profile.txt
 # RUN: tar xOf repro1.tar repro1/%:t.dir/build1/foo.o > build1-foo.o
 # RUN: cmp build1/foo.o build1-foo.o
+# RUN: tar tvf repro1.tar | FileCheck %s --check-prefix=LTO_SAMPLE_PROFILE
+# LTO_SAMPLE_PROFILE: repro1/{{.*}}/empty_profile.txt
 
 # RUN: tar xf repro1.tar repro1/response.txt repro1/version.txt
 # RUN: FileCheck %s --check-prefix=RSP1 < repro1/response.txt
 # RSP1:      {{^}}--hash-style gnu{{$}}
 # RSP1-NOT:  {{^}}repro1{{[/\\]}}
 # RSP1-NEXT: {{[/\\]}}foo.o
 # RSP1-NEXT: -o bar
 # RSP1-NEXT: -shared