Author: Joseph Huber Date: 2023-01-27T11:30:50-06:00 New Revision: 4f9964738b9c01f16bc962aac68e441377c8c842
URL: https://github.com/llvm/llvm-project/commit/4f9964738b9c01f16bc962aac68e441377c8c842 DIFF: https://github.com/llvm/llvm-project/commit/4f9964738b9c01f16bc962aac68e441377c8c842.diff LOG: [LinkerWrapper] Add support for --[no-]whole-archive into the linker wrapper Summary: This patch adds support for `--[no-]whole-archive` to the linker wrapper. This allows us to bypass the symbol resolution logic that is normally used for static archives. For multi-architecture binaries this also allows us to build for every single member. Added: Modified: clang/test/Driver/linker-wrapper-libs.c clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp clang/tools/clang-linker-wrapper/LinkerWrapperOpts.td Removed: ################################################################################ diff --git a/clang/test/Driver/linker-wrapper-libs.c b/clang/test/Driver/linker-wrapper-libs.c index a97420c34162c..65d4c2546ba9c 100644 --- a/clang/test/Driver/linker-wrapper-libs.c +++ b/clang/test/Driver/linker-wrapper-libs.c @@ -132,3 +132,28 @@ int bar() { return weak; } // LIBRARY-GLOBAL-DEFINED: clang{{.*}} -o {{.*}}.img --target=amdgcn-amd-amdhsa -mcpu=gfx1030 {{.*}}.o {{.*}}.o // LIBRARY-GLOBAL-DEFINED-NOT: {{.*}}gfx1030{{.*}}.o // LIBRARY-GLOBAL-DEFINED: clang{{.*}} -o {{.*}}.img --target=nvptx64-nvidia-cuda -march=sm_70 {{.*}}.s {{.*}}.o + +// +// Check that we can use --[no-]whole-archive to control extraction. +// +// RUN: %clang -cc1 %s -triple nvptx64-nvidia-cuda -emit-llvm-bc -DGLOBAL -o %t.nvptx.global.bc +// RUN: %clang -cc1 %s -triple amdgcn-amd-amdhsa -emit-llvm-bc -DGLOBAL -o %t.amdgpu.global.bc +// RUN: clang-offload-packager -o %t-lib.out \ +// RUN: --image=file=%t.nvptx.global.bc,kind=openmp,triple=nvptx64-nvidia-cuda,arch=sm_70 \ +// RUN: --image=file=%t.nvptx.global.bc,kind=openmp,triple=nvptx64-nvidia-cuda,arch=sm_52 \ +// RUN: --image=file=%t.amdgpu.global.bc,kind=openmp,triple=amdgcn-amd-amdhsa,arch=gfx1030 \ +// RUN: --image=file=%t.amdgpu.global.bc,kind=openmp,triple=amdgcn-amd-amdhsa,arch=gfx90a +// RUN: %clang -cc1 %s -triple x86_64-unknown-linux-gnu -emit-obj -o %t.o -fembed-offload-object=%t-lib.out +// RUN: llvm-ar rcs %t.a %t.o +// RUN: clang-offload-packager -o %t.out \ +// RUN: --image=file=%t.elf.o,kind=openmp,triple=nvptx64-nvidia-cuda,arch=sm_70 \ +// RUN: --image=file=%t.elf.o,kind=openmp,triple=amdgcn-amd-amdhsa,arch=gfx1030 +// RUN: %clang -cc1 %s -triple x86_64-unknown-linux-gnu -emit-obj -o %t.o -fembed-offload-object=%t.out +// RUN: clang-linker-wrapper --host-triple=x86_64-unknown-linux-gnu --dry-run \ +// RUN: --linker-path=/usr/bin/ld -- %t.o --whole-archive %t.a -o a.out 2>&1 \ +// RUN: | FileCheck %s --check-prefix=LIBRARY-WHOLE-ARCHIVE + +// LIBRARY-WHOLE-ARCHIVE: clang{{.*}} -o {{.*}}.img --target=amdgcn-amd-amdhsa -mcpu=gfx1030 {{.*}}.o {{.*}}.o +// LIBRARY-WHOLE-ARCHIVE: clang{{.*}} -o {{.*}}.img --target=nvptx64-nvidia-cuda -march=sm_52 {{.*}}.s +// LIBRARY-WHOLE-ARCHIVE: clang{{.*}} -o {{.*}}.img --target=amdgcn-amd-amdhsa -mcpu=gfx90a {{.*}}.o +// LIBRARY-WHOLE-ARCHIVE: clang{{.*}} -o {{.*}}.img --target=nvptx64-nvidia-cuda -march=sm_70 {{.*}}.s {{.*}}.o diff --git a/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp b/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp index d479b5a6cccef..3c92d34571044 100644 --- a/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp +++ b/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp @@ -1267,7 +1267,15 @@ Expected<SmallVector<OffloadFile>> getDeviceInput(const ArgList &Args) { // Try to extract device code from the linker input files. SmallVector<OffloadFile> InputFiles; DenseMap<OffloadFile::TargetID, DenseMap<StringRef, Symbol>> Syms; - for (const opt::Arg *Arg : Args.filtered(OPT_INPUT, OPT_library)) { + bool WholeArchive = false; + for (const opt::Arg *Arg : Args.filtered( + OPT_INPUT, OPT_library, OPT_whole_archive, OPT_no_whole_archive)) { + if (Arg->getOption().matches(OPT_whole_archive) || + Arg->getOption().matches(OPT_no_whole_archive)) { + WholeArchive = Arg->getOption().matches(OPT_whole_archive); + continue; + } + std::optional<std::string> Filename = Arg->getOption().matches(OPT_library) ? searchLibrary(Arg->getValue(), Root, LibraryPaths) @@ -1306,7 +1314,7 @@ Expected<SmallVector<OffloadFile>> getDeviceInput(const ArgList &Args) { // If we don't have an object file for this architecture do not // extract. - if (IsArchive && !Syms.count(Binary)) + if (IsArchive && !WholeArchive && !Syms.count(Binary)) continue; Expected<bool> ExtractOrErr = @@ -1314,9 +1322,9 @@ Expected<SmallVector<OffloadFile>> getDeviceInput(const ArgList &Args) { if (!ExtractOrErr) return ExtractOrErr.takeError(); - Extracted = IsArchive && *ExtractOrErr; + Extracted = IsArchive && !WholeArchive && *ExtractOrErr; - if (!IsArchive || Extracted) + if (!IsArchive || WholeArchive || Extracted) InputFiles.emplace_back(std::move(Binary)); // If we extracted any files we need to check all the symbols again. diff --git a/clang/tools/clang-linker-wrapper/LinkerWrapperOpts.td b/clang/tools/clang-linker-wrapper/LinkerWrapperOpts.td index ce37a6d4821c5..5dace9766e0c1 100644 --- a/clang/tools/clang-linker-wrapper/LinkerWrapperOpts.td +++ b/clang/tools/clang-linker-wrapper/LinkerWrapperOpts.td @@ -116,3 +116,6 @@ def rpath_EQ : Joined<["--", "-"], "rpath=">, Flags<[HelpHidden]>, Alias<rpath>; def v : Flag<["--", "-"], "v">, HelpText<"Display the version number and exit">; def version : Flag<["--", "-"], "version">, Flags<[HelpHidden]>, Alias<v>; + +def whole_archive : Flag<["--", "-"], "whole-archive">, Flags<[HelpHidden]>; +def no_whole_archive : Flag<["--", "-"], "no-whole-archive">, Flags<[HelpHidden]>; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
