encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-10 05:57:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

GLSL: Change Add[Spirv]BlockAttribute to support GLSL

Browse Source 
Modify the AddSpirvBlockAttribute transform to fix top-level structure
access of uniform, storage and push-constant buffers for use in the
GLSL backend. The small change to the transform makes the transform
wrap host-sharable buffers, if they're also used as a
non-host-sharable structure. Also rename the transform to
AddBlockAttrbibute in order to reflect its wider applicability.

Change-Id: Ib2bf4ebf6bce72790791dbae9387032be765e4b9
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/101061
Reviewed-by: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Stephen White <senorblanco@chromium.org>
This commit is contained in:
Stephen White
2022-09-02 19:19:10 +00:00
committed by Dawn LUCI CQ
parent 822de46c74
commit 863d9edf59
362 changed files with 2316 additions and 3876 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/tint/array/assign_to_function_var.wgsl.expected.glsl
View File

@@ -10,13 +10,14 @@ struct S {
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) uniform S_1 {
ivec4 arr[4];
layout(binding = 0) uniform src_uniform_block_ubo {
S inner;
} src_uniform;
layout(binding = 1, std430) buffer S_2 {
ivec4 arr[4];
layout(binding = 1, std430) buffer src_uniform_block_ssbo {
S inner;
} src_storage;
ivec4[4] ret_arr() {
ivec4 tint_symbol_1[4] = ivec4[4](ivec4(0), ivec4(0), ivec4(0), ivec4(0));
return tint_symbol_1;
@@ -41,8 +42,8 @@ void foo(ivec4 src_param[4]) {
dst = src_workgroup;
S tint_symbol = ret_struct_arr();
dst = tint_symbol.arr;
dst = src_uniform.arr;
dst = src_storage.arr;
dst = src_uniform.inner.arr;
dst = src_storage.inner.arr;
int dst_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)));
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 = src_nested;

94
test/tint/array/assign_to_function_var.wgsl.expected.spvasm
View File

@@ -1,7 +1,7 @@
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 64
; Bound: 65
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
@@ -9,6 +9,8 @@
OpExecutionMode %unused_entry_point LocalSize 1 1 1
OpName %src_private "src_private"
OpName %src_workgroup "src_workgroup"
OpName %src_uniform_block "src_uniform_block"
OpMemberName %src_uniform_block 0 "inner"
OpName %S "S"
OpMemberName %S 0 "arr"
OpName %src_uniform "src_uniform"
@@ -23,7 +25,8 @@
OpName %dst_nested "dst_nested"
OpName %src_nested "src_nested"
OpDecorate %_arr_v4int_uint_4 ArrayStride 16
OpDecorate %S Block
OpDecorate %src_uniform_block Block
OpMemberDecorate %src_uniform_block 0 Offset 0
OpMemberDecorate %S 0 Offset 0
OpDecorate %src_uniform NonWritable
OpDecorate %src_uniform DescriptorSet 0
@@ -44,24 +47,25 @@
%_ptr_Workgroup__arr_v4int_uint_4 = OpTypePointer Workgroup %_arr_v4int_uint_4
%src_workgroup = OpVariable %_ptr_Workgroup__arr_v4int_uint_4 Workgroup
%S = OpTypeStruct %_arr_v4int_uint_4
%_ptr_Uniform_S = OpTypePointer Uniform %S
%src_uniform = OpVariable %_ptr_Uniform_S Uniform
%_ptr_StorageBuffer_S = OpTypePointer StorageBuffer %S
%src_storage = OpVariable %_ptr_StorageBuffer_S StorageBuffer
%src_uniform_block = OpTypeStruct %S
%_ptr_Uniform_src_uniform_block = OpTypePointer Uniform %src_uniform_block
%src_uniform = OpVariable %_ptr_Uniform_src_uniform_block Uniform
%_ptr_StorageBuffer_src_uniform_block = OpTypePointer StorageBuffer %src_uniform_block
%src_storage = OpVariable %_ptr_StorageBuffer_src_uniform_block StorageBuffer
%void = OpTypeVoid
%16 = OpTypeFunction %void
%20 = OpTypeFunction %_arr_v4int_uint_4
%23 = OpTypeFunction %S
%26 = OpConstantNull %S
%27 = OpTypeFunction %void %_arr_v4int_uint_4
%17 = OpTypeFunction %void
%21 = OpTypeFunction %_arr_v4int_uint_4
%24 = OpTypeFunction %S
%27 = OpConstantNull %S
%28 = OpTypeFunction %void %_arr_v4int_uint_4
%_ptr_Function__arr_v4int_uint_4 = OpTypePointer Function %_arr_v4int_uint_4
%int_1 = OpConstant %int 1
%35 = OpConstantComposite %v4int %int_1 %int_1 %int_1 %int_1
%36 = OpConstantComposite %v4int %int_1 %int_1 %int_1 %int_1
%int_2 = OpConstant %int 2
%37 = OpConstantComposite %v4int %int_2 %int_2 %int_2 %int_2
%38 = OpConstantComposite %v4int %int_2 %int_2 %int_2 %int_2
%int_3 = OpConstant %int 3
%39 = OpConstantComposite %v4int %int_3 %int_3 %int_3 %int_3
%40 = OpConstantComposite %_arr_v4int_uint_4 %35 %37 %39 %39
%40 = OpConstantComposite %v4int %int_3 %int_3 %int_3 %int_3
%41 = OpConstantComposite %_arr_v4int_uint_4 %36 %38 %40 %40
%uint_0 = OpConstant %uint 0
%_ptr_Uniform__arr_v4int_uint_4 = OpTypePointer Uniform %_arr_v4int_uint_4
%_ptr_StorageBuffer__arr_v4int_uint_4 = OpTypePointer StorageBuffer %_arr_v4int_uint_4
@@ -71,47 +75,47 @@
%_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
%_ptr_Function__arr__arr__arr_int_uint_2_uint_3_uint_4 = OpTypePointer Function %_arr__arr__arr_int_uint_2_uint_3_uint_4
%61 = OpConstantNull %_arr__arr__arr_int_uint_2_uint_3_uint_4
%unused_entry_point = OpFunction %void None %16
%19 = OpLabel
%62 = OpConstantNull %_arr__arr__arr_int_uint_2_uint_3_uint_4
%unused_entry_point = OpFunction %void None %17
%20 = OpLabel
OpReturn
OpFunctionEnd
%ret_arr = OpFunction %_arr_v4int_uint_4 None %20
%22 = OpLabel
%ret_arr = OpFunction %_arr_v4int_uint_4 None %21
%23 = OpLabel
OpReturnValue %8
OpFunctionEnd
%ret_struct_arr = OpFunction %S None %23
%25 = OpLabel
OpReturnValue %26
%ret_struct_arr = OpFunction %S None %24
%26 = OpLabel
OpReturnValue %27
OpFunctionEnd
%foo = OpFunction %void None %27
%foo = OpFunction %void None %28
%src_param = OpFunctionParameter %_arr_v4int_uint_4
%30 = OpLabel
%31 = OpLabel
%src_function = OpVariable %_ptr_Function__arr_v4int_uint_4 Function %8
%dst = OpVariable %_ptr_Function__arr_v4int_uint_4 Function %8
%dst_nested = OpVariable %_ptr_Function__arr__arr__arr_int_uint_2_uint_3_uint_4 Function %61
%src_nested = OpVariable %_ptr_Function__arr__arr__arr_int_uint_2_uint_3_uint_4 Function %61
OpStore %dst %40
OpStore %dst %src_param
%41 = OpFunctionCall %_arr_v4int_uint_4 %ret_arr
%dst_nested = OpVariable %_ptr_Function__arr__arr__arr_int_uint_2_uint_3_uint_4 Function %62
%src_nested = OpVariable %_ptr_Function__arr__arr__arr_int_uint_2_uint_3_uint_4 Function %62
OpStore %dst %41
OpStore %dst %8
%42 = OpLoad %_arr_v4int_uint_4 %src_function
OpStore %dst %src_param
%42 = OpFunctionCall %_arr_v4int_uint_4 %ret_arr
OpStore %dst %42
%43 = OpLoad %_arr_v4int_uint_4 %src_private
OpStore %dst %8
%43 = OpLoad %_arr_v4int_uint_4 %src_function
OpStore %dst %43
%44 = OpLoad %_arr_v4int_uint_4 %src_workgroup
%44 = OpLoad %_arr_v4int_uint_4 %src_private
OpStore %dst %44
%45 = OpFunctionCall %S %ret_struct_arr
%46 = OpCompositeExtract %_arr_v4int_uint_4 %45 0
OpStore %dst %46
%49 = OpAccessChain %_ptr_Uniform__arr_v4int_uint_4 %src_uniform %uint_0
%50 = OpLoad %_arr_v4int_uint_4 %49
OpStore %dst %50
%52 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %src_storage %uint_0
%53 = OpLoad %_arr_v4int_uint_4 %52
OpStore %dst %53
%63 = OpLoad %_arr__arr__arr_int_uint_2_uint_3_uint_4 %src_nested
OpStore %dst_nested %63
%45 = OpLoad %_arr_v4int_uint_4 %src_workgroup
OpStore %dst %45
%46 = OpFunctionCall %S %ret_struct_arr
%47 = OpCompositeExtract %_arr_v4int_uint_4 %46 0
OpStore %dst %47
%50 = OpAccessChain %_ptr_Uniform__arr_v4int_uint_4 %src_uniform %uint_0 %uint_0
%51 = OpLoad %_arr_v4int_uint_4 %50
OpStore %dst %51
%53 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %src_storage %uint_0 %uint_0
%54 = OpLoad %_arr_v4int_uint_4 %53
OpStore %dst %54
%64 = OpLoad %_arr__arr__arr_int_uint_2_uint_3_uint_4 %src_nested
OpStore %dst_nested %64
OpReturn
OpFunctionEnd

13
test/tint/array/assign_to_private_var.wgsl.expected.glsl
View File

@@ -10,13 +10,14 @@ struct S {
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) uniform S_1 {
ivec4 arr[4];
layout(binding = 0) uniform src_uniform_block_ubo {
S inner;
} src_uniform;
layout(binding = 1, std430) buffer S_2 {
ivec4 arr[4];
layout(binding = 1, std430) buffer src_uniform_block_ssbo {
S inner;
} src_storage;
ivec4 dst[4] = ivec4[4](ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0));
int dst_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)));
ivec4[4] ret_arr() {
@@ -42,8 +43,8 @@ void foo(ivec4 src_param[4]) {
dst = src_workgroup;
S tint_symbol = ret_struct_arr();
dst = tint_symbol.arr;
dst = src_uniform.arr;
dst = src_storage.arr;
dst = src_uniform.inner.arr;
dst = 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 = src_nested;
}

94
test/tint/array/assign_to_private_var.wgsl.expected.spvasm
View File

@@ -1,7 +1,7 @@
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 65
; Bound: 66
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
@@ -9,6 +9,8 @@
OpExecutionMode %unused_entry_point LocalSize 1 1 1
OpName %src_private "src_private"
OpName %src_workgroup "src_workgroup"
OpName %src_uniform_block "src_uniform_block"
OpMemberName %src_uniform_block 0 "inner"
OpName %S "S"
OpMemberName %S 0 "arr"
OpName %src_uniform "src_uniform"
@@ -23,7 +25,8 @@
OpName %src_function "src_function"
OpName %src_nested "src_nested"
OpDecorate %_arr_v4int_uint_4 ArrayStride 16
OpDecorate %S Block
OpDecorate %src_uniform_block Block
OpMemberDecorate %src_uniform_block 0 Offset 0
OpMemberDecorate %S 0 Offset 0
OpDecorate %src_uniform NonWritable
OpDecorate %src_uniform DescriptorSet 0
@@ -44,10 +47,11 @@
%_ptr_Workgroup__arr_v4int_uint_4 = OpTypePointer Workgroup %_arr_v4int_uint_4
%src_workgroup = OpVariable %_ptr_Workgroup__arr_v4int_uint_4 Workgroup
%S = OpTypeStruct %_arr_v4int_uint_4
%_ptr_Uniform_S = OpTypePointer Uniform %S
%src_uniform = OpVariable %_ptr_Uniform_S Uniform
%_ptr_StorageBuffer_S = OpTypePointer StorageBuffer %S
%src_storage = OpVariable %_ptr_StorageBuffer_S StorageBuffer
%src_uniform_block = OpTypeStruct %S
%_ptr_Uniform_src_uniform_block = OpTypePointer Uniform %src_uniform_block
%src_uniform = OpVariable %_ptr_Uniform_src_uniform_block Uniform
%_ptr_StorageBuffer_src_uniform_block = OpTypePointer StorageBuffer %src_uniform_block
%src_storage = OpVariable %_ptr_StorageBuffer_src_uniform_block StorageBuffer
%dst = OpVariable %_ptr_Private__arr_v4int_uint_4 Private %8
%uint_2 = OpConstant %uint 2
%_arr_int_uint_2 = OpTypeArray %int %uint_2
@@ -55,64 +59,64 @@
%_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
%_ptr_Private__arr__arr__arr_int_uint_2_uint_3_uint_4 = OpTypePointer Private %_arr__arr__arr_int_uint_2_uint_3_uint_4
%24 = OpConstantNull %_arr__arr__arr_int_uint_2_uint_3_uint_4
%dst_nested = OpVariable %_ptr_Private__arr__arr__arr_int_uint_2_uint_3_uint_4 Private %24
%25 = OpConstantNull %_arr__arr__arr_int_uint_2_uint_3_uint_4
%dst_nested = OpVariable %_ptr_Private__arr__arr__arr_int_uint_2_uint_3_uint_4 Private %25
%void = OpTypeVoid
%25 = OpTypeFunction %void
%29 = OpTypeFunction %_arr_v4int_uint_4
%32 = OpTypeFunction %S
%35 = OpConstantNull %S
%36 = OpTypeFunction %void %_arr_v4int_uint_4
%26 = OpTypeFunction %void
%30 = OpTypeFunction %_arr_v4int_uint_4
%33 = OpTypeFunction %S
%36 = OpConstantNull %S
%37 = OpTypeFunction %void %_arr_v4int_uint_4
%_ptr_Function__arr_v4int_uint_4 = OpTypePointer Function %_arr_v4int_uint_4
%int_1 = OpConstant %int 1
%43 = OpConstantComposite %v4int %int_1 %int_1 %int_1 %int_1
%44 = OpConstantComposite %v4int %int_1 %int_1 %int_1 %int_1
%int_2 = OpConstant %int 2
%45 = OpConstantComposite %v4int %int_2 %int_2 %int_2 %int_2
%46 = OpConstantComposite %v4int %int_2 %int_2 %int_2 %int_2
%int_3 = OpConstant %int 3
%47 = OpConstantComposite %v4int %int_3 %int_3 %int_3 %int_3
%48 = OpConstantComposite %_arr_v4int_uint_4 %43 %45 %47 %47
%48 = OpConstantComposite %v4int %int_3 %int_3 %int_3 %int_3
%49 = OpConstantComposite %_arr_v4int_uint_4 %44 %46 %48 %48
%uint_0 = OpConstant %uint 0
%_ptr_Uniform__arr_v4int_uint_4 = OpTypePointer Uniform %_arr_v4int_uint_4
%_ptr_StorageBuffer__arr_v4int_uint_4 = OpTypePointer StorageBuffer %_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
%unused_entry_point = OpFunction %void None %25
%28 = OpLabel
%unused_entry_point = OpFunction %void None %26
%29 = OpLabel
OpReturn
OpFunctionEnd
%ret_arr = OpFunction %_arr_v4int_uint_4 None %29
%31 = OpLabel
%ret_arr = OpFunction %_arr_v4int_uint_4 None %30
%32 = OpLabel
OpReturnValue %8
OpFunctionEnd
%ret_struct_arr = OpFunction %S None %32
%34 = OpLabel
OpReturnValue %35
%ret_struct_arr = OpFunction %S None %33
%35 = OpLabel
OpReturnValue %36
OpFunctionEnd
%foo = OpFunction %void None %36
%foo = OpFunction %void None %37
%src_param = OpFunctionParameter %_arr_v4int_uint_4
%39 = OpLabel
%40 = 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 %24
OpStore %dst %48
OpStore %dst %src_param
%49 = OpFunctionCall %_arr_v4int_uint_4 %ret_arr
%src_nested = OpVariable %_ptr_Function__arr__arr__arr_int_uint_2_uint_3_uint_4 Function %25
OpStore %dst %49
OpStore %dst %8
%50 = OpLoad %_arr_v4int_uint_4 %src_function
OpStore %dst %src_param
%50 = OpFunctionCall %_arr_v4int_uint_4 %ret_arr
OpStore %dst %50
%51 = OpLoad %_arr_v4int_uint_4 %src_private
OpStore %dst %8
%51 = OpLoad %_arr_v4int_uint_4 %src_function
OpStore %dst %51
%52 = OpLoad %_arr_v4int_uint_4 %src_workgroup
%52 = OpLoad %_arr_v4int_uint_4 %src_private
OpStore %dst %52
%53 = OpFunctionCall %S %ret_struct_arr
%54 = OpCompositeExtract %_arr_v4int_uint_4 %53 0
OpStore %dst %54
%57 = OpAccessChain %_ptr_Uniform__arr_v4int_uint_4 %src_uniform %uint_0
%58 = OpLoad %_arr_v4int_uint_4 %57
OpStore %dst %58
%60 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %src_storage %uint_0
%61 = OpLoad %_arr_v4int_uint_4 %60
OpStore %dst %61
%64 = OpLoad %_arr__arr__arr_int_uint_2_uint_3_uint_4 %src_nested
OpStore %dst_nested %64
%53 = OpLoad %_arr_v4int_uint_4 %src_workgroup
OpStore %dst %53
%54 = OpFunctionCall %S %ret_struct_arr
%55 = OpCompositeExtract %_arr_v4int_uint_4 %54 0
OpStore %dst %55
%58 = OpAccessChain %_ptr_Uniform__arr_v4int_uint_4 %src_uniform %uint_0 %uint_0
%59 = OpLoad %_arr_v4int_uint_4 %58
OpStore %dst %59
%61 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %src_storage %uint_0 %uint_0
%62 = OpLoad %_arr_v4int_uint_4 %61
OpStore %dst %62
%65 = OpLoad %_arr__arr__arr_int_uint_2_uint_3_uint_4 %src_nested
OpStore %dst_nested %65
OpReturn
OpFunctionEnd

41
test/tint/array/assign_to_storage_var.wgsl.expected.glsl
View File

@@ -8,25 +8,24 @@ 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) uniform S_1 {
ivec4 arr[4];
layout(binding = 0) uniform src_uniform_block_ubo {
S inner;
} src_uniform;
layout(binding = 1, std430) buffer S_2 {
ivec4 arr[4];
layout(binding = 1, std430) buffer src_uniform_block_ssbo {
S inner;
} src_storage;
layout(binding = 2, std430) buffer S_3 {
ivec4 arr[4];
layout(binding = 2, std430) buffer src_uniform_block_ssbo_1 {
S inner;
} dst;
layout(binding = 3, std430) buffer S_nested_1 {
layout(binding = 3, std430) buffer S_nested_ssbo {
int arr[4][3][2];
} dst_nested;
ivec4[4] ret_arr() {
ivec4 tint_symbol_2[4] = ivec4[4](ivec4(0), ivec4(0), ivec4(0), ivec4(0));
return tint_symbol_2;
@@ -40,19 +39,19 @@ S ret_struct_arr() {
void foo(ivec4 src_param[4]) {
ivec4 src_function[4] = ivec4[4](ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0));
ivec4 tint_symbol_4[4] = ivec4[4](ivec4(1), ivec4(2), ivec4(3), ivec4(3));
dst.arr = tint_symbol_4;
dst.arr = src_param;
dst.inner.arr = tint_symbol_4;
dst.inner.arr = src_param;
ivec4 tint_symbol[4] = ret_arr();
dst.arr = tint_symbol;
dst.inner.arr = tint_symbol;
ivec4 src_let[4] = ivec4[4](ivec4(0), ivec4(0), ivec4(0), ivec4(0));
dst.arr = src_let;
dst.arr = src_function;
dst.arr = src_private;
dst.arr = src_workgroup;
dst.inner.arr = src_let;
dst.inner.arr = src_function;
dst.inner.arr = src_private;
dst.inner.arr = src_workgroup;
S tint_symbol_1 = ret_struct_arr();
dst.arr = tint_symbol_1.arr;
dst.arr = src_uniform.arr;
dst.arr = src_storage.arr;
dst.inner.arr = tint_symbol_1.arr;
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;
}

124
test/tint/array/assign_to_storage_var.wgsl.expected.spvasm
View File

@@ -1,7 +1,7 @@
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 78
; Bound: 79
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
@@ -9,6 +9,8 @@
OpExecutionMode %unused_entry_point LocalSize 1 1 1
OpName %src_private "src_private"
OpName %src_workgroup "src_workgroup"
OpName %src_uniform_block "src_uniform_block"
OpMemberName %src_uniform_block 0 "inner"
OpName %S "S"
OpMemberName %S 0 "arr"
OpName %src_uniform "src_uniform"
@@ -25,7 +27,8 @@
OpName %src_function "src_function"
OpName %src_nested "src_nested"
OpDecorate %_arr_v4int_uint_4 ArrayStride 16
OpDecorate %S Block
OpDecorate %src_uniform_block Block
OpMemberDecorate %src_uniform_block 0 Offset 0
OpMemberDecorate %S 0 Offset 0
OpDecorate %src_uniform NonWritable
OpDecorate %src_uniform DescriptorSet 0
@@ -52,11 +55,12 @@
%_ptr_Workgroup__arr_v4int_uint_4 = OpTypePointer Workgroup %_arr_v4int_uint_4
%src_workgroup = OpVariable %_ptr_Workgroup__arr_v4int_uint_4 Workgroup
%S = OpTypeStruct %_arr_v4int_uint_4
%_ptr_Uniform_S = OpTypePointer Uniform %S
%src_uniform = OpVariable %_ptr_Uniform_S Uniform
%_ptr_StorageBuffer_S = OpTypePointer StorageBuffer %S
%src_storage = OpVariable %_ptr_StorageBuffer_S StorageBuffer
%dst = OpVariable %_ptr_StorageBuffer_S StorageBuffer
%src_uniform_block = OpTypeStruct %S
%_ptr_Uniform_src_uniform_block = OpTypePointer Uniform %src_uniform_block
%src_uniform = OpVariable %_ptr_Uniform_src_uniform_block Uniform
%_ptr_StorageBuffer_src_uniform_block = OpTypePointer StorageBuffer %src_uniform_block
%src_storage = OpVariable %_ptr_StorageBuffer_src_uniform_block StorageBuffer
%dst = OpVariable %_ptr_StorageBuffer_src_uniform_block StorageBuffer
%uint_2 = OpConstant %uint 2
%_arr_int_uint_2 = OpTypeArray %int %uint_2
%uint_3 = OpConstant %uint 3
@@ -66,74 +70,74 @@
%_ptr_StorageBuffer_S_nested = OpTypePointer StorageBuffer %S_nested
%dst_nested = OpVariable %_ptr_StorageBuffer_S_nested StorageBuffer
%void = OpTypeVoid
%25 = OpTypeFunction %void
%29 = OpTypeFunction %_arr_v4int_uint_4
%32 = OpTypeFunction %S
%35 = OpConstantNull %S
%36 = OpTypeFunction %void %_arr_v4int_uint_4
%26 = OpTypeFunction %void
%30 = OpTypeFunction %_arr_v4int_uint_4
%33 = OpTypeFunction %S
%36 = OpConstantNull %S
%37 = 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
%46 = OpConstantComposite %v4int %int_1 %int_1 %int_1 %int_1
%47 = OpConstantComposite %v4int %int_1 %int_1 %int_1 %int_1
%int_2 = OpConstant %int 2
%48 = OpConstantComposite %v4int %int_2 %int_2 %int_2 %int_2
%49 = OpConstantComposite %v4int %int_2 %int_2 %int_2 %int_2
%int_3 = OpConstant %int 3
%50 = OpConstantComposite %v4int %int_3 %int_3 %int_3 %int_3
%51 = OpConstantComposite %_arr_v4int_uint_4 %46 %48 %50 %50
%51 = OpConstantComposite %v4int %int_3 %int_3 %int_3 %int_3
%52 = OpConstantComposite %_arr_v4int_uint_4 %47 %49 %51 %51
%_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
%74 = OpConstantNull %_arr__arr__arr_int_uint_2_uint_3_uint_4
%75 = 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 %25
%28 = OpLabel
%unused_entry_point = OpFunction %void None %26
%29 = OpLabel
OpReturn
OpFunctionEnd
%ret_arr = OpFunction %_arr_v4int_uint_4 None %29
%31 = OpLabel
%ret_arr = OpFunction %_arr_v4int_uint_4 None %30
%32 = OpLabel
OpReturnValue %8
OpFunctionEnd
%ret_struct_arr = OpFunction %S None %32
%34 = OpLabel
OpReturnValue %35
%ret_struct_arr = OpFunction %S None %33
%35 = OpLabel
OpReturnValue %36
OpFunctionEnd
%foo = OpFunction %void None %36
%foo = OpFunction %void None %37
%src_param = OpFunctionParameter %_arr_v4int_uint_4
%39 = OpLabel
%40 = 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 %74
%44 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %dst %uint_0
OpStore %44 %51
%52 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %dst %uint_0
OpStore %52 %src_param
%53 = OpFunctionCall %_arr_v4int_uint_4 %ret_arr
%54 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %dst %uint_0
OpStore %54 %53
%55 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %dst %uint_0
OpStore %55 %8
%56 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %dst %uint_0
%57 = OpLoad %_arr_v4int_uint_4 %src_function
OpStore %56 %57
%58 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %dst %uint_0
%59 = OpLoad %_arr_v4int_uint_4 %src_private
OpStore %58 %59
%60 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %dst %uint_0
%61 = OpLoad %_arr_v4int_uint_4 %src_workgroup
OpStore %60 %61
%62 = OpFunctionCall %S %ret_struct_arr
%63 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %dst %uint_0
%64 = OpCompositeExtract %_arr_v4int_uint_4 %62 0
OpStore %63 %64
%65 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %dst %uint_0
%67 = OpAccessChain %_ptr_Uniform__arr_v4int_uint_4 %src_uniform %uint_0
%68 = OpLoad %_arr_v4int_uint_4 %67
OpStore %65 %68
%69 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %dst %uint_0
%70 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %src_storage %uint_0
%71 = OpLoad %_arr_v4int_uint_4 %70
OpStore %69 %71
%76 = OpAccessChain %_ptr_StorageBuffer__arr__arr__arr_int_uint_2_uint_3_uint_4 %dst_nested %uint_0
%77 = OpLoad %_arr__arr__arr_int_uint_2_uint_3_uint_4 %src_nested
OpStore %76 %77
%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
%56 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %dst %uint_0 %uint_0
OpStore %56 %8
%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
OpReturn
OpFunctionEnd

13
test/tint/array/assign_to_workgroup_var.wgsl.expected.glsl
View File

@@ -10,13 +10,14 @@ struct S {
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) uniform S_1 {
ivec4 arr[4];
layout(binding = 0) uniform src_uniform_block_ubo {
S inner;
} src_uniform;
layout(binding = 1, std430) buffer S_2 {
ivec4 arr[4];
layout(binding = 1, std430) buffer src_uniform_block_ssbo {
S inner;
} src_storage;
shared ivec4 dst[4];
shared int dst_nested[4][3][2];
ivec4[4] ret_arr() {
@@ -42,8 +43,8 @@ void foo(ivec4 src_param[4]) {
dst = src_workgroup;
S tint_symbol = ret_struct_arr();
dst = tint_symbol.arr;
dst = src_uniform.arr;
dst = src_storage.arr;
dst = src_uniform.inner.arr;
dst = 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 = src_nested;
}

92
test/tint/array/assign_to_workgroup_var.wgsl.expected.spvasm
View File

@@ -1,7 +1,7 @@
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 65
; Bound: 66
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
@@ -9,6 +9,8 @@
OpExecutionMode %unused_entry_point LocalSize 1 1 1
OpName %src_private "src_private"
OpName %src_workgroup "src_workgroup"
OpName %src_uniform_block "src_uniform_block"
OpMemberName %src_uniform_block 0 "inner"
OpName %S "S"
OpMemberName %S 0 "arr"
OpName %src_uniform "src_uniform"
@@ -23,7 +25,8 @@
OpName %src_function "src_function"
OpName %src_nested "src_nested"
OpDecorate %_arr_v4int_uint_4 ArrayStride 16
OpDecorate %S Block
OpDecorate %src_uniform_block Block
OpMemberDecorate %src_uniform_block 0 Offset 0
OpMemberDecorate %S 0 Offset 0
OpDecorate %src_uniform NonWritable
OpDecorate %src_uniform DescriptorSet 0
@@ -44,10 +47,11 @@
%_ptr_Workgroup__arr_v4int_uint_4 = OpTypePointer Workgroup %_arr_v4int_uint_4
%src_workgroup = OpVariable %_ptr_Workgroup__arr_v4int_uint_4 Workgroup
%S = OpTypeStruct %_arr_v4int_uint_4
%_ptr_Uniform_S = OpTypePointer Uniform %S
%src_uniform = OpVariable %_ptr_Uniform_S Uniform
%_ptr_StorageBuffer_S = OpTypePointer StorageBuffer %S
%src_storage = OpVariable %_ptr_StorageBuffer_S StorageBuffer
%src_uniform_block = OpTypeStruct %S
%_ptr_Uniform_src_uniform_block = OpTypePointer Uniform %src_uniform_block
%src_uniform = OpVariable %_ptr_Uniform_src_uniform_block Uniform
%_ptr_StorageBuffer_src_uniform_block = OpTypePointer StorageBuffer %src_uniform_block
%src_storage = OpVariable %_ptr_StorageBuffer_src_uniform_block StorageBuffer
%dst = OpVariable %_ptr_Workgroup__arr_v4int_uint_4 Workgroup
%uint_2 = OpConstant %uint 2
%_arr_int_uint_2 = OpTypeArray %int %uint_2
@@ -57,62 +61,62 @@
%_ptr_Workgroup__arr__arr__arr_int_uint_2_uint_3_uint_4 = OpTypePointer Workgroup %_arr__arr__arr_int_uint_2_uint_3_uint_4
%dst_nested = OpVariable %_ptr_Workgroup__arr__arr__arr_int_uint_2_uint_3_uint_4 Workgroup
%void = OpTypeVoid
%24 = OpTypeFunction %void
%28 = OpTypeFunction %_arr_v4int_uint_4
%31 = OpTypeFunction %S
%34 = OpConstantNull %S
%35 = OpTypeFunction %void %_arr_v4int_uint_4
%25 = OpTypeFunction %void
%29 = OpTypeFunction %_arr_v4int_uint_4
%32 = OpTypeFunction %S
%35 = OpConstantNull %S
%36 = OpTypeFunction %void %_arr_v4int_uint_4
%_ptr_Function__arr_v4int_uint_4 = OpTypePointer Function %_arr_v4int_uint_4
%int_1 = OpConstant %int 1
%42 = OpConstantComposite %v4int %int_1 %int_1 %int_1 %int_1
%43 = OpConstantComposite %v4int %int_1 %int_1 %int_1 %int_1
%int_2 = OpConstant %int 2
%44 = OpConstantComposite %v4int %int_2 %int_2 %int_2 %int_2
%45 = OpConstantComposite %v4int %int_2 %int_2 %int_2 %int_2
%int_3 = OpConstant %int 3
%46 = OpConstantComposite %v4int %int_3 %int_3 %int_3 %int_3
%47 = OpConstantComposite %_arr_v4int_uint_4 %42 %44 %46 %46
%47 = OpConstantComposite %v4int %int_3 %int_3 %int_3 %int_3
%48 = OpConstantComposite %_arr_v4int_uint_4 %43 %45 %47 %47
%uint_0 = OpConstant %uint 0
%_ptr_Uniform__arr_v4int_uint_4 = OpTypePointer Uniform %_arr_v4int_uint_4
%_ptr_StorageBuffer__arr_v4int_uint_4 = OpTypePointer StorageBuffer %_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
%63 = OpConstantNull %_arr__arr__arr_int_uint_2_uint_3_uint_4
%unused_entry_point = OpFunction %void None %24
%27 = OpLabel
%64 = OpConstantNull %_arr__arr__arr_int_uint_2_uint_3_uint_4
%unused_entry_point = OpFunction %void None %25
%28 = OpLabel
OpReturn
OpFunctionEnd
%ret_arr = OpFunction %_arr_v4int_uint_4 None %28
%30 = OpLabel
%ret_arr = OpFunction %_arr_v4int_uint_4 None %29
%31 = OpLabel
OpReturnValue %8
OpFunctionEnd
%ret_struct_arr = OpFunction %S None %31
%33 = OpLabel
OpReturnValue %34
%ret_struct_arr = OpFunction %S None %32
%34 = OpLabel
OpReturnValue %35
OpFunctionEnd
%foo = OpFunction %void None %35
%foo = OpFunction %void None %36
%src_param = OpFunctionParameter %_arr_v4int_uint_4
%38 = OpLabel
%39 = 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 %63
OpStore %dst %47
OpStore %dst %src_param
%48 = OpFunctionCall %_arr_v4int_uint_4 %ret_arr
%src_nested = OpVariable %_ptr_Function__arr__arr__arr_int_uint_2_uint_3_uint_4 Function %64
OpStore %dst %48
OpStore %dst %8
%49 = OpLoad %_arr_v4int_uint_4 %src_function
OpStore %dst %src_param
%49 = OpFunctionCall %_arr_v4int_uint_4 %ret_arr
OpStore %dst %49
%50 = OpLoad %_arr_v4int_uint_4 %src_private
OpStore %dst %8
%50 = OpLoad %_arr_v4int_uint_4 %src_function
OpStore %dst %50
%51 = OpLoad %_arr_v4int_uint_4 %src_workgroup
%51 = OpLoad %_arr_v4int_uint_4 %src_private
OpStore %dst %51
%52 = OpFunctionCall %S %ret_struct_arr
%53 = OpCompositeExtract %_arr_v4int_uint_4 %52 0
OpStore %dst %53
%56 = OpAccessChain %_ptr_Uniform__arr_v4int_uint_4 %src_uniform %uint_0
%57 = OpLoad %_arr_v4int_uint_4 %56
OpStore %dst %57
%59 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %src_storage %uint_0
%60 = OpLoad %_arr_v4int_uint_4 %59
OpStore %dst %60
%64 = OpLoad %_arr__arr__arr_int_uint_2_uint_3_uint_4 %src_nested
OpStore %dst_nested %64
%52 = OpLoad %_arr_v4int_uint_4 %src_workgroup
OpStore %dst %52
%53 = OpFunctionCall %S %ret_struct_arr
%54 = OpCompositeExtract %_arr_v4int_uint_4 %53 0
OpStore %dst %54
%57 = OpAccessChain %_ptr_Uniform__arr_v4int_uint_4 %src_uniform %uint_0 %uint_0
%58 = OpLoad %_arr_v4int_uint_4 %57
OpStore %dst %58
%60 = OpAccessChain %_ptr_StorageBuffer__arr_v4int_uint_4 %src_storage %uint_0 %uint_0
%61 = OpLoad %_arr_v4int_uint_4 %60
OpStore %dst %61
%65 = OpLoad %_arr__arr__arr_int_uint_2_uint_3_uint_4 %src_nested
OpStore %dst_nested %65
OpReturn
OpFunctionEnd

7
test/tint/array/strides.spvasm.expected.glsl
View File

@@ -8,13 +8,10 @@ struct strided_arr_1 {
strided_arr el[3][2];
};
struct S {
strided_arr_1 a[4];
};
layout(binding = 0, std430) buffer S_1 {
layout(binding = 0, std430) buffer S_ssbo {
strided_arr_1 a[4];
} s;
void f_1() {
strided_arr_1 x_19[4] = s.a;
strided_arr x_24[3][2] = s.a[3].el;