Skip to content

Commit d6b78b7

Browse files
authored
Update test requirements to handle the SM decrement to released version (#8069)
This change updates tests so they don't fail on release branch when DXIL version is constrained to 1.9. Also, disable tests for running against downlevel DXIL validator which don't make sense for that testing mode.
1 parent 26bbce3 commit d6b78b7

8 files changed

Lines changed: 13 additions & 3 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
config.unsupported = 'dxil-1-9' not in config.available_features
1+
config.unsupported = 'dxil-1-10' not in config.available_features
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
config.unsupported = not config.spirv
2-
config.suffixes = ['.hlsl', '.hlsl2spv']
1+
config.suffixes = ['.hlsl', '.hlsl2spv']
2+
# Skip when SPIR-V disabled or during down-level DXIL testing
3+
if not config.spirv or "dxc_dxil_dll_path" in config.available_features:
4+
config.unsupported = True

tools/clang/test/CodeGenSPIRV/sm6_10.group-wave-count.hlsl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// REQUIRES: dxil-1-10
12
// RUN: %dxc -T cs_6_10 -E main -fspv-target-env=vulkan1.1 -fcgl %s -spirv | FileCheck %s
23

34
// CHECK: ; Version: 1.3

tools/clang/test/CodeGenSPIRV/sm6_10.group-wave-index.hlsl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// REQUIRES: dxil-1-10
12
// RUN: %dxc -T cs_6_10 -E main -fspv-target-env=vulkan1.1 -fcgl %s -spirv | FileCheck %s
23

34
// CHECK: ; Version: 1.3

tools/clang/test/DXC/Passes/DxilGen/group-wave-index.ll

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
; REQUIRES: dxil-1-10
12
; RUN: %dxopt %s -hlsl-passes-resume -dxilgen -S | FileCheck %s
23

34
; CHECK: call i32 @dx.op.getGroupWaveIndex(i32 -2147483647)
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Skip during down-level DXIL testing
2+
config.unsupported = "dxc_dxil_dll_path" in config.available_features
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
config.unsupported = "dxil-1-10" not in config.available_features
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Skip during down-level DXIL testing
2+
config.unsupported = "dxc_dxil_dll_path" in config.available_features

0 commit comments

Comments
 (0)