Enable fixed-size resource array tests for Clang (#364)

hekota · web-flow · commit c4405760b525 · 2025-08-25T10:53:51.000-07:00
Since the support for fixed-size resource array has been implemented in Clang, these tests are now passing. Also removing -fvk-use-scalar-layout flag from the tests as they did not really need it (none of them are using structs). Related to llvm/llvm-project#133835.
diff --git a/test/Feature/ResourceArrays/array-global.test b/test/Feature/ResourceArrays/array-global.test
@@ -118,17 +118,16 @@ DescriptorSets:
 ...
 #--- end
 
-# Resource arrays are not yet implemented in Clang:
-# https://github.com/llvm/llvm-project/issues/133835
-# XFAIL: Clang
-
 # Offload tests are missing support for resource arrays on Metal
 # https://github.com/llvm/offload-test-suite/issues/305
 # XFAIL: Metal
 
+# https://github.com/llvm/llvm-project/issues/149561
+# XFAIL: Clang-Vulkan && !VK_KHR_shader_float_controls2
+
 # RUN: split-file %s %t
 # RUN: %if !Vulkan %{ %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl %}
-# RUN: %if Vulkan %{ %dxc_target -T cs_6_0 -fspv-target-env=vulkan1.3 -fvk-use-scalar-layout -Fo %t.o %t/source.hlsl %}
+# RUN: %if Vulkan %{ %dxc_target -T cs_6_0 -fspv-target-env=vulkan1.3 -Fo %t.o %t/source.hlsl %}
 # RUN: %offloader %t/pipeline.yaml %t.o | FileCheck %s
 
 // CHECK: Name: BufB
diff --git a/test/Feature/ResourceArrays/array-local.test b/test/Feature/ResourceArrays/array-local.test
@@ -79,12 +79,13 @@ DescriptorSets:
 ...
 #--- end
 
-# UNSUPPORTED: Clang
-
 # Resource arrays are not yet supported on Metal
 # UNSUPPORTED: Metal
 
+# https://github.com/llvm/llvm-project/issues/154669
+# XFAIL: Clang-Vulkan
+
 # RUN: split-file %s %t
 # RUN: %if !Vulkan %{ %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl %}
-# RUN: %if Vulkan %{ %dxc_target -T cs_6_0 -fspv-target-env=vulkan1.3 -fvk-use-scalar-layout -Fo %t.o %t/source.hlsl %}
+# RUN: %if Vulkan %{ %dxc_target -T cs_6_0 -fspv-target-env=vulkan1.3 -Fo %t.o %t/source.hlsl %}
 # RUN: %offloader %t/pipeline.yaml %t.o
diff --git a/test/Feature/ResourceArrays/array-local2.test b/test/Feature/ResourceArrays/array-local2.test
@@ -74,8 +74,6 @@ DescriptorSets:
 ...
 #--- end
 
-# UNSUPPORTED: Clang
-
 # DXC-DirectX has a bug here because it does not create a local copy
 # of a function argument if the type is resource or resource array.
 https://github.com/microsoft/DirectXShaderCompiler/issues/7678
@@ -84,7 +82,10 @@ https://github.com/microsoft/DirectXShaderCompiler/issues/7678
 # Resource arrays are not yet supported on Metal
 # UNSUPPORTED: Metal
 
+# https://github.com/llvm/llvm-project/issues/154669
+# XFAIL: Clang-Vulkan
+
 # RUN: split-file %s %t
 # RUN: %if !Vulkan %{ %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl %}
-# RUN: %if Vulkan %{ %dxc_target -T cs_6_0 -fspv-target-env=vulkan1.3 -fvk-use-scalar-layout -Fo %t.o %t/source.hlsl %}
+# RUN: %if Vulkan %{ %dxc_target -T cs_6_0 -fspv-target-env=vulkan1.3 -Fo %t.o %t/source.hlsl %}
 # RUN: %offloader %t/pipeline.yaml %t.o
diff --git a/test/Feature/ResourceArrays/array-of-constant-buffers.test b/test/Feature/ResourceArrays/array-of-constant-buffers.test
@@ -76,5 +76,5 @@ DescriptorSets:
 
 # RUN: split-file %s %t
 # RUN: %if !Vulkan %{ %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl %}
-# RUN: %if Vulkan %{ %dxc_target -T cs_6_0 -fspv-target-env=vulkan1.3 -fvk-use-scalar-layout -Fo %t.o %t/source.hlsl %}
+# RUN: %if Vulkan %{ %dxc_target -T cs_6_0 -fspv-target-env=vulkan1.3 -Fo %t.o %t/source.hlsl %}
 # RUN: %offloader %t/pipeline.yaml %t.o
diff --git a/test/Feature/ResourceArrays/multi-dim-array-global.test b/test/Feature/ResourceArrays/multi-dim-array-global.test
@@ -69,8 +69,6 @@ DescriptorSets:
 ...
 #--- end
 
-# UNSUPPORTED: Clang
-
 # Resource arrays are not yet supported on Metal
 # UNSUPPORTED: Metal
 
diff --git a/test/Feature/ResourceArrays/multi-dim-array-local.test b/test/Feature/ResourceArrays/multi-dim-array-local.test
@@ -76,8 +76,6 @@ DescriptorSets:
 ...
 #--- end
 
-# UNSUPPORTED: Clang
-
 # Vulkan does not support multi-dimensional resource arrays
 # UNSUPPORTED: Vulkan
 
@@ -86,5 +84,5 @@ DescriptorSets:
 
 # RUN: split-file %s %t
 # RUN: %if !Vulkan %{ %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl %}
-# RUN: %if Vulkan %{ %dxc_target -T cs_6_0 -fspv-target-env=vulkan1.3 -fvk-use-scalar-layout -Fo %t.o %t/source.hlsl %}
+# RUN: %if Vulkan %{ %dxc_target -T cs_6_0 -fspv-target-env=vulkan1.3 -Fo %t.o %t/source.hlsl %}
 # RUN: %offloader %t/pipeline.yaml %t.o
diff --git a/test/Feature/ResourceArrays/multi-dim-array-subset.test b/test/Feature/ResourceArrays/multi-dim-array-subset.test
@@ -75,5 +75,5 @@ DescriptorSets:
 
 # RUN: split-file %s %t
 # RUN: %if !Vulkan %{ %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl %}
-# RUN: %if Vulkan %{ %dxc_target -T cs_6_0 -fspv-target-env=vulkan1.3 -fvk-use-scalar-layout -Fo %t.o %t/source.hlsl %}
+# RUN: %if Vulkan %{ %dxc_target -T cs_6_0 -fspv-target-env=vulkan1.3 -Fo %t.o %t/source.hlsl %}
 # RUN: %offloader %t/pipeline.yaml %t.o
diff --git a/test/Feature/ResourceArrays/unbounded-array.test b/test/Feature/ResourceArrays/unbounded-array.test
@@ -70,5 +70,5 @@ DescriptorSets:
 
 # RUN: split-file %s %t
 # RUN: %if !Vulkan %{ %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl %}
-# RUN: %if Vulkan %{ %dxc_target -T cs_6_0 -fspv-target-env=vulkan1.3 -fvk-use-scalar-layout -Fo %t.o %t/source.hlsl %}
+# RUN: %if Vulkan %{ %dxc_target -T cs_6_0 -fspv-target-env=vulkan1.3 -Fo %t.o %t/source.hlsl %}
 # RUN: %offloader %t/pipeline.yaml %t.o
diff --git a/test/Feature/StructuredBuffer/inc_counter_array.test b/test/Feature/StructuredBuffer/inc_counter_array.test
@@ -46,16 +46,16 @@ DescriptorSets:
 # https://github.com/llvm/offload-test-suite/issues/305
 # XFAIL: Metal
 
-# Resource arrays are not yet implemented in Clang:
-# https://github.com/llvm/llvm-project/issues/133835
-# XFAIL: Clang
+# https://github.com/llvm/llvm-project/issues/154407
+# XFAIL: Clang-DirectX
 
 # WARP has an issue counters in resource arrays
 # Internal issue #58567630
-# XFAIL: DXC && DirectX-WARP
-
+# XFAIL: DirectX-WARP
+# 
 # Intel has an issue with counters in resource arrays
-# XFAIL: DXC && DirectX-Intel
+# https://github.com/llvm/offload-test-suite/issues/376
+# XFAIL: DirectX-Intel
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl
diff --git a/test/Tools/Offloader/BufferExact-error-array.test b/test/Tools/Offloader/BufferExact-error-array.test
@@ -46,10 +46,6 @@ DescriptorSets:
 ...
 #--- end
 
-# Resource arrays are not yet implemented in Clang:
-# https://github.com/llvm/llvm-project/issues/133835
-# XFAIL: Clang
-
 # Offload tests are missing support for resource arrays on Metal
 # https://github.com/llvm/offload-test-suite/issues/305
 # XFAIL: Metal
