SPIRV `Block` decoration fixes. (#4303)

* SPIRV `Block` decoration fixes.

- SPIRV does not allow duplicate `Block` decorations. So we shouldn't be generating them.

- Also fixes duplication of OpName.

- SPIRV and HLSL do not allow ConstantBuffer with trailing unsized arrays. Added a check in the front-end against such code.

* Convert failing cross-compile tests to filecheck.

---------

Co-authored-by: Jay Kwak <82421531+jkwak-work@users.noreply.github.com>

21 files changed, 47 insertions, 222 deletions

diff --git a/tests/cross-compile/barycentrics.slang b/tests/cross-compile/barycentrics.slang
index 1f2c27572..c63835ccc 100644
--- a/tests/cross-compile/barycentrics.slang
+++ b/tests/cross-compile/barycentrics.slang
@@ -1,4 +1,6 @@
-//TEST:CROSS_COMPILE:-target spirv-assembly -entry main -stage fragment
+//TEST:SIMPLE(filecheck=CHECK):-target spirv-assembly -entry main -stage fragment
+
+// CHECK: OpDecorate %{{.*}} BuiltIn BaryCoordKHR
 
 float4 main(float3 bary : SV_Barycentrics) : SV_Target
 {
diff --git a/tests/cross-compile/barycentrics.slang.glsl b/tests/cross-compile/barycentrics.slang.glsl
deleted file mode 100644
index ede585db0..000000000
--- a/tests/cross-compile/barycentrics.slang.glsl
+++ /dev/null
@@ -1,12 +0,0 @@
-#version 450
-
-#extension GL_EXT_fragment_shader_barycentric : enable
-
-layout(location = 0)
-out vec4 main_0;
-
-void main()
-{
-    main_0 = vec4(gl_BaryCoordEXT, float(0));
-    return;
-}
diff --git a/tests/cross-compile/dual-source-blending.slang b/tests/cross-compile/dual-source-blending.slang
index 51af956b2..602f8e20f 100644
--- a/tests/cross-compile/dual-source-blending.slang
+++ b/tests/cross-compile/dual-source-blending.slang
@@ -4,9 +4,13 @@
 // `vk::index` attributes to compile
 // for dual-source color blending.
 
-//TEST:CROSS_COMPILE:-target spirv-assembly -entry main -stage fragment
+//TEST:SIMPLE(filecheck=CHECK):-target spirv-assembly -entry main -stage fragment
 //TEST_DISABLED:SIMPLE:-target glsl
 
+// CHECK: OpDecorate %{{.*}}main_a Location 0
+// CHECK: OpDecorate %{{.*}}main_b Location 0
+// CHECK: OpDecorate %{{.*}}main_b Index 1
+
 struct FragmentOutput
 {
 	[[vk::location(0)]]
diff --git a/tests/cross-compile/early-depth-stencil.hlsl b/tests/cross-compile/early-depth-stencil.hlsl
index b40a29aba..931538edb 100644
--- a/tests/cross-compile/early-depth-stencil.hlsl
+++ b/tests/cross-compile/early-depth-stencil.hlsl
@@ -1,5 +1,7 @@
-//TEST:CROSS_COMPILE:-target spirv-assembly -entry main -stage fragment
-//TEST:CROSS_COMPILE:-profile ps_6_0 -target dxil-assembly -entry main 
+//TEST:SIMPLE(filecheck=SPIRV):-target spirv-assembly -entry main -stage fragment
+//TEST:SIMPLE(filecheck=SPIRV):-target spirv-assembly -entry main -stage fragment -emit-spirv-via-glsl
+
+// SPIRV: OpExecutionMode %main EarlyFragmentTests
 
 [earlydepthstencil]
 float4 main(): SV_Target
diff --git a/tests/cross-compile/early-depth-stencil.hlsl.glsl b/tests/cross-compile/early-depth-stencil.hlsl.glsl
deleted file mode 100644
index 4a723215c..000000000
--- a/tests/cross-compile/early-depth-stencil.hlsl.glsl
+++ /dev/null
@@ -1,16 +0,0 @@
-//TEST_IGNORE_FILE:
-#version 450
-layout(row_major) uniform;
-layout(row_major) buffer;
-
-#line 5 0
-layout(location = 0)
-out vec4 main_0;
-
-#line 5
-layout(early_fragment_tests) in;
-void main()
-{
-    main_0 = vec4(float(1), float(0), float(0), float(1));
-    return;
-}
diff --git a/tests/cross-compile/early-depth-stencil.hlsl.hlsl b/tests/cross-compile/early-depth-stencil.hlsl.hlsl
deleted file mode 100644
index 378c5c0a1..000000000
--- a/tests/cross-compile/early-depth-stencil.hlsl.hlsl
+++ /dev/null
@@ -1,8 +0,0 @@
-//TEST_IGNORE_FILE:
-#pragma pack_matrix(column_major)
-
-[earlydepthstencil]
-vector<float,4> main() : SV_TARGET
-{
-    return vector<float,4>((float) 1, (float) 0, (float) 0, (float) 1);
-}
diff --git a/tests/cross-compile/glsl-empty-struct-param-field.slang b/tests/cross-compile/glsl-empty-struct-param-field.slang
index 21b67e325..f146d4684 100644
--- a/tests/cross-compile/glsl-empty-struct-param-field.slang
+++ b/tests/cross-compile/glsl-empty-struct-param-field.slang
@@ -1,5 +1,7 @@
-//TEST:CROSS_COMPILE:-target spirv-assembly -entry main -profile ps_5_0
+//TEST:SIMPLE(filecheck=CHECK):-target spirv-assembly -entry main -profile ps_5_0
 
+// CHECK: OpDecorate %pblock Binding 0
+// CHECK: OpDecorate %pblock DescriptorSet 0
 struct E
 {
 };
diff --git a/tests/cross-compile/glsl-empty-struct-param-field.slang.glsl b/tests/cross-compile/glsl-empty-struct-param-field.slang.glsl
deleted file mode 100644
index bff888233..000000000
--- a/tests/cross-compile/glsl-empty-struct-param-field.slang.glsl
+++ /dev/null
@@ -1,23 +0,0 @@
-//TEST_IGNORE_FILE:
-#version 450
-layout(row_major) uniform;
-layout(row_major) buffer;
-
-struct P_0
-{
-    vec4 param_0;
-};
-
-layout(binding = 0)
-layout(std140) uniform _S1
-{
-    vec4 param_0;
-} pblock_0;
-layout(location = 0)
-out vec4 main_0;
-
-void main()
-{
-    main_0 = pblock_0.param_0;
-    return;
-}
\ No newline at end of file
diff --git a/tests/cross-compile/half-conversion.slang b/tests/cross-compile/half-conversion.slang
index 316629f81..39ba4001c 100644
--- a/tests/cross-compile/half-conversion.slang
+++ b/tests/cross-compile/half-conversion.slang
@@ -1,6 +1,8 @@
 // half-conversion.slang
 
-//TEST:CROSS_COMPILE:-target spirv-assembly -entry main -stage fragment
+//TEST:SIMPLE(filecheck=SPIRV):-target spirv-assembly -entry main -stage fragment
+
+// SPIRV: OpBitcast
 
 cbuffer C
 {
diff --git a/tests/cross-compile/non-uniform-indexing.slang b/tests/cross-compile/non-uniform-indexing.slang
index 22e00a212..73483afae 100644
--- a/tests/cross-compile/non-uniform-indexing.slang
+++ b/tests/cross-compile/non-uniform-indexing.slang
@@ -1,8 +1,9 @@
-//TEST:CROSS_COMPILE:-target spirv-assembly -entry main -stage fragment
-//TEST:CROSS_COMPILE:-target spirv-assembly -entry main -stage fragment -verify-debug-serial-ir
+//TEST:SIMPLE(filecheck=CHECK):-target spirv-assembly -entry main -stage fragment -verify-debug-serial-ir
 
 // Confirm that `NonUniformResourceIndex` translates to SPIR-V as expected
 
+// CHECK: NonUniform
+
 Texture2D t[10];
 SamplerState s;
 
diff --git a/tests/cross-compile/non-uniform-indexing.slang.glsl b/tests/cross-compile/non-uniform-indexing.slang.glsl
deleted file mode 100644
index 35b5fab95..000000000
--- a/tests/cross-compile/non-uniform-indexing.slang.glsl
+++ /dev/null
@@ -1,22 +0,0 @@
-#version 450
-#extension GL_EXT_nonuniform_qualifier : require
-layout(row_major) uniform;
-layout(row_major) buffer;
-layout(binding = 0)
-uniform texture2D  t_0[10];
-
-layout(binding = 1)
-uniform sampler s_0;
-
-layout(location = 0)
-out vec4 main_0;
-
-layout(location = 0)
-in vec3 uv_0;
-
-void main()
-{
-    main_0 = (texture(sampler2D(t_0[nonuniformEXT(int(uv_0.z))],s_0), (uv_0.xy)));
-    return;
-}
-
diff --git a/tests/cross-compile/sign.slang b/tests/cross-compile/sign.slang
index 17a51d93d..934bc5c5a 100644
--- a/tests/cross-compile/sign.slang
+++ b/tests/cross-compile/sign.slang
@@ -1,10 +1,13 @@
 // sign.slang
 
-//TEST:CROSS_COMPILE:-target spirv-assembly -entry main -stage fragment
-//TEST:CROSS_COMPILE:-target dxil-assembly  -entry main -stage fragment -profile sm_6_0
+//TEST:SIMPLE(filecheck=SPIRV):-target spirv-assembly -entry main -stage fragment
+//TEST:SIMPLE(filecheck=DXIL):-target dxil-assembly  -entry main -stage fragment -profile sm_6_0
 
 // Test cross compilation of the sign function
 
+// SPIRV: FSign
+// DXIL: define void @main
+
 float4 main() : SV_Target
 {
     float4 s = sign(float4(1.5, 1.0, -1.5, -1.0));
diff --git a/tests/cross-compile/sign.slang.glsl b/tests/cross-compile/sign.slang.glsl
deleted file mode 100644
index ec0bfe377..000000000
--- a/tests/cross-compile/sign.slang.glsl
+++ /dev/null
@@ -1,12 +0,0 @@
-#version 450
-layout(row_major) uniform;
-layout(row_major) buffer;
-
-layout(location = 0)
-out vec4 main_0;
-
-void main()
-{
-    main_0 = vec4((ivec4(sign((vec4(1.5, 1.0, -1.5, -1.0))))));
-    return;
-}
diff --git a/tests/cross-compile/sign.slang.hlsl b/tests/cross-compile/sign.slang.hlsl
deleted file mode 100644
index d7016dde7..000000000
--- a/tests/cross-compile/sign.slang.hlsl
+++ /dev/null
@@ -1,6 +0,0 @@
-//TEST_IGNORE_FILE:
-float4 main() : SV_Target
-{
-    float4 s = sign(float4(1.5, 1.0, -1.5, -1.0));
-    return s;
-}
\ No newline at end of file
diff --git a/tests/cross-compile/sv-coverage.slang b/tests/cross-compile/sv-coverage.slang
index b61530e7b..ab11311a0 100644
--- a/tests/cross-compile/sv-coverage.slang
+++ b/tests/cross-compile/sv-coverage.slang
@@ -1,7 +1,7 @@
 // sv-coverage.slang
 
-//TEST:CROSS_COMPILE:-target spirv-assembly -entry main -stage fragment
 //TEST:SIMPLE(filecheck=CHECK):-target spirv -entry main -stage fragment -emit-spirv-directly
+//TEST:SIMPLE(filecheck=CHECK):-target spirv -entry main -stage fragment -emit-spirv-via-glsl
 
 float4 main(
 	in float4 color : COLOR,
@@ -9,7 +9,8 @@ float4 main(
 	out uint outputCoverage : SV_Coverage)
 	: SV_Target
 {
-    // CHECK: %gl_SampleMask = OpVariable %_ptr_Input__arr_int_int_1 Input
+    // CHECK: OpDecorate %gl_SampleMask{{.*}} BuiltIn SampleMask
+    // CHECK: %gl_SampleMask{{.*}} = OpVariable %_ptr_Input__arr_int_{{u?}}int_1 Input
 	outputCoverage = inputCoverage ^ 1;
 	return color;
 }
diff --git a/tests/cross-compile/sv-coverage.slang.glsl b/tests/cross-compile/sv-coverage.slang.glsl
deleted file mode 100644
index a5e0dea47..000000000
--- a/tests/cross-compile/sv-coverage.slang.glsl
+++ /dev/null
@@ -1,16 +0,0 @@
-// sv-coverage.slang.glsl
-#version 450
-
-layout(location = 0)
-out vec4 main_0;
-
-layout(location = 0)
-in vec4 color_0;
-
-void main()
-{
-    uint _S1 = uint(gl_SampleMaskIn[0]) ^ uint(1);
-    main_0 = color_0;
-    gl_SampleMask[0] = int(_S1);
-    return;
-}
diff --git a/tests/cross-compile/unknown-image-format.slang b/tests/cross-compile/unknown-image-format.slang
index bf937c5fa..27eaee606 100644
--- a/tests/cross-compile/unknown-image-format.slang
+++ b/tests/cross-compile/unknown-image-format.slang
@@ -1,9 +1,14 @@
 // unknown-image-format.slang
 
-//TEST:CROSS_COMPILE:-target spirv-assembly -entry main -stage fragment -default-image-format-unknown
+//TEST:SIMPLE(filecheck=CHECK):-target spirv-assembly -entry main -stage fragment -default-image-format-unknown
 
 // Ensure that we can emit R/W images with an unknown format, when required.
 
+// CHECK: OpTypeImage %float 2D 2 0 0 2 Unknown
+// CHECK: OpTypeImage %float 2D 2 0 0 2 R32f
+// CHECK: OpTypeImage %float 2D 2 0 0 2 Rgba8
+// CHECK: OpTypeImage %float 2D 2 0 0 2 Rgba16f
+
 // Global Scope:
 
 RWTexture2D<float> gNoFormat;
diff --git a/tests/cross-compile/unknown-image-format.slang.glsl b/tests/cross-compile/unknown-image-format.slang.glsl
deleted file mode 100644
index a39cf3693..000000000
--- a/tests/cross-compile/unknown-image-format.slang.glsl
+++ /dev/null
@@ -1,66 +0,0 @@
-// unknown-image-format.slang.glsl
-//TEST_IGNORE_FILE:
-
-#version 450
-#extension GL_EXT_shader_image_load_formatted : require
-layout(row_major) uniform;
-layout(row_major) buffer;
-
-struct SLANG_ParameterGroup_C_0
-{
-    uvec2 index_0;
-};
-
-layout(binding = 2)
-layout(std140) uniform _S1
-{
-    uvec2 index_0;
-} C_0;
-
-layout(binding = 0)
-uniform image2D gNoFormat_0;
-
-layout(r32f)
-layout(binding = 1)
-uniform image2D gExplicitFormat_0;
-
-layout(binding = 0, set = 1)
-uniform image2D gBlock_noFormat_0;
-
-layout(rgba8)
-layout(binding = 1, set = 1)
-uniform image2D gBlock_explicitFormat_0;
-
-layout(binding = 3)
-uniform image2D entryPointParams_noFormat_0;
-
-layout(rgba16f)
-layout(binding = 4)
-uniform image2D entryPointParams_explicitFormat_0;
-
-layout(location = 0)
-out vec4 main_0;
-
-void main()
-{
-
-    float _S3 = (imageLoad((gNoFormat_0), ivec2((C_0.index_0))).x);
-    vec4 _S4 = vec4(_S3);
-
-    float _S5 = (imageLoad((gExplicitFormat_0), ivec2((C_0.index_0))).x);
-    vec4 result_0 = _S4 + _S5;
-
-    vec4 _S6 = (imageLoad((gBlock_noFormat_0), ivec2((C_0.index_0))));
-    vec4 result_1 = result_0 + _S6;
-
-    vec4 _S7 = (imageLoad((gBlock_explicitFormat_0), ivec2((C_0.index_0))));
-    vec4 result_2 = result_1 + _S7;
-
-    vec4 _S8 = (imageLoad((entryPointParams_noFormat_0), ivec2((C_0.index_0))));
-    vec4 result_3 = result_2 + _S8;
-
-    vec4 _S9 = (imageLoad((entryPointParams_explicitFormat_0), ivec2((C_0.index_0))));
-    main_0 = result_3 + _S9;
-
-    return;
-}
diff --git a/tests/cross-compile/vector-comparison.slang b/tests/cross-compile/vector-comparison.slang
index f363eb40c..a018dc940 100644
--- a/tests/cross-compile/vector-comparison.slang
+++ b/tests/cross-compile/vector-comparison.slang
@@ -1,10 +1,17 @@
 // vector-comparison.slang
 
-//TEST:CROSS_COMPILE:-target spirv-assembly -entry main -stage fragment -Wno-use-of-non-short-circuiting-operator
+//TEST:SIMPLE(filecheck=CHECK):-target spirv-assembly -entry main -stage fragment -Wno-use-of-non-short-circuiting-operator
 
 // This test ensures that we cross-compile vector comparison operators
 // correctly to GLSL
 
+// CHECK: OpFOrdEqual %v4bool
+// CHECK: OpFOrdLessThan %v4bool
+// CHECK: OpFOrdGreaterThan %v4bool
+// CHECK: OpFOrdLessThanEqual %v4bool
+// CHECK: OpFOrdGreaterThanEqual %v4bool
+// CHECK: OpFUnordNotEqual %v4bool
+
 struct Param
 {
     float4 a, b;
diff --git a/tests/cross-compile/vector-comparison.slang.glsl b/tests/cross-compile/vector-comparison.slang.glsl
deleted file mode 100644
index f3f103678..000000000
--- a/tests/cross-compile/vector-comparison.slang.glsl
+++ /dev/null
@@ -1,26 +0,0 @@
-#version 450
-layout(row_major) uniform;
-layout(row_major) buffer;
-struct Param_0
-{
-    vec4 a_0;
-    vec4 b_0;
-};
-
-layout(binding = 0)
-layout(std140) uniform _S1
-{
-    vec4 a_0;
-    vec4 b_0;
-} params_0;
-layout(location = 0)
-out vec4 main_0;
-
-void main()
-{
-
-    const vec4 _S3 = vec4(2.0);
-    const vec4 _S4 = vec4(3.0);
-    main_0 = mix(_S4, _S3, (equal(params_0.a_0,params_0.b_0))) + mix(_S4, _S3, (lessThan(params_0.a_0,params_0.b_0))) + mix(_S4, _S3, (greaterThan(params_0.a_0,params_0.b_0))) + mix(_S4, _S3, (lessThanEqual(params_0.a_0,params_0.b_0))) + mix(_S4, _S3, (greaterThanEqual(params_0.a_0,params_0.b_0))) + mix(_S4, _S3, (notEqual(params_0.a_0,params_0.b_0)));
-    return;
-}
diff --git a/tests/cross-compile/vk-push-constant-set.slang b/tests/cross-compile/vk-push-constant-set.slang
index ee9c68ed8..362db59ec 100644
--- a/tests/cross-compile/vk-push-constant-set.slang
+++ b/tests/cross-compile/vk-push-constant-set.slang
@@ -5,7 +5,7 @@
 // parameters and shifting a parameer block over to
 // `space=1`.
 
-//TEST:CROSS_COMPILE:-target spirv-assembly -entry main -stage fragment
+//TEST:SIMPLE(filecheck=CHECK):-target spirv-assembly -entry main -stage fragment
 
 struct S
 {
@@ -15,6 +15,9 @@ struct S
 [[vk::push_constant]]
 ConstantBuffer<S> x;
 
+// CHECK: OpDecorate %y Binding 0
+// CHECK: OpDecorate %y DescriptorSet 0
+
 ParameterBlock<S> y;
 
 float4 main() : SV_Target