This is an archive of the discontinued LLVM Phabricator instance.

Differential D74591

[Driver] Rename AddGoldPlugin to addLTOOptions. NFC
ClosedPublic

Authored by MaskRay on Feb 13 2020, 10:41 PM.

Details

Reviewers
evgeny777
tejohnson
Commits
rG597dfb3bd56c: [Driver] Rename AddGoldPlugin to addLTOOptions. NFC
Summary

AddGoldPlugin does more than adding -plugin path/to/LLVMgold.so.
It works with lld and GNU ld, and adds other LTO options.
So AddGoldPlugin is no longer a suitable name.

Diff Detail

Event Timeline

MaskRay created this revision.Feb 13 2020, 10:41 PM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 13 2020, 10:41 PM
Herald added subscribers: cfe-commits, dexonsmith, inglorion, emaste. · View Herald Transcript
Harbormaster failed remote builds in B46475: Diff 244574!Feb 13 2020, 11:11 PM
tejohnson accepted this revision.Feb 14 2020, 6:28 AM

lgtm

This revision is now accepted and ready to land.Feb 14 2020, 6:28 AM
Closed by commit rG597dfb3bd56c: [Driver] Rename AddGoldPlugin to addLTOOptions. NFC (authored by MaskRay). · Explain WhyFeb 14 2020, 8:14 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
clang/
lib/
Driver/
ToolChains/
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines

Diff 244677

clang/lib/Driver/ToolChains/Ananas.cpp

Show First 20 Lines • Show All 97 Lines • ▼ Show 20 Linesvoid ananas::Linker::ConstructJob(Compilation &C, const JobAction &JA,
Args.AddAllArgs(CmdArgs, options::OPT_L); Args.AddAllArgs(CmdArgs, options::OPT_L);
ToolChain.AddFilePathLibArgs(Args, CmdArgs); ToolChain.AddFilePathLibArgs(Args, CmdArgs);
Args.AddAllArgs(CmdArgs, Args.AddAllArgs(CmdArgs,
{options::OPT_T_Group, options::OPT_e, options::OPT_s, {options::OPT_T_Group, options::OPT_e, options::OPT_s,
options::OPT_t, options::OPT_Z_Flag, options::OPT_r}); options::OPT_t, options::OPT_Z_Flag, options::OPT_r});
if (D.isUsingLTO()) { if (D.isUsingLTO()) {
assert(!Inputs.empty() && "Must have at least one input."); assert(!Inputs.empty() && "Must have at least one input.");
AddGoldPlugin(ToolChain, Args, CmdArgs, Output, Inputs[0], addLTOOptions(ToolChain, Args, CmdArgs, Output, Inputs[0],
D.getLTOMode() == LTOK_Thin); D.getLTOMode() == LTOK_Thin);
} }
AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs, JA); AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs, JA);
if (ToolChain.ShouldLinkCXXStdlib(Args)) if (ToolChain.ShouldLinkCXXStdlib(Args))
ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs); ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs);
if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs))
Show All 26 Lines

clang/lib/Driver/ToolChains/CloudABI.cpp

