Replace -Xdist with -Xthinlto-distributor=

Author: bd1976bris

clang/docs/ThinLTO.rst

@@ -258,13 +258,14 @@ DTLTO requires the LLD linker (``-fuse-ld=lld``).
    - Specifies the ``<path>`` to the distributor process executable for DTLTO.
    - If specified, ThinLTO backend compilations will be distributed by LLD.
 
-``-Xdist <arg>``
+``-Xthinlto-distributor=<arg>``
    - Pass ``<arg>`` to the distributor process (see ``-fthinlto-distributor=``).
    - Can be specified multiple times to pass multiple options.
+   - Can specify multiple options by separating them with commas.
 
 Examples:
-   - ``clang -flto=thin -fthinlto-distributor=incredibuild.exe -Xdist --verbose -fuse-ld=lld``
-   - ``clang -flto=thin -fthinlto-distributor=$(which python) -Xdist incredibuild.py -fuse-ld=lld``
+   - ``clang -flto=thin -fthinlto-distributor=incredibuild.exe -Xthinlto-distributor=--verbose,--j10 -fuse-ld=lld``
+   - ``clang -flto=thin -fthinlto-distributor=$(which python) -Xthinlto-distributor=incredibuild.py -fuse-ld=lld``
 
 If ``-fthinlto-distributor=`` is specified Clang supplies the path to a
 distributable optimization and code generation tool to LLD. Currently this tool

clang/include/clang/Driver/Options.td

@@ -969,7 +969,7 @@ def Xlinker : Separate<["-"], "Xlinker">, Flags<[LinkerInput, RenderAsInput]>,
   Visibility<[ClangOption, CLOption, FlangOption]>,
   HelpText<"Pass <arg> to the linker">, MetaVarName<"<arg>">,
   Group<Link_Group>;
-def Xdist : Separate<["-"], "Xdist">, Flags<[LinkOption]>,
+def Xthinlto_distributor_EQ : CommaJoined<["-"], "Xthinlto-distributor=">, Flags<[LinkOption]>,
   Visibility<[ClangOption, CLOption]>,
   HelpText<"Pass <arg> to the ThinLTO distributor">,
   MetaVarName<"<arg>">, Group<Link_Group>;

clang/lib/Driver/ToolChains/Gnu.cpp

@@ -546,11 +546,8 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
         Args.MakeArgString("--thinlto-remote-opt-tool=" +
                            Twine(ToolChain.getDriver().getClangProgramPath())));
 
-    for (const Arg *A : Args.filtered(options::OPT_Xdist)) {
-      A->claim();
-      CmdArgs.push_back(Args.MakeArgString("-mllvm=-thinlto-distributor-arg=" +
-                                           Twine(A->getValue())));
-    }
+    for (auto A : Args.getAllArgValues(options::OPT_Xthinlto_distributor_EQ))
+      CmdArgs.push_back(Args.MakeArgString("-mllvm=-thinlto-distributor-arg=" + A));
   }
 
   if (Args.hasArg(options::OPT_Z_Xlinker__no_demangle))

clang/test/Driver/DTLTO/dtlto.c

@@ -3,8 +3,8 @@
 // REQUIRES: lld
 
 // RUN: echo "--target=x86_64-linux-gnu \
-// RUN:   -Xdist distarg1 \
-// RUN:   -Xdist distarg2 \
+// RUN:   -Xthinlto-distributor=distarg1 \
+// RUN:   -Xthinlto-distributor=distarg2,distarg3 \
 // RUN:   -fuse-ld=lld" > %t.rsp
 
 
@@ -17,16 +17,17 @@
 // CHECK-SAME: "--thinlto-remote-opt-tool={{.*}}clang
 // CHECK-SAME: "-mllvm=-thinlto-distributor-arg=distarg1"
 // CHECK-SAME: "-mllvm=-thinlto-distributor-arg=distarg2"
+// CHECK-SAME: "-mllvm=-thinlto-distributor-arg=distarg3"
 
 
 /// Check that options are not added without --thinlto-distributor= and
-/// that there is an unused option warning issued for -Xdist options. We
+/// that there is an unused option warning issued for -Xthinlto-distributor= options. We
 /// specify -flto here as these options should be unaffected by it.
 // RUN: %clang -### @%t.rsp -flto=thin %s 2>&1 | \
 // RUN:   FileCheck %s --check-prefixes=NONE,NOMORE --implicit-check-not=warning
 
-// NONE: warning: argument unused during compilation: '-Xdist distarg1'
-// NONE: warning: argument unused during compilation: '-Xdist distarg2'
+// NONE: warning: argument unused during compilation: '-Xthinlto-distributor=distarg1'
+// NONE: warning: argument unused during compilation: '-Xthinlto-distributor=distarg2,distarg3'
 // NONE:     ld.lld
 // NOMORE-NOT: --thinlto-distributor=
 // NOMORE-NOT: --thinlto-remote-opt-tool=

cross-project-tests/dtlto/archive-thin.test

@@ -26,7 +26,7 @@
 # RUN:   %t.dir/foo.a %t.dir/lib/bar.a ../_start.a %t.dir/cat.a -Wl,--whole-archive,../dog.a \
 # RUN:   -flto=thin \
 # RUN:   -fthinlto-distributor=%python \
-# RUN:   -Xdist %llvm_src_root/utils/dtlto/local.py \
+# RUN:   -Xthinlto-distributor=%llvm_src_root/utils/dtlto/local.py \
 # RUN:   --save-temps \
 # RUN:   -fuse-ld=lld \
 # RUN:   -nostdlib \

cross-project-tests/dtlto/dtlto.c

@@ -8,7 +8,7 @@
 
 // RUN: %clang --target=x86_64-linux-gnu %s -shared -flto=thin \
 // RUN:   -fthinlto-distributor=%python \
-// RUN:   -Xdist %llvm_src_root/utils/dtlto/local.py \
+// RUN:   -Xthinlto-distributor=%llvm_src_root/utils/dtlto/local.py \
 // RUN:   --save-temps \
 // RUN:   -fuse-ld=lld \
 // RUN:   -nostdlib \

lld/docs/DTLTO.rst

@@ -44,8 +44,8 @@ properties of the distribution system (as such additional input/output files may
 not be pushed to or fetched from distribution system nodes correctly). If such 
 options are required, then the distributor can be modified to accept switches 
 that specify additional input/output dependencies, and 
-``-Xdist``/``-thinlto-distributor-arg=`` can be used to pass such options through 
-to the distributor.
+``-mllvm -thinlto-distributor-arg=`` can be used to pass such options through to
+the distributor.
 
 Some LLD LTO options (e.g., ``--lto-sample-profile=<file>``) are supported. 
 Currently, other options are silently accepted but do not have the desired