Tint/transform: make AddBlockAttribute always do wrapping if possible

This CL make transform AddBlockAttribute always try to wrap types used
by buffer variables into a struct, in order to generate valid GLSL code
for assigning one buffer struct variable to another buffer struct
variable.

Fixed: tint:1735
Change-Id: I009d8a9ca7ecea1dc0ad6164275c964a18acb33f
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/108023
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Commit-Queue: Zhaoming Jiang <zhaoming.jiang@intel.com>
This commit is contained in:
Zhaoming Jiang
2022-11-02 02:25:38 +00:00
committed by Dawn LUCI CQ
parent 2bea9055f4
commit 6ab5d3c151
465 changed files with 15681 additions and 12853 deletions

View File

@@ -8,6 +8,10 @@ struct S {
ivec4 arr[4];
};
struct S_nested {
int arr[4][3][2];
};
ivec4 src_private[4] = ivec4[4](ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0));
shared ivec4 src_workgroup[4];
layout(binding = 0, std140) uniform src_uniform_block_ubo {
@@ -22,8 +26,8 @@ layout(binding = 2, std430) buffer src_uniform_block_ssbo_1 {
S inner;
} dst;
layout(binding = 3, std430) buffer S_nested_ssbo {
int arr[4][3][2];
layout(binding = 3, std430) buffer dst_nested_block_ssbo {
S_nested inner;
} dst_nested;
ivec4[4] ret_arr() {
@@ -53,6 +57,6 @@ void foo(ivec4 src_param[4]) {
dst.inner.arr = src_uniform.inner.arr;
dst.inner.arr = src_storage.inner.arr;
int src_nested[4][3][2] = int[4][3][2](int[3][2](int[2](0, 0), int[2](0, 0), int[2](0, 0)), int[3][2](int[2](0, 0), int[2](0, 0), int[2](0, 0)), int[3][2](int[2](0, 0), int[2](0, 0), int[2](0, 0)), int[3][2](int[2](0, 0), int[2](0, 0), int[2](0, 0)));
dst_nested.arr = src_nested;
dst_nested.inner.arr = src_nested;
}

View File

@@ -1,7 +1,7 @@
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 79
; Bound: 80
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
@@ -16,6 +16,8 @@
OpName %src_uniform "src_uniform"
OpName %src_storage "src_storage"
OpName %dst "dst"
OpName %dst_nested_block "dst_nested_block"
OpMemberName %dst_nested_block 0 "inner"
OpName %S_nested "S_nested"
OpMemberName %S_nested 0 "arr"
OpName %dst_nested "dst_nested"
@@ -37,7 +39,8 @@
OpDecorate %src_storage Binding 1
OpDecorate %dst DescriptorSet 0
OpDecorate %dst Binding 2
OpDecorate %S_nested Block
OpDecorate %dst_nested_block Block
OpMemberDecorate %dst_nested_block 0 Offset 0
OpMemberDecorate %S_nested 0 Offset 0
OpDecorate %_arr_int_uint_2 ArrayStride 4
OpDecorate %_arr__arr_int_uint_2_uint_3 ArrayStride 8
@@ -67,77 +70,78 @@
%_arr__arr_int_uint_2_uint_3 = OpTypeArray %_arr_int_uint_2 %uint_3
%_arr__arr__arr_int_uint_2_uint_3_uint_4 = OpTypeArray %_arr__arr_int_uint_2_uint_3 %uint_4
%S_nested = OpTypeStruct %_arr__arr__arr_int_uint_2_uint_3_uint_4
%_ptr_StorageBuffer_S_nested = OpTypePointer StorageBuffer %S_nested
%dst_nested = OpVariable %_ptr_StorageBuffer_S_nested StorageBuffer
%dst_nested_block = OpTypeStruct %S_nested
%_ptr_StorageBuffer_dst_nested_block = OpTypePointer StorageBuffer %dst_nested_block
%dst_nested = OpVariable %_ptr_StorageBuffer_dst_nested_block StorageBuffer
%void = OpTypeVoid
%26 = OpTypeFunction %void
%30 = OpTypeFunction %_arr_v4int_uint_4
%33 = OpTypeFunction %S
%36 = OpConstantNull %S
%37 = OpTypeFunction %void %_arr_v4int_uint_4
%27 = OpTypeFunction %void
%31 = OpTypeFunction %_arr_v4int_uint_4
%34 = OpTypeFunction %S
%37 = OpConstantNull %S
%38 = OpTypeFunction %void %_arr_v4int_uint_4
%_ptr_Function__arr_v4int_uint_4 = OpTypePointer Function %_arr_v4int_uint_4
%uint_0 = OpConstant %uint 0
%_ptr_StorageBuffer__arr_v4int_uint_4 = OpTypePointer StorageBuffer %_arr_v4int_uint_4
%int_1 = OpConstant %int 1
%47 = OpConstantComposite %v4int %int_1 %int_1 %int_1 %int_1
%48 = OpConstantComposite %v4int %int_1 %int_1 %int_1 %int_1
%int_2 = OpConstant %int 2
%49 = OpConstantComposite %v4int %int_2 %int_2 %int_2 %int_2
%50 = OpConstantComposite %v4int %int_2 %int_2 %int_2 %int_2
%int_3 = OpConstant %int 3
%51 = OpConstantComposite %v4int %int_3 %int_3 %int_3 %int_3
%52 = OpConstantComposite %_arr_v4int_uint_4 %47 %49 %51 %51
%52 = OpConstantComposite %v4int %int_3 %int_3 %int_3 %int_3
%53 = OpConstantComposite %_arr_v4int_uint_4 %48 %50 %52 %52
%_ptr_Uniform__arr_v4int_uint_4 = OpTypePointer Uniform %_arr_v4int_uint_4
%_ptr_Function__arr__arr__arr_int_uint_2_uint_3_uint_4 = OpTypePointer Function %_arr__arr__arr_int_uint_2_uint_3_uint_4
%75 = OpConstantNull %_arr__arr__arr_int_uint_2_uint_3_uint_4
%76 = OpConstantNull %_arr__arr__arr_int_uint_2_uint_3_uint_4
%_ptr_StorageBuffer__arr__arr__arr_int_uint_2_uint_3_uint_4 = OpTypePointer StorageBuffer %_arr__arr__arr_int_uint_2_uint_3_uint_4
%unused_entry_point = OpFunction %void None %26
%29 = OpLabel
%unused_entry_point = OpFunction %void None %27
%30 = OpLabel
OpReturn
OpFunctionEnd
%ret_arr = OpFunction %_arr_v4int_uint_4 None %30
%32 = OpLabel
%ret_arr = OpFunction %_arr_v4int_uint_4 None %31
%33 = OpLabel
OpReturnValue %8
OpFunctionEnd
%ret_struct_arr = OpFunction %S None %33
%35 = OpLabel
OpReturnValue %36
%ret_struct_arr = OpFunction %S None %34
%36 = OpLabel
OpReturnValue %37
OpFunctionEnd
%foo = OpFunction %void None %37
%foo = OpFunction %void None %38
%src_param = OpFunctionParameter %_arr_v4int_uint_4
%40 = OpLabel
%41 = OpLabel
%src_function = OpVariable %_ptr_Function__arr_v4int_uint_4 Function %8
%src_nested = OpVariable %_ptr_Function__arr__arr__arr_int_uint_2_uint_3_uint_4 Function %75
%45 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %dst %uint_0 %uint_0
OpStore %45 %52
%53 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %dst %uint_0 %uint_0
OpStore %53 %src_param
%54 = OpFunctionCall %_arr_v4int_uint_4 %ret_arr
%55 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %dst %uint_0 %uint_0
OpStore %55 %54
%src_nested = OpVariable %_ptr_Function__arr__arr__arr_int_uint_2_uint_3_uint_4 Function %76
%46 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %dst %uint_0 %uint_0
OpStore %46 %53
%54 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %dst %uint_0 %uint_0
OpStore %54 %src_param
%55 = OpFunctionCall %_arr_v4int_uint_4 %ret_arr
%56 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %dst %uint_0 %uint_0
OpStore %56 %8
OpStore %56 %55
%57 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %dst %uint_0 %uint_0
%58 = OpLoad %_arr_v4int_uint_4 %src_function
OpStore %57 %58
%59 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %dst %uint_0 %uint_0
%60 = OpLoad %_arr_v4int_uint_4 %src_private
OpStore %59 %60
%61 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %dst %uint_0 %uint_0
%62 = OpLoad %_arr_v4int_uint_4 %src_workgroup
OpStore %61 %62
%63 = OpFunctionCall %S %ret_struct_arr
%64 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %dst %uint_0 %uint_0
%65 = OpCompositeExtract %_arr_v4int_uint_4 %63 0
OpStore %64 %65
%66 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %dst %uint_0 %uint_0
%68 = OpAccessChain %_ptr_Uniform__arr_v4int_uint_4 %src_uniform %uint_0 %uint_0
%69 = OpLoad %_arr_v4int_uint_4 %68
OpStore %66 %69
%70 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %dst %uint_0 %uint_0
%71 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %src_storage %uint_0 %uint_0
%72 = OpLoad %_arr_v4int_uint_4 %71
OpStore %70 %72
%77 = OpAccessChain %_ptr_StorageBuffer__arr__arr__arr_int_uint_2_uint_3_uint_4 %dst_nested %uint_0
%78 = OpLoad %_arr__arr__arr_int_uint_2_uint_3_uint_4 %src_nested
OpStore %77 %78
OpStore %57 %8
%58 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %dst %uint_0 %uint_0
%59 = OpLoad %_arr_v4int_uint_4 %src_function
OpStore %58 %59
%60 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %dst %uint_0 %uint_0
%61 = OpLoad %_arr_v4int_uint_4 %src_private
OpStore %60 %61
%62 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %dst %uint_0 %uint_0
%63 = OpLoad %_arr_v4int_uint_4 %src_workgroup
OpStore %62 %63
%64 = OpFunctionCall %S %ret_struct_arr
%65 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %dst %uint_0 %uint_0
%66 = OpCompositeExtract %_arr_v4int_uint_4 %64 0
OpStore %65 %66
%67 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %dst %uint_0 %uint_0
%69 = OpAccessChain %_ptr_Uniform__arr_v4int_uint_4 %src_uniform %uint_0 %uint_0
%70 = OpLoad %_arr_v4int_uint_4 %69
OpStore %67 %70
%71 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %dst %uint_0 %uint_0
%72 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %src_storage %uint_0 %uint_0
%73 = OpLoad %_arr_v4int_uint_4 %72
OpStore %71 %73
%78 = OpAccessChain %_ptr_StorageBuffer__arr__arr__arr_int_uint_2_uint_3_uint_4 %dst_nested %uint_0 %uint_0
%79 = OpLoad %_arr__arr__arr_int_uint_2_uint_3_uint_4 %src_nested
OpStore %78 %79
OpReturn
OpFunctionEnd

View File

@@ -29,18 +29,22 @@ struct strided_arr_1 {
uint pad_20;
};
layout(binding = 0, std430) buffer S_ssbo {
struct S {
strided_arr_1 a[4];
};
layout(binding = 0, std430) buffer s_block_ssbo {
S inner;
} s;
void f_1() {
strided_arr_1 x_19[4] = s.a;
strided_arr x_24[3][2] = s.a[3].el;
strided_arr x_28[2] = s.a[3].el[2];
float x_32 = s.a[3].el[2][1].el;
strided_arr_1 x_19[4] = s.inner.a;
strided_arr x_24[3][2] = s.inner.a[3].el;
strided_arr x_28[2] = s.inner.a[3].el[2];
float x_32 = s.inner.a[3].el[2][1].el;
strided_arr_1 tint_symbol[4] = strided_arr_1[4](strided_arr_1(strided_arr[3][2](strided_arr[2](strided_arr(0.0f, 0u), strided_arr(0.0f, 0u)), strided_arr[2](strided_arr(0.0f, 0u), strided_arr(0.0f, 0u)), strided_arr[2](strided_arr(0.0f, 0u), strided_arr(0.0f, 0u))), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), strided_arr_1(strided_arr[3][2](strided_arr[2](strided_arr(0.0f, 0u), strided_arr(0.0f, 0u)), strided_arr[2](strided_arr(0.0f, 0u), strided_arr(0.0f, 0u)), strided_arr[2](strided_arr(0.0f, 0u), strided_arr(0.0f, 0u))), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), strided_arr_1(strided_arr[3][2](strided_arr[2](strided_arr(0.0f, 0u), strided_arr(0.0f, 0u)), strided_arr[2](strided_arr(0.0f, 0u), strided_arr(0.0f, 0u)), strided_arr[2](strided_arr(0.0f, 0u), strided_arr(0.0f, 0u))), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), strided_arr_1(strided_arr[3][2](strided_arr[2](strided_arr(0.0f, 0u), strided_arr(0.0f, 0u)), strided_arr[2](strided_arr(0.0f, 0u), strided_arr(0.0f, 0u)), strided_arr[2](strided_arr(0.0f, 0u), strided_arr(0.0f, 0u))), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u));
s.a = tint_symbol;
s.a[3].el[2][1].el = 5.0f;
s.inner.a = tint_symbol;
s.inner.a[3].el[2][1].el = 5.0f;
return;
}

View File

@@ -1,12 +1,14 @@
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 42
; Bound: 43
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint GLCompute %f "f"
OpExecutionMode %f LocalSize 1 1 1
OpName %s_block "s_block"
OpMemberName %s_block 0 "inner"
OpName %S "S"
OpMemberName %S 0 "a"
OpName %strided_arr_1 "strided_arr_1"
@@ -16,7 +18,8 @@
OpName %s "s"
OpName %f_1 "f_1"
OpName %f "f"
OpDecorate %S Block
OpDecorate %s_block Block
OpMemberDecorate %s_block 0 Offset 0
OpMemberDecorate %S 0 Offset 0
OpMemberDecorate %strided_arr_1 0 Offset 0
OpMemberDecorate %strided_arr 0 Offset 0
@@ -36,10 +39,11 @@
%uint_4 = OpConstant %uint 4
%_arr_strided_arr_1_uint_4 = OpTypeArray %strided_arr_1 %uint_4
%S = OpTypeStruct %_arr_strided_arr_1_uint_4
%_ptr_StorageBuffer_S = OpTypePointer StorageBuffer %S
%s = OpVariable %_ptr_StorageBuffer_S StorageBuffer
%s_block = OpTypeStruct %S
%_ptr_StorageBuffer_s_block = OpTypePointer StorageBuffer %s_block
%s = OpVariable %_ptr_StorageBuffer_s_block StorageBuffer
%void = OpTypeVoid
%14 = OpTypeFunction %void
%15 = OpTypeFunction %void
%uint_0 = OpConstant %uint 0
%_ptr_StorageBuffer__arr_strided_arr_1_uint_4 = OpTypePointer StorageBuffer %_arr_strided_arr_1_uint_4
%int = OpTypeInt 32 1
@@ -49,26 +53,26 @@
%_ptr_StorageBuffer__arr_strided_arr_uint_2 = OpTypePointer StorageBuffer %_arr_strided_arr_uint_2
%int_1 = OpConstant %int 1
%_ptr_StorageBuffer_float = OpTypePointer StorageBuffer %float
%36 = OpConstantNull %_arr_strided_arr_1_uint_4
%37 = OpConstantNull %_arr_strided_arr_1_uint_4
%float_5 = OpConstant %float 5
%f_1 = OpFunction %void None %14
%17 = OpLabel
%20 = OpAccessChain %_ptr_StorageBuffer__arr_strided_arr_1_uint_4 %s %uint_0
%21 = OpLoad %_arr_strided_arr_1_uint_4 %20
%25 = OpAccessChain %_ptr_StorageBuffer__arr__arr_strided_arr_uint_2_uint_3 %s %uint_0 %int_3 %uint_0
%26 = OpLoad %_arr__arr_strided_arr_uint_2_uint_3 %25
%29 = OpAccessChain %_ptr_StorageBuffer__arr_strided_arr_uint_2 %s %uint_0 %int_3 %uint_0 %int_2
%30 = OpLoad %_arr_strided_arr_uint_2 %29
%33 = OpAccessChain %_ptr_StorageBuffer_float %s %uint_0 %int_3 %uint_0 %int_2 %int_1 %uint_0
%34 = OpLoad %float %33
%35 = OpAccessChain %_ptr_StorageBuffer__arr_strided_arr_1_uint_4 %s %uint_0
OpStore %35 %36
%37 = OpAccessChain %_ptr_StorageBuffer_float %s %uint_0 %int_3 %uint_0 %int_2 %int_1 %uint_0
OpStore %37 %float_5
%f_1 = OpFunction %void None %15
%18 = OpLabel
%21 = OpAccessChain %_ptr_StorageBuffer__arr_strided_arr_1_uint_4 %s %uint_0 %uint_0
%22 = OpLoad %_arr_strided_arr_1_uint_4 %21
%26 = OpAccessChain %_ptr_StorageBuffer__arr__arr_strided_arr_uint_2_uint_3 %s %uint_0 %uint_0 %int_3 %uint_0
%27 = OpLoad %_arr__arr_strided_arr_uint_2_uint_3 %26
%30 = OpAccessChain %_ptr_StorageBuffer__arr_strided_arr_uint_2 %s %uint_0 %uint_0 %int_3 %uint_0 %int_2
%31 = OpLoad %_arr_strided_arr_uint_2 %30
%34 = OpAccessChain %_ptr_StorageBuffer_float %s %uint_0 %uint_0 %int_3 %uint_0 %int_2 %int_1 %uint_0
%35 = OpLoad %float %34
%36 = OpAccessChain %_ptr_StorageBuffer__arr_strided_arr_1_uint_4 %s %uint_0 %uint_0
OpStore %36 %37
%38 = OpAccessChain %_ptr_StorageBuffer_float %s %uint_0 %uint_0 %int_3 %uint_0 %int_2 %int_1 %uint_0
OpStore %38 %float_5
OpReturn
OpFunctionEnd
%f = OpFunction %void None %14
%40 = OpLabel
%41 = OpFunctionCall %void %f_1
%f = OpFunction %void None %15
%41 = OpLabel
%42 = OpFunctionCall %void %f_1
OpReturn
OpFunctionEnd