Skip to content

Commit 21d4cb5

Browse files
authored
[lit] [SPIRV] convert layout related tests to lit FileCheck test (microsoft#5664)
setScalar/GL/DxLayout will be replaced by -fvk_use_scalar/gl/dx_layout to match the validation behavior in runFileTest. vk.layout.shader-record-ext.std430.hlsl and vk.layout.shader-record-nv.std430 fails after add -fvk-use-gl-layout. Updated the CHECK line to match the new output with -fvk-use-gl-layout.
1 parent 1598cd8 commit 21d4cb5

File tree

38 files changed

+207
-364
lines changed

38 files changed

+207
-364
lines changed

tools/clang/test/CodeGenSPIRV/vk.layout.cbuffer.fxc.matrix.n-by-m.hlsl

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

tools/clang/test/CodeGenSPIRV/vk.layout.cbuffer.fxc.matrix.struct.hlsl

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

tools/clang/test/CodeGenSPIRV/vk.layout.cbuffer.fxc.matrix.v2arr.conversion.hlsl

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

tools/clang/test/CodeGenSPIRV/type.structured-buffer.vector.dx.hlsl renamed to tools/clang/test/CodeGenSPIRV_Lit/type.structured-buffer.vector.dx.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 -fvk-use-dx-layout
1+
// RUN: %dxc -T ps_6_0 -E main -fvk-use-dx-layout -fcgl %s -spirv | FileCheck %s
22

33
// CHECK: OpDecorate %_runtimearr_v3uint ArrayStride 12
44
// CHECK: OpDecorate %type_StructuredBuffer_v3uint BufferBlock

tools/clang/test/CodeGenSPIRV/type.structured-buffer.vector.gl.hlsl renamed to tools/clang/test/CodeGenSPIRV_Lit/type.structured-buffer.vector.gl.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 -fvk-use-gl-layout
1+
// RUN: %dxc -T ps_6_0 -E main -fvk-use-gl-layout -fcgl %s -spirv | FileCheck %s
22

33
// CHECK: OpDecorate %_runtimearr_v3uint ArrayStride 16
44
// CHECK: OpDecorate %type_StructuredBuffer_v3uint BufferBlock

tools/clang/test/CodeGenSPIRV/type.structured-buffer.vector.scalar.hlsl renamed to tools/clang/test/CodeGenSPIRV_Lit/type.structured-buffer.vector.scalar.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 -fvk-use-scalar-layout
1+
// RUN: %dxc -T ps_6_0 -E main -fvk-use-scalar-layout -fcgl %s -spirv | FileCheck %s
22

33
// CHECK: OpDecorate %_runtimearr_v3uint ArrayStride 12
44
// CHECK: OpDecorate %type_StructuredBuffer_v3uint BufferBlock

tools/clang/test/CodeGenSPIRV/vk.layout.asbuffer.std430.hlsl renamed to tools/clang/test/CodeGenSPIRV_Lit/vk.layout.asbuffer.std430.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 -fvk-use-gl-layout -fcgl %s -spirv | FileCheck %s
22

33
// CHECK: OpDecorate %_arr_float_uint_2 ArrayStride 4
44
// CHECK: OpDecorate %_arr_v3float_uint_2 ArrayStride 16

tools/clang/test/CodeGenSPIRV/vk.layout.attr.offset.hlsl renamed to tools/clang/test/CodeGenSPIRV_Lit/vk.layout.attr.offset.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 -fvk-use-dx-layout
1+
// RUN: %dxc -T vs_6_0 -E main -fvk-use-dx-layout -fcgl %s -spirv | FileCheck %s
22

33
// Make sure that:
44
// * [[vk::offset]] on an internal struct affects layout of an external struct.

tools/clang/test/CodeGenSPIRV/vk.layout.cbuffer.fxc.1.hlsl renamed to tools/clang/test/CodeGenSPIRV_Lit/vk.layout.cbuffer.fxc.1.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 -fvk-use-dx-layout
1+
// RUN: %dxc -T ps_6_0 -E main -fvk-use-dx-layout -fcgl %s -spirv | FileCheck %s
22

33
struct S {
44
float a;

tools/clang/test/CodeGenSPIRV/vk.layout.cbuffer.fxc.hlsl renamed to tools/clang/test/CodeGenSPIRV_Lit/vk.layout.cbuffer.fxc.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 -fvk-use-dx-layout
1+
// RUN: %dxc -T ps_6_0 -E main -fvk-use-dx-layout -fcgl %s -spirv | FileCheck %s
22

33
// fxc layout:
44
//

0 commit comments

Comments
 (0)