This is an archive of the discontinued LLVM Phabricator instance.

Differential D15953

Driver: Pass -flavor gnu to lld for AMDGPU rather than -flavor gnu-old
ClosedPublic

Authored by • tstellarAMD on Jan 7 2016, 8:54 AM.

Details

Reviewers
ruiu
• rafael
arsenm
Commits
rG0e04f6c30f6a: Driver: Use the new ELF lld linker for AMDGPU
rC257175: Driver: Use the new ELF lld linker for AMDGPU
rL257175: Driver: Use the new ELF lld linker for AMDGPU
Summary

'gnu-old' has been deprecated in favor or 'gnu'.

Diff Detail

Repository
rL LLVM

Event Timeline

• tstellarAMD updated this revision to Diff 44218.Jan 7 2016, 8:54 AM
• tstellarAMD retitled this revision from to Driver: Pass -flavor gnu to lld for AMDGPU rather than -flavor gnu-old.
• tstellarAMD updated this object.
• tstellarAMD added reviewers: arsenm, ruiu, • rafael.
• tstellarAMD added a subscriber: cfe-commits.
• tstellarAMD added parent revisions: D15951: AMDGPU: Emit functions sizes, D15952: AMDGPU/SI: Emit global variable sizes when targeting HSA.Jan 7 2016, 8:57 AM
• tstellarAMD added a child revision: D15954: [old ELF] Remove AMDGPU target.
ruiu edited edge metadata.Jan 7 2016, 9:07 AM

You can use "ld.lld" which is a symlink to lld instead of "lld -flavor gnu".

• tstellarAMD updated this revision to Diff 44249.Jan 7 2016, 12:33 PM
• tstellarAMD edited edge metadata.

Use ld.lld alias instead of '-flavor gnu'

ruiu accepted this revision.Jan 7 2016, 12:35 PM
ruiu edited edge metadata.

LGTM

This revision is now accepted and ready to land.Jan 7 2016, 12:35 PM
Closed by commit rL257175: Driver: Use the new ELF lld linker for AMDGPU (authored by tstellar). · Explain WhyJan 8 2016, 7:18 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
cfe/
trunk/
lib/
Driver/
2 lines
4 lines
test/
Driver/
2 lines

Diff 44327

cfe/trunk/lib/Driver/Tools.h

Show First 20 Lines • Show All 234 Lines • ▼ Show 20 Lines void ConstructJob(Compilation &C, const JobAction &JA,
const char *LinkingOutput) const override; const char *LinkingOutput) const override;
}; };
} // end namespace hexagon. } // end namespace hexagon.
namespace amdgpu { namespace amdgpu {
class LLVM_LIBRARY_VISIBILITY Linker : public GnuTool { class LLVM_LIBRARY_VISIBILITY Linker : public GnuTool {
public: public:
Linker(const ToolChain &TC) : GnuTool("amdgpu::Linker", "lld", TC) {} Linker(const ToolChain &TC) : GnuTool("amdgpu::Linker", "ld.lld", TC) {}
bool isLinkJob() const override { return true; } bool isLinkJob() const override { return true; }
bool hasIntegratedCPP() const override { return false; } bool hasIntegratedCPP() const override { return false; }
void ConstructJob(Compilation &C, const JobAction &JA, void ConstructJob(Compilation &C, const JobAction &JA,
const InputInfo &Output, const InputInfoList &Inputs, const InputInfo &Output, const InputInfoList &Inputs,
const llvm::opt::ArgList &TCArgs, const llvm::opt::ArgList &TCArgs,
const char *LinkingOutput) const override; const char *LinkingOutput) const override;
}; };
▲ Show 20 Lines • Show All 659 Lines • Show Last 20 Lines

cfe/trunk/lib/Driver/Tools.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 6,514 Lines • ▼ Show 20 Lines
void amdgpu::Linker::ConstructJob(Compilation &C, const JobAction &JA, void amdgpu::Linker::ConstructJob(Compilation &C, const JobAction &JA,
const InputInfo &Output, const InputInfo &Output,
const InputInfoList &Inputs, const InputInfoList &Inputs,
const ArgList &Args, const ArgList &Args,
const char *LinkingOutput) const { const char *LinkingOutput) const {
std::string Linker = getToolChain().GetProgramPath(getShortName()); std::string Linker = getToolChain().GetProgramPath(getShortName());
ArgStringList CmdArgs; ArgStringList CmdArgs;
CmdArgs.push_back("-flavor");
CmdArgs.push_back("old-gnu");
CmdArgs.push_back("-target");
CmdArgs.push_back(Args.MakeArgString(getToolChain().getTripleString()));
AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs); AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs);
CmdArgs.push_back("-o"); CmdArgs.push_back("-o");
CmdArgs.push_back(Output.getFilename()); CmdArgs.push_back(Output.getFilename());
C.addCommand(llvm::make_unique<Command>(JA, *this, Args.MakeArgString(Linker), C.addCommand(llvm::make_unique<Command>(JA, *this, Args.MakeArgString(Linker),
CmdArgs, Inputs)); CmdArgs, Inputs));
} }
// AMDGPU tools end. // AMDGPU tools end.
▲ Show 20 Lines • Show All 4,072 Lines • Show Last 20 Lines

cfe/trunk/test/Driver/amdgpu-toolchain.c

// RUN: %clang -### -target amdgcn--amdhsa -x assembler -mcpu=kaveri %s 2>&1 | FileCheck -check-prefix=AS_LINK %s // RUN: %clang -### -target amdgcn--amdhsa -x assembler -mcpu=kaveri %s 2>&1 | FileCheck -check-prefix=AS_LINK %s
// AS_LINK: clang{{.*}} "-cc1as" // AS_LINK: clang{{.*}} "-cc1as"
// AS_LINK: lld{{.*}} "-flavor" "old-gnu" "-target" "amdgcn--amdhsa" // AS_LINK: ld.lld{{.*}}