Skip to content

[Driver][AMDGPU][HIP][SPIRV] Disable optimizations for AMDGCN SPIR-V #154765

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 11 commits into from
Sep 18, 2025
+22 −2
Merged

[Driver][AMDGPU][HIP][SPIRV] Disable optimizations for AMDGCN SPIR-V #154765

Show file tree
Hide file tree
Changes from 9 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
cb678c7
Retain unmodified CodeGen output for AMDGCN SPIRV.
AlexVlx Aug 21, 2025
d534a9b
Merge branch 'main' into amdgcnspirv_does_not_need_passes
AlexVlx Aug 21, 2025
86da5cd
Merge branch 'main' into amdgcnspirv_does_not_need_passes
AlexVlx Aug 26, 2025
4f39e80
Merge branch 'main' of https://github.com/llvm/llvm-project into amdg…
AlexVlx Sep 9, 2025
43e4753
Switch to using `-disable-llvm-optzns`. Clarify the temporary nature.
AlexVlx Sep 9, 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
7 changes: 7 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 @@ -858,6 +858,13 @@ void AMDGPUToolChain::addClangTargetOptions(
CC1Args.push_back("-fapply-global-visibility-to-externs");
}

// For SPIR-V we want to retain the pristine output of Clang CodeGen, since
// optimizations might lose structure / information that is necessary for
// generating optimal concrete AMDGPU code.
if (getTriple().isSPIRV() &&
!DriverArgs.hasArg(options::OPT_disable_llvm_passes))
CC1Args.push_back("-disable-llvm-passes");

if (DeviceOffloadingKind == Action::OFK_None)
addOpenCLBuiltinsLib(getDriver(), DriverArgs, CC1Args);
}
Expand Down
6 changes: 6 additions & 0 deletions clang/lib/Driver/ToolChains/HIPAMD.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,12 @@ void HIPAMDToolChain::addClangTargetOptions(
// with options that match the user-supplied ones.
if (!DriverArgs.hasArg(options::OPT_fembed_bitcode_marker))
CC1Args.push_back("-fembed-bitcode=marker");
// For SPIR-V we want to retain the pristine output of Clang CodeGen, since
// optimizations might lose structure / information that is necessary for
// generating optimal concrete AMDGPU code. We duplicate this because the
// HIP TC doesn't invoke the base AMDGPU TC addClangTargetOptions.
if (!DriverArgs.hasArg(options::OPT_disable_llvm_passes))
CC1Args.push_back("-disable-llvm-passes");
return; // No DeviceLibs for SPIR-V.
}

Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -206,7 +206,7 @@
// Check mixed AMDGCNSPIRV and concrete GPU arch.
//

// AMDGCNSPIRV: "-cc1" "-triple" "spirv64-amd-amdhsa" {{.*}}"-emit-llvm-bc" {{.*}} "-o" "[[AMDGCNSPV_BC:.*bc]]"
// 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: "-cc1" "-triple" "amdgcn-amd-amdhsa" {{.*}}"-emit-obj" {{.*}}"-target-cpu" "gfx900"{{.*}} "-o" "[[GFX900_OBJ:.*o]]"
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 @@ -14,6 +14,6 @@

// RUN: %clang -### --target=spirv64-amd-amdhsa %s -nogpulib -nogpuinc 2>&1 \
// RUN: | FileCheck %s --check-prefix=INVOCATION
// INVOCATION: "-cc1" "-triple" "spirv64-amd-amdhsa" {{.*}} "-o" "[[OUTPUT:.+]]" "-x" "c"
// INVOCATION: "-cc1" "-triple" "spirv64-amd-amdhsa" {{.*}}"-disable-llvm-passes" {{.*}} "-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"
Loading