Skip to content

Commit 121344a

Browse files
python3kgaepython3kgae
committed
[lit][SPIRV] convert shaders to lit FileCheck test
Convert the moved shaders to lit FileCheck test.
1 parent 24ee928 commit 121344a

File tree

42 files changed

+161
-161
lines changed

Some content is hidden

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

42 files changed

+161
-161
lines changed

‎tools/clang/test/CodeGenSPIRV_Lit/spirv.interpolation.ps.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
1+
// RUN: %dxc -T ps_6_0 -E main -fcgl %s -spirv | FileCheck %s
22

33
// Required by the sample interpolation mode
44
// CHECK: OpCapability SampleRateShading

‎tools/clang/test/CodeGenSPIRV_Lit/spirv.interpolation.vs.hlsl

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

33
// Required by the sample interpolation mode
44
// CHECK: OpCapability SampleRateShading

‎tools/clang/test/CodeGenSPIRV_Lit/spirv.legal.cbuffer.hlsl

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

33
// %type_ConstantBuffer_S is the type for myCBuffer. With layout decoration.
44
// %S is the type for myASBuffer elements. With layout decoration.
@@ -28,49 +28,49 @@ float4 doStuff(S buffer) {
2828
float4 main(in float4 pos : SV_Position) : SV_Target
2929
{
3030
// Initializing a T with a ConstantBuffer<T> is a copy
31-
// CHECK: [[val:%\d+]] = OpLoad %type_ConstantBuffer_S %myCBuffer
32-
// CHECK-NEXT: [[vec:%\d+]] = OpCompositeExtract %v4float [[val]] 0
33-
// CHECK-NEXT: [[tmp:%\d+]] = OpCompositeConstruct %S_0 [[vec]]
31+
// CHECK: [[val:%[0-9]+]] = OpLoad %type_ConstantBuffer_S %myCBuffer
32+
// CHECK-NEXT: [[vec:%[0-9]+]] = OpCompositeExtract %v4float [[val]] 0
33+
// CHECK-NEXT: [[tmp:%[0-9]+]] = OpCompositeConstruct %S_0 [[vec]]
3434
// CHECK-NEXT: OpStore %buffer1 [[tmp]]
3535
S buffer1 = myCBuffer;
3636

3737
// Assigning a ConstantBuffer<T> to a T is a copy
38-
// CHECK: [[val:%\d+]] = OpLoad %type_ConstantBuffer_S %myCBuffer
39-
// CHECK-NEXT: [[vec:%\d+]] = OpCompositeExtract %v4float [[val]] 0
40-
// CHECK-NEXT: [[tmp:%\d+]] = OpCompositeConstruct %S_0 [[vec]]
41-
// CHECK-NEXT: OpStore %buffer2 [[tmp]]
38+
// CHECK: [[val_0:%[0-9]+]] = OpLoad %type_ConstantBuffer_S %myCBuffer
39+
// CHECK-NEXT: [[vec_0:%[0-9]+]] = OpCompositeExtract %v4float [[val_0]] 0
40+
// CHECK-NEXT: [[tmp_0:%[0-9]+]] = OpCompositeConstruct %S_0 [[vec_0]]
41+
// CHECK-NEXT: OpStore %buffer2 [[tmp_0]]
4242
S buffer2;
4343
buffer2 = myCBuffer;
4444

4545
// We have the same struct type here
46-
// CHECK: [[val:%\d+]] = OpFunctionCall %S_0 %retStuff
47-
// CHECK-NEXT: OpStore %buffer3 [[val]]
46+
// CHECK: [[val_1:%[0-9]+]] = OpFunctionCall %S_0 %retStuff
47+
// CHECK-NEXT: OpStore %buffer3 [[val_1]]
4848
S buffer3;
4949
buffer3 = retStuff();
5050

5151
// Write out each component recursively
52-
// CHECK: [[ptr:%\d+]] = OpAccessChain %_ptr_Uniform_S %myASBuffer %uint_0 {{%\d+}}
53-
// CHECK-NEXT: [[val:%\d+]] = OpLoad %type_ConstantBuffer_S %myCBuffer
54-
// CHECK-NEXT: [[vec:%\d+]] = OpCompositeExtract %v4float [[val]] 0
55-
// CHECK-NEXT: [[tmp:%\d+]] = OpCompositeConstruct %S_0 [[vec]]
56-
// CHECK-NEXT: [[vec:%\d+]] = OpCompositeExtract %v4float [[tmp]] 0
57-
// CHECK-NEXT: [[tmp:%\d+]] = OpCompositeConstruct %S [[vec]]
58-
// CHECK-NEXT: OpStore [[ptr]] [[tmp]]
52+
// CHECK: [[ptr:%[0-9]+]] = OpAccessChain %_ptr_Uniform_S %myASBuffer %uint_0 {{%[0-9]+}}
53+
// CHECK-NEXT: [[val_2:%[0-9]+]] = OpLoad %type_ConstantBuffer_S %myCBuffer
54+
// CHECK-NEXT: [[vec_1:%[0-9]+]] = OpCompositeExtract %v4float [[val_2]] 0
55+
// CHECK-NEXT: [[tmp_1:%[0-9]+]] = OpCompositeConstruct %S_0 [[vec_1]]
56+
// CHECK-NEXT: [[vec_2:%[0-9]+]] = OpCompositeExtract %v4float [[tmp_1]] 0
57+
// CHECK-NEXT: [[tmp_2:%[0-9]+]] = OpCompositeConstruct %S [[vec_2]]
58+
// CHECK-NEXT: OpStore [[ptr]] [[tmp_2]]
5959
myASBuffer.Append(myCBuffer);
6060

6161
// Passing a ConstantBuffer<T> to a T parameter is a copy
62-
// CHECK: [[val:%\d+]] = OpLoad %type_ConstantBuffer_S %myCBuffer
63-
// CHECK-NEXT: [[vec:%\d+]] = OpCompositeExtract %v4float [[val]] 0
64-
// CHECK-NEXT: [[tmp:%\d+]] = OpCompositeConstruct %S_0 [[vec]]
65-
// CHECK-NEXT: OpStore %param_var_buffer [[tmp]]
62+
// CHECK: [[val_3:%[0-9]+]] = OpLoad %type_ConstantBuffer_S %myCBuffer
63+
// CHECK-NEXT: [[vec_3:%[0-9]+]] = OpCompositeExtract %v4float [[val_3]] 0
64+
// CHECK-NEXT: [[tmp_3:%[0-9]+]] = OpCompositeConstruct %S_0 [[vec_3]]
65+
// CHECK-NEXT: OpStore %param_var_buffer [[tmp_3]]
6666
return doStuff(myCBuffer);
6767
}
6868

6969
S retStuff() {
7070
// Returning a ConstantBuffer<T> as a T is a copy
71-
// CHECK: [[val:%\d+]] = OpLoad %type_ConstantBuffer_S %myCBuffer
72-
// CHECK-NEXT: [[vec:%\d+]] = OpCompositeExtract %v4float [[val]] 0
73-
// CHECK-NEXT: [[ret:%\d+]] = OpCompositeConstruct %S_0 [[vec]]
71+
// CHECK: [[val_4:%[0-9]+]] = OpLoad %type_ConstantBuffer_S %myCBuffer
72+
// CHECK-NEXT: [[vec_4:%[0-9]+]] = OpCompositeExtract %v4float [[val_4]] 0
73+
// CHECK-NEXT: [[ret:%[0-9]+]] = OpCompositeConstruct %S_0 [[vec_4]]
7474
// CHECK-NEXT: OpReturnValue [[ret]]
7575
return myCBuffer;
7676
}

‎tools/clang/test/CodeGenSPIRV_Lit/spirv.legal.tbuffer.hlsl

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

33
// Note: The following is invalid SPIR-V code.
44
//
@@ -32,50 +32,50 @@ float4 doStuff(S buffer) {
3232
float4 main(in float4 pos : SV_Position) : SV_Target
3333
{
3434
// Initializing a T with a TextureBuffer<T> is a copy
35-
// CHECK: [[val:%\d+]] = OpLoad %type_TextureBuffer_S %myTBuffer
36-
// CHECK-NEXT: [[vec:%\d+]] = OpCompositeExtract %v4float [[val]] 0
37-
// CHECK-NEXT: [[tmp:%\d+]] = OpCompositeConstruct %S_0 [[vec]]
35+
// CHECK: [[val:%[0-9]+]] = OpLoad %type_TextureBuffer_S %myTBuffer
36+
// CHECK-NEXT: [[vec:%[0-9]+]] = OpCompositeExtract %v4float [[val]] 0
37+
// CHECK-NEXT: [[tmp:%[0-9]+]] = OpCompositeConstruct %S_0 [[vec]]
3838
// CHECK-NEXT: OpStore %buffer1 [[tmp]]
3939
S buffer1 = myTBuffer;
4040

4141
// Assigning a TextureBuffer<T> to a T is a copy
42-
// CHECK: [[val:%\d+]] = OpLoad %type_TextureBuffer_S %myTBuffer
43-
// CHECK-NEXT: [[vec:%\d+]] = OpCompositeExtract %v4float [[val]] 0
44-
// CHECK-NEXT: [[tmp:%\d+]] = OpCompositeConstruct %S_0 [[vec]]
45-
// CHECK-NEXT: OpStore %buffer2 [[tmp]]
42+
// CHECK: [[val_0:%[0-9]+]] = OpLoad %type_TextureBuffer_S %myTBuffer
43+
// CHECK-NEXT: [[vec_0:%[0-9]+]] = OpCompositeExtract %v4float [[val_0]] 0
44+
// CHECK-NEXT: [[tmp_0:%[0-9]+]] = OpCompositeConstruct %S_0 [[vec_0]]
45+
// CHECK-NEXT: OpStore %buffer2 [[tmp_0]]
4646
S buffer2;
4747
buffer2 = myTBuffer;
4848

4949
// We have the same struct type here
50-
// CHECK: [[val:%\d+]] = OpFunctionCall %S_0 %retStuff
51-
// CHECK-NEXT: OpStore %buffer3 [[val]]
50+
// CHECK: [[val_1:%[0-9]+]] = OpFunctionCall %S_0 %retStuff
51+
// CHECK-NEXT: OpStore %buffer3 [[val_1]]
5252
S buffer3;
5353
buffer3 = retStuff();
5454

5555
// TODO: The underlying struct type has the same layout but %type_TextureBuffer_S
5656
// has an additional BufferBlock decoration. So this causes an validation error.
57-
// CHECK: [[ptr:%\d+]] = OpAccessChain %_ptr_Uniform_S %myASBuffer %uint_0 {{%\d+}}
58-
// CHECK-NEXT: [[tb:%\d+]] = OpLoad %type_TextureBuffer_S %myTBuffer
59-
// CHECK-NEXT: [[vec:%\d+]] = OpCompositeExtract %v4float [[tb]] 0
60-
// CHECK-NEXT: [[loc:%\d+]] = OpCompositeConstruct %S_0 [[vec]]
61-
// CHECK-NEXT: [[vec:%\d+]] = OpCompositeExtract %v4float [[loc]] 0
62-
// CHECK-NEXT: [[val:%\d+]] = OpCompositeConstruct %S [[vec]]
63-
// CHECK-NEXT: OpStore [[ptr]] [[val]]
57+
// CHECK: [[ptr:%[0-9]+]] = OpAccessChain %_ptr_Uniform_S %myASBuffer %uint_0 {{%[0-9]+}}
58+
// CHECK-NEXT: [[tb:%[0-9]+]] = OpLoad %type_TextureBuffer_S %myTBuffer
59+
// CHECK-NEXT: [[vec_1:%[0-9]+]] = OpCompositeExtract %v4float [[tb]] 0
60+
// CHECK-NEXT: [[loc:%[0-9]+]] = OpCompositeConstruct %S_0 [[vec_1]]
61+
// CHECK-NEXT: [[vec_2:%[0-9]+]] = OpCompositeExtract %v4float [[loc]] 0
62+
// CHECK-NEXT: [[val_2:%[0-9]+]] = OpCompositeConstruct %S [[vec_2]]
63+
// CHECK-NEXT: OpStore [[ptr]] [[val_2]]
6464
myASBuffer.Append(myTBuffer);
6565

6666
// Passing a TextureBuffer<T> to a T parameter is a copy
67-
// CHECK: [[val:%\d+]] = OpLoad %type_TextureBuffer_S %myTBuffer
68-
// CHECK-NEXT: [[vec:%\d+]] = OpCompositeExtract %v4float [[val]] 0
69-
// CHECK-NEXT: [[tmp:%\d+]] = OpCompositeConstruct %S_0 [[vec]]
70-
// CHECK-NEXT: OpStore %param_var_buffer [[tmp]]
67+
// CHECK: [[val_3:%[0-9]+]] = OpLoad %type_TextureBuffer_S %myTBuffer
68+
// CHECK-NEXT: [[vec_3:%[0-9]+]] = OpCompositeExtract %v4float [[val_3]] 0
69+
// CHECK-NEXT: [[tmp_1:%[0-9]+]] = OpCompositeConstruct %S_0 [[vec_3]]
70+
// CHECK-NEXT: OpStore %param_var_buffer [[tmp_1]]
7171
return doStuff(myTBuffer);
7272
}
7373

7474
S retStuff() {
7575
// Returning a TextureBuffer<T> as a T is a copy
76-
// CHECK: [[val:%\d+]] = OpLoad %type_TextureBuffer_S %myTBuffer
77-
// CHECK-NEXT: [[vec:%\d+]] = OpCompositeExtract %v4float [[val]] 0
78-
// CHECK-NEXT: [[ret:%\d+]] = OpCompositeConstruct %S_0 [[vec]]
76+
// CHECK: [[val_4:%[0-9]+]] = OpLoad %type_TextureBuffer_S %myTBuffer
77+
// CHECK-NEXT: [[vec_4:%[0-9]+]] = OpCompositeExtract %v4float [[val_4]] 0
78+
// CHECK-NEXT: [[ret:%[0-9]+]] = OpCompositeConstruct %S_0 [[vec_4]]
7979
// CHECK-NEXT: OpReturnValue [[ret]]
8080
return myTBuffer;
8181
}

‎tools/clang/test/CodeGenSPIRV_Lit/spirv.stage-io.16bit.hlsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %dxc -T vs_6_2 -E main -enable-16bit-types
1+
// RUN: %dxc -T vs_6_2 -E main -enable-16bit-types -fcgl %s -spirv | FileCheck %s
22

33
// CHECK: OpCapability StorageInputOutput16
44

‎tools/clang/test/CodeGenSPIRV_Lit/spirv.stage-io.relaxed-precision.hlsl

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

33
// CHECK: OpDecorate %in_var_A Location 0
44
// CHECK: OpDecorate %in_var_B Location 4

‎tools/clang/test/CodeGenSPIRV_Lit/spirv.user-semantic.vs.hlsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %dxc -T vs_6_0 -E main -fspv-reflect
1+
// RUN: %dxc -T vs_6_0 -E main -fspv-reflect -fcgl %s -spirv | FileCheck %s
22

33

44
// CHECK: OpExtension "SPV_GOOGLE_hlsl_functionality1"

‎tools/clang/test/CodeGenSPIRV_Lit/vk.attribute.image-format.arrays.hlsl

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

33
// CHECK: OpTypeImage %float Buffer 2 0 0 2 Rgba16f
44
[[vk::image_format("rgba16f")]]

‎tools/clang/test/CodeGenSPIRV_Lit/vk.attribute.image-format.o3.hlsl

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

33
//CHECK: OpTypeImage %float Buffer 2 0 0 2 Rgba16f
44
[[vk::image_format("rgba16f")]]

‎tools/clang/test/CodeGenSPIRV_Lit/vk.attribute.image-format.simple.hlsl

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

33
//CHECK: OpTypeImage %float Buffer 2 0 0 2 Rgba16f
44
[[vk::image_format("rgba16f")]]

0 commit comments

Comments
 (0)