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/scalar/and.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 {
   int a;
+};
+
+layout(binding = 0, std430) buffer v_block_ssbo {
+  S inner;
 } v;
 
 void foo() {
-  v.a = (v.a & 2);
+  v.inner.a = (v.inner.a & 2);
 }
 

test/tint/statements/compound_assign/scalar/and.wgsl.expected.spvasm

@@ -1,41 +1,45 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 19
+; Bound: 20
 ; 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
                OpDecorate %v DescriptorSet 0
                OpDecorate %v Binding 0
         %int = OpTypeInt 32 1
           %S = OpTypeStruct %int
-%_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
-          %5 = OpTypeFunction %void
+          %6 = OpTypeFunction %void
        %uint = OpTypeInt 32 0
      %uint_0 = OpConstant %uint 0
 %_ptr_StorageBuffer_int = OpTypePointer StorageBuffer %int
       %int_2 = OpConstant %int 2
-%unused_entry_point = OpFunction %void None %5
-          %8 = OpLabel
+%unused_entry_point = OpFunction %void None %6
+          %9 = OpLabel
                OpReturn
                OpFunctionEnd
-        %foo = OpFunction %void None %5
-         %10 = OpLabel
-         %14 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
-         %15 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
-         %16 = OpLoad %int %15
-         %18 = OpBitwiseAnd %int %16 %int_2
-               OpStore %14 %18
+        %foo = OpFunction %void None %6
+         %11 = OpLabel
+         %15 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0 %uint_0
+         %16 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0 %uint_0
+         %17 = OpLoad %int %16
+         %19 = OpBitwiseAnd %int %17 %int_2
+               OpStore %15 %19
                OpReturn
                OpFunctionEnd

test/tint/statements/compound_assign/scalar/divide.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 {
   int a;
+};
+
+layout(binding = 0, std430) buffer v_block_ssbo {
+  S inner;
 } v;
 
 void foo() {
-  v.a = (v.a / 2);
+  v.inner.a = (v.inner.a / 2);
 }
 

test/tint/statements/compound_assign/scalar/divide.wgsl.expected.spvasm

@@ -1,41 +1,45 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 19
+; Bound: 20
 ; 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
                OpDecorate %v DescriptorSet 0
                OpDecorate %v Binding 0
         %int = OpTypeInt 32 1
           %S = OpTypeStruct %int
-%_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
-          %5 = OpTypeFunction %void
+          %6 = OpTypeFunction %void
        %uint = OpTypeInt 32 0
      %uint_0 = OpConstant %uint 0
 %_ptr_StorageBuffer_int = OpTypePointer StorageBuffer %int
       %int_2 = OpConstant %int 2
-%unused_entry_point = OpFunction %void None %5
-          %8 = OpLabel
+%unused_entry_point = OpFunction %void None %6
+          %9 = OpLabel
                OpReturn
                OpFunctionEnd
-        %foo = OpFunction %void None %5
-         %10 = OpLabel
-         %14 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
-         %15 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
-         %16 = OpLoad %int %15
-         %18 = OpSDiv %int %16 %int_2
-               OpStore %14 %18
+        %foo = OpFunction %void None %6
+         %11 = OpLabel
+         %15 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0 %uint_0
+         %16 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0 %uint_0
+         %17 = OpLoad %int %16
+         %19 = OpSDiv %int %17 %int_2
+               OpStore %15 %19
                OpReturn
                OpFunctionEnd

test/tint/statements/compound_assign/scalar/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 {
   int a;
+};
+
+layout(binding = 0, std430) buffer v_block_ssbo {
+  S inner;
 } v;
 
 void foo() {
-  v.a = (v.a - 2);
+  v.inner.a = (v.inner.a - 2);
 }
 

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

@@ -1,41 +1,45 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 19
+; Bound: 20
 ; 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
                OpDecorate %v DescriptorSet 0
                OpDecorate %v Binding 0
         %int = OpTypeInt 32 1
           %S = OpTypeStruct %int
-%_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
-          %5 = OpTypeFunction %void
+          %6 = OpTypeFunction %void
        %uint = OpTypeInt 32 0
      %uint_0 = OpConstant %uint 0
 %_ptr_StorageBuffer_int = OpTypePointer StorageBuffer %int
       %int_2 = OpConstant %int 2
