Skip to content

[HLSL][Driver] Make vk1.3 the default. #143384

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 3 commits into from
Jun 11, 2025
Merged

[HLSL][Driver] Make vk1.3 the default. #143384

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee4c25c
[HLSL][Driver] Make vk1.3 the default.
s-perron Jun 9, 2025
9f01c2c
Update clang/lib/Driver/Driver.cpp
s-perron Jun 10, 2025
3df5c4d
Merge branch 'main' into vk1.3
s-perron Jun 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
26 changes: 12 additions & 14 deletions clang/lib/Driver/Driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1596,28 +1596,26 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) {
A->claim();

if (Args.hasArg(options::OPT_spirv)) {
const llvm::StringMap<llvm::Triple::SubArchType> ValidTargets = {
{"vulkan1.2", llvm::Triple::SPIRVSubArch_v15},
{"vulkan1.3", llvm::Triple::SPIRVSubArch_v16}};
llvm::Triple T(TargetTriple);
T.setArch(llvm::Triple::spirv);
T.setOS(llvm::Triple::Vulkan);

// Set specific Vulkan version if applicable.
// Set specific Vulkan version. Default to vulkan1.3.
auto TargetInfo = ValidTargets.find("vulkan1.3");
if (const Arg *A = Args.getLastArg(options::OPT_fspv_target_env_EQ)) {
const llvm::StringMap<llvm::Triple::SubArchType> ValidTargets = {
{"vulkan1.2", llvm::Triple::SPIRVSubArch_v15},
{"vulkan1.3", llvm::Triple::SPIRVSubArch_v16}};

auto TargetInfo = ValidTargets.find(A->getValue());
if (TargetInfo != ValidTargets.end()) {
T.setOSName(TargetInfo->getKey());
T.setArch(llvm::Triple::spirv, TargetInfo->getValue());
} else {
TargetInfo = ValidTargets.find(A->getValue());
if (TargetInfo == ValidTargets.end()) {
Diag(diag::err_drv_invalid_value)
<< A->getAsString(Args) << A->getValue();
}
A->claim();
}

TargetTriple = T.str();
if (TargetInfo != ValidTargets.end()) {
T.setOSName(TargetInfo->getKey());
T.setArch(llvm::Triple::spirv, TargetInfo->getValue());
TargetTriple = T.str();
}
}
} else {
Diag(diag::err_drv_dxc_missing_target_profile);
Expand Down
2 changes: 1 addition & 1 deletion clang/test/Driver/dxc_spirv.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// RUN: %clang_dxc -T cs_6_0 -spirv -fspv-target-env=vulkan1.3 -### %s 2>&1 | FileCheck %s --check-prefix=CHECK-VULKAN13
// RUN: not %clang_dxc -T cs_6_0 -spirv -fspv-target-env=vulkan1.0 -### %s 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR

// CHECK: "-triple" "spirv-unknown-vulkan-compute"
// CHECK: "-triple" "spirv1.6-unknown-vulkan1.3-compute"
// CHECK-SAME: "-x" "hlsl"

// CHECK-VULKAN12: "-triple" "spirv1.5-unknown-vulkan1.2-compute"
Expand Down
Loading