This is an archive of the discontinued LLVM Phabricator instance.

Differential D19952

AMDGPU: Use lld as the linker again
ClosedPublic

Authored by • tstellarAMD on May 4 2016, 7:15 PM.

Details

Reviewers
kzhuravl
arsenm
Commits
rGf6699f504757: AMDGPU: Use lld as the linker again
rC268648: AMDGPU: Use lld as the linker again
rL268648: AMDGPU: Use lld as the linker again
Summary

Now that LLVM is emitting version 2 of the AMD code object, we can
start using lld again for linking instead of our custom tool.

Diff Detail

Event Timeline

• tstellarAMD updated this revision to Diff 56231.May 4 2016, 7:15 PM
• tstellarAMD retitled this revision from to AMDGPU: Use lld as the linker again.
• tstellarAMD updated this object.
• tstellarAMD added reviewers: kzhuravl, arsenm.
• tstellarAMD added a subscriber: llvm-commits.
• tstellarAMD edited subscribers, added: cfe-commits; removed: llvm-commits.May 4 2016, 7:29 PM
• rafael added a subscriber: • rafael.May 5 2016, 6:16 AM

lgtm

kzhuravl accepted this revision.May 5 2016, 9:25 AM
kzhuravl edited edge metadata.

LGTM

This revision is now accepted and ready to land.May 5 2016, 9:25 AM
Closed by commit rL268648: AMDGPU: Use lld as the linker again (authored by tstellar). · Explain WhyMay 5 2016, 10:09 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
Driver/
2 lines
2 lines
test/
Driver/
2 lines

Diff 56231

lib/Driver/Tools.h

Show First 20 Lines • Show All 236 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", "amdphdrs", 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 694 Lines • Show Last 20 Lines

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,770 Lines • ▼ Show 20 Linesvoid 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;
AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs); AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs);
CmdArgs.push_back("-shared");
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.
wasm::Linker::Linker(const ToolChain &TC) wasm::Linker::Linker(const ToolChain &TC)
: GnuTool("wasm::Linker", "lld", TC) {} : GnuTool("wasm::Linker", "lld", TC) {}
▲ Show 20 Lines • Show All 4,260 Lines • Show Last 20 Lines

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: amdphdrs{{.*}} // AS_LINK: ld.lld{{.*}} "-shared"