https://github.com/jhuber6 created
https://github.com/llvm/llvm-project/pull/114298
Summary:
These flags were used in the very early days while we were trying to
port stuff. Now that we just pass bitcode to the device link job it
can be easily replaced by `-Xoffload-linker foo.bc`.
>From 1a38b96f1a6e2301d2b70da261ac34ff480e15ee Mon Sep 17 00:00:00 2001
From: Joseph Huber <hube...@outlook.com>
Date: Wed, 30 Oct 2024 15:05:39 -0500
Subject: [PATCH] [LinkerWrapper] Remove handling of special bitcode flags
Summary:
These flags were used in the very early days while we were trying to
port stuff. Now that we just pass bitcode to the device link job it
can be easily replaced by `-Xoffload-linker foo.bc`.
---
.../ClangLinkerWrapper.cpp | 18 ------------------
.../clang-linker-wrapper/LinkerWrapperOpts.td | 10 ----------
2 files changed, 28 deletions(-)
diff --git a/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
b/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
index 561b73c73ad7df..fc985bfe1d6c30 100644
--- a/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
+++ b/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
@@ -600,17 +600,6 @@ Expected<StringRef> clang(ArrayRef<StringRef> InputFiles,
const ArgList &Args) {
for (StringRef Arg : Args.getAllArgValues(OPT_compiler_arg_EQ))
CmdArgs.push_back(Args.MakeArgString(Arg));
- for (StringRef Arg : Args.getAllArgValues(OPT_builtin_bitcode_EQ)) {
- if (llvm::Triple(Arg.split('=').first) == Triple)
- CmdArgs.append({"-Xclang", "-mlink-builtin-bitcode", "-Xclang",
- Args.MakeArgString(Arg.split('=').second)});
- }
-
- // The OpenMPOpt pass can introduce new calls and is expensive, we do
- // not want this when running CodeGen through clang.
- if (Args.hasArg(OPT_clang_backend) || Args.hasArg(OPT_builtin_bitcode_EQ))
- CmdArgs.append({"-mllvm", "-openmp-opt-disable"});
-
if (Error Err = executeCommands(*ClangPath, CmdArgs))
return std::move(Err);
@@ -1362,13 +1351,6 @@ getDeviceInput(const ArgList &Args) {
}
}
- for (StringRef Library : Args.getAllArgValues(OPT_bitcode_library_EQ)) {
- auto FileOrErr = getInputBitcodeLibrary(Library);
- if (!FileOrErr)
- return FileOrErr.takeError();
- InputFiles[*FileOrErr].push_back(std::move(*FileOrErr));
- }
-
SmallVector<SmallVector<OffloadFile>> InputsForTarget;
for (auto &[ID, Input] : InputFiles)
InputsForTarget.emplace_back(std::move(Input));
diff --git a/clang/tools/clang-linker-wrapper/LinkerWrapperOpts.td
b/clang/tools/clang-linker-wrapper/LinkerWrapperOpts.td
index a3e8199380046f..57d918db0a73ce 100644
--- a/clang/tools/clang-linker-wrapper/LinkerWrapperOpts.td
+++ b/clang/tools/clang-linker-wrapper/LinkerWrapperOpts.td
@@ -22,22 +22,12 @@ def host_triple_EQ : Joined<["--"], "host-triple=">,
def opt_level : Joined<["--"], "opt-level=">,
Flags<[WrapperOnlyOption]>, MetaVarName<"<O0, O1, O2, or O3>">,
HelpText<"Optimization level for LTO">;
-def bitcode_library_EQ : Joined<["--"], "bitcode-library=">,
- Flags<[WrapperOnlyOption]>, MetaVarName<"<kind>-<triple>-<arch>=<path>">,
- HelpText<"Extra bitcode library to link">;
-def builtin_bitcode_EQ : Joined<["--"], "builtin-bitcode=">,
- Flags<[WrapperOnlyOption]>, MetaVarName<"<triple>=<path>">,
- HelpText<"Perform a special internalizing link on the bitcode file. "
- "This is necessary for some vendor libraries to be linked
correctly">;
def device_linker_args_EQ : Joined<["--"], "device-linker=">,
Flags<[WrapperOnlyOption]>, MetaVarName<"<value> or <triple>=<value>">,
HelpText<"Arguments to pass to the device linker invocation">;
def device_compiler_args_EQ : Joined<["--"], "device-compiler=">,
Flags<[WrapperOnlyOption]>, MetaVarName<"<value> or <triple>=<value>">,
HelpText<"Arguments to pass to the device compiler invocation">;
-def clang_backend : Flag<["--"], "clang-backend">,
- Flags<[WrapperOnlyOption]>,
- HelpText<"Run the backend using clang rather than the LTO backend">;
def dry_run : Flag<["--"], "dry-run">,
Flags<[WrapperOnlyOption]>,
HelpText<"Print program arguments without running">;
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
