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>

test/tint/statements/compound_assign/matrix/minus.wgsl.expected.glsl

@@ -4,11 +4,15 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-layout(binding = 0, std430) buffer S_ssbo {
+struct S {
   mat4 a;
+};
+
+layout(binding = 0, std430) buffer v_block_ssbo {
+  S inner;
 } v;
 
 void foo() {
-  v.a = (v.a - mat4(vec4(0.0f), vec4(0.0f), vec4(0.0f), vec4(0.0f)));
+  v.inner.a = (v.inner.a - mat4(vec4(0.0f), vec4(0.0f), vec4(0.0f), vec4(0.0f)));
 }
 

test/tint/statements/compound_assign/matrix/minus.wgsl.expected.spvasm

@@ -1,18 +1,21 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 34
+; Bound: 35
 ; Schema: 0
                OpCapability Shader
                OpMemoryModel Logical GLSL450
                OpEntryPoint GLCompute %unused_entry_point "unused_entry_point"
                OpExecutionMode %unused_entry_point LocalSize 1 1 1
+               OpName %v_block "v_block"
+               OpMemberName %v_block 0 "inner"
                OpName %S "S"
                OpMemberName %S 0 "a"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
                OpName %foo "foo"
-               OpDecorate %S Block
+               OpDecorate %v_block Block
+               OpMemberDecorate %v_block 0 Offset 0
                OpMemberDecorate %S 0 Offset 0
                OpMemberDecorate %S 0 ColMajor
                OpMemberDecorate %S 0 MatrixStride 16
@@ -22,36 +25,37 @@
     %v4float = OpTypeVector %float 4
 %mat4v4float = OpTypeMatrix %v4float 4
           %S = OpTypeStruct %mat4v4float
-%_ptr_StorageBuffer_S = OpTypePointer StorageBuffer %S
-          %v = OpVariable %_ptr_StorageBuffer_S StorageBuffer
+    %v_block = OpTypeStruct %S
+%_ptr_StorageBuffer_v_block = OpTypePointer StorageBuffer %v_block
+          %v = OpVariable %_ptr_StorageBuffer_v_block StorageBuffer
        %void = OpTypeVoid
-          %7 = OpTypeFunction %void
+          %8 = OpTypeFunction %void
        %uint = OpTypeInt 32 0
      %uint_0 = OpConstant %uint 0
 %_ptr_StorageBuffer_mat4v4float = OpTypePointer StorageBuffer %mat4v4float
-         %19 = OpConstantNull %mat4v4float
-%unused_entry_point = OpFunction %void None %7
-         %10 = OpLabel
+         %20 = OpConstantNull %mat4v4float
+%unused_entry_point = OpFunction %void None %8
+         %11 = OpLabel
                OpReturn
                OpFunctionEnd
-        %foo = OpFunction %void None %7
-         %12 = OpLabel
-         %16 = OpAccessChain %_ptr_StorageBuffer_mat4v4float %v %uint_0
-         %17 = OpAccessChain %_ptr_StorageBuffer_mat4v4float %v %uint_0
-         %18 = OpLoad %mat4v4float %17
-         %21 = OpCompositeExtract %v4float %18 0
+        %foo = OpFunction %void None %8
+         %13 = OpLabel
+         %17 = OpAccessChain %_ptr_StorageBuffer_mat4v4float %v %uint_0 %uint_0
+         %18 = OpAccessChain %_ptr_StorageBuffer_mat4v4float %v %uint_0 %uint_0
+         %19 = OpLoad %mat4v4float %18
          %22 = OpCompositeExtract %v4float %19 0
-         %23 = OpFSub %v4float %21 %22
-         %24 = OpCompositeExtract %v4float %18 1
+         %23 = OpCompositeExtract %v4float %20 0
+         %24 = OpFSub %v4float %22 %23
          %25 = OpCompositeExtract %v4float %19 1
-         %26 = OpFSub %v4float %24 %25
-         %27 = OpCompositeExtract %v4float %18 2
+         %26 = OpCompositeExtract %v4float %20 1
+         %27 = OpFSub %v4float %25 %26
          %28 = OpCompositeExtract %v4float %19 2
-         %29 = OpFSub %v4float %27 %28
-         %30 = OpCompositeExtract %v4float %18 3
+         %29 = OpCompositeExtract %v4float %20 2
+         %30 = OpFSub %v4float %28 %29
          %31 = OpCompositeExtract %v4float %19 3
-         %32 = OpFSub %v4float %30 %31
-         %33 = OpCompositeConstruct %mat4v4float %23 %26 %29 %32
-               OpStore %16 %33
+         %32 = OpCompositeExtract %v4float %20 3
+         %33 = OpFSub %v4float %31 %32
+         %34 = OpCompositeConstruct %mat4v4float %24 %27 %30 %33
+               OpStore %17 %34
                OpReturn
                OpFunctionEnd

test/tint/statements/compound_assign/matrix/plus.wgsl.expected.glsl

@@ -4,11 +4,15 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-layout(binding = 0, std430) buffer S_ssbo {
+struct S {
   mat4 a;
+};
+
+layout(binding = 0, std430) buffer v_block_ssbo {
+  S inner;
 } v;
 
 void foo() {
-  v.a = (v.a + mat4(vec4(0.0f), vec4(0.0f), vec4(0.0f), vec4(0.0f)));
+  v.inner.a = (v.inner.a + mat4(vec4(0.0f), vec4(0.0f), vec4(0.0f), vec4(0.0f)));
 }
 

test/tint/statements/compound_assign/matrix/plus.wgsl.expected.spvasm

@@ -1,18 +1,21 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 34
+; Bound: 35
 ; Schema: 0
                OpCapability Shader
                OpMemoryModel Logical GLSL450
                OpEntryPoint GLCompute %unused_entry_point "unused_entry_point"
                OpExecutionMode %unused_entry_point LocalSize 1 1 1
+               OpName %v_block "v_block"
+               OpMemberName %v_block 0 "inner"
                OpName %S "S"
                OpMemberName %S 0 "a"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
                OpName %foo "foo"
-               OpDecorate %S Block
+               OpDecorate %v_block Block
+               OpMemberDecorate %v_block 0 Offset 0
                OpMemberDecorate %S 0 Offset 0
                OpMemberDecorate %S 0 ColMajor
                OpMemberDecorate %S 0 MatrixStride 16
@@ -22,36 +25,37 @@
     %v4float = OpTypeVector %float 4
 %mat4v4float = OpTypeMatrix %v4float 4
           %S = OpTypeStruct %mat4v4float
-%_ptr_StorageBuffer_S = OpTypePointer StorageBuffer %S
-          %v = OpVariable %_ptr_StorageBuffer_S StorageBuffer
+    %v_block = OpTypeStruct %S
+%_ptr_StorageBuffer_v_block = OpTypePointer StorageBuffer %v_block
+          %v = OpVariable %_ptr_StorageBuffer_v_block StorageBuffer
        %void = OpTypeVoid
-          %7 = OpTypeFunction %void
+          %8 = OpTypeFunction %void
        %uint = OpTypeInt 32 0
      %uint_0 = OpConstant %uint 0
 %_ptr_StorageBuffer_mat4v4float = OpTypePointer StorageBuffer %mat4v4float
-         %19 = OpConstantNull %mat4v4float
-%unused_entry_point = OpFunction %void None %7
-         %10 = OpLabel
+         %20 = OpConstantNull %mat4v4float
+%unused_entry_point = OpFunction %void None %8
+         %11 = OpLabel
                OpReturn
                OpFunctionEnd
-        %foo = OpFunction %void None %7
-         %12 = OpLabel
-         %16 = OpAccessChain %_ptr_StorageBuffer_mat4v4float %v %uint_0
-         %17 = OpAccessChain %_ptr_StorageBuffer_mat4v4float %v %uint_0
-         %18 = OpLoad %mat4v4float %17
-         %21 = OpCompositeExtract %v4float %18 0
+        %foo = OpFunction %void None %8
+         %13 = OpLabel
+         %17 = OpAccessChain %_ptr_StorageBuffer_mat4v4float %v %uint_0 %uint_0
+         %18 = OpAccessChain %_ptr_StorageBuffer_mat4v4float %v %uint_0 %uint_0
+         %19 = OpLoad %mat4v4float %18
          %22 = OpCompositeExtract %v4float %19 0
-         %23 = OpFAdd %v4float %21 %22
-         %24 = OpCompositeExtract %v4float %18 1
+         %23 = OpCompositeExtract %v4float %20 0
+         %24 = OpFAdd %v4float %22 %23
          %25 = OpCompositeExtract %v4float %19 1
-         %26 = OpFAdd %v4float %24 %25
-         %27 = OpCompositeExtract %v4float %18 2
+         %26 = OpCompositeExtract %v4float %20 1
+         %27 = OpFAdd %v4float %25 %26
          %28 = OpCompositeExtract %v4float %19 2
-         %29 = OpFAdd %v4float %27 %28
-         %30 = OpCompositeExtract %v4float %18 3
+         %29 = OpCompositeExtract %v4float %20 2
+         %30 = OpFAdd %v4float %28 %29
          %31 = OpCompositeExtract %v4float %19 3
-         %32 = OpFAdd %v4float %30 %31
-         %33 = OpCompositeConstruct %mat4v4float %23 %26 %29 %32
-               OpStore %16 %33
+         %32 = OpCompositeExtract %v4float %20 3
+         %33 = OpFAdd %v4float %31 %32
+         %34 = OpCompositeConstruct %mat4v4float %24 %27 %30 %33
+               OpStore %17 %34
                OpReturn
                OpFunctionEnd

test/tint/statements/compound_assign/matrix/times-scalar.wgsl.expected.glsl

@@ -4,11 +4,15 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-layout(binding = 0, std430) buffer S_ssbo {
+struct S {
   mat4 a;
+};
+
+layout(binding = 0, std430) buffer v_block_ssbo {
+  S inner;
 } v;
 
 void foo() {
-  v.a = (v.a * 2.0f);
+  v.inner.a = (v.inner.a * 2.0f);
 }
 

test/tint/statements/compound_assign/matrix/times-scalar.wgsl.expected.spvasm

@@ -1,18 +1,21 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 21
+; Bound: 22
 ; Schema: 0
                OpCapability Shader
                OpMemoryModel Logical GLSL450
                OpEntryPoint GLCompute %unused_entry_point "unused_entry_point"
                OpExecutionMode %unused_entry_point LocalSize 1 1 1
+               OpName %v_block "v_block"
+               OpMemberName %v_block 0 "inner"
                OpName %S "S"
                OpMemberName %S 0 "a"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
                OpName %foo "foo"
-               OpDecorate %S Block
+               OpDecorate %v_block Block
+               OpMemberDecorate %v_block 0 Offset 0
                OpMemberDecorate %S 0 Offset 0
                OpMemberDecorate %S 0 ColMajor
                OpMemberDecorate %S 0 MatrixStride 16
@@ -22,24 +25,25 @@
     %v4float = OpTypeVector %float 4
 %mat4v4float = OpTypeMatrix %v4float 4
           %S = OpTypeStruct %mat4v4float
-%_ptr_StorageBuffer_S = OpTypePointer StorageBuffer %S
-          %v = OpVariable %_ptr_StorageBuffer_S StorageBuffer
+    %v_block = OpTypeStruct %S
+%_ptr_StorageBuffer_v_block = OpTypePointer StorageBuffer %v_block
+          %v = OpVariable %_ptr_StorageBuffer_v_block StorageBuffer
        %void = OpTypeVoid
-          %7 = OpTypeFunction %void
+          %8 = OpTypeFunction %void
        %uint = OpTypeInt 32 0
      %uint_0 = OpConstant %uint 0
 %_ptr_StorageBuffer_mat4v4float = OpTypePointer StorageBuffer %mat4v4float
     %float_2 = OpConstant %float 2
-%unused_entry_point = OpFunction %void None %7
-         %10 = OpLabel
+%unused_entry_point = OpFunction %void None %8
+         %11 = OpLabel
                OpReturn
                OpFunctionEnd
-        %foo = OpFunction %void None %7
-         %12 = OpLabel
-         %16 = OpAccessChain %_ptr_StorageBuffer_mat4v4float %v %uint_0
-         %17 = OpAccessChain %_ptr_StorageBuffer_mat4v4float %v %uint_0
-         %18 = OpLoad %mat4v4float %17
-         %20 = OpMatrixTimesScalar %mat4v4float %18 %float_2
-               OpStore %16 %20
+        %foo = OpFunction %void None %8
+         %13 = OpLabel
+         %17 = OpAccessChain %_ptr_StorageBuffer_mat4v4float %v %uint_0 %uint_0
+         %18 = OpAccessChain %_ptr_StorageBuffer_mat4v4float %v %uint_0 %uint_0
+         %19 = OpLoad %mat4v4float %18
+         %21 = OpMatrixTimesScalar %mat4v4float %19 %float_2
+               OpStore %17 %21
                OpReturn
                OpFunctionEnd

test/tint/statements/compound_assign/matrix/times.wgsl.expected.glsl

@@ -4,11 +4,15 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-layout(binding = 0, std430) buffer S_ssbo {
+struct S {
   mat4 a;
+};
+
+layout(binding = 0, std430) buffer v_block_ssbo {
+  S inner;
 } v;
 
 void foo() {
-  v.a = (v.a * mat4(vec4(0.0f), vec4(0.0f), vec4(0.0f), vec4(0.0f)));
+  v.inner.a = (v.inner.a * mat4(vec4(0.0f), vec4(0.0f), vec4(0.0f), vec4(0.0f)));
 }
 

test/tint/statements/compound_assign/matrix/times.wgsl.expected.spvasm

@@ -1,18 +1,21 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 21
+; Bound: 22
 ; Schema: 0
                OpCapability Shader
                OpMemoryModel Logical GLSL450
                OpEntryPoint GLCompute %unused_entry_point "unused_entry_point"
                OpExecutionMode %unused_entry_point LocalSize 1 1 1
+               OpName %v_block "v_block"
+               OpMemberName %v_block 0 "inner"
                OpName %S "S"
                OpMemberName %S 0 "a"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
                OpName %foo "foo"
-               OpDecorate %S Block
+               OpDecorate %v_block Block
+               OpMemberDecorate %v_block 0 Offset 0
                OpMemberDecorate %S 0 Offset 0
                OpMemberDecorate %S 0 ColMajor
                OpMemberDecorate %S 0 MatrixStride 16
@@ -22,24 +25,25 @@
     %v4float = OpTypeVector %float 4
 %mat4v4float = OpTypeMatrix %v4float 4
           %S = OpTypeStruct %mat4v4float
-%_ptr_StorageBuffer_S = OpTypePointer StorageBuffer %S
-          %v = OpVariable %_ptr_StorageBuffer_S StorageBuffer
+    %v_block = OpTypeStruct %S
+%_ptr_StorageBuffer_v_block = OpTypePointer StorageBuffer %v_block
+          %v = OpVariable %_ptr_StorageBuffer_v_block StorageBuffer
        %void = OpTypeVoid
-          %7 = OpTypeFunction %void
+          %8 = OpTypeFunction %void
        %uint = OpTypeInt 32 0
      %uint_0 = OpConstant %uint 0
 %_ptr_StorageBuffer_mat4v4float = OpTypePointer StorageBuffer %mat4v4float
-         %19 = OpConstantNull %mat4v4float
-%unused_entry_point = OpFunction %void None %7
-         %10 = OpLabel
+         %20 = OpConstantNull %mat4v4float
+%unused_entry_point = OpFunction %void None %8
+         %11 = OpLabel
                OpReturn
                OpFunctionEnd
-        %foo = OpFunction %void None %7
-         %12 = OpLabel
-         %16 = OpAccessChain %_ptr_StorageBuffer_mat4v4float %v %uint_0
-         %17 = OpAccessChain %_ptr_StorageBuffer_mat4v4float %v %uint_0
-         %18 = OpLoad %mat4v4float %17
-         %20 = OpMatrixTimesMatrix %mat4v4float %18 %19
-               OpStore %16 %20
+        %foo = OpFunction %void None %8
+         %13 = OpLabel
+         %17 = OpAccessChain %_ptr_StorageBuffer_mat4v4float %v %uint_0 %uint_0
+         %18 = OpAccessChain %_ptr_StorageBuffer_mat4v4float %v %uint_0 %uint_0
+         %19 = OpLoad %mat4v4float %18
+         %21 = OpMatrixTimesMatrix %mat4v4float %19 %20
+               OpStore %17 %21
                OpReturn
                OpFunctionEnd