Fixes array tests to be more portable (#420)

The resource array tests are failing on some of the new hardware we're
bringing up this is for a couple reasons. The main issues stem from the
use of RWBuffer, which may or may not be clamped. This required wider
tolerances for floating point values and caused some integer values to
come back wrong.

This update switches the tests to RWStructuredBuffer instead and adjusts
some of the test checks.

Fixes #335, Fixes #336

Author: llvm-beanz

test/Feature/ResourceArrays/array-global.test

@@ -7,16 +7,16 @@
 // results compare for array BufC and BufD.
 
 [[vk::binding(0)]]
-RWBuffer<int> A[2] : register(u0);
+RWStructuredBuffer<int> A[2] : register(u0);
 
 [[vk::binding(1)]]
 RWStructuredBuffer<int> B[4] : register(u4);
 
 [[vk::binding(2)]]
-RWBuffer<int> C[2] : register(u8);
+RWStructuredBuffer<int> C[2] : register(u8);
 
 [[vk::binding(3)]]
-RWBuffer<float> D[2] : register(u10);
+RWStructuredBuffer<float> D[2] : register(u10);
 
 [numthreads(4,2,1)]
 void main(uint GI : SV_GroupIndex) {
@@ -27,7 +27,7 @@ void main(uint GI : SV_GroupIndex) {
     C[i][GI] = A[i][GI] * 2;
   }
   for (int i = 0; i < 2; i++) {
-    D[i][GI] = (float)A[i][GI] / 3.14159f;
+    D[i][GI] = (float)A[i][GI] / 1.5f;
   }
 }
 
@@ -50,6 +50,15 @@ Buffers:
     ArraySize: 4
     ZeroInitSize: 32
 
+  - Name: ExpectedBufB
+    Format: Int32
+    ArraySize: 4
+    Data:
+      - [ 0, 1, 2, 3, 4, 5, 6, 7 ]
+      - [ 0, 2, 4, 6, 8, 10, 12, 14 ]
+      - [ 0, 3, 6, 9, 12, 15, 18, 21 ]
+      - [ 0, 4, 8, 12, 16, 20, 24, 28 ]
+
   - Name: BufC
     Format: Int32
     ArraySize: 2
@@ -58,7 +67,7 @@ Buffers:
   - Name: ExpectedBufC
     Format: Int32
     ArraySize: 2
-    Data: 
+    Data:
       - [ 0, 2, 4, 6, 8, 10, 12, 14 ]
       - [ 2, 4, 6, 8, 10, 12, 14, 16 ]
 
@@ -71,24 +80,31 @@ Buffers:
     Format: Float32
     ArraySize: 2
     Data:
-      - [ 0, 0.32, 0.64, 0.94, 1.27, 1.59, 1.91, 2.23 ]
-      - [ 0.32, 0.64, 0.95, 1.27, 1.59, 1.91, 2.23, 2.54 ]
+      - [ 0x0.0000000000000p+0, 0x1.5555560000000p-1, 0x1.5555560000000p+0, 0x1.0000000000000p+1, 0x1.5555560000000p+1, 0x1.aaaaac0000000p+1, 0x1.0000000000000p+2, 0x1.2aaaac0000000p+2 ]
+      # [ 0, 0.666667, 1.33333, 2, 2.66667, 3.33333, 4, 4.66667 ]
+      - [ 0x1.5555560000000p-1, 0x1.5555560000000p+0, 0x1.0000000000000p+1, 0x1.5555560000000p+1, 0x1.aaaaac0000000p+1, 0x1.0000000000000p+2, 0x1.2aaaac0000000p+2, 0x1.5555560000000p+2 ]
+      # [ 0.666667, 1.33333, 2, 2.66667, 3.33333, 4, 4.66667, 5.33333 ]
 Results:
+  - Result: BufB
+    Rule: BufferExact
+    Actual: BufB
+    Expected: ExpectedBufB
+
   - Result: BufC
     Rule: BufferExact
     Actual: BufC
     Expected: ExpectedBufC
 
   - Result: BufD
-    Rule: BufferFloatEpsilon
-    Epsilon: 0.05
+    Rule: BufferFloatULP
+    ULPT: 5
     Actual: BufD
     Expected: ExpectedBufD
 
 DescriptorSets:
   - Resources:
     - Name: BufA
-      Kind: RWBuffer
+      Kind: RWStructuredBuffer
       DirectXBinding:
         Register: 0
         Space: 0
@@ -102,14 +118,14 @@ DescriptorSets:
       VulkanBinding:
         Binding: 1
     - Name: BufC
-      Kind: RWBuffer
+      Kind: RWStructuredBuffer
       DirectXBinding:
         Register: 8
         Space: 0
       VulkanBinding:
         Binding: 2
     - Name: BufD
-      Kind: RWBuffer
+      Kind: RWStructuredBuffer
       DirectXBinding:
         Register: 10
         Space: 0
@@ -126,10 +142,10 @@ DescriptorSets:
 # 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 -Fo %t.o %t/source.hlsl %}
+# RUN: %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl
 # RUN: %offloader %t/pipeline.yaml %t.o | FileCheck %s
 
+// These checks added to verify YAML printing of arrays.
 // CHECK: Name: BufB
 // CHECK: Format: Int32
 // CHECK: ArraySize: 4
@@ -143,6 +159,5 @@ DescriptorSets:
 // CHECK: Format: Float32
 // CHECK: ArraySize: 2
 // CHECK: Data:
-// CHECK: - [ 0, 0.31831, 0.63662, 0.95493, 1.27324, 1.59155, 1.90986, 2.22817 ]
-// CHECK: - [ 0.31831, 0.63662, 0.95493, 1.27324, 1.59155, 1.90986, 2.22817, 
-// CHECK:     2.54648 ]
+// CHECK: - [ 0, 0.666667, 1.33333, 2, 2.66667, 3.33333, 4, 4.66667 ]
+// CHECK: - [ 0.666667, 1.33333, 2, 2.66667, 3.33333, 4, 4.66667, 5.33333 ]

test/Feature/ResourceArrays/array-local.test

@@ -3,16 +3,16 @@
 // This test verified handling of resource arrays used as a local
 // variable and function argument.
 
-RWBuffer<float> BufA : register(u0);
-RWBuffer<float> BufB : register(u1);
-RWBuffer<float> Out  : register(u2);
+RWStructuredBuffer<float> BufA : register(u0);
+RWStructuredBuffer<float> BufB : register(u1);
+RWStructuredBuffer<float> Out  : register(u2);
 
-float foo(RWBuffer<float> ArgArray[2], uint Index) {
+float foo(RWStructuredBuffer<float> ArgArray[2], uint Index) {
     return ArgArray[0][Index] + ArgArray[1][Index] * 10;
 }
 
 float bar(uint Index) {
-  RWBuffer<float> LocalArray[2];
+  RWStructuredBuffer<float> LocalArray[2];
   LocalArray[0] = BufA;
   LocalArray[1] = BufB;
   return foo(LocalArray, Index);
@@ -48,29 +48,29 @@ Buffers:
 
 Results:
   - Result: BufOut
-    Rule: BufferFloatEpsilon
-    Epsilon: 0.0001
+    Rule: BufferFloatULP
+    ULPT: 5
     Actual: BufOut
     Expected: ExpectedOut
 
 DescriptorSets:
   - Resources:
     - Name: BufA
-      Kind: RWBuffer
+      Kind: RWStructuredBuffer
       DirectXBinding:
         Register: 0
         Space: 0
       VulkanBinding:
         Binding: 0
     - Name: BufB
-      Kind: RWBuffer
+      Kind: RWStructuredBuffer
       DirectXBinding:
         Register: 1
         Space: 0
       VulkanBinding:
         Binding: 1
     - Name: BufOut
-      Kind: RWBuffer
+      Kind: RWStructuredBuffer
       DirectXBinding:
         Register: 2
         Space: 0
@@ -85,7 +85,10 @@ DescriptorSets:
 # Bug https://github.com/llvm/llvm-project/issues/154669
 # XFAIL: Clang-Vulkan
 
+# DXC-Vulkan support for arrays of RWStructuredBuffer are pretty broken.
+# Tracked by https://github.com/microsoft/DirectXShaderCompiler/issues/7727
+# XFAIL: DXC-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 -Fo %t.o %t/source.hlsl %}
+# RUN: %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl
 # RUN: %offloader %t/pipeline.yaml %t.o

test/Feature/ResourceArrays/array-local2.test

@@ -6,17 +6,17 @@
 // The test verifies that this modification of local array B does not affect
 // array A.
 
-RWBuffer<int> X : register(u0);
-RWBuffer<int> Y : register(u1);
+RWStructuredBuffer<int> X : register(u0);
+RWStructuredBuffer<int> Y : register(u1);
 
-void SomeFn(RWBuffer<int> B[2], uint Idx, int Val0) {
+void SomeFn(RWStructuredBuffer<int> B[2], uint Idx, int Val0) {
   B[0] = Y;
   B[0][Idx] = Val0;
 }
 
 [numthreads(4,1,1)]
 void main(uint GI : SV_GroupIndex) {
-  RWBuffer<int> A[2] = {X, Y};
+  RWStructuredBuffer<int> A[2] = {X, Y};
   SomeFn(A, GI, 1);
   A[0][GI] = 2;
 }
@@ -58,14 +58,14 @@ Results:
 DescriptorSets:
   - Resources:
     - Name: BufX
-      Kind: RWBuffer
+      Kind: RWStructuredBuffer
       DirectXBinding:
         Register: 0
         Space: 0
       VulkanBinding:
         Binding: 0
     - Name: BufY
-      Kind: RWBuffer
+      Kind: RWStructuredBuffer
       DirectXBinding:
         Register: 1
         Space: 0
@@ -79,13 +79,16 @@ DescriptorSets:
 # Bug https://github.com/microsoft/DirectXShaderCompiler/issues/7678
 # XFAIL: DXC-DirectX
 
+# DXC-Vulkan support for arrays of RWStructuredBuffer are pretty broken.
+# Tracked by https://github.com/microsoft/DirectXShaderCompiler/issues/7727
+# XFAIL: DXC-Vulkan
+
 # Resource arrays are not yet supported on Metal
 # UNSUPPORTED: Metal
 
 # Bug 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 -Fo %t.o %t/source.hlsl %}
+# RUN: %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl
 # RUN: %offloader %t/pipeline.yaml %t.o

test/Feature/ResourceArrays/multi-dim-array-global.test

@@ -2,8 +2,8 @@
 
 // This test verified handling of global multi-dimensional resource arrays.
 
-RWBuffer<int> In[2][3] : register(u0);
-RWBuffer<int> Out[2][3] : register(u6);
+RWStructuredBuffer<int> In[2][3] : register(u0);
+RWStructuredBuffer<int> Out[2][3] : register(u6);
 
 [numthreads(4,1,1)]
 void main(uint GI : SV_GroupIndex) {
@@ -57,12 +57,12 @@ Results:
 DescriptorSets:
   - Resources:
     - Name: BufIn
-      Kind: RWBuffer
+      Kind: RWStructuredBuffer
       DirectXBinding:
         Register: 0
         Space: 0
     - Name: BufOut
-      Kind: RWBuffer
+      Kind: RWStructuredBuffer
       DirectXBinding:
         Register: 6
         Space: 0

test/Feature/ResourceArrays/multi-dim-array-local.test

@@ -3,17 +3,17 @@
 // This test verified handling of multi-dimensional resource arrays
 // used as a local variable and function argument
 
-RWBuffer<float> BufA : register(u0);
-RWBuffer<float> BufB : register(u1);
-RWBuffer<float> Out  : register(u2);
+RWStructuredBuffer<float> BufA : register(u0);
+RWStructuredBuffer<float> BufB : register(u1);
+RWStructuredBuffer<float> Out  : register(u2);
 
-float foo(RWBuffer<float> A[2][3], uint Index) {
+float foo(RWStructuredBuffer<float> A[2][3], uint Index) {
     return A[0][0][Index] + (A[0][1][Index] + 1) * 10 + (A[0][2][Index] + 2) * 100 +
            A[1][0][Index] + (A[1][1][Index] + 0.1) / 10 + (A[1][2][Index] + 0.2) / 100;
 }
 
 float bar(uint Index) {
-  RWBuffer<float> LocalArray[2][3];
+  RWStructuredBuffer<float> LocalArray[2][3];
   for (int i = 0; i < 3; i++) {
     LocalArray[0][i] = BufA;
     LocalArray[1][i] = BufB;
@@ -51,25 +51,25 @@ Buffers:
             876.678, 987.789 ]
 Results:
   - Result: BufOut
-    Rule: BufferFloatEpsilon
-    Epsilon: 0.001
+    Rule: BufferFloatULP
+    ULPT: 10
     Actual: BufOut
     Expected: ExpectedOut
 
 DescriptorSets:
   - Resources:
     - Name: BufA
-      Kind: RWBuffer
+      Kind: RWStructuredBuffer
       DirectXBinding:
         Register: 0
         Space: 0
     - Name: BufB
-      Kind: RWBuffer
+      Kind: RWStructuredBuffer
       DirectXBinding:
         Register: 1
         Space: 0
     - Name: BufOut
-      Kind: RWBuffer
+      Kind: RWStructuredBuffer
       DirectXBinding:
         Register: 2
         Space: 0
@@ -83,6 +83,5 @@ DescriptorSets:
 # UNSUPPORTED: Metal
 
 # 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 -Fo %t.o %t/source.hlsl %}
+# RUN: %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl
 # RUN: %offloader %t/pipeline.yaml %t.o