Make thinlto-remote-compiler a cl::opt

bd1976bris · bd1976bris · commit 7525a1380c82 · 2025-02-27T22:51:43.000Z
diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
@@ -543,7 +543,7 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
     CmdArgs.push_back(
         Args.MakeArgString("--thinlto-distributor=" + Twine(A->getValue())));
     CmdArgs.push_back(
-        Args.MakeArgString("--thinlto-remote-compiler=" +
+        Args.MakeArgString("-mllvm=-thinlto-remote-compiler=" +
                            Twine(ToolChain.getDriver().getClangProgramPath())));
 
     for (auto A : Args.getAllArgValues(options::OPT_Xthinlto_distributor_EQ))
diff --git a/clang/test/Driver/DTLTO/dtlto.c b/clang/test/Driver/DTLTO/dtlto.c
@@ -14,7 +14,7 @@
 
 // CHECK: ld.lld
 // CHECK-SAME: "--thinlto-distributor=dist.exe"
-// CHECK-SAME: "--thinlto-remote-compiler={{.*}}clang
+// CHECK-SAME: "-mllvm=-thinlto-remote-compiler={{.*}}clang
 // CHECK-SAME: "-mllvm=-thinlto-distributor-arg=distarg1"
 // CHECK-SAME: "-mllvm=-thinlto-distributor-arg=distarg2"
 // CHECK-SAME: "-mllvm=-thinlto-distributor-arg=distarg3"
@@ -30,7 +30,7 @@
 // NONE: warning: argument unused during compilation: '-Xthinlto-distributor=distarg2,distarg3'
 // NONE:     ld.lld
 // NOMORE-NOT: --thinlto-distributor=
-// NOMORE-NOT: --thinlto-remote-compiler=
+// NOMORE-NOT: -thinlto-remote-compiler=
 // NOMORE-NOT: -mllvm
 // NOMORE-NOT: -thinlto-distributor-arg=
 
@@ -43,4 +43,4 @@
 
 // DEFAULT: ld.lld
 // DEFAULT-SAME: "--thinlto-distributor=dist.exe"
-// DEFAULT-SAME: "--thinlto-remote-compiler={{.*}}clang
+// DEFAULT-SAME: "-mllvm=-thinlto-remote-compiler={{.*}}clang
diff --git a/cross-project-tests/dtlto/dtlto-translate-options.ll b/cross-project-tests/dtlto/dtlto-translate-options.ll
@@ -29,17 +29,17 @@
 
 ; RUN: echo "x86_64-unknown-linux-gnu.bc -o x86_64-unknown-linux-gnu.o \
 ; RUN:       -dtlto \
-; RUN:       -dtlto-remote-compiler=%clang \
-; RUN:       -thinlto-remote-compiler-arg=-Werror \
 ; RUN:       -dtlto-distributor=%python \
+; RUN:       -thinlto-remote-compiler=%clang \
+; RUN:       -thinlto-remote-compiler-arg=-Werror \
 ; RUN:       -r=x86_64-unknown-linux-gnu.bc,globalfunc1,plx" > x86_64-unknown-linux-gnu.rsp
 
 ; RUN: echo "x86_64-pc-windows-msvc.bc -o x86_64-pc-windows-msvc.o \
 ; RUN:       -dtlto \
-; RUN:       -dtlto-remote-compiler=%clang \
+; RUN:       -dtlto-distributor=%python \
+; RUN:       -thinlto-remote-compiler=%clang \
 ; RUN:       -thinlto-remote-compiler-arg=-Werror \
 ; RUN:       -thinlto-remote-compiler-arg=-Wno-override-module \
-; RUN:       -dtlto-distributor=%python \
 ; RUN:       -r=x86_64-pc-windows-msvc.bc,globalfunc2,plx" > x86_64-pc-windows-msvc.rsp
 
 
diff --git a/lld/COFF/Config.h b/lld/COFF/Config.h
@@ -194,8 +194,6 @@ struct Configuration {
 
   // Used for --thinlto-distributor=
   StringRef dtltoDistributor;
-  // Used for --thinlto-remote-compiler=
-  StringRef dtltoRemoteCompiler;
 
   // Used for /opt:[no]ltodebugpassmanager
   bool ltoDebugPassManager = false;
diff --git a/lld/COFF/Driver.cpp b/lld/COFF/Driver.cpp
@@ -2091,8 +2091,6 @@ void LinkerDriver::linkerMain(ArrayRef<const char *> argsArr) {
 
   // Handle DTLTO options.
   config->dtltoDistributor = args.getLastArgValue(OPT_thinlto_distributor_eq);
-  config->dtltoRemoteCompiler =
-      args.getLastArgValue(OPT_thinlto_remote_compiler_eq);
 
   // Handle /dwodir
   config->dwoDir = args.getLastArgValue(OPT_dwodir);
diff --git a/lld/COFF/LTO.cpp b/lld/COFF/LTO.cpp
@@ -123,8 +123,7 @@ BitcodeCompiler::BitcodeCompiler(COFFLinkerContext &c) : ctx(c) {
         /*OnWrite=*/nullptr,
         /*ShouldEmitIndexFiles=*/false,
         /*ShouldEmitImportFiles=*/false, ctx.config.outputFile,
-        ctx.config.dtltoRemoteCompiler, ctx.config.dtltoDistributor,
-        !ctx.config.saveTempsArgs.empty());
+        ctx.config.dtltoDistributor, !ctx.config.saveTempsArgs.empty());
   } else if (ctx.config.thinLTOIndexOnly) {
     auto OnIndexWrite = [&](StringRef S) { thinIndices.erase(S); };
     backend = lto::createWriteIndexesThinBackend(
diff --git a/lld/COFF/Options.td b/lld/COFF/Options.td
@@ -272,8 +272,6 @@ def thinlto_prefix_replace: P<
     "'old;new' replace old prefix with new prefix in ThinLTO outputs">;
 def thinlto_distributor_eq: Joined<["--"], "thinlto-distributor=">,
   HelpText<"Distributor to use for ThinLTO backend compilations">;
-def thinlto_remote_compiler_eq: Joined<["--"], "thinlto-remote-compiler=">,
-  HelpText<"Optimization tool to be invoked by the ThinLTO distributor">;
 def lto_obj_path : P<
     "lto-obj-path",
     "output native object for merged LTO unit to this path">;
diff --git a/lld/ELF/Config.h b/lld/ELF/Config.h
@@ -244,7 +244,6 @@ struct Config {
   llvm::SmallVector<llvm::StringRef, 0> symbolOrderingFile;
   llvm::SmallVector<llvm::StringRef, 0> thinLTOModulesToCompile;
   llvm::StringRef dtltoDistributor;
-  llvm::StringRef dtltoRemoteCompiler;
   llvm::SmallVector<llvm::StringRef, 0> undefined;
   llvm::SmallVector<SymbolVersion, 0> dynamicList;
   llvm::SmallVector<uint8_t, 0> buildIdVector;
diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
@@ -1342,8 +1342,6 @@ static void readConfigs(Ctx &ctx, opt::InputArgList &args) {
   ctx.arg.disableVerify = args.hasArg(OPT_disable_verify);
   ctx.arg.discard = getDiscard(args);
   ctx.arg.dtltoDistributor = args.getLastArgValue(OPT_thinlto_distributor_eq);
-  ctx.arg.dtltoRemoteCompiler =
-      args.getLastArgValue(OPT_thinlto_remote_compiler_eq);
   ctx.arg.dwoDir = args.getLastArgValue(OPT_plugin_opt_dwo_dir_eq);
   ctx.arg.dynamicLinker = getDynamicLinker(ctx, args);
   ctx.arg.ehFrameHdr =
diff --git a/lld/ELF/LTO.cpp b/lld/ELF/LTO.cpp
@@ -192,8 +192,7 @@ BitcodeCompiler::BitcodeCompiler(Ctx &ctx) : ctx(ctx) {
         llvm::heavyweight_hardware_concurrency(ctx.arg.thinLTOJobs),
         onIndexWrite, ctx.arg.thinLTOEmitIndexFiles,
         ctx.arg.thinLTOEmitImportsFiles, ctx.arg.outputFile,
-        ctx.arg.dtltoRemoteCompiler, ctx.arg.dtltoDistributor,
-        !ctx.arg.saveTempsArgs.empty());
+        ctx.arg.dtltoDistributor, !ctx.arg.saveTempsArgs.empty());
   } else {
     backend = lto::createInProcessThinBackend(
         llvm::heavyweight_hardware_concurrency(ctx.arg.thinLTOJobs),
diff --git a/lld/ELF/Options.td b/lld/ELF/Options.td
@@ -702,8 +702,6 @@ def thinlto_single_module_eq: JJ<"thinlto-single-module=">,
   HelpText<"Specify a single module to compile in ThinLTO mode, for debugging only">;
 def thinlto_distributor_eq: JJ<"thinlto-distributor=">,
   HelpText<"Distributor to use for ThinLTO backend compilations">;
-def thinlto_remote_compiler_eq : JJ<"thinlto-remote-compiler=">,
-  HelpText<"Optimization tool to be invoked by the ThinLTO distributor">;
 defm fat_lto_objects: BB<"fat-lto-objects",
     "Use the .llvm.lto section, which contains LLVM bitcode, in fat LTO object files to perform LTO.",
     "Ignore the .llvm.lto section in relocatable object files (default).">;
diff --git a/lld/docs/DTLTO.rst b/lld/docs/DTLTO.rst
@@ -19,7 +19,7 @@ The command line interface for DTLTO is:
   Specifies the file to execute as a distributor process.
   If specified, ThinLTO backend compilations will be distributed.
 
-- ``--thinlto-remote-compiler=<path>``
+- ``-mllvm -thinlto-remote-compiler=<path>``
   Specifies the path to the tool that the distributor process will use for
   backend compilations.
 
@@ -55,6 +55,7 @@ COFF LLD
 --------
 
 The command line interface for COFF LLD is generally the same as for ELF LLD.
+Note however, that ``mllvm`` options are passed using ``/mllvm:<option>``.
 
-Currently, there is no DTLTO command line interface supplied for ``Clang-cl``, as
-users are expected to invoke LLD directly.
+Currently, there is no DTLTO command line interface supplied for ``Clang-cl``,
+as users are expected to invoke LLD directly.
diff --git a/lld/test/COFF/dtlto.test b/lld/test/COFF/dtlto.test
@@ -13,7 +13,7 @@
 # RUN: echo "foo.obj /entry:foo /subsystem:console \
 # RUN:   --thinlto-distributor=%python \
 # RUN:   -mllvm:-thinlto-distributor-arg=%llvm_src_root/utils/dtlto/validate.py \
-# RUN:   --thinlto-remote-compiler=my_clang.exe" > l.rsp
+# RUN:   -mllvm:-thinlto-remote-compiler=my_clang.exe" > l.rsp
 
 ## Show that command line arguments have the desired effect when specified and
 ## that the effect is not present otherwise.
diff --git a/lld/test/ELF/dtlto/dtlto.test b/lld/test/ELF/dtlto/dtlto.test
@@ -12,8 +12,8 @@
 ## the link to fail.
 # RUN: echo "foo.o \
 # RUN:       --thinlto-distributor=%python \
-# RUN:       -mllvm -thinlto-distributor-arg=%llvm_src_root/utils/dtlto/validate.py \
-# RUN:       --thinlto-remote-compiler=my_clang.exe" > l.rsp
+# RUN:       -mllvm=-thinlto-distributor-arg=%llvm_src_root/utils/dtlto/validate.py \
+# RUN:       -mllvm=-thinlto-remote-compiler=my_clang.exe" > l.rsp
 
 ## Show that command line arguments have the desired effect when specified and
 ## that the effect is not present otherwise.
diff --git a/lld/test/ELF/dtlto/imports.test b/lld/test/ELF/dtlto/imports.test
@@ -12,8 +12,7 @@
 ## the link to fail.
 # RUN: echo "0.o 1.o \
 # RUN:       --thinlto-distributor=%python \
-# RUN:       -mllvm -thinlto-distributor-arg=%llvm_src_root/utils/dtlto/validate.py \
-# RUN:       --thinlto-remote-compiler=dummy.exe" > l.rsp
+# RUN:       -mllvm=-thinlto-distributor-arg=%llvm_src_root/utils/dtlto/validate.py"  > l.rsp
 
 ## We expect an import from 0.o into 1.o but no imports into 0.o. Check that the
 ## expected input files have been added to the JSON.
diff --git a/lld/test/ELF/dtlto/parallel.test b/lld/test/ELF/dtlto/parallel.test
@@ -16,7 +16,6 @@ RUN: llc thin2.ll --filetype=obj -o thin2.o --relocation-model=pic
 # Link with 3 LTO partitions.
 RUN: ld.lld full.bc thin1.bc thin2.bc \ 
 RUN:   --thinlto-distributor=%python \
-RUN:   --thinlto-remote-compiler=dummy \
 RUN:   -mllvm=-thinlto-distributor-arg=%llvm_src_root/utils/dtlto/mock.py \
 RUN:   -mllvm=-thinlto-distributor-arg=thin1.o \
 RUN:   -mllvm=-thinlto-distributor-arg=thin2.o \
diff --git a/lld/test/ELF/dtlto/relative.test b/lld/test/ELF/dtlto/relative.test
@@ -13,8 +13,7 @@
 ## Common command line arguments. Note that the use of validate.py will cause
 ## the link to fail.
 # RUN: echo "--thinlto-distributor=%python \
-# RUN:   -mllvm -thinlto-distributor-arg=%llvm_src_root/utils/dtlto/validate.py \
-# RUN:   --thinlto-remote-compiler=dummy.exe" > l.rsp
+# RUN:   -mllvm=-thinlto-distributor-arg=%llvm_src_root/utils/dtlto/validate.py" > l.rsp
 
 ## Check that the expected set of filenames have been generated.
 # RUN: not ld.lld @l.rsp ../0.o ../1.o -o ../up.elf --thinlto-emit-index-files \
diff --git a/llvm/include/llvm/LTO/LTO.h b/llvm/include/llvm/LTO/LTO.h
@@ -312,17 +312,14 @@ ThinBackend createInProcessThinBackend(ThreadPoolStrategy Parallelism,
 /// LinkerOutputFile is a string that should identify this LTO invocation in
 /// the context of a wider build. It's used for naming to aid the user in
 /// identifying activity related to a specific LTO invocation.
-/// RemoteCompiler specifies the path to a Clang executable to be invoked for the
-/// backend jobs.
 /// Distributor specifies the path to a process to invoke to manage the backend
 /// jobs execution.
 /// SaveTemps is a debugging tool that prevents temporary files created by this
 /// backend from being cleaned up.
 ThinBackend createOutOfProcessThinBackend(
     ThreadPoolStrategy Parallelism, IndexWriteCallback OnWrite,
     bool ShouldEmitIndexFiles, bool ShouldEmitImportsFiles,
-    StringRef LinkerOutputFile, StringRef RemoteCompiler, StringRef Distributor,
-    bool SaveTemps);
+    StringRef LinkerOutputFile, StringRef Distributor, bool SaveTemps);
 
 /// This ThinBackend writes individual module indexes to files, instead of
 /// running the individual backend jobs. This backend is for distributed builds
diff --git a/llvm/lib/LTO/LTO.cpp b/llvm/lib/LTO/LTO.cpp
@@ -99,10 +99,15 @@ cl::list<std::string> AdditionalThinLTODistributorArgs(
     "thinlto-distributor-arg",
     cl::desc("Additional arguments to pass to the ThinLTO distributor"));
 
+cl::opt<std::string>
+    ThinLTORemoteCompiler("thinlto-remote-compiler",
+                          cl::desc("Additional arguments to pass to the "
+                                   "ThinLTO remote optimization tool"));
+
 cl::list<std::string>
     ThinLTORemoteCompilerArgs("thinlto-remote-compiler-arg",
-                             cl::desc("Additional arguments to pass to the "
-                                      "ThinLTO remote optimization tool"));
+                              cl::desc("Additional arguments to pass to the "
+                                       "ThinLTO remote compiler"));
 } // namespace llvm
 
 // Computes a unique hash for the Module considering the current list of
@@ -2207,7 +2212,6 @@ class OutOfProcessThinBackend : public CGThinBackend {
   StringSaver Saver{Alloc};
 
   SString LinkerOutputFile;
-  SString RemoteCompiler;
   SString DistributorPath;
   bool SaveTemps;
 
@@ -2240,13 +2244,12 @@ class OutOfProcessThinBackend : public CGThinBackend {
       AddStreamFn AddStream, AddBufferFn AddBuffer,
       lto::IndexWriteCallback OnWrite, bool ShouldEmitIndexFiles,
       bool ShouldEmitImportsFiles, StringRef LinkerOutputFile,
-      StringRef RemoteCompiler, StringRef Distributor, bool SaveTemps)
+      StringRef Distributor, bool SaveTemps)
       : CGThinBackend(Conf, CombinedIndex, ModuleToDefinedGVSummaries, OnWrite,
                       ShouldEmitIndexFiles, ShouldEmitImportsFiles,
                       ThinLTOParallelism),
         AddBuffer(std::move(AddBuffer)), LinkerOutputFile(LinkerOutputFile),
-        RemoteCompiler(RemoteCompiler), DistributorPath(Distributor),
-        SaveTemps(SaveTemps) {}
+        DistributorPath(Distributor), SaveTemps(SaveTemps) {}
 
   virtual void setup(unsigned MaxTasks, unsigned ReservedTasks) override {
     UID = itostr(sys::Process::getProcessId());
@@ -2372,7 +2375,7 @@ class OutOfProcessThinBackend : public CGThinBackend {
 
         // Common command line template.
         JOS.attributeArray("args", [&]() {
-          JOS.value(RemoteCompiler);
+          JOS.value(ThinLTORemoteCompiler);
 
           // Reference to Job::NativeObjectPath.
           JOS.value("-o");
@@ -2502,17 +2505,15 @@ class OutOfProcessThinBackend : public CGThinBackend {
 ThinBackend lto::createOutOfProcessThinBackend(
     ThreadPoolStrategy Parallelism, lto::IndexWriteCallback OnWrite,
     bool ShouldEmitIndexFiles, bool ShouldEmitImportsFiles,
-    StringRef LinkerOutputFile, StringRef RemoteCompiler, StringRef Distributor,
-    bool SaveTemps) {
+    StringRef LinkerOutputFile, StringRef Distributor, bool SaveTemps) {
   auto Func =
       [=](const Config &Conf, ModuleSummaryIndex &CombinedIndex,
           const DenseMap<StringRef, GVSummaryMapTy> &ModuleToDefinedGVSummaries,
           AddStreamFn AddStream, AddBufferFn AddBuffer, FileCache /*Cache*/) {
         return std::make_unique<OutOfProcessThinBackend>(
             Conf, CombinedIndex, Parallelism, ModuleToDefinedGVSummaries,
             AddStream, AddBuffer, OnWrite, ShouldEmitIndexFiles,
-            ShouldEmitImportsFiles, LinkerOutputFile, RemoteCompiler,
-            Distributor, SaveTemps);
+            ShouldEmitImportsFiles, LinkerOutputFile, Distributor, SaveTemps);
       };
   return ThinBackend(Func, Parallelism);
 }
diff --git a/llvm/test/ThinLTO/X86/dtlto/dtlto.test b/llvm/test/ThinLTO/X86/dtlto/dtlto.test
@@ -16,7 +16,6 @@ RUN: mkdir %t/out && cd %t/out
 # Define a substitution to share the common DTLTO arguments.
 DEFINE: %{command} = llvm-lto2 run ../t1.bc ../t2.bc -o t.o \
 DEFINE:   -dtlto \
-DEFINE:   -dtlto-remote-compiler=dummy \
 DEFINE:   -dtlto-distributor=%python \
 DEFINE:   -thinlto-distributor-arg=%llvm_src_root/utils/dtlto/mock.py \
 DEFINE:   -thinlto-distributor-arg=../t1.o \
diff --git a/llvm/test/ThinLTO/X86/dtlto/imports.test b/llvm/test/ThinLTO/X86/dtlto/imports.test
@@ -10,7 +10,6 @@ RUN: opt -thinlto-bc 1.ll -o 1.bc -O2
 # of validate.py will cause a failure as it does not create output files.
 DEFINE: %{command} = llvm-lto2 run 0.bc 1.bc -o t.o \
 DEFINE:    -dtlto \
-DEFINE:    -dtlto-remote-compiler=dummy \
 DEFINE:    -dtlto-distributor=%python \
 DEFINE:    -thinlto-distributor-arg=%llvm_src_root/utils/dtlto/validate.py \
 DEFINE:    -thinlto-distributor-arg=0.bc \
diff --git a/llvm/test/ThinLTO/X86/dtlto/json.test b/llvm/test/ThinLTO/X86/dtlto/json.test
@@ -11,9 +11,9 @@ RUN: opt -thinlto-bc t2.ll -o t2.bc
 RUN: not llvm-lto2 run t1.bc t2.bc -o my.output \
 RUN:     -r=t1.bc,t1,px -r=t2.bc,t2,px \
 RUN:     -dtlto \
-RUN:     -dtlto-remote-compiler=my_clang.exe \
 RUN:     -dtlto-distributor=%python \
 RUN:     -thinlto-distributor-arg=%llvm_src_root/utils/dtlto/validate.py \
+RUN:     -thinlto-remote-compiler=my_clang.exe \
 RUN:     -thinlto-remote-compiler-arg=--rota1=10 \
 RUN:     -thinlto-remote-compiler-arg=--rota2=20 \
 RUN:     -thinlto-distributor-arg=--da1=10 \
diff --git a/llvm/test/ThinLTO/X86/dtlto/summary.test b/llvm/test/ThinLTO/X86/dtlto/summary.test
@@ -20,7 +20,6 @@ DEFINE:     -thinlto-emit-indexes
 
 # Perform DTLTO.
 RUN: %{command} -dtlto \
-RUN:     -dtlto-remote-compiler=dummy \
 RUN:     -dtlto-distributor=%python \
 RUN:     -thinlto-distributor-arg=%llvm_src_root/utils/dtlto/mock.py \
 RUN:     -thinlto-distributor-arg=t1.o \
diff --git a/llvm/test/ThinLTO/X86/dtlto/triple.test b/llvm/test/ThinLTO/X86/dtlto/triple.test
@@ -14,7 +14,6 @@ RUN: opt t2.ll -o t2.o
 # object files supplied using -thinlto-distributor-arg in job order.
 RUN: not llvm-lto2 run t1.bc t2.bc -o t.o -save-temps \
 RUN:   -dtlto \
-RUN:   -dtlto-remote-compiler=dummy \
 RUN:   -dtlto-distributor=%python \
 RUN:   -thinlto-distributor-arg=%llvm_src_root/utils/dtlto/mock.py \
 RUN:   -thinlto-distributor-arg=t1.o \
diff --git a/llvm/tools/llvm-lto2/llvm-lto2.cpp b/llvm/tools/llvm-lto2/llvm-lto2.cpp
@@ -99,10 +99,6 @@ static cl::opt<bool>
 
 static cl::opt<bool> DTLTO("dtlto", cl::desc("Perform DTLTO"));
 
-static cl::opt<std::string>
-    DTLTORemoteCompiler("dtlto-remote-compiler",
-                       cl::desc("Specify the remote opt tool for DTLTO"));
-
 static cl::opt<std::string>
     DTLTODistributor("dtlto-distributor",
                      cl::desc("Specify the distributor for DTLTO"));
@@ -372,7 +368,7 @@ static int run(int argc, char **argv) {
     Backend = createOutOfProcessThinBackend(
         llvm::heavyweight_hardware_concurrency(Threads),
         /*OnWrite=*/{}, ThinLTOEmitIndexes, ThinLTOEmitImports, OutputFilename,
-        DTLTORemoteCompiler, DTLTODistributor, SaveTemps);
+        DTLTODistributor, SaveTemps);
   } else
     Backend = createInProcessThinBackend(
         llvm::heavyweight_hardware_concurrency(Threads),