-%unused_entry_point = OpFunction %void None %5
-          %8 = OpLabel
+%unused_entry_point = OpFunction %void None %6
+          %9 = OpLabel
                OpReturn
                OpFunctionEnd
-        %foo = OpFunction %void None %5
-         %10 = OpLabel
-         %14 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
-         %15 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
-         %16 = OpLoad %int %15
-         %18 = OpISub %int %16 %int_2
-               OpStore %14 %18
+        %foo = OpFunction %void None %6
+         %11 = OpLabel
+         %15 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0 %uint_0
+         %16 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0 %uint_0
+         %17 = OpLoad %int %16
+         %19 = OpISub %int %17 %int_2
+               OpStore %15 %19
                OpReturn
                OpFunctionEnd

test/tint/statements/compound_assign/scalar/modulo.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 {
   int a;
+};
+
+layout(binding = 0, std430) buffer v_block_ssbo {
+  S inner;
 } v;
 
 void foo() {
-  v.a = (v.a % 2);
+  v.inner.a = (v.inner.a % 2);
 }
 

test/tint/statements/compound_assign/scalar/modulo.wgsl.expected.spvasm

@@ -1,41 +1,45 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 19
+; Bound: 20
 ; 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
                OpDecorate %v DescriptorSet 0
                OpDecorate %v Binding 0
         %int = OpTypeInt 32 1
           %S = OpTypeStruct %int
-%_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
-          %5 = OpTypeFunction %void
+          %6 = OpTypeFunction %void
        %uint = OpTypeInt 32 0
      %uint_0 = OpConstant %uint 0
 %_ptr_StorageBuffer_int = OpTypePointer StorageBuffer %int
       %int_2 = OpConstant %int 2
-%unused_entry_point = OpFunction %void None %5
-          %8 = OpLabel
+%unused_entry_point = OpFunction %void None %6
+          %9 = OpLabel
                OpReturn
                OpFunctionEnd
-        %foo = OpFunction %void None %5
-         %10 = OpLabel
-         %14 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
-         %15 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
-         %16 = OpLoad %int %15
-         %18 = OpSMod %int %16 %int_2
-               OpStore %14 %18
+        %foo = OpFunction %void None %6
+         %11 = OpLabel
+         %15 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0 %uint_0
+         %16 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0 %uint_0
+         %17 = OpLoad %int %16
+         %19 = OpSMod %int %17 %int_2
+               OpStore %15 %19
                OpReturn
                OpFunctionEnd

test/tint/statements/compound_assign/scalar/or.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 {
   int a;
+};
+
+layout(binding = 0, std430) buffer v_block_ssbo {
+  S inner;
 } v;
 
 void foo() {
-  v.a = (v.a | 2);
+  v.inner.a = (v.inner.a | 2);
 }
 

test/tint/statements/compound_assign/scalar/or.wgsl.expected.spvasm

@@ -1,41 +1,45 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 19
+; Bound: 20
 ; 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
                OpDecorate %v DescriptorSet 0
                OpDecorate %v Binding 0
         %int = OpTypeInt 32 1
           %S = OpTypeStruct %int
-%_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
-          %5 = OpTypeFunction %void
+          %6 = OpTypeFunction %void
        %uint = OpTypeInt 32 0
      %uint_0 = OpConstant %uint 0
 %_ptr_StorageBuffer_int = OpTypePointer StorageBuffer %int
       %int_2 = OpConstant %int 2
-%unused_entry_point = OpFunction %void None %5
-          %8 = OpLabel
+%unused_entry_point = OpFunction %void None %6
+          %9 = OpLabel
                OpReturn
                OpFunctionEnd
-        %foo = OpFunction %void None %5
-         %10 = OpLabel
-         %14 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
-         %15 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
-         %16 = OpLoad %int %15
-         %18 = OpBitwiseOr %int %16 %int_2
-               OpStore %14 %18
+        %foo = OpFunction %void None %6
+         %11 = OpLabel
+         %15 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0 %uint_0
+         %16 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0 %uint_0
+         %17 = OpLoad %int %16
+         %19 = OpBitwiseOr %int %17 %int_2
+               OpStore %15 %19
                OpReturn
                OpFunctionEnd

