Skip to content

HIPSPV: Unbundle SDL #136412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jul 28, 2025
Merged

HIPSPV: Unbundle SDL #136412

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fe6a426
HIPSPV: Unbundle SDL
pvelesko Apr 19, 2025
116d689
Update clang/lib/Driver/ToolChains/HIPSPV.cpp
pvelesko Jun 17, 2025
9e4e9f3
Address PR comments: Fix HIPSPV SDL linking
pvelesko Jun 17, 2025
fe9bf36
address PR comments
pvelesko Jun 19, 2025
67fcf1c
Merge branch 'main' into hipspv-sdl-unbundle
pvelesko Jun 19, 2025
18e96ff
Merge branch 'main' into hipspv-sdl-unbundle
pvelesko Jul 2, 2025
578b97b
fmt
pvelesko Jul 7, 2025
13ce82c
Merge branch 'main' into hipspv-sdl-unbundle
pvelesko Jul 23, 2025
85cfeae
Merge branch 'main' into hipspv-sdl-unbundle
pvelesko Jul 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions clang/lib/Driver/ToolChains/HIPSPV.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,16 @@ void HIPSPV::Linker::constructLinkAndEmitSpirvCommand(

// Link LLVM bitcode.
ArgStringList LinkArgs{};

for (auto Input : Inputs)
LinkArgs.push_back(Input.getFilename());

// 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
tools::AddStaticDeviceLibsLinking(C, *this, JA, Inputs, Args, LinkArgs, Arch,
Target, /*IsBitCodeSDL=*/true);
LinkArgs.append({"-o", TempFile});
const char *LlvmLink =
Args.MakeArgString(getToolChain().GetProgramPath("llvm-link"));
Expand Down
28 changes: 28 additions & 0 deletions clang/test/Driver/hipspv-link-static-library.hip
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// Test HIPSPV static device library linking
// REQUIRES: system-linux
// UNSUPPORTED: system-windows

// Create a dummy archive to test SDL linking
// RUN: rm -rf %t && mkdir %t
// RUN: touch %t/dummy.bc
// RUN: llvm-ar cr %t/libSDL.a %t/dummy.bc

// Test that -l options are passed to llvm-link for --offload=spirv64
// RUN: %clang -### --target=x86_64-linux-gnu --offload=spirv64 \
// RUN: --hip-path=%S/Inputs/hipspv -nohipwrapperinc %s \
// RUN: -L%t -lSDL \
// RUN: 2>&1 | FileCheck -check-prefix=SDL-LINK %s

// Test that .a files are properly unbundled and passed to llvm-link
// RUN: %clang -### --target=x86_64-linux-gnu --offload=spirv64 \
// RUN: --hip-path=%S/Inputs/hipspv -nohipwrapperinc %s \
// RUN: %t/libSDL.a \
// RUN: 2>&1 | FileCheck -check-prefix=SDL-ARCHIVE %s

// Verify that the input files are added before the SDL files in llvm-link command
// This tests the ordering fix to match HIPAMD behavior
// SDL-LINK: "{{.*}}clang-offload-bundler" "-unbundle" "-type=a" "-input={{.*}}libSDL.a" "-targets=hip-spirv64-unknown-unknown-unknown-generic" "-output=[[SDL_A:.*\.a]]" "-allow-missing-bundles"
// SDL-LINK: "{{.*}}llvm-link" "{{.*}}.bc" "[[SDL_A]]" "-o"

// SDL-ARCHIVE: "{{.*}}clang-offload-bundler" "-unbundle" "-type=a" "-input={{.*}}libSDL.a" "-targets=hip-spirv64-unknown-unknown-unknown-generic" "-output=[[SDL_A:.*\.a]]" "-allow-missing-bundles"
// SDL-ARCHIVE: "{{.*}}llvm-link" "{{.*}}.bc" "[[SDL_A]]" "-o"
Loading