Skip to content

Commit 55c59de

Browse files
committed
[lit][SPIRV] update to lit FileCheck test
attribute tests and binary op tests.
1 parent f228e48 commit 55c59de

37 files changed

+1059
-1059
lines changed

tools/clang/test/CodeGenSPIRV_Lit/attribute.earlydepthstencil.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
// CHECK: OpExecutionMode %main EarlyFragmentTests
44

tools/clang/test/CodeGenSPIRV_Lit/attribute.instance.gs.hlsl

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

33
// CHECK: OpExecutionMode %main Invocations 42
44

tools/clang/test/CodeGenSPIRV_Lit/attribute.instance.missing.gs.hlsl

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

33
// CHECK: OpExecutionMode %main Invocations 1
44

tools/clang/test/CodeGenSPIRV_Lit/attribute.max-vertex-count.hlsl

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

33
// CHECK: OpExecutionMode %main OutputVertices 3
44

tools/clang/test/CodeGenSPIRV_Lit/attribute.numthreads.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: OpEntryPoint GLCompute %main "main"
44
// CHECK: OpExecutionMode %main LocalSize 8 4 1

tools/clang/test/CodeGenSPIRV_Lit/attribute.numthreads.lib.hlsl

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

33
// CHECK: OpExecutionMode %entryHistogram LocalSize 16 16 1
44
[shader("compute")]

tools/clang/test/CodeGenSPIRV_Lit/attribute.numthreads.lib.missing.hlsl

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

33
[shader("compute")]
44
[numthreads(16, 16, 1)]
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: not %dxc -T cs_6_0 -E main -fcgl %s -spirv 2>&1 | FileCheck %s
22

33
// CHECK: 4:6: error: thread group size [numthreads(x,y,z)] is missing from the entry-point function
44
void main() {}

tools/clang/test/CodeGenSPIRV_Lit/attribute.postdepthcoverage.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
// CHECK: OpCapability SampleMaskPostDepthCoverage
44
// CHECK: OpExtension "SPV_KHR_post_depth_coverage"

