Author: Joseph Huber Date: 2022-07-09T21:18:19-04:00 New Revision: 22a01b860b909d7836658e0c58e484950766239b
URL: https://github.com/llvm/llvm-project/commit/22a01b860b909d7836658e0c58e484950766239b DIFF: https://github.com/llvm/llvm-project/commit/22a01b860b909d7836658e0c58e484950766239b.diff LOG: [LinkerWrapper] Forward `-mllvm` options to the linker wrapper This patch adds the ability to use `-mllvm` options in the linker wrapper when performing bitcode linking or the module compilation. This is done by passing in the LLVM argument to the clang-linker-wrapper tool. Inside the linker-wrapper tool we invoke the `CommandLine` parser solely for forwarding command line options to the `clang-linker-wrapper` to the LLVM tools that also use the `CommandLine` parser. The actual arguments to the linker wrapper are parsed using the `Opt` library instead. For example, in the following command the `CommandLine` parser will attempt to parse `abc`, while the `opt` parser takes `-mllvm <arg>` and ignores it so it is not passed to the linker arguments. ``` clang-linker-wrapper -mllvm -abc -- <linker-args> ``` As far as I can tell this is the easiest way to forward arguments to LLVM tool invocations. If there is a better way to pass these arguments (such as through the LTO config) let me know. Reviewed By: MaskRay Differential Revision: https://reviews.llvm.org/D129424 Added: Modified: clang/lib/Driver/ToolChains/Clang.cpp clang/test/Driver/linker-wrapper.c clang/test/Driver/openmp-offload.c clang/tools/clang-linker-wrapper/LinkerWrapperOpts.td Removed: ################################################################################ diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index bc29dd8107a60..ee445775e7b72 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -8449,19 +8449,26 @@ void LinkerWrapper::ConstructJob(Compilation &C, const JobAction &JA, const auto &LinkCommand = C.getJobs().getJobs().back(); // Forward -Xoffload-linker<-triple> arguments to the device link job. - for (auto *Arg : Args.filtered(options::OPT_Xoffload_linker)) { - StringRef Val = Arg->getValue(0); + for (Arg *A : Args.filtered(options::OPT_Xoffload_linker)) { + StringRef Val = A->getValue(0); if (Val.empty()) CmdArgs.push_back( - Args.MakeArgString(Twine("--device-linker=") + Arg->getValue(1))); + Args.MakeArgString(Twine("--device-linker=") + A->getValue(1))); else CmdArgs.push_back(Args.MakeArgString( "--device-linker=" + ToolChain::getOpenMPTriple(Val.drop_front()).getTriple() + "=" + - Arg->getValue(1))); + A->getValue(1))); } Args.ClaimAllArgs(options::OPT_Xoffload_linker); + // Forward `-mllvm` arguments to the LLVM invocations if present. + for (Arg *A : Args.filtered(options::OPT_mllvm)) { + CmdArgs.push_back("-mllvm"); + CmdArgs.push_back(A->getValue()); + A->claim(); + } + // Add the linker arguments to be forwarded by the wrapper. CmdArgs.push_back(Args.MakeArgString(Twine("--linker-path=") + LinkCommand->getExecutable())); diff --git a/clang/test/Driver/linker-wrapper.c b/clang/test/Driver/linker-wrapper.c index 7adf627cba178..201a69c44c999 100644 --- a/clang/test/Driver/linker-wrapper.c +++ b/clang/test/Driver/linker-wrapper.c @@ -39,10 +39,11 @@ // CPU_LINK: ld.lld{{.*}}-m elf_x86_64 -shared -Bsymbolic -o {{.*}}.out {{.*}}.o {{.*}}.o // RUN: %clang -cc1 %s -triple x86_64-unknown-linux-gnu -emit-obj -o %t.o -// RUN: clang-linker-wrapper --dry-run --host-triple=x86_64-unknown-linux-gnu \ +// RUN: clang-linker-wrapper --dry-run --host-triple=x86_64-unknown-linux-gnu -mllvm -abc \ // RUN: --linker-path=/usr/bin/ld.lld -- -a -b -c %t.o -o a.out 2>&1 | FileCheck %s --check-prefix=HOST_LINK // HOST_LINK: ld.lld{{.*}}-a -b -c {{.*}}.o -o a.out +// HOST_LINK-NOT: ld.lld{{.*}}-abc // RUN: clang-offload-packager -o %t.out \ // RUN: --image=file=%S/Inputs/dummy-bc.bc,kind=openmp,triple=nvptx64-nvidia-cuda,arch=sm_70 \ diff --git a/clang/test/Driver/openmp-offload.c b/clang/test/Driver/openmp-offload.c index 5a5da4c408ecf..a800c75f8c236 100644 --- a/clang/test/Driver/openmp-offload.c +++ b/clang/test/Driver/openmp-offload.c @@ -664,7 +664,13 @@ // CHK-NEW-DRIVER: clang-linker-wrapper{{.*}}"--host-triple=powerpc64le-unknown-linux"{{.*}}--{{.*}}"-lomp"{{.*}}"-lomptarget" /// Check arguments to the linker wrapper -// RUN: %clang -### --target=powerpc64le-linux -fopenmp=libomp -fopenmp-targets=powerpc64le-ibm-linux-gnu -g -fopenmp-new-driver %s 2>&1 \ +// RUN: %clang -### --target=powerpc64le-linux -fopenmp=libomp -fopenmp-targets=powerpc64le-ibm-linux-gnu -g %s 2>&1 \ // RUN: | FileCheck -check-prefix=CHK-NEW-DRIVER-DEBUG %s -// CHK-NEW-DRIVER-DEBUG: clang-linker-wrapper{{.*}}"--device-debug +// CHK-NEW-DRIVER-DEBUG: clang-linker-wrapper{{.*}} "--device-debug" + +/// Check arguments to the linker wrapper +// RUN: %clang -### --target=powerpc64le-linux -fopenmp=libomp -fopenmp-targets=powerpc64le-ibm-linux-gnu \ +// RUN: -mllvm -abc %s 2>&1 | FileCheck -check-prefix=CHK-NEW-DRIVER-MLLVM %s + +// CHK-NEW-DRIVER-MLLVM: clang-linker-wrapper{{.*}} "-abc" diff --git a/clang/tools/clang-linker-wrapper/LinkerWrapperOpts.td b/clang/tools/clang-linker-wrapper/LinkerWrapperOpts.td index 7620873aa8f6a..4449ac897bc91 100644 --- a/clang/tools/clang-linker-wrapper/LinkerWrapperOpts.td +++ b/clang/tools/clang-linker-wrapper/LinkerWrapperOpts.td @@ -70,6 +70,10 @@ def linker_arg_EQ : Joined<["--"], "linker-arg=">, def separator : Flag<["--"], "">, Flags<[WrapperOnlyOption]>, HelpText<"The separator for the wrapped linker arguments">; +// Arguments for the LLVM backend. +def mllvm : Separate<["-"], "mllvm">, Flags<[WrapperOnlyOption]>, + MetaVarName<"<arg>">, HelpText<"Arguments passed to the LLVM invocation">; + // Standard linker flags also used by the linker wrapper. def sysroot_EQ : Joined<["--"], "sysroot">, HelpText<"Set the system root">; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
