Skip to content

Commit 9f2a358

Browse files
python3kgaepython3kgae
committed
[lit][SPIRV] convert shaders to lit FileCheck test
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. Will move all files back to CodeGenSPIRV and delete CodeGenSPIRV_Lit next.
1 parent 59249a1 commit 9f2a358

36 files changed

+167
-169
lines changed

‎tools/clang/test/CodeGenSPIRV/fn.template.arg.substitute.hlsl

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/spirv.opt.gis.hlsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %dxc -T ps_6_0 -E main -spirv -Gis
1+
// RUN: not %dxc -T ps_6_0 -E main -spirv -Gis %s 2>&1 | FileCheck %s
22

33
void main() {}
44

‎tools/clang/test/CodeGenSPIRV/type.template.function.empty-struct-argument.hlsl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
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
struct A {};
44

@@ -9,7 +9,7 @@ struct B {
99
};
1010

1111
float4 main() : SV_Target {
12-
// CHECK: %12 = OpConstantComposite %v4float %float_1 %float_2 %float_3 %float_4
12+
// CHECK: {{%[0-9]+}} = OpCompositeConstruct %v4float %float_1 %float_2 %float_3 %float_4
1313
B<float4> b = { float4(1, 2, 3, 4) };
1414
return b.m0;
1515
}

‎tools/clang/test/CodeGenSPIRV_Lit/sm6.quad-read-across-diagonal.vulkan1.2.hlsl

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

33
// CHECK: ; Version: 1.5
44

@@ -20,13 +20,13 @@ void main(uint3 id: SV_DispatchThreadID) {
2020
uint3 val2 = values[x].val2;
2121
float val3 = values[x].val3;
2222

23-
// CHECK: [[val1:%\d+]] = OpLoad %v4int %val1
24-
// CHECK-NEXT: {{%\d+}} = OpGroupNonUniformQuadSwap %v4int %uint_3 [[val1]] %uint_2
23+
// CHECK: [[val1:%[0-9]+]] = OpLoad %v4int %val1
24+
// CHECK-NEXT: {{%[0-9]+}} = OpGroupNonUniformQuadSwap %v4int %uint_3 [[val1]] %uint_2
2525
values[x].val1 = QuadReadAcrossDiagonal(val1);
26-
// CHECK: [[val2:%\d+]] = OpLoad %v3uint %val2
27-
// CHECK-NEXT: {{%\d+}} = OpGroupNonUniformQuadSwap %v3uint %uint_3 [[val2]] %uint_2
26+
// CHECK: [[val2:%[0-9]+]] = OpLoad %v3uint %val2
27+
// CHECK-NEXT: {{%[0-9]+}} = OpGroupNonUniformQuadSwap %v3uint %uint_3 [[val2]] %uint_2
2828
values[x].val2 = QuadReadAcrossDiagonal(val2);
29-
// CHECK: [[val3:%\d+]] = OpLoad %float %val3
30-
// CHECK-NEXT: {{%\d+}} = OpGroupNonUniformQuadSwap %float %uint_3 [[val3]] %uint_2
29+
// CHECK: [[val3:%[0-9]+]] = OpLoad %float %val3
30+
// CHECK-NEXT: {{%[0-9]+}} = OpGroupNonUniformQuadSwap %float %uint_3 [[val3]] %uint_2
3131
values[x].val3 = QuadReadAcrossDiagonal(val3);
3232
}

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

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

33
// CHECK: ; Version: 1.5
44

@@ -20,13 +20,13 @@ void main(uint3 id: SV_DispatchThreadID) {
2020
uint3 val2 = values[x].val2;
2121
float val3 = values[x].val3;
2222

23-
// CHECK: [[val1:%\d+]] = OpLoad %v4int %val1
24-
// CHECK-NEXT: {{%\d+}} = OpGroupNonUniformQuadSwap %v4int %uint_3 [[val1]] %uint_0
23+
// CHECK: [[val1:%[0-9]+]] = OpLoad %v4int %val1
24+
// CHECK-NEXT: {{%[0-9]+}} = OpGroupNonUniformQuadSwap %v4int %uint_3 [[val1]] %uint_0
2525
values[x].val1 = QuadReadAcrossX(val1);
26-
// CHECK: [[val2:%\d+]] = OpLoad %v3uint %val2
27-
// CHECK-NEXT: {{%\d+}} = OpGroupNonUniformQuadSwap %v3uint %uint_3 [[val2]] %uint_0
26+
// CHECK: [[val2:%[0-9]+]] = OpLoad %v3uint %val2
27+
// CHECK-NEXT: {{%[0-9]+}} = OpGroupNonUniformQuadSwap %v3uint %uint_3 [[val2]] %uint_0
2828
values[x].val2 = QuadReadAcrossX(val2);
29-
// CHECK: [[val3:%\d+]] = OpLoad %float %val3
30-
// CHECK-NEXT: {{%\d+}} = OpGroupNonUniformQuadSwap %float %uint_3 [[val3]] %uint_0
29+
// CHECK: [[val3:%[0-9]+]] = OpLoad %float %val3
30+
// CHECK-NEXT: {{%[0-9]+}} = OpGroupNonUniformQuadSwap %float %uint_3 [[val3]] %uint_0
3131
values[x].val3 = QuadReadAcrossX(val3);
3232
}

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

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

