From 4485cf3eaf142cfd5f8470e86739acc67d4e12ea Mon Sep 17 00:00:00 2001 From: Yong He Date: Thu, 6 Mar 2025 14:26:34 -0800 Subject: 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. --- tests/compute/byte-address-buffer-array.slang | 45 ++------------------------- 1 file changed, 3 insertions(+), 42 deletions(-) (limited to 'tests/compute') 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(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(0)); buffer.StoreAligned(16, buffer.Load(4, 16)); } -- cgit v1.2.3