test/tint/statements/compound_assign/scalar/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 {
   int a;
+};
+
+layout(binding = 0, std430) buffer v_block_ssbo {
+  S inner;
 } v;
 
 void foo() {
-  v.a = (v.a + 2);
+  v.inner.a = (v.inner.a + 2);
 }
 

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

@@ -1,41 +1,45 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 19
+; Bound: 20
 ; 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
                OpDecorate %v DescriptorSet 0
                OpDecorate %v Binding 0
         %int = OpTypeInt 32 1
           %S = OpTypeStruct %int
-%_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
-          %5 = OpTypeFunction %void
+          %6 = OpTypeFunction %void
        %uint = OpTypeInt 32 0
      %uint_0 = OpConstant %uint 0
 %_ptr_StorageBuffer_int = OpTypePointer StorageBuffer %int
       %int_2 = OpConstant %int 2
-%unused_entry_point = OpFunction %void None %5
-          %8 = OpLabel
+%unused_entry_point = OpFunction %void None %6
+          %9 = OpLabel
                OpReturn
                OpFunctionEnd
-        %foo = OpFunction %void None %5
-         %10 = OpLabel
-         %14 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
-         %15 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
-         %16 = OpLoad %int %15
-         %18 = OpIAdd %int %16 %int_2
-               OpStore %14 %18
+        %foo = OpFunction %void None %6
+         %11 = OpLabel
+         %15 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0 %uint_0
+         %16 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0 %uint_0
+         %17 = OpLoad %int %16
+         %19 = OpIAdd %int %17 %int_2
+               OpStore %15 %19
                OpReturn
                OpFunctionEnd

test/tint/statements/compound_assign/scalar/shift_left.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 {
   int a;
+};
+
+layout(binding = 0, std430) buffer v_block_ssbo {
+  S inner;
 } v;
 
 void foo() {
-  v.a = (v.a << 2u);
+  v.inner.a = (v.inner.a << 2u);
 }
 

test/tint/statements/compound_assign/scalar/shift_left.wgsl.expected.spvasm

@@ -1,41 +1,45 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 19
+; Bound: 20
 ; 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
                OpDecorate %v DescriptorSet 0
                OpDecorate %v Binding 0
         %int = OpTypeInt 32 1
           %S = OpTypeStruct %int
-%_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
-          %5 = OpTypeFunction %void
+          %6 = OpTypeFunction %void
        %uint = OpTypeInt 32 0
      %uint_0 = OpConstant %uint 0
 %_ptr_StorageBuffer_int = OpTypePointer StorageBuffer %int
      %uint_2 = OpConstant %uint 2
-%unused_entry_point = OpFunction %void None %5
-          %8 = OpLabel
+%unused_entry_point = OpFunction %void None %6
+          %9 = OpLabel
                OpReturn
                OpFunctionEnd
-        %foo = OpFunction %void None %5
-         %10 = OpLabel
-         %14 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
-         %15 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
-         %16 = OpLoad %int %15
-         %18 = OpShiftLeftLogical %int %16 %uint_2
-               OpStore %14 %18
+        %foo = OpFunction %void None %6
+         %11 = OpLabel
+         %15 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0 %uint_0
+         %16 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0 %uint_0
+         %17 = OpLoad %int %16
+         %19 = OpShiftLeftLogical %int %17 %uint_2
+               OpStore %15 %19
                OpReturn
                OpFunctionEnd

test/tint/statements/compound_assign/scalar/shift_right.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 {
   int a;
+};
+
+layout(binding = 0, std430) buffer v_block_ssbo {
+  S inner;
 } v;
 
 void foo() {
-  v.a = (v.a >> 2u);
+  v.inner.a = (v.inner.a >> 2u);
 }
 

test/tint/statements/compound_assign/scalar/shift_right.wgsl.expected.spvasm

@@ -1,41 +1,45 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 19
+; Bound: 20
 ; 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
                OpDecorate %v DescriptorSet 0
                OpDecorate %v Binding 0
         %int = OpTypeInt 32 1
           %S = OpTypeStruct %int
-%_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
-          %5 = OpTypeFunction %void
+          %6 = OpTypeFunction %void
        %uint = OpTypeInt 32 0
      %uint_0 = OpConstant %uint 0
 %_ptr_StorageBuffer_int = OpTypePointer StorageBuffer %int
      %uint_2 = OpConstant %uint 2