Show First 20 Lines • Show All 69 Lines • ▼ Show 20 Linesvoid cloudabi::Linker::ConstructJob(Compilation &C, const JobAction &JA,
Args.AddAllArgs(CmdArgs, options::OPT_L); Args.AddAllArgs(CmdArgs, options::OPT_L);
ToolChain.AddFilePathLibArgs(Args, CmdArgs); ToolChain.AddFilePathLibArgs(Args, CmdArgs);
Args.AddAllArgs(CmdArgs, Args.AddAllArgs(CmdArgs,
{options::OPT_T_Group, options::OPT_e, options::OPT_s, {options::OPT_T_Group, options::OPT_e, options::OPT_s,
options::OPT_t, options::OPT_Z_Flag, options::OPT_r}); options::OPT_t, options::OPT_Z_Flag, options::OPT_r});
if (D.isUsingLTO()) { if (D.isUsingLTO()) {
assert(!Inputs.empty() && "Must have at least one input."); assert(!Inputs.empty() && "Must have at least one input.");
AddGoldPlugin(ToolChain, Args, CmdArgs, Output, Inputs[0], addLTOOptions(ToolChain, Args, CmdArgs, Output, Inputs[0],
D.getLTOMode() == LTOK_Thin); D.getLTOMode() == LTOK_Thin);
} }
AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs, JA); AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs, JA);
if (ToolChain.ShouldLinkCXXStdlib(Args)) if (ToolChain.ShouldLinkCXXStdlib(Args))
ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs); ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs);
if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) { if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
▲ Show 20 Lines • Show All 61 Lines • Show Last 20 Lines

clang/lib/Driver/ToolChains/CommonArgs.h

Show First 20 Lines • Show All 52 Lines • ▼ Show 20 Lines
const char *SplitDebugName(const llvm::opt::ArgList &Args, const char *SplitDebugName(const llvm::opt::ArgList &Args,
const InputInfo &Input, const InputInfo &Output); const InputInfo &Input, const InputInfo &Output);
void SplitDebugInfo(const ToolChain &TC, Compilation &C, const Tool &T, void SplitDebugInfo(const ToolChain &TC, Compilation &C, const Tool &T,
const JobAction &JA, const llvm::opt::ArgList &Args, const JobAction &JA, const llvm::opt::ArgList &Args,
const InputInfo &Output, const char *OutFile); const InputInfo &Output, const char *OutFile);
void AddGoldPlugin(const ToolChain &ToolChain, const llvm::opt::ArgList &Args, void addLTOOptions(const ToolChain &ToolChain, const llvm::opt::ArgList &Args,
llvm::opt::ArgStringList &CmdArgs, const InputInfo &Output, llvm::opt::ArgStringList &CmdArgs, const InputInfo &Output,
const InputInfo &Input, bool IsThinLTO); const InputInfo &Input, bool IsThinLTO);
std::tuple<llvm::Reloc::Model, unsigned, bool> std::tuple<llvm::Reloc::Model, unsigned, bool>
ParsePICArgs(const ToolChain &ToolChain, const llvm::opt::ArgList &Args); ParsePICArgs(const ToolChain &ToolChain, const llvm::opt::ArgList &Args);
unsigned ParseFunctionAlignment(const ToolChain &TC, unsigned ParseFunctionAlignment(const ToolChain &TC,
const llvm::opt::ArgList &Args); const llvm::opt::ArgList &Args);
▲ Show 20 Lines • Show All 64 Lines • Show Last 20 Lines

clang/lib/Driver/ToolChains/CommonArgs.cpp

Show First 20 Lines • Show All 347 Lines • ▼ Show 20 Linesunsigned tools::getLTOParallelism(const ArgList &Args, const Driver &D) {
return Parallelism; return Parallelism;
} }
// CloudABI uses -ffunction-sections and -fdata-sections by default. // CloudABI uses -ffunction-sections and -fdata-sections by default.
bool tools::isUseSeparateSections(const llvm::Triple &Triple) { bool tools::isUseSeparateSections(const llvm::Triple &Triple) {
return Triple.getOS() == llvm::Triple::CloudABI; return Triple.getOS() == llvm::Triple::CloudABI;
} }
void tools::AddGoldPlugin(const ToolChain &ToolChain, const ArgList &Args, void tools::addLTOOptions(const ToolChain &ToolChain, const ArgList &Args,
ArgStringList &CmdArgs, const InputInfo &Output, ArgStringList &CmdArgs, const InputInfo &Output,
const InputInfo &Input, bool IsThinLTO) { const InputInfo &Input, bool IsThinLTO) {
const char *Linker = Args.MakeArgString(ToolChain.GetLinkerPath()); const char *Linker = Args.MakeArgString(ToolChain.GetLinkerPath());
if (llvm::sys::path::filename(Linker) != "ld.lld" && if (llvm::sys::path::filename(Linker) != "ld.lld" &&
llvm::sys::path::stem(Linker) != "ld.lld") { llvm::sys::path::stem(Linker) != "ld.lld") {
// Tell the linker to load the plugin. This has to come before // Tell the linker to load the plugin. This has to come before
// AddLinkerInputs as gold requires -plugin to come before any -plugin-opt // AddLinkerInputs as gold requires -plugin to come before any -plugin-opt
// that -Wl might forward. // that -Wl might forward.
▲ Show 20 Lines • Show All 1,053 Lines • Show Last 20 Lines

clang/lib/Driver/ToolChains/FreeBSD.cpp

Show First 20 Lines • Show All 269 Lines • ▼ Show 20 Linesvoid freebsd::Linker::ConstructJob(Compilation &C, const JobAction &JA,
Args.AddAllArgs(CmdArgs, options::OPT_e); Args.AddAllArgs(CmdArgs, options::OPT_e);
Args.AddAllArgs(CmdArgs, options::OPT_s); Args.AddAllArgs(CmdArgs, options::OPT_s);
Args.AddAllArgs(CmdArgs, options::OPT_t); Args.AddAllArgs(CmdArgs, options::OPT_t);
Args.AddAllArgs(CmdArgs, options::OPT_Z_Flag); Args.AddAllArgs(CmdArgs, options::OPT_Z_Flag);
Args.AddAllArgs(CmdArgs, options::OPT_r); Args.AddAllArgs(CmdArgs, options::OPT_r);
if (D.isUsingLTO()) { if (D.isUsingLTO()) {
assert(!Inputs.empty() && "Must have at least one input."); assert(!Inputs.empty() && "Must have at least one input.");
AddGoldPlugin(ToolChain, Args, CmdArgs, Output, Inputs[0], addLTOOptions(ToolChain, Args, CmdArgs, Output, Inputs[0],
D.getLTOMode() == LTOK_Thin); D.getLTOMode() == LTOK_Thin);
} }
bool NeedsSanitizerDeps = addSanitizerRuntimes(ToolChain, Args, CmdArgs); bool NeedsSanitizerDeps = addSanitizerRuntimes(ToolChain, Args, CmdArgs);
bool NeedsXRayDeps = addXRayRuntime(ToolChain, Args, CmdArgs); bool NeedsXRayDeps = addXRayRuntime(ToolChain, Args, CmdArgs);
AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs, JA); AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs, JA);
if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) { if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
▲ Show 20 Lines • Show All 191 Lines • Show Last 20 Lines

clang/lib/Driver/ToolChains/Fuchsia.cpp

Show First 20 Lines • Show All 105 Lines • ▼ Show 20 Linesvoid fuchsia::Linker::ConstructJob(Compilation &C, const JobAction &JA,
Args.AddAllArgs(CmdArgs, options::OPT_L); Args.AddAllArgs(CmdArgs, options::OPT_L);
Args.AddAllArgs(CmdArgs, options::OPT_u); Args.AddAllArgs(CmdArgs, options::OPT_u);
ToolChain.AddFilePathLibArgs(Args, CmdArgs); ToolChain.AddFilePathLibArgs(Args, CmdArgs);
if (D.isUsingLTO()) { if (D.isUsingLTO()) {
assert(!Inputs.empty() && "Must have at least one input."); assert(!Inputs.empty() && "Must have at least one input.");
AddGoldPlugin(ToolChain, Args, CmdArgs, Output, Inputs[0], addLTOOptions(ToolChain, Args, CmdArgs, Output, Inputs[0],
D.getLTOMode() == LTOK_Thin); D.getLTOMode() == LTOK_Thin);
} }
bool NeedsSanitizerDeps = addSanitizerRuntimes(ToolChain, Args, CmdArgs); bool NeedsSanitizerDeps = addSanitizerRuntimes(ToolChain, Args, CmdArgs);
bool NeedsXRayDeps = addXRayRuntime(ToolChain, Args, CmdArgs); bool NeedsXRayDeps = addXRayRuntime(ToolChain, Args, CmdArgs);
AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs, JA); AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs, JA);
ToolChain.addProfileRTLibs(Args, CmdArgs); ToolChain.addProfileRTLibs(Args, CmdArgs);
▲ Show 20 Lines • Show All 241 Lines • Show Last 20 Lines

clang/lib/Driver/ToolChains/Gnu.cpp

Show First 20 Lines • Show All 506 Lines • ▼ Show 20 Linesvoid tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
Args.AddAllArgs(CmdArgs, options::OPT_L); Args.AddAllArgs(CmdArgs, options::OPT_L);
Args.AddAllArgs(CmdArgs, options::OPT_u); Args.AddAllArgs(CmdArgs, options::OPT_u);
ToolChain.AddFilePathLibArgs(Args, CmdArgs); ToolChain.AddFilePathLibArgs(Args, CmdArgs);
if (D.isUsingLTO()) { if (D.isUsingLTO()) {
assert(!Inputs.empty() && "Must have at least one input."); assert(!Inputs.empty() && "Must have at least one input.");
AddGoldPlugin(ToolChain, Args, CmdArgs, Output, Inputs[0], addLTOOptions(ToolChain, Args, CmdArgs, Output, Inputs[0],
D.getLTOMode() == LTOK_Thin); D.getLTOMode() == LTOK_Thin);
} }
if (Args.hasArg(options::OPT_Z_Xlinker__no_demangle)) if (Args.hasArg(options::OPT_Z_Xlinker__no_demangle))
CmdArgs.push_back("--no-demangle"); CmdArgs.push_back("--no-demangle");
bool NeedsSanitizerDeps = addSanitizerRuntimes(ToolChain, Args, CmdArgs); bool NeedsSanitizerDeps = addSanitizerRuntimes(ToolChain, Args, CmdArgs);
bool NeedsXRayDeps = addXRayRuntime(ToolChain, Args, CmdArgs); bool NeedsXRayDeps = addXRayRuntime(ToolChain, Args, CmdArgs);
▲ Show 20 Lines • Show All 2,347 Lines • Show Last 20 Lines