tools/clang/test/CodeGenSPIRV_Lit/binary-op.arith-assign.matrix.hlsl

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,70 @@
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
void main() {
44
// CHECK-LABEL: %bb_entry = OpLabel
55

66
float1x1 a, b;
7-
// CHECK: [[a0:%\d+]] = OpLoad %float %a
8-
// CHECK-NEXT: [[b0:%\d+]] = OpLoad %float %b
9-
// CHECK-NEXT: [[b1:%\d+]] = OpFAdd %float [[b0]] [[a0]]
7+
// CHECK: [[a0:%[0-9]+]] = OpLoad %float %a
8+
// CHECK-NEXT: [[b0:%[0-9]+]] = OpLoad %float %b
9+
// CHECK-NEXT: [[b1:%[0-9]+]] = OpFAdd %float [[b0]] [[a0]]
1010
// CHECK-NEXT: OpStore %b [[b1]]
1111
b += a;
1212

1313
float2x1 c, d;
14-
// CHECK-NEXT: [[c0:%\d+]] = OpLoad %v2float %c
15-
// CHECK-NEXT: [[d0:%\d+]] = OpLoad %v2float %d
16-
// CHECK-NEXT: [[d1:%\d+]] = OpFSub %v2float [[d0]] [[c0]]
14+
// CHECK-NEXT: [[c0:%[0-9]+]] = OpLoad %v2float %c
15+
// CHECK-NEXT: [[d0:%[0-9]+]] = OpLoad %v2float %d
16+
// CHECK-NEXT: [[d1:%[0-9]+]] = OpFSub %v2float [[d0]] [[c0]]
1717
// CHECK-NEXT: OpStore %d [[d1]]
1818
d -= c;
1919

2020
float1x3 e, f;
21-
// CHECK-NEXT: [[e0:%\d+]] = OpLoad %v3float %e
22-
// CHECK-NEXT: [[f0:%\d+]] = OpLoad %v3float %f
23-
// CHECK-NEXT: [[f1:%\d+]] = OpFMul %v3float [[f0]] [[e0]]
21+
// CHECK-NEXT: [[e0:%[0-9]+]] = OpLoad %v3float %e
22+
// CHECK-NEXT: [[f0:%[0-9]+]] = OpLoad %v3float %f
23+
// CHECK-NEXT: [[f1:%[0-9]+]] = OpFMul %v3float [[f0]] [[e0]]
2424
// CHECK-NEXT: OpStore %f [[f1]]
2525
f *= e;
2626

2727
float2x3 g, h;
28-
// CHECK-NEXT: [[g0:%\d+]] = OpLoad %mat2v3float %g
29-
// CHECK-NEXT: [[h0:%\d+]] = OpLoad %mat2v3float %h
30-
// CHECK-NEXT: [[h0v0:%\d+]] = OpCompositeExtract %v3float [[h0]] 0
31-
// CHECK-NEXT: [[g0v0:%\d+]] = OpCompositeExtract %v3float [[g0]] 0
32-
// CHECK-NEXT: [[h1v0:%\d+]] = OpFDiv %v3float [[h0v0]] [[g0v0]]
33-
// CHECK-NEXT: [[h0v1:%\d+]] = OpCompositeExtract %v3float [[h0]] 1
34-
// CHECK-NEXT: [[g0v1:%\d+]] = OpCompositeExtract %v3float [[g0]] 1
35-
// CHECK-NEXT: [[h1v1:%\d+]] = OpFDiv %v3float [[h0v1]] [[g0v1]]
36-
// CHECK-NEXT: [[h1:%\d+]] = OpCompositeConstruct %mat2v3float [[h1v0]] [[h1v1]]
28+
// CHECK-NEXT: [[g0:%[0-9]+]] = OpLoad %mat2v3float %g
29+
// CHECK-NEXT: [[h0:%[0-9]+]] = OpLoad %mat2v3float %h
30+
// CHECK-NEXT: [[h0v0:%[0-9]+]] = OpCompositeExtract %v3float [[h0]] 0
31+
// CHECK-NEXT: [[g0v0:%[0-9]+]] = OpCompositeExtract %v3float [[g0]] 0
32+
// CHECK-NEXT: [[h1v0:%[0-9]+]] = OpFDiv %v3float [[h0v0]] [[g0v0]]
33+
// CHECK-NEXT: [[h0v1:%[0-9]+]] = OpCompositeExtract %v3float [[h0]] 1
34+
// CHECK-NEXT: [[g0v1:%[0-9]+]] = OpCompositeExtract %v3float [[g0]] 1
35+
// CHECK-NEXT: [[h1v1:%[0-9]+]] = OpFDiv %v3float [[h0v1]] [[g0v1]]
36+
// CHECK-NEXT: [[h1:%[0-9]+]] = OpCompositeConstruct %mat2v3float [[h1v0]] [[h1v1]]
3737
// CHECK-NEXT: OpStore %h [[h1]]
3838
h /= g;
3939

4040
float3x2 i, j;
41-
// CHECK-NEXT: [[i0:%\d+]] = OpLoad %mat3v2float %i
42-
// CHECK-NEXT: [[j0:%\d+]] = OpLoad %mat3v2float %j
43-
// CHECK-NEXT: [[j0v0:%\d+]] = OpCompositeExtract %v2float [[j0]] 0
44-
// CHECK-NEXT: [[i0v0:%\d+]] = OpCompositeExtract %v2float [[i0]] 0
45-
// CHECK-NEXT: [[j1v0:%\d+]] = OpFRem %v2float [[j0v0]] [[i0v0]]
46-
// CHECK-NEXT: [[j0v1:%\d+]] = OpCompositeExtract %v2float [[j0]] 1
47-
// CHECK-NEXT: [[i0v1:%\d+]] = OpCompositeExtract %v2float [[i0]] 1
48-
// CHECK-NEXT: [[j1v1:%\d+]] = OpFRem %v2float [[j0v1]] [[i0v1]]
49-
// CHECK-NEXT: [[j0v2:%\d+]] = OpCompositeExtract %v2float [[j0]] 2
50-
// CHECK-NEXT: [[i0v2:%\d+]] = OpCompositeExtract %v2float [[i0]] 2
51-
// CHECK-NEXT: [[j1v2:%\d+]] = OpFRem %v2float [[j0v2]] [[i0v2]]
52-
// CHECK-NEXT: [[j1:%\d+]] = OpCompositeConstruct %mat3v2float [[j1v0]] [[j1v1]] [[j1v2]]
41+
// CHECK-NEXT: [[i0:%[0-9]+]] = OpLoad %mat3v2float %i
42+
// CHECK-NEXT: [[j0:%[0-9]+]] = OpLoad %mat3v2float %j
43+
// CHECK-NEXT: [[j0v0:%[0-9]+]] = OpCompositeExtract %v2float [[j0]] 0
44+
// CHECK-NEXT: [[i0v0:%[0-9]+]] = OpCompositeExtract %v2float [[i0]] 0
45+
// CHECK-NEXT: [[j1v0:%[0-9]+]] = OpFRem %v2float [[j0v0]] [[i0v0]]
46+
// CHECK-NEXT: [[j0v1:%[0-9]+]] = OpCompositeExtract %v2float [[j0]] 1
47+
// CHECK-NEXT: [[i0v1:%[0-9]+]] = OpCompositeExtract %v2float [[i0]] 1
48+
// CHECK-NEXT: [[j1v1:%[0-9]+]] = OpFRem %v2float [[j0v1]] [[i0v1]]
49+
// CHECK-NEXT: [[j0v2:%[0-9]+]] = OpCompositeExtract %v2float [[j0]] 2
50+
// CHECK-NEXT: [[i0v2:%[0-9]+]] = OpCompositeExtract %v2float [[i0]] 2
51+
// CHECK-NEXT: [[j1v2:%[0-9]+]] = OpFRem %v2float [[j0v2]] [[i0v2]]
52+
// CHECK-NEXT: [[j1:%[0-9]+]] = OpCompositeConstruct %mat3v2float [[j1v0]] [[j1v1]] [[j1v2]]
5353
// CHECK-NEXT: OpStore %j [[j1]]
5454
j %= i;
5555

5656
// Non-floating point matrices
5757

5858
int2x3 k, l;
59-
// CHECK-NEXT: [[k0:%\d+]] = OpLoad %_arr_v3int_uint_2 %k
60-
// CHECK-NEXT: [[l0:%\d+]] = OpLoad %_arr_v3int_uint_2 %l
61-
// CHECK-NEXT: [[l0v0:%\d+]] = OpCompositeExtract %v3int [[l0]] 0
62-
// CHECK-NEXT: [[k0v0:%\d+]] = OpCompositeExtract %v3int [[k0]] 0
63-
// CHECK-NEXT: [[l1v0:%\d+]] = OpIAdd %v3int [[l0v0]] [[k0v0]]
64-
// CHECK-NEXT: [[l0v1:%\d+]] = OpCompositeExtract %v3int [[l0]] 1
65-
// CHECK-NEXT: [[k0v1:%\d+]] = OpCompositeExtract %v3int [[k0]] 1
66-
// CHECK-NEXT: [[l1v1:%\d+]] = OpIAdd %v3int [[l0v1]] [[k0v1]]
67-
// CHECK-NEXT: [[l1:%\d+]] = OpCompositeConstruct %_arr_v3int_uint_2 [[l1v0]] [[l1v1]]
59+
// CHECK-NEXT: [[k0:%[0-9]+]] = OpLoad %_arr_v3int_uint_2 %k
60+
// CHECK-NEXT: [[l0:%[0-9]+]] = OpLoad %_arr_v3int_uint_2 %l
61+
// CHECK-NEXT: [[l0v0:%[0-9]+]] = OpCompositeExtract %v3int [[l0]] 0
62+
// CHECK-NEXT: [[k0v0:%[0-9]+]] = OpCompositeExtract %v3int [[k0]] 0
63+
// CHECK-NEXT: [[l1v0:%[0-9]+]] = OpIAdd %v3int [[l0v0]] [[k0v0]]
64+
// CHECK-NEXT: [[l0v1:%[0-9]+]] = OpCompositeExtract %v3int [[l0]] 1
65+
// CHECK-NEXT: [[k0v1:%[0-9]+]] = OpCompositeExtract %v3int [[k0]] 1
66+
// CHECK-NEXT: [[l1v1:%[0-9]+]] = OpIAdd %v3int [[l0v1]] [[k0v1]]
67+
// CHECK-NEXT: [[l1:%[0-9]+]] = OpCompositeConstruct %_arr_v3int_uint_2 [[l1v0]] [[l1v1]]
6868
// CHECK-NEXT: OpStore %l [[l1]]
6969
l += k;
7070

0 commit comments

Comments
 (0)