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

spirv: Use generic transform to process shader IO

Browse Source 
The refactored CanonicalizeEntryPointIO transform makes it much easier
to handle SPIR-V style IO as well, and doing this removes a lot of
duplicated code. Remove all of the SPIR-V transform code for shader IO
and vertex point size.

Bug: tint:920
Change-Id: Id1b97517619b4d2fd09b45d5aee848259f3dfa77
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/60840
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: James Price <jrprice@google.com>
Auto-Submit: James Price <jrprice@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
This commit is contained in:
James Price
2021-08-05 17:34:19 +00:00
committed by Tint LUCI CQ
parent 11e172ab64
commit 11c6fcdb51
1981 changed files with 55207 additions and 57171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/terminate_loop/1.spvasm.expected.spvasm
View File

@@ -1,47 +1,48 @@
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 71
; Bound: 72
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %main "main" %tint_symbol %tint_symbol_1 %tint_symbol_3
OpEntryPoint Fragment %main "main" %x_2_param_1 %x_3_param_1 %x_4_1_1
OpExecutionMode %main OriginUpperLeft
OpName %x_2_param_1 "x_2_param_1"
OpName %x_3_param_1 "x_3_param_1"
OpName %x_4_1_1 "x_4_1_1"
OpName %x_2 "x_2"
OpName %x_3 "x_3"
OpName %x_4 "x_4"
OpName %tint_symbol "tint_symbol"
OpName %tint_symbol_1 "tint_symbol_1"
OpName %tint_symbol_3 "tint_symbol_3"
OpName %main_1 "main_1"
OpName %x_33_phi "x_33_phi"
OpName %x_34 "x_34"
OpName %main_out "main_out"
OpMemberName %main_out 0 "x_4_1"
OpName %tint_symbol_4 "tint_symbol_4"
OpName %tint_symbol_2 "tint_symbol_2"
OpName %main_inner "main_inner"
OpName %x_2_param "x_2_param"
OpName %x_3_param "x_3_param"
OpName %main "main"
OpDecorate %tint_symbol BuiltIn FragCoord
OpDecorate %tint_symbol_1 Location 0
OpDecorate %tint_symbol_1 Flat
OpDecorate %tint_symbol_3 Location 0
OpDecorate %x_2_param_1 BuiltIn FragCoord
OpDecorate %x_3_param_1 Location 0
OpDecorate %x_3_param_1 Flat
OpDecorate %x_4_1_1 Location 0
OpMemberDecorate %main_out 0 Offset 0
%float = OpTypeFloat 32
%v4float = OpTypeVector %float 4
%_ptr_Private_v4float = OpTypePointer Private %v4float
%5 = OpConstantNull %v4float
%x_2 = OpVariable %_ptr_Private_v4float Private %5
%int = OpTypeInt 32 1
%_ptr_Private_int = OpTypePointer Private %int
%9 = OpConstantNull %int
%x_3 = OpVariable %_ptr_Private_int Private %9
%x_4 = OpVariable %_ptr_Private_int Private %9
%_ptr_Input_v4float = OpTypePointer Input %v4float
%tint_symbol = OpVariable %_ptr_Input_v4float Input
%x_2_param_1 = OpVariable %_ptr_Input_v4float Input
%int = OpTypeInt 32 1
%_ptr_Input_int = OpTypePointer Input %int
%tint_symbol_1 = OpVariable %_ptr_Input_int Input
%x_3_param_1 = OpVariable %_ptr_Input_int Input
%_ptr_Output_int = OpTypePointer Output %int
%tint_symbol_3 = OpVariable %_ptr_Output_int Output %9
%10 = OpConstantNull %int
%x_4_1_1 = OpVariable %_ptr_Output_int Output %10
%_ptr_Private_v4float = OpTypePointer Private %v4float
%13 = OpConstantNull %v4float
%x_2 = OpVariable %_ptr_Private_v4float Private %13
%_ptr_Private_int = OpTypePointer Private %int
%x_3 = OpVariable %_ptr_Private_int Private %10
%x_4 = OpVariable %_ptr_Private_int Private %10
%void = OpTypeVoid
%17 = OpTypeFunction %void
%_ptr_Function_int = OpTypePointer Function %int
@@ -51,11 +52,11 @@
%uint = OpTypeInt 32 0
%int_10 = OpConstant %int 10
%main_out = OpTypeStruct %int
%57 = OpTypeFunction %void %main_out
%57 = OpTypeFunction %main_out %v4float %int
%main_1 = OpFunction %void None %17
%20 = OpLabel
%x_33_phi = OpVariable %_ptr_Function_int Function %9
%x_34 = OpVariable %_ptr_Function_int Function %9
%x_33_phi = OpVariable %_ptr_Function_int Function %10
%x_34 = OpVariable %_ptr_Function_int Function %10
%23 = OpLoad %v4float %x_2
%24 = OpLoad %int %x_3
OpStore %x_33_phi %int_0
@@ -102,22 +103,23 @@
OpStore %x_4 %int_1
OpReturn
OpFunctionEnd
%tint_symbol_4 = OpFunction %void None %57
%tint_symbol_2 = OpFunctionParameter %main_out
%61 = OpLabel
%62 = OpCompositeExtract %int %tint_symbol_2 0
OpStore %tint_symbol_3 %62
OpReturn
%main_inner = OpFunction %main_out None %57
%x_2_param = OpFunctionParameter %v4float
%x_3_param = OpFunctionParameter %int
%62 = OpLabel
OpStore %x_2 %x_2_param
OpStore %x_3 %x_3_param
%63 = OpFunctionCall %void %main_1
%64 = OpLoad %int %x_4
%65 = OpCompositeConstruct %main_out %64
OpReturnValue %65
OpFunctionEnd
%main = OpFunction %void None %17
%64 = OpLabel
%65 = OpLoad %v4float %tint_symbol
OpStore %x_2 %65
%66 = OpLoad %int %tint_symbol_1
OpStore %x_3 %66
%67 = OpFunctionCall %void %main_1
%69 = OpLoad %int %x_4
%70 = OpCompositeConstruct %main_out %69
%68 = OpFunctionCall %void %tint_symbol_4 %70
%67 = OpLabel
%69 = OpLoad %v4float %x_2_param_1
%70 = OpLoad %int %x_3_param_1
%68 = OpFunctionCall %main_out %main_inner %69 %70
%71 = OpCompositeExtract %int %68 0
OpStore %x_4_1_1 %71
OpReturn
OpFunctionEnd

