This is an archive of the discontinued LLVM Phabricator instance.

Differential D126704

[HIP] Pass -Xoffload-linker option to device linker
ClosedPublic

Authored by yaxunl on May 31 2022, 8:21 AM.

Details

Reviewers
tra
Commits
rG92a606f6de77: [HIP] Pass -Xoffload-linker option to device linker
Summary

Reuse -Xoffload-linker option for HIP toolchain.

Diff Detail

Event Timeline

yaxunl created this revision.May 31 2022, 8:21 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 31 2022, 8:21 AM
yaxunl requested review of this revision.May 31 2022, 8:21 AM
Herald added a subscriber: MaskRay. · View Herald TranscriptMay 31 2022, 8:21 AM
Harbormaster completed remote builds in B167047: Diff 433091.May 31 2022, 8:58 AM
tra accepted this revision.May 31 2022, 10:07 AM
This revision is now accepted and ready to land.May 31 2022, 10:07 AM
Closed by commit rG92a606f6de77: [HIP] Pass -Xoffload-linker option to device linker (authored by yaxunl). · Explain WhyMay 31 2022, 7:38 PM
This revision was automatically updated to reflect the committed changes.
yaxunl added a commit: rG92a606f6de77: [HIP] Pass -Xoffload-linker option to device linker.
Herald added a project: Restricted Project. · View Herald TranscriptMay 31 2022, 7:38 PM

Revision Contents

PathSize
clang/
lib/
Driver/
ToolChains/
3 lines
test/
Driver/
10 lines

Diff 433274

clang/lib/Driver/ToolChains/HIPAMD.cpp

Show First 20 Lines • Show All 141 Lines • ▼ Show 20 Lines LldArgs.push_back(
Args.MakeArgString(Twine("-plugin-opt=") + A->getValue(0))); Args.MakeArgString(Twine("-plugin-opt=") + A->getValue(0)));
} }
if (C.getDriver().isSaveTempsEnabled()) if (C.getDriver().isSaveTempsEnabled())
LldArgs.push_back("-save-temps"); LldArgs.push_back("-save-temps");
addLinkerCompressDebugSectionsOption(TC, Args, LldArgs); addLinkerCompressDebugSectionsOption(TC, Args, LldArgs);
for (auto *Arg : Args.filtered(options::OPT_Xoffload_linker))
LldArgs.push_back(Arg->getValue(1));
LldArgs.append({"-o", Output.getFilename()}); LldArgs.append({"-o", Output.getFilename()});
for (auto Input : Inputs) for (auto Input : Inputs)
LldArgs.push_back(Input.getFilename()); LldArgs.push_back(Input.getFilename());
// Look for archive of bundled bitcode in arguments, and add temporary files // Look for archive of bundled bitcode in arguments, and add temporary files
// for the extracted archive of bitcode to inputs. // for the extracted archive of bitcode to inputs.
auto TargetID = Args.getLastArgValue(options::OPT_mcpu_EQ); auto TargetID = Args.getLastArgValue(options::OPT_mcpu_EQ);
AddStaticDeviceLibsLinking(C, *this, JA, Inputs, Args, LldArgs, "amdgcn", AddStaticDeviceLibsLinking(C, *this, JA, Inputs, Args, LldArgs, "amdgcn",
▲ Show 20 Lines • Show All 256 Lines • Show Last 20 Lines

clang/test/Driver/hip-options.hip

Show First 20 Lines • Show All 100 Lines • ▼ Show 20 Lines
// RUN: --offload-arch=gfx906 -fopenmp %s 2>&1 | FileCheck -check-prefix=OMP %s // RUN: --offload-arch=gfx906 -fopenmp %s 2>&1 | FileCheck -check-prefix=OMP %s
// OMP-NOT: "-cc1"{{.*}} "-triple" "amdgcn-amd-amdhsa" {{.*}} "-fopenmp" // OMP-NOT: "-cc1"{{.*}} "-triple" "amdgcn-amd-amdhsa" {{.*}} "-fopenmp"
// OMP: "-cc1"{{.*}} "-triple" "x86_64-unknown-linux-gnu" {{.*}} "-fopenmp" // OMP: "-cc1"{{.*}} "-triple" "x86_64-unknown-linux-gnu" {{.*}} "-fopenmp"
// RUN: not %clang --target=x86_64-unknown-linux-gnu -nogpuinc -nogpulib \ // RUN: not %clang --target=x86_64-unknown-linux-gnu -nogpuinc -nogpulib \
// RUN: --offload-arch=gfx906 -fopenmp -fopenmp-targets=amdgcn %s 2>&1 \ // RUN: --offload-arch=gfx906 -fopenmp -fopenmp-targets=amdgcn %s 2>&1 \
// RUN: | FileCheck -check-prefix=OMPTGT %s // RUN: | FileCheck -check-prefix=OMPTGT %s
// OMPTGT: unsupported option '-fopenmp-targets=' for language mode 'HIP' // OMPTGT: unsupported option '-fopenmp-targets=' for language mode 'HIP'
// Check -Xoffload-linker option is passed to lld.
// RUN: %clang -### --target=x86_64-unknown-linux-gnu -nogpuinc -nogpulib \
// RUN: --cuda-gpu-arch=gfx906 -fgpu-rdc -Xoffload-linker --build-id=md5 %s 2>&1 \
// RUN: | FileCheck -check-prefix=OFL-LINK %s
// RUN: %clang -### --target=x86_64-unknown-linux-gnu -nogpuinc -nogpulib \
// RUN: --cuda-gpu-arch=gfx906 -Xoffload-linker --build-id=md5 %s 2>&1 \
// RUN: | FileCheck -check-prefix=OFL-LINK %s
// OFL-LINK: lld{{.*}}"--build-id=md5"