HIPSPV: Unbundle SDL #136412
HIPSPV: Unbundle SDL #136412
Conversation
|
Thank you for submitting a Pull Request (PR) to the LLVM Project! This PR will be automatically labeled and the relevant teams will be notified. If you wish to, you can add reviewers by using the "Reviewers" section on this page. If this is not working for you, it is probably because you do not have write permissions for the repository. In which case you can instead tag reviewers by name in a comment by using If you have received no comments on your PR for a week, you can request a review by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate is once a week. Please remember that you are asking for valuable time from other developers. If you have further questions, they may be answered by the LLVM GitHub User Guide. You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums. |
|
@llvm/pr-subscribers-clang-driver @llvm/pr-subscribers-clang Author: Paulius Velesko (pvelesko) ChangesThis fixes the issue of rdc linking static libraries with device code Full diff: https://github.com/llvm/llvm-project/pull/136412.diff 1 Files Affected:
diff --git a/clang/lib/Driver/ToolChains/HIPSPV.cpp b/clang/lib/Driver/ToolChains/HIPSPV.cpp
index bbde5c047c3f9..9d227ca6fa1c8 100644
--- a/clang/lib/Driver/ToolChains/HIPSPV.cpp
+++ b/clang/lib/Driver/ToolChains/HIPSPV.cpp
@@ -70,6 +70,16 @@ void HIPSPV::Linker::constructLinkAndEmitSpirvCommand(
// Link LLVM bitcode.
ArgStringList LinkArgs{};
+
+ // Add static device libraries using the common helper function.
+ // This handles unbundling archives (.a) containing bitcode bundles.
+ const HIPSPVToolChain &TC = static_cast<const HIPSPVToolChain &>(getToolChain());
+ StringRef Arch = TC.getTriple().getArchName();
+ StringRef Target = "generic"; // SPIR-V is generic, no specific target ID like -mcpu
+ tools::AddStaticDeviceLibsLinking(C, *this, JA, Inputs, Args, LinkArgs, Arch,
+ Target, /*IsBitCodeSDL=*/true,
+ /*PostClangLink=*/false);
+
for (auto Input : Inputs)
LinkArgs.push_back(Input.getFilename());
LinkArgs.append({"-o", TempFile});
|
This fixes the issue of rdc linking static libraries with device code
4a569a2 to
fe6a426
Compare
|
ping |
1 similar comment
|
ping |
Co-authored-by: Henry Linjamäki <[email protected]>
* Also ordering and add --no-offloadlib support
* Remove --no-gpuoffload options and tests
f5220c5 to
fe9bf36
Compare
|
ping |
|
@svenvh saw you merged other SPIR-V/HIP related PRs |
You can test this locally with the following command:git-clang-format --diff HEAD~1 HEAD --extensions cpp -- clang/lib/Driver/ToolChains/HIPSPV.cppView the diff from clang-format here.diff --git a/clang/lib/Driver/ToolChains/HIPSPV.cpp b/clang/lib/Driver/ToolChains/HIPSPV.cpp
index 0f6a9c1aa..39f5e51ba 100644
--- a/clang/lib/Driver/ToolChains/HIPSPV.cpp
+++ b/clang/lib/Driver/ToolChains/HIPSPV.cpp
@@ -76,9 +76,10 @@ void HIPSPV::Linker::constructLinkAndEmitSpirvCommand(
// Add static device libraries using the common helper function.
// This handles unbundling archives (.a) containing bitcode bundles.
StringRef Arch = getToolChain().getTriple().getArchName();
- StringRef Target = "generic"; // SPIR-V is generic, no specific target ID like -mcpu
+ StringRef Target =
+ "generic"; // SPIR-V is generic, no specific target ID like -mcpu
tools::AddStaticDeviceLibsLinking(C, *this, JA, Inputs, Args, LinkArgs, Arch,
- Target, /*IsBitCodeSDL=*/true);
+ Target, /*IsBitCodeSDL=*/true);
LinkArgs.append({"-o", TempFile});
const char *LlvmLink =
Args.MakeArgString(getToolChain().GetProgramPath("llvm-link"));
|
This fixes the issue of rdc linking static libraries with device code
CHIP-SPV/chipStar#984