[HLSL] Explicitly set the SPIR-V version with spv-target-env #121961
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In DXC, setting the vulkan version automatically sets the target spir-v version to the maximum spir-v version that the vulkan version must support. So for Vulkan 1.2, we set the spir-v version to spirv 1.5 because every implementation of Vulkan 1.2 must support spirv 1.5, but not spir-v 1.6.
llvmbot
added
clang
Member
|
@llvm/pr-subscribers-clang-driver Author: Steven Perron (s-perron) ChangesIn DXC, setting the vulkan version automatically sets the target spir-v Full diff: https://github.com/llvm/llvm-project/pull/121961.diff 3 Files Affected:
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index 36d6c93c43321f..a31fb3fc08a42f 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -1468,9 +1468,14 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) {
// Set specific Vulkan version if applicable.
if (const Arg *A = Args.getLastArg(options::OPT_fspv_target_env_EQ)) {
- const llvm::StringSet<> ValidValues = {"vulkan1.2", "vulkan1.3"};
- if (ValidValues.contains(A->getValue())) {
- T.setOSName(A->getValue());
+ 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 {
Diag(diag::err_drv_invalid_value)
<< A->getAsString(Args) << A->getValue();
diff --git a/clang/test/Driver/dxc_spirv.hlsl b/clang/test/Driver/dxc_spirv.hlsl
index c087ea4b0d709f..e6624e5f1b3f6f 100644
--- a/clang/test/Driver/dxc_spirv.hlsl
+++ b/clang/test/Driver/dxc_spirv.hlsl
@@ -6,8 +6,8 @@
// CHECK: "-triple" "spirv-unknown-vulkan-compute"
// CHECK-SAME: "-x" "hlsl"
-// CHECK-VULKAN12: "-triple" "spirv-unknown-vulkan1.2-compute"
+// CHECK-VULKAN12: "-triple" "spirv1.5-unknown-vulkan1.2-compute"
-// CHECK-VULKAN13: "-triple" "spirv-unknown-vulkan1.3-compute"
+// CHECK-VULKAN13: "-triple" "spirv1.6-unknown-vulkan1.3-compute"
// CHECK-ERROR: error: invalid value 'vulkan1.0' in '-fspv-target-env=vulkan1.0'
diff --git a/llvm/lib/TargetParser/Triple.cpp b/llvm/lib/TargetParser/Triple.cpp
index 7e040688dc1a7b..4c1de09e91f21c 100644
--- a/llvm/lib/TargetParser/Triple.cpp
+++ b/llvm/lib/TargetParser/Triple.cpp
@@ -113,6 +113,26 @@ StringRef Triple::getArchName(ArchType Kind, SubArchType SubArch) {
if (SubArch == AArch64SubArch_arm64e)
return "arm64e";
break;
+ case Triple::spirv:
+ switch (SubArch) {
+ case Triple::SPIRVSubArch_v10:
+ return "spirv1.0";
+ case Triple::SPIRVSubArch_v11:
+ return "spirv1.1";
+ case Triple::SPIRVSubArch_v12:
+ return "spirv1.2";
+ case Triple::SPIRVSubArch_v13:
+ return "spirv1.3";
+ case Triple::SPIRVSubArch_v14:
+ return "spirv1.4";
+ case Triple::SPIRVSubArch_v15:
+ return "spirv1.5";
+ case Triple::SPIRVSubArch_v16:
+ return "spirv1.6";
+ default:
+ break;
+ }
+ break;
case Triple::dxil:
switch (SubArch) {
case Triple::NoSubArch:
|
Member
|
@llvm/pr-subscribers-clang Author: Steven Perron (s-perron) ChangesIn DXC, setting the vulkan version automatically sets the target spir-v Full diff: https://github.com/llvm/llvm-project/pull/121961.diff 3 Files Affected:
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index 36d6c93c43321f..a31fb3fc08a42f 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -1468,9 +1468,14 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) {
// Set specific Vulkan version if applicable.
if (const Arg *A = Args.getLastArg(options::OPT_fspv_target_env_EQ)) {
- const llvm::StringSet<> ValidValues = {"vulkan1.2", "vulkan1.3"};
- if (ValidValues.contains(A->getValue())) {
- T.setOSName(A->getValue());
+ 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 {
Diag(diag::err_drv_invalid_value)
<< A->getAsString(Args) << A->getValue();
diff --git a/clang/test/Driver/dxc_spirv.hlsl b/clang/test/Driver/dxc_spirv.hlsl
index c087ea4b0d709f..e6624e5f1b3f6f 100644
--- a/clang/test/Driver/dxc_spirv.hlsl
+++ b/clang/test/Driver/dxc_spirv.hlsl
@@ -6,8 +6,8 @@
// CHECK: "-triple" "spirv-unknown-vulkan-compute"
// CHECK-SAME: "-x" "hlsl"
-// CHECK-VULKAN12: "-triple" "spirv-unknown-vulkan1.2-compute"
+// CHECK-VULKAN12: "-triple" "spirv1.5-unknown-vulkan1.2-compute"
-// CHECK-VULKAN13: "-triple" "spirv-unknown-vulkan1.3-compute"
+// CHECK-VULKAN13: "-triple" "spirv1.6-unknown-vulkan1.3-compute"
// CHECK-ERROR: error: invalid value 'vulkan1.0' in '-fspv-target-env=vulkan1.0'
diff --git a/llvm/lib/TargetParser/Triple.cpp b/llvm/lib/TargetParser/Triple.cpp
index 7e040688dc1a7b..4c1de09e91f21c 100644
--- a/llvm/lib/TargetParser/Triple.cpp
+++ b/llvm/lib/TargetParser/Triple.cpp
@@ -113,6 +113,26 @@ StringRef Triple::getArchName(ArchType Kind, SubArchType SubArch) {
if (SubArch == AArch64SubArch_arm64e)
return "arm64e";
break;
+ case Triple::spirv:
+ switch (SubArch) {
+ case Triple::SPIRVSubArch_v10:
+ return "spirv1.0";
+ case Triple::SPIRVSubArch_v11:
+ return "spirv1.1";
+ case Triple::SPIRVSubArch_v12:
+ return "spirv1.2";
+ case Triple::SPIRVSubArch_v13:
+ return "spirv1.3";
+ case Triple::SPIRVSubArch_v14:
+ return "spirv1.4";
+ case Triple::SPIRVSubArch_v15:
+ return "spirv1.5";
+ case Triple::SPIRVSubArch_v16:
+ return "spirv1.6";
+ default:
+ break;
+ }
+ break;
case Triple::dxil:
switch (SubArch) {
case Triple::NoSubArch:
|
Keenuts
reviewed
Jan 8, 2025
Contributor
Author
|
Failure is unrelated to my change. |
Keenuts
approved these changes
Jan 8, 2025
Collaborator
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/73/builds/11439 Here is the relevant piece of the build log for the reference |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In DXC, setting the vulkan version automatically sets the target spir-v
version to the maximum spir-v version that the vulkan version must
support. So for Vulkan 1.2, we set the spir-v version to spirv 1.5
because every implementation of Vulkan 1.2 must support spirv 1.5, but
not spir-v 1.6.