Skip to content

Commit 41241d7

Browse files
author
Greg Roth
authored
[lit][SPIRV] convert runFileTest shaders to lit FileCheck test (microsoft#6069)
Convert the moved shaders to lit FileCheck test. 5 shaders not used by runFileTest are also converted and left in CodeGenSPIRV with CodeGenSPIRV folder enabled for lit. Now all shaders are converted to lit. Will move all files back to CodeGenSPIRV and delete CodeGenSPIRV_Lit next.
2 parents bc56be9 + 9f2a358 commit 41241d7

File tree

54 files changed

+579
-623
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+579
-623
lines changed
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
// RUN: %dxc -T ps_6_0 -E main -HV 2021
1+
// RUN: %dxc -T ps_6_0 -E main -HV 2021 -fcgl %s -spirv | FileCheck %s
22

33
template <bool B1>
44
bool fnTemplate(bool B2) {
55
return !B1 && B2;
66
}
77

8-
// CHECK: %10 = OpConstantComposite %v4float %float_1 %float_1 %float_1 %float_1
9-
// CHECK: %12 = OpConstantComposite %v4float %float_0 %float_0 %float_0 %float_0
10-
// CHECK: %main = OpFunction %void None %17
8+
// CHECK: {{%[0-9]+}} = OpConstantComposite %v4float %float_1 %float_1 %float_1 %float_1
9+
// CHECK: {{%[0-9]+}} = OpConstantComposite %v4float %float_0 %float_0 %float_0 %float_0
10+
// CHECK: %main = OpFunction %void None {{%[0-9]+}}
1111
float4 main(int val : A) : SV_Target {
1212
return fnTemplate<false>(val != 0) ? (float4)1 : (float4)0;
1313
}

tools/clang/test/CodeGenSPIRV/lit.local.cfg

Lines changed: 0 additions & 2 deletions
This file was deleted.

tools/clang/test/CodeGenSPIRV/meshshading.ext.ps.hlsl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
// RUN: %dxc -T ps_6_1 -E main
1+
// RUN: %dxc -T ps_6_1 -E main -fcgl %s -spirv | FileCheck %s
22

33
// CHECK: OpCapability MultiView
44
// CHECK: OpExtension "SPV_KHR_multiview"
55

66
// CHECK: OpEntryPoint Fragment
7-
// CHECK-SAME: [[viewindex:%\d+]]
7+
// CHECK-SAME: [[viewindex:%[0-9]+]]
88

99
// CHECK: OpDecorate [[viewindex]] BuiltIn ViewIndex
1010

tools/clang/test/CodeGenSPIRV/oo.inheritance.call.base.method.hlsl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %dxc -T vs_5_0 -E main -fspv-target-env=vulkan1.1
1+
// RUN: %dxc -T vs_5_0 -E main -fspv-target-env=vulkan1.1 -fcgl %s -spirv | FileCheck %s
22

33
// CHECK: %bar = OpTypeStruct %empty %mat4v4float
44
// CHECK: %foo = OpTypeStruct %bar
@@ -23,7 +23,7 @@ struct foo : bar {
2323

2424
// CHECK: %foo_get = OpFunction
2525
// CHECK: %param_this = OpFunctionParameter %_ptr_Function_foo
26-
// CHECK: [[bar:%\w+]] = OpAccessChain %_ptr_Function_bar %param_this %uint_0
26+
// CHECK: [[bar:%[a-zA-Z0-9_]+]] = OpAccessChain %_ptr_Function_bar %param_this %uint_0
2727
// CHECK: OpFunctionCall %v4float %bar_value [[bar]]
2828

2929
float4 get() {

tools/clang/test/CodeGenSPIRV/sm6.quad-read-across-x.vulkan1.2.hlsl

Lines changed: 0 additions & 32 deletions
This file was deleted.

tools/clang/test/CodeGenSPIRV/sm6.quad-read-across-y.vulkan1.2.hlsl

Lines changed: 0 additions & 32 deletions
This file was deleted.

tools/clang/test/CodeGenSPIRV/sm6.quad-read-lane-at.vulkan1.2.hlsl

Lines changed: 0 additions & 33 deletions
This file was deleted.

tools/clang/test/CodeGenSPIRV/sm6.wave-active-all-equal.vulkan1.2.hlsl

Lines changed: 0 additions & 34 deletions
This file was deleted.

tools/clang/test/CodeGenSPIRV/sm6.wave-active-bit-and.vulkan1.2.hlsl

Lines changed: 0 additions & 38 deletions
This file was deleted.

tools/clang/test/CodeGenSPIRV/sm6.wave-active-bit-or.vulkan1.2.hlsl

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)