33
// CHECK: ; Version: 1.5
44

@@ -20,13 +20,13 @@ void main(uint3 id: SV_DispatchThreadID) {
2020
uint3 val2 = values[x].val2;
2121
float val3 = values[x].val3;
2222

23-
// CHECK: [[val1:%\d+]] = OpLoad %v4int %val1
24-
// CHECK-NEXT: {{%\d+}} = OpGroupNonUniformQuadSwap %v4int %uint_3 [[val1]] %uint_1
23+
// CHECK: [[val1:%[0-9]+]] = OpLoad %v4int %val1
24+
// CHECK-NEXT: {{%[0-9]+}} = OpGroupNonUniformQuadSwap %v4int %uint_3 [[val1]] %uint_1
2525
values[x].val1 = QuadReadAcrossY(val1);
26-
// CHECK: [[val2:%\d+]] = OpLoad %v3uint %val2
27-
// CHECK-NEXT: {{%\d+}} = OpGroupNonUniformQuadSwap %v3uint %uint_3 [[val2]] %uint_1
26+
// CHECK: [[val2:%[0-9]+]] = OpLoad %v3uint %val2
27+
// CHECK-NEXT: {{%[0-9]+}} = OpGroupNonUniformQuadSwap %v3uint %uint_3 [[val2]] %uint_1
2828
values[x].val2 = QuadReadAcrossY(val2);
29-
// CHECK: [[val3:%\d+]] = OpLoad %float %val3
30-
// CHECK-NEXT: {{%\d+}} = OpGroupNonUniformQuadSwap %float %uint_3 [[val3]] %uint_1
29+
// CHECK: [[val3:%[0-9]+]] = OpLoad %float %val3
30+
// CHECK-NEXT: {{%[0-9]+}} = OpGroupNonUniformQuadSwap %float %uint_3 [[val3]] %uint_1
3131
values[x].val3 = QuadReadAcrossY(val3);
3232
}

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

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

33
// CHECK: ; Version: 1.5
44

@@ -20,14 +20,14 @@ void main(uint3 id: SV_DispatchThreadID) {
2020
uint3 val2 = values[x].val2;
2121
int val3 = values[x].val3;
2222

23-
// CHECK: [[val1:%\d+]] = OpLoad %v4float %val1
24-
// CHECK-NEXT: {{%\d+}} = OpGroupNonUniformQuadBroadcast %v4float %uint_3 [[val1]] %uint_0
23+
// CHECK: [[val1:%[0-9]+]] = OpLoad %v4float %val1
24+
// CHECK-NEXT: {{%[0-9]+}} = OpGroupNonUniformQuadBroadcast %v4float %uint_3 [[val1]] %uint_0
2525
values[x].val1 = QuadReadLaneAt(val1, 0);
26-
// CHECK: [[val2:%\d+]] = OpLoad %v3uint %val2
27-
// CHECK-NEXT: {{%\d+}} = OpGroupNonUniformQuadBroadcast %v3uint %uint_3 [[val2]] %uint_1
26+
// CHECK: [[val2:%[0-9]+]] = OpLoad %v3uint %val2
27+
// CHECK-NEXT: {{%[0-9]+}} = OpGroupNonUniformQuadBroadcast %v3uint %uint_3 [[val2]] %uint_1
2828
values[x].val2 = QuadReadLaneAt(val2, 1);
29-
// CHECK: [[val3:%\d+]] = OpLoad %int %val3
30-
// CHECK-NEXT: {{%\d+}} = OpGroupNonUniformQuadBroadcast %int %uint_3 [[val3]] %uint_2
29+
// CHECK: [[val3:%[0-9]+]] = OpLoad %int %val3
30+
// CHECK-NEXT: {{%[0-9]+}} = OpGroupNonUniformQuadBroadcast %int %uint_3 [[val3]] %uint_2
3131
values[x].val3 = QuadReadLaneAt(val3, 2);
3232
}
3333

0 commit comments

Comments
 (0)