Skip to content

[clang][Driver] SPIRVAMDToolChain must not require device libs. #171815

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
mgcarrasco merged 4 commits into from
Dec 11, 2025
Merged

[clang][Driver] SPIRVAMDToolChain must not require device libs. #171815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e84eb0
[clang][Driver] SPIRVAMDToolChain must not require device libs.
mgcarrasco Dec 11, 2025
5c7ecdb
[Review] Revert last changes except its test case.
mgcarrasco Dec 11, 2025
911051b
[Review] Skip device lib linking in ROCMToolChain for SPIR-V.
mgcarrasco Dec 11, 2025
4ff79bf
[Review] Early return instead.
mgcarrasco Dec 11, 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
4 changes: 4 additions & 0 deletions clang/lib/Driver/ToolChains/AMDGPU.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -967,6 +967,10 @@ void ROCMToolChain::addClangTargetOptions(
true))
return;

// For SPIR-V (SPIRVAMDToolChain) we must not link any device libraries so we
// skip it.
if (this->getEffectiveTriple().isSPIRV())
return;
// Get the device name and canonicalize it
const StringRef GpuArch = getGPUArch(DriverArgs);
auto Kind = llvm::AMDGPU::parseArchAMDGCN(GpuArch);
Expand Down
2 changes: 1 addition & 1 deletion clang/test/Driver/spirv-amd-toolchain.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// BINDINGS: # "spirv64-amd-amdhsa" - "clang", inputs: ["[[INPUT:.+]]"], output: "[[OUTPUT:.+]]"
// BINDINGS: # "spirv64-amd-amdhsa" - "AMDGCN::Linker", inputs: ["[[OUTPUT]]"], output: "a.out"

// RUN: %clang -### --target=spirv64-amd-amdhsa %s -nogpulib -nogpuinc 2>&1 \
// RUN: %clang -### --target=spirv64-amd-amdhsa %s 2>&1 \
// RUN: | FileCheck %s --check-prefix=INVOCATION
// INVOCATION: "-cc1" "-triple" "spirv64-amd-amdhsa" {{.*}}"-disable-llvm-optzns" {{.*}} "-o" "[[OUTPUT:.+]]" "-x" "c"
// INVOCATION: "{{.*}}llvm-link" "-o" "[[LINKED_OUTPUT:.+]]" "[[OUTPUT]]"
Expand Down