82
test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/terminate_loop/1.wgsl.expected.spvasm
View File

@@ -1,47 +1,48 @@
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 71
; Bound: 72
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %main "main" %tint_symbol %tint_symbol_1 %tint_symbol_3
OpEntryPoint Fragment %main "main" %x_2_param_1 %x_3_param_1 %x_4_1_1
OpExecutionMode %main OriginUpperLeft
OpName %x_2_param_1 "x_2_param_1"
OpName %x_3_param_1 "x_3_param_1"
OpName %x_4_1_1 "x_4_1_1"
OpName %x_2 "x_2"
OpName %x_3 "x_3"
OpName %x_4 "x_4"
OpName %tint_symbol "tint_symbol"
OpName %tint_symbol_1 "tint_symbol_1"
OpName %tint_symbol_3 "tint_symbol_3"
OpName %main_1 "main_1"
OpName %x_33_phi "x_33_phi"
OpName %x_34 "x_34"
OpName %main_out "main_out"
OpMemberName %main_out 0 "x_4_1"
OpName %tint_symbol_4 "tint_symbol_4"
OpName %tint_symbol_2 "tint_symbol_2"
OpName %main_inner "main_inner"
OpName %x_2_param "x_2_param"
OpName %x_3_param "x_3_param"
OpName %main "main"
OpDecorate %tint_symbol BuiltIn FragCoord
OpDecorate %tint_symbol_1 Location 0
OpDecorate %tint_symbol_1 Flat
OpDecorate %tint_symbol_3 Location 0
OpDecorate %x_2_param_1 BuiltIn FragCoord
OpDecorate %x_3_param_1 Location 0
OpDecorate %x_3_param_1 Flat
OpDecorate %x_4_1_1 Location 0
OpMemberDecorate %main_out 0 Offset 0
%float = OpTypeFloat 32
%v4float = OpTypeVector %float 4
%_ptr_Private_v4float = OpTypePointer Private %v4float
%5 = OpConstantNull %v4float
%x_2 = OpVariable %_ptr_Private_v4float Private %5
%int = OpTypeInt 32 1
%_ptr_Private_int = OpTypePointer Private %int
%9 = OpConstantNull %int
%x_3 = OpVariable %_ptr_Private_int Private %9
%x_4 = OpVariable %_ptr_Private_int Private %9
%_ptr_Input_v4float = OpTypePointer Input %v4float
%tint_symbol = OpVariable %_ptr_Input_v4float Input
%x_2_param_1 = OpVariable %_ptr_Input_v4float Input
%int = OpTypeInt 32 1
%_ptr_Input_int = OpTypePointer Input %int
%tint_symbol_1 = OpVariable %_ptr_Input_int Input
%x_3_param_1 = OpVariable %_ptr_Input_int Input
%_ptr_Output_int = OpTypePointer Output %int
%tint_symbol_3 = OpVariable %_ptr_Output_int Output %9
%10 = OpConstantNull %int
%x_4_1_1 = OpVariable %_ptr_Output_int Output %10
%_ptr_Private_v4float = OpTypePointer Private %v4float
%13 = OpConstantNull %v4float
%x_2 = OpVariable %_ptr_Private_v4float Private %13
%_ptr_Private_int = OpTypePointer Private %int
%x_3 = OpVariable %_ptr_Private_int Private %10
%x_4 = OpVariable %_ptr_Private_int Private %10
%void = OpTypeVoid
%17 = OpTypeFunction %void
%_ptr_Function_int = OpTypePointer Function %int
@@ -51,11 +52,11 @@
%uint = OpTypeInt 32 0
%int_10 = OpConstant %int 10
%main_out = OpTypeStruct %int
%57 = OpTypeFunction %void %main_out
%57 = OpTypeFunction %main_out %v4float %int
%main_1 = OpFunction %void None %17
%20 = OpLabel
%x_33_phi = OpVariable %_ptr_Function_int Function %9
%x_34 = OpVariable %_ptr_Function_int Function %9
%x_33_phi = OpVariable %_ptr_Function_int Function %10
%x_34 = OpVariable %_ptr_Function_int Function %10
%23 = OpLoad %v4float %x_2
%24 = OpLoad %int %x_3
OpStore %x_33_phi %int_0
@@ -102,22 +103,23 @@
OpStore %x_4 %int_1
OpReturn
OpFunctionEnd
%tint_symbol_4 = OpFunction %void None %57
%tint_symbol_2 = OpFunctionParameter %main_out
%61 = OpLabel
%62 = OpCompositeExtract %int %tint_symbol_2 0
OpStore %tint_symbol_3 %62
OpReturn
%main_inner = OpFunction %main_out None %57
%x_2_param = OpFunctionParameter %v4float
%x_3_param = OpFunctionParameter %int
%62 = OpLabel
OpStore %x_2 %x_2_param
OpStore %x_3 %x_3_param
%63 = OpFunctionCall %void %main_1
%64 = OpLoad %int %x_4
%65 = OpCompositeConstruct %main_out %64
OpReturnValue %65
OpFunctionEnd
%main = OpFunction %void None %17
%64 = OpLabel
%65 = OpLoad %v4float %tint_symbol
OpStore %x_2 %65
%66 = OpLoad %int %tint_symbol_1
OpStore %x_3 %66
%67 = OpFunctionCall %void %main_1
%69 = OpLoad %int %x_4
%70 = OpCompositeConstruct %main_out %69
%68 = OpFunctionCall %void %tint_symbol_4 %70
%67 = OpLabel
%69 = OpLoad %v4float %x_2_param_1
%70 = OpLoad %int %x_3_param_1
%68 = OpFunctionCall %main_out %main_inner %69 %70
%71 = OpCompositeExtract %int %68 0
OpStore %x_4_1_1 %71
OpReturn
OpFunctionEnd