Update SPIRV-Tools and fix new validation errors. (#6511)

* Update SPIRV-Tools and fix new validation errors.

* Implement pointers for glsl target.

* Reworked packStorage/unpackStorage code gen to operate on pointers rather than values.

8 files changed, 29 insertions, 87 deletions

diff --git a/tests/bugs/gh-3931.slang b/tests/bugs/gh-3931.slang
deleted file mode 100644
index 501e85ae2..000000000
--- a/tests/bugs/gh-3931.slang
+++ /dev/null
@@ -1,24 +0,0 @@
-//TEST:SIMPLE(filecheck=CHECK): -O0 -target spirv -emit-spirv-directly -stage compute -entry computeMain -matrix-layout-row-major
-//COM:TEST:SIMPLE(filecheck=CHECK): -O2 -target spirv -emit-spirv-directly -stage compute -entry computeMain -matrix-layout-row-major
-
-// Any level of optimization removes all OpMemberDecorations from FooBar
-// with spirv-opt 2023 or upstream (2024-04). spirv-opt 2024-1 fixes the issue.
-
-//CHECK: ColMajor
-
-struct FooBar {
-    float4x4 c;
-    int load(int row, int col)
-    {
-        return int(c[row][col]);
-        //return *(int*)int(c[row][col]); // Does not fail if using a pointer to any member to indirectly send data
-    }
-};
-RWStructuredBuffer<int> outputBuffer;
-uniform StructuredBuffer<FooBar, ScalarDataLayout> sb;
-[numthreads(4, 1, 1)]
-void computeMain(
-    int3 dispatchThreadID : SV_DispatchThreadID)
-{
-    outputBuffer[dispatchThreadID.x] = sb[0].load(dispatchThreadID.x/4, dispatchThreadID.x%4);
-}
\ No newline at end of file
diff --git a/tests/compute/byte-address-buffer-array.slang b/tests/compute/byte-address-buffer-array.slang
index 77cfb07d2..429d24072 100644
--- a/tests/compute/byte-address-buffer-array.slang
+++ b/tests/compute/byte-address-buffer-array.slang
@@ -2,7 +2,6 @@
 //TEST(compute, vulkan):COMPARE_COMPUTE_EX(filecheck-buffer=CHECK):-slang -compute -d3d12 -profile cs_6_0 -use-dxil -shaderobj -output-using-type
 //DISABLED_TEST(compute, vulkan):COMPARE_COMPUTE_EX(filecheck-buffer=CHECK):-slang -compute -vk -shaderobj -output-using-type
 
-//TEST:SIMPLE(filecheck=CHECK1):-target glsl -entry computeMain -stage compute
 //TEST:SIMPLE(filecheck=CHECK2):-target hlsl -entry computeMain -stage compute
 //TEST:SIMPLE(filecheck=CHECK3):-target spirv -entry computeMain -stage compute
 //TEST:SIMPLE(filecheck=CHECK3):-target spirv -emit-spirv-directly -entry computeMain -stage compute
@@ -19,18 +18,6 @@ struct Block {
 void computeMain(uint3 threadId : SV_DispatchThreadID)
 {
     // CHECK-NOT: warning
-    // CHECK1: _Array_std430_vector{{.*}} _data[]
-    // CHECK1: _Array_std430_vector{{.*}} packStorage_0(vec4 {{.*}}[2])
-    // CHECK1: vec4  {{.*}}[2] = { {{.*}}[0], {{.*}}[1] };
-    // CHECK1: _Array_std430_vector{{.*}} {{.*}} = { {{.*}} };
-    // CHECK1: void unpackStorage_0(_Array_std430_vector{{.*}}, out vec4 {{.*}}[2])
-    // CHECK1: {{.*}}[0] =  {{.*}}.data_0[0];
-    // CHECK1: {{.*}}[1] =  {{.*}}.data_0[1];
-    // CHECK1: vec4  {{.*}}[2];
-    // CHECK1: unpackStorage_0(buffer_0._data[uint(0)], {{.*}});
-    // CHECK1: vec4  {{.*}}[2] = buffer_0._data[0] = packStorage_0({{.*}});
-    // CHECK1: vec4 {{.*}} = buffer_2._data[uint(1)];
-    // CHECK1: vec4 {{.*}} = buffer_2._data[1] = vec4(buffer_1._data[uint(1)], buffer_1._data[uint(2)], buffer_1._data[uint(3)], buffer_1._data[uint(4)]);
 
     // CHECK2: float4 {{.*}}[int(2)] = (buffer_0).Load<float4 [int(2)] >(int(0));
     // CHECK2: buffer_0.Store(int(0),{{.*}});
@@ -43,35 +30,9 @@ void computeMain(uint3 threadId : SV_DispatchThreadID)
     // CHECK2: buffer_0.Store(int(16),{{.*}});
     // CHECK2: buffer_0.Store(int(32),{{.*}});
 
-    // CHECK3-DAG: %[[ARRV4_2:[a-zA-Z0-9_]+]] = OpTypeArray %v4float %int_2
-    // CHECK3-DAG: %[[SARRV4_2:[a-zA-Z0-9_]+]] = OpTypeStruct %[[ARRV4_2]]
-    // CHECK3-DAG: %[[SBA:[a-zA-Z0-9_]+]] = OpTypePointer StorageBuffer %[[SARRV4_2]]
-    // CHECK3-DAG: %[[SBF:[a-zA-Z0-9_]+]] = OpTypePointer StorageBuffer %float
-    // CHECK3-DAG: %[[SBVF:[a-zA-Z0-9_]+]] = OpTypePointer StorageBuffer %v4float
-    // CHECK3-DAG: %[[V0:[a-zA-Z0-9_]+]] = OpAccessChain %[[SBA]] %buffer {{.*}}
-    // CHECK3-DAG: %[[V1:[a-zA-Z0-9_]+]] = OpLoad %[[SARRV4_2]] %[[V0]]
-    // CHECK3-DAG: %[[V2:[a-zA-Z0-9_]+]] = OpCompositeExtract %[[ARRV4_2]] %[[V1]] 0
-    // CHECK3-DAG: %[[V3:[a-zA-Z0-9_]+]] = OpCompositeExtract %v4float %[[V2]] 0
-    // CHECK3-DAG: %[[V4:[a-zA-Z0-9_]+]] = OpCompositeExtract %v4float %[[V2]] 1
-    // CHECK3-DAG: %[[V5:[a-zA-Z0-9_]+]] = OpCompositeConstruct %[[ARRV4_2]] %[[V3]] %[[V4]]
-    // CHECK3-DAG: %[[V6:[a-zA-Z0-9_]+]] = OpCompositeConstruct %[[SARRV4_2]] %[[V5]]
-    // CHECK3-DAG: %[[V7:[a-zA-Z0-9_]+]] = OpAccessChain %[[SBA]] %buffer {{.*}}
-    // CHECK3-DAG: OpStore %[[V7]] %[[V6]]
-    // CHECK3-DAG: %[[V8:[a-zA-Z0-9_]+]] = OpAccessChain %[[SBF]] %buffer_0 {{.*}}
-    // CHECK3-DAG: %[[V9:[a-zA-Z0-9_]+]] = OpLoad %float %[[V8]]
-    // CHECK3-DAG: %[[V10:[a-zA-Z0-9_]+]] = OpAccessChain %[[SBF]] %buffer_0 {{.*}}
-    // CHECK3-DAG: %[[V11:[a-zA-Z0-9_]+]] = OpLoad %float %[[V10]]
-    // CHECK3-DAG: %[[V12:[a-zA-Z0-9_]+]] = OpAccessChain %[[SBF]] %buffer_0 {{.*}}
-    // CHECK3-DAG: %[[V13:[a-zA-Z0-9_]+]] = OpLoad %float %[[V12]]
-    // CHECK3-DAG: %[[V14:[a-zA-Z0-9_]+]] = OpAccessChain %[[SBF]] %buffer_0 {{.*}}
-    // CHECK3-DAG: %[[V15:[a-zA-Z0-9_]+]] = OpLoad %float %[[V14]]
-    // CHECK3-DAG: %[[V16:[a-zA-Z0-9_]+]] = OpCompositeConstruct %v4float %[[V9]] %[[V11]] %[[V13]] %[[V15]]
-    // CHECK3-DAG: %[[V17:[a-zA-Z0-9_]+]] = OpAccessChain %[[SBVF]] %buffer_1 {{.*}}
-    // CHECK3-DAG: %[[V18:[a-zA-Z0-9_]+]] = OpLoad %v4float %[[V17]]
-    // CHECK3-DAG: %[[V19:[a-zA-Z0-9_]+]] = OpAccessChain %[[SBVF]] %buffer_1 {{.*}}
-    // CHECK3-DAG: OpStore %[[V19]] %[[V16]]
-    // CHECK3-DAG: %[[V20:[a-zA-Z0-9_]+]] = OpAccessChain %[[SBVF]] %buffer_1 {{.*}}
-    // CHECK3-DAG: OpStore %[[V20]] %[[V18]]
+    // CHECK3: OpAccessChain
+    // CHECK3: OpLoad %v4float
+    // CHECK3: OpStore
     buffer.Store(0, buffer.LoadAligned<Block>(0));
     buffer.StoreAligned(16, buffer.Load<Block>(4, 16));
 }
diff --git a/tests/glsl-intrinsic/atomic/atomicCounter.slang b/tests/glsl-intrinsic/atomic/atomicCounter.slang
index a3b938565..4e32800e0 100644
--- a/tests/glsl-intrinsic/atomic/atomicCounter.slang
+++ b/tests/glsl-intrinsic/atomic/atomicCounter.slang
@@ -48,7 +48,7 @@ bool counterAsParam(atomic_uint param)
 bool testAtomicUint()
 {
 // ensure the code emits for `one` index into [3] for 12/4
-// CHECK_GLSL-DAG: {{.*}}_data_0[3]{{.*}}
+// CHECK_GLSL-DAG: {{.*}}_data_{{.*}}[3]{{.*}}
     return true
     
         && atomicCounterExchange(one, 5) != 100
diff --git a/tests/glsl-intrinsic/atomic/atomicCounterTestMultiple.slang b/tests/glsl-intrinsic/atomic/atomicCounterTestMultiple.slang
index e6a3ae7e9..714ddd571 100644
--- a/tests/glsl-intrinsic/atomic/atomicCounterTestMultiple.slang
+++ b/tests/glsl-intrinsic/atomic/atomicCounterTestMultiple.slang
@@ -20,15 +20,15 @@ void computeMain()
 {
 
     outputBuffer.data[0] = true
-// CHECK_GLSL: one_0._data_0[3]
+// CHECK_GLSL: one_0._data_{{.*}}[3]
         && atomicCounter(one) == 0
-// CHECK_GLSL: one_0._data_0[4]
+// CHECK_GLSL: one_0._data_{{.*}}[4]
         && atomicCounter(two) == 0
-// CHECK_GLSL: one_0._data_0[1]
+// CHECK_GLSL: one_0._data_{{.*}}[1]
         && atomicCounter(three) == 0
-// CHECK_GLSL: one_0._data_0[2]
+// CHECK_GLSL: one_0._data_{{.*}}[2]
         && atomicCounter(four) == 0
-// CHECK_GLSL: five_0._data_1[0]
+// CHECK_GLSL: five_0._data_{{.*}}[0]
         && atomicCounter(five) == 0
         
         ;
diff --git a/tests/hlsl-intrinsic/const-buffer-pointer.slang b/tests/hlsl-intrinsic/const-buffer-pointer.slang
index 060871307..9fd8a23d8 100644
--- a/tests/hlsl-intrinsic/const-buffer-pointer.slang
+++ b/tests/hlsl-intrinsic/const-buffer-pointer.slang
@@ -1,33 +1,27 @@
 //TEST:SIMPLE(filecheck=CHECK):-target glsl -profile glsl_450 -entry main -stage compute
-//TEST:SIMPLE(filecheck=SPV):-target spirv -profile glsl_450 -entry main -stage compute
+//TEST:SIMPLE(filecheck=SPV):-target spirv -profile glsl_450 -entry main -stage compute -emit-spirv-via-glsl
 //TEST:SIMPLE(filecheck=SPV):-target spirv -profile glsl_450 -entry main -stage compute -emit-spirv-directly
 // SPV: OpMemoryModel PhysicalStorageBuffer64
 // SPV: OpEntryPoint GLCompute {{.*}} "main" {{.*}}
 // SPV: OpTypePointer PhysicalStorageBuffer
-// SPV: OpINotEqual
 // SPV: OpConvertPtrToU
-// SPV: OpIAdd
-// SPV: OpConvertUToPtr
-// SPV: OpLoad
+// SPV: OpINotEqual
 struct MyStruct
 {
     float4 position;
     float4x4 transform;
 }
 
-// CHECK: layout(buffer_reference, std430, buffer_reference_align = 16) readonly buffer BufferPointer_MyStruct
+// CHECK: layout(buffer_reference, std430, buffer_reference_align = 4) readonly buffer BufferPointer_MyStruct
 // CHECK-NEXT: {
 // CHECK-NEXT: MyStruct{{.*}} _data;
 // CHECK-NEXT: }
 
-// CHECK: struct Globals
+// CHECK: struct ConstBufferPointer
 // CHECK-NEXT: {
-// CHECK-NEXT: BufferPointer_MyStruct{{.*}} pStruct
+// CHECK-NEXT: BufferPointer_MyStruct{{.*}} _ptr
 // CHECK-NEXT: }
 
-// CHECK: void main
-// CHECK: MyStruct{{.*}} s{{.*}} = ((gGlobals{{.*}}.pStruct{{.*}})._data);
-
 struct Globals
 {
     ConstBufferPointer<MyStruct> pStruct;
diff --git a/tests/spirv/aligned-load-store.slang b/tests/spirv/aligned-load-store.slang
index c6b958dc2..e8bee779e 100644
--- a/tests/spirv/aligned-load-store.slang
+++ b/tests/spirv/aligned-load-store.slang
@@ -3,11 +3,23 @@
 // CHECK: OpLoad {{.*}} Aligned 8
 // CHECK: OpStore {{.*}} Aligned 16
 
+// CHECK: OpLoad {{.*}} Aligned 8
+// CHECK: OpLoad {{.*}} Aligned 8
+// CHECK: OpStore {{.*}} Aligned 16
+// CHECK: OpStore {{.*}} Aligned 16
+
 uniform float4* data;
 
+struct C { float4 v0; float4 v1; }
+uniform C* data2;
+
+
 [numthreads(1,1,1)]
 void computeMain()
 {
     var v = loadAligned<8>((float2x4*)data);
     storeAligned<16>((float2x4*)data+1, v);
+
+    var v1 = loadAligned<8>(data2);
+    storeAligned<16>(data2, v1);
 }
\ No newline at end of file
diff --git a/tests/spirv/buffer-pointer-matrix-layout.slang b/tests/spirv/buffer-pointer-matrix-layout.slang
index 2ccde7b71..cbb8f2857 100644
--- a/tests/spirv/buffer-pointer-matrix-layout.slang
+++ b/tests/spirv/buffer-pointer-matrix-layout.slang
@@ -1,7 +1,6 @@
 //TEST:SIMPLE(filecheck=CHECK): -target spirv -emit-spirv-directly -stage compute -entry main -matrix-layout-column-major
 
-// CHECK: OpLoad %_MatrixStorage_float3x4_ColMajornatural {{.*}} Aligned 4
-// CHECK: OpLoad %_MatrixStorage_float3x4_ColMajornatural {{.*}} Aligned 4
+// CHECK: OpLoad {{.*}} Aligned 4
 
 struct Push
 {
diff --git a/tests/spirv/sb-load-2.slang b/tests/spirv/sb-load-2.slang
index b4c10cb4a..05f3766d8 100644
--- a/tests/spirv/sb-load-2.slang
+++ b/tests/spirv/sb-load-2.slang
@@ -11,8 +11,8 @@ struct Test1
 StructuredBuffer<Test1> dp;
 RWStructuredBuffer<float4> outputBuffer;
 
-// CHECK-COUNT-2: unpackStorage
-// CHECK-NOT: unpackStorage
+// CHECK: outputBuffer{{.*}}._data[{{.*}}] =
+
 [numthreads(4, 4, 1)]
 void main(uint3 GTid : SV_GroupThreadID, 
           uint GI    : SV_GroupIndex)