-%unused_entry_point = OpFunction %void None %5
-          %8 = OpLabel
+%unused_entry_point = OpFunction %void None %6
+          %9 = OpLabel
                OpReturn
                OpFunctionEnd
-        %foo = OpFunction %void None %5
-         %10 = OpLabel
-         %14 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
-         %15 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
-         %16 = OpLoad %int %15
-         %18 = OpShiftRightArithmetic %int %16 %uint_2
-               OpStore %14 %18
+        %foo = OpFunction %void None %6
+         %11 = OpLabel
+         %15 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0 %uint_0
+         %16 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0 %uint_0
+         %17 = OpLoad %int %16
+         %19 = OpShiftRightArithmetic %int %17 %uint_2
+               OpStore %15 %19
                OpReturn
                OpFunctionEnd

test/tint/statements/compound_assign/scalar/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 {
   int a;
+};
+
+layout(binding = 0, std430) buffer v_block_ssbo {
+  S inner;
 } v;
 
 void foo() {
-  v.a = (v.a * 2);
+  v.inner.a = (v.inner.a * 2);
 }
 

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

@@ -1,41 +1,45 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 19
+; Bound: 20
 ; 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
                OpDecorate %v DescriptorSet 0
                OpDecorate %v Binding 0
         %int = OpTypeInt 32 1
           %S = OpTypeStruct %int
-%_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
-          %5 = OpTypeFunction %void
+          %6 = OpTypeFunction %void
        %uint = OpTypeInt 32 0
      %uint_0 = OpConstant %uint 0
 %_ptr_StorageBuffer_int = OpTypePointer StorageBuffer %int
       %int_2 = OpConstant %int 2
-%unused_entry_point = OpFunction %void None %5
-          %8 = OpLabel
+%unused_entry_point = OpFunction %void None %6
+          %9 = OpLabel
                OpReturn
                OpFunctionEnd
-        %foo = OpFunction %void None %5
-         %10 = OpLabel
-         %14 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
-         %15 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
-         %16 = OpLoad %int %15
-         %18 = OpIMul %int %16 %int_2
-               OpStore %14 %18
+        %foo = OpFunction %void None %6
+         %11 = OpLabel
+         %15 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0 %uint_0
+         %16 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0 %uint_0
+         %17 = OpLoad %int %16
+         %19 = OpIMul %int %17 %int_2
+               OpStore %15 %19
                OpReturn
                OpFunctionEnd

test/tint/statements/compound_assign/scalar/xor.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 {
   int a;
+};
+
+layout(binding = 0, std430) buffer v_block_ssbo {
+  S inner;
 } v;
 
 void foo() {
-  v.a = (v.a ^ 2);
+  v.inner.a = (v.inner.a ^ 2);
 }
 

test/tint/statements/compound_assign/scalar/xor.wgsl.expected.spvasm

@@ -1,41 +1,45 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 19
+; Bound: 20
 ; 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
                OpDecorate %v DescriptorSet 0
                OpDecorate %v Binding 0
         %int = OpTypeInt 32 1
           %S = OpTypeStruct %int
-%_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
-          %5 = OpTypeFunction %void
+          %6 = OpTypeFunction %void
        %uint = OpTypeInt 32 0
      %uint_0 = OpConstant %uint 0
 %_ptr_StorageBuffer_int = OpTypePointer StorageBuffer %int
       %int_2 = OpConstant %int 2
-%unused_entry_point = OpFunction %void None %5
-          %8 = OpLabel
+%unused_entry_point = OpFunction %void None %6
+          %9 = OpLabel
                OpReturn
                OpFunctionEnd
-        %foo = OpFunction %void None %5
-         %10 = OpLabel
-         %14 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
-         %15 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
-         %16 = OpLoad %int %15
-         %18 = OpBitwiseXor %int %16 %int_2
-               OpStore %14 %18
+        %foo = OpFunction %void None %6
+         %11 = OpLabel
+         %15 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0 %uint_0
+         %16 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0 %uint_0
+         %17 = OpLoad %int %16
+         %19 = OpBitwiseXor %int %17 %int_2
+               OpStore %15 %19
                OpReturn
                OpFunctionEnd