Skip to content

[NFC][HIP][SPIRV] Fix linking / translation step on Windows #162175

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

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

[NFC][HIP][SPIRV] Fix linking / translation step on Windows #162175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3e0abe1
Add pass which forwards unimplemented math builtins / libcalls to the…
AlexVlx May 15, 2025
6ac96c6
Merge branch 'main' of https://github.com/llvm/llvm-project
AlexVlx May 16, 2025
92749f7
Merge branch 'main' of https://github.com/llvm/llvm-project
AlexVlx Jun 11, 2025
2d9a794
Merge branch 'main' of https://github.com/llvm/llvm-project
AlexVlx Jul 15, 2025
0e331b5
Merge branch 'main' of https://github.com/llvm/llvm-project
AlexVlx Aug 18, 2025
f97d25d
Merge branch 'main' of https://github.com/llvm/llvm-project
AlexVlx Aug 20, 2025
2d43a92
Merge branch 'main' of https://github.com/llvm/llvm-project
AlexVlx Sep 23, 2025
1ead36f
Merge branch 'main' of https://github.com/llvm/llvm-project
AlexVlx Oct 3, 2025
f74c828
Merge branch 'main' of https://github.com/llvm/llvm-project
AlexVlx Oct 5, 2025
83dbc0d
Merge branch 'main' of https://github.com/llvm/llvm-project
AlexVlx Oct 6, 2025
ad259dc
Re-using output as the bitcode linking target does not work on Window…
AlexVlx Oct 6, 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
13 changes: 9 additions & 4 deletions clang/lib/Driver/ToolChains/HIPAMD.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,14 @@ void AMDGCN::Linker::constructLinkAndEmitSpirvCommand(
const InputInfo &Output, const llvm::opt::ArgList &Args) const {
assert(!Inputs.empty() && "Must have at least one input.");

constructLlvmLinkCommand(C, JA, Inputs, Output, Args);

// Linked BC is now in Output
InputInfo LinkedBC = Inputs.front();
if (Inputs.size() > 1) {
std::string TempPath = C.getDriver().GetTemporaryPath("pre-spirv-translate",
"bc");
LinkedBC = InputInfo(&JA, C.getArgs().MakeArgString(TempPath),
Output.getBaseInput());
constructLlvmLinkCommand(C, JA, Inputs, LinkedBC, Args);
}

// Emit SPIR-V binary.
llvm::opt::ArgStringList TrArgs{
Expand All @@ -180,7 +185,7 @@ void AMDGCN::Linker::constructLinkAndEmitSpirvCommand(
"--spirv-lower-const-expr",
"--spirv-preserve-auxdata",
"--spirv-debug-info-version=nonsemantic-shader-200"};
SPIRV::constructTranslateCommand(C, *this, JA, Output, Output, TrArgs);
SPIRV::constructTranslateCommand(C, *this, JA, Output, LinkedBC, TrArgs);
}

// For amdgcn the inputs of the linker job are device bitcode and output is
Expand Down
3 changes: 1 addition & 2 deletions clang/test/Driver/hip-toolchain-no-rdc.hip
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,7 @@
//

// AMDGCNSPIRV: "-cc1" "-triple" "spirv64-amd-amdhsa" {{.*}}"-emit-llvm-bc" {{.*}}"-fembed-bitcode=marker" "-disable-llvm-passes" {{.*}} "-o" "[[AMDGCNSPV_BC:.*bc]]"
// AMDGCNSPIRV: {{".*llvm-link.*"}} "-o" "[[AMDGCNSPV_TMP:.*out]]" "[[AMDGCNSPV_BC]]"
// AMDGCNSPIRV: {{".*llvm-spirv.*"}} "--spirv-max-version=1.6" "--spirv-ext=+all" {{.*}} "[[AMDGCNSPV_TMP]]" {{.*}}"-o" "[[AMDGCNSPV_CO:.*out]]"
// AMDGCNSPIRV: {{".*llvm-spirv.*"}} "--spirv-max-version=1.6" "--spirv-ext=+all" {{.*}} "[[AMDGCNSPV_BC]]" {{.*}}"-o" "[[AMDGCNSPV_CO:.*out]]"
// AMDGCNSPIRV: "-cc1" "-triple" "amdgcn-amd-amdhsa" {{.*}}"-emit-obj" {{.*}}"-target-cpu" "gfx900"{{.*}} "-o" "[[GFX900_OBJ:.*o]]"
// AMDGCNSPIRV: {{".*lld.*"}} {{.*}}"-plugin-opt=mcpu=gfx900" {{.*}} "-o" "[[GFX900_CO:.*out]]" {{.*}}"[[GFX900_OBJ]]"
// AMDGCNSPIRV: {{".*clang-offload-bundler.*"}} "-type=o"
Expand Down
3 changes: 1 addition & 2 deletions clang/test/Driver/spirv-amd-toolchain.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@
// RUN: %clang -### --target=spirv64-amd-amdhsa %s -nogpulib -nogpuinc 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" "a.out" "[[OUTPUT]]"
// INVOCATION: "{{.*}}llvm-spirv" "--spirv-max-version=1.6" "--spirv-ext=+all" "--spirv-allow-unknown-intrinsics" "--spirv-lower-const-expr" "--spirv-preserve-auxdata" "--spirv-debug-info-version=nonsemantic-shader-200" "a.out" "-o" "a.out"
// INVOCATION: "{{.*}}llvm-spirv" "--spirv-max-version=1.6" "--spirv-ext=+all" "--spirv-allow-unknown-intrinsics" "--spirv-lower-const-expr" "--spirv-preserve-auxdata" "--spirv-debug-info-version=nonsemantic-shader-200" "[[OUTPUT]]" "-o" "a.out"
Loading