spirv: Use generic transform to process shader IO

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

View File

@@ -1,18 +1,18 @@
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 94
; Bound: 93
; Schema: 0
OpCapability Shader
%27 = OpExtInstImport "GLSL.std.450"
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %main "main" %tint_symbol_1
OpEntryPoint Fragment %main "main" %x_GLF_color_1_1
OpExecutionMode %main OriginUpperLeft
OpName %x_GLF_color_1_1 "x_GLF_color_1_1"
OpName %buf0 "buf0"
OpMemberName %buf0 0 "x_GLF_uniform_int_values"
OpName %x_5 "x_5"
OpName %x_GLF_color "x_GLF_color"
OpName %tint_symbol_1 "tint_symbol_1"
OpName %main_1 "main_1"
OpName %x_28 "x_28"
OpName %x_29 "x_29"
@@ -22,17 +22,21 @@
OpName %x_32 "x_32"
OpName %main_out "main_out"
OpMemberName %main_out 0 "x_GLF_color_1"
OpName %tint_symbol_2 "tint_symbol_2"
OpName %tint_symbol "tint_symbol"
OpName %main_inner "main_inner"
OpName %main "main"
OpDecorate %x_GLF_color_1_1 Location 0
OpDecorate %buf0 Block
OpMemberDecorate %buf0 0 Offset 0
OpDecorate %_arr_int_uint_4 ArrayStride 16
OpDecorate %x_5 NonWritable
OpDecorate %x_5 DescriptorSet 0
OpDecorate %x_5 Binding 0
OpDecorate %tint_symbol_1 Location 0
OpMemberDecorate %main_out 0 Offset 0
%float = OpTypeFloat 32
%v4float = OpTypeVector %float 4
%_ptr_Output_v4float = OpTypePointer Output %v4float
%5 = OpConstantNull %v4float
%x_GLF_color_1_1 = OpVariable %_ptr_Output_v4float Output %5
%int = OpTypeInt 32 1
%uint = OpTypeInt 32 0
%uint_4 = OpConstant %uint 4
@@ -40,13 +44,8 @@
%buf0 = OpTypeStruct %_arr_int_uint_4
%_ptr_Uniform_buf0 = OpTypePointer Uniform %buf0
%x_5 = OpVariable %_ptr_Uniform_buf0 Uniform
%float = OpTypeFloat 32
%v4float = OpTypeVector %float 4
%_ptr_Private_v4float = OpTypePointer Private %v4float
%12 = OpConstantNull %v4float
%x_GLF_color = OpVariable %_ptr_Private_v4float Private %12
%_ptr_Output_v4float = OpTypePointer Output %v4float
%tint_symbol_1 = OpVariable %_ptr_Output_v4float Output %12
%x_GLF_color = OpVariable %_ptr_Private_v4float Private %5
%void = OpTypeVoid
%15 = OpTypeFunction %void
%_ptr_Function_int = OpTypePointer Function %int
@@ -59,7 +58,7 @@
%int_0 = OpConstant %int 0
%int_2 = OpConstant %int 2
%main_out = OpTypeStruct %v4float
%82 = OpTypeFunction %void %main_out
%82 = OpTypeFunction %main_out
%main_1 = OpFunction %void None %15
%18 = OpLabel
%x_28 = OpVariable %_ptr_Function_int Function %21
@@ -144,18 +143,17 @@
%68 = OpLabel
OpReturn
OpFunctionEnd
%tint_symbol_2 = OpFunction %void None %82
%tint_symbol = OpFunctionParameter %main_out
%86 = OpLabel
%87 = OpCompositeExtract %v4float %tint_symbol 0
OpStore %tint_symbol_1 %87
OpReturn
%main_inner = OpFunction %main_out None %82
%85 = OpLabel
%86 = OpFunctionCall %void %main_1
%87 = OpLoad %v4float %x_GLF_color
%88 = OpCompositeConstruct %main_out %87
OpReturnValue %88
OpFunctionEnd
%main = OpFunction %void None %15
%89 = OpLabel
%90 = OpFunctionCall %void %main_1
%92 = OpLoad %v4float %x_GLF_color
%93 = OpCompositeConstruct %main_out %92
%91 = OpFunctionCall %void %tint_symbol_2 %93
%90 = OpLabel
%91 = OpFunctionCall %main_out %main_inner
%92 = OpCompositeExtract %v4float %91 0
OpStore %x_GLF_color_1_1 %92
OpReturn
OpFunctionEnd

View File

@@ -1,18 +1,18 @@
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 94
; Bound: 93
; Schema: 0
OpCapability Shader
%27 = OpExtInstImport "GLSL.std.450"
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %main "main" %tint_symbol_1
OpEntryPoint Fragment %main "main" %x_GLF_color_1_1
OpExecutionMode %main OriginUpperLeft
OpName %x_GLF_color_1_1 "x_GLF_color_1_1"
OpName %buf0 "buf0"
OpMemberName %buf0 0 "x_GLF_uniform_int_values"
OpName %x_5 "x_5"
OpName %x_GLF_color "x_GLF_color"
OpName %tint_symbol_1 "tint_symbol_1"
OpName %main_1 "main_1"
OpName %x_28 "x_28"
OpName %x_29 "x_29"
@@ -22,17 +22,21 @@
OpName %x_32 "x_32"
OpName %main_out "main_out"
OpMemberName %main_out 0 "x_GLF_color_1"
OpName %tint_symbol_2 "tint_symbol_2"
OpName %tint_symbol "tint_symbol"
OpName %main_inner "main_inner"
OpName %main "main"
OpDecorate %x_GLF_color_1_1 Location 0
OpDecorate %buf0 Block
OpMemberDecorate %buf0 0 Offset 0
OpDecorate %_arr_int_uint_4 ArrayStride 16
OpDecorate %x_5 NonWritable
OpDecorate %x_5 DescriptorSet 0
OpDecorate %x_5 Binding 0
OpDecorate %tint_symbol_1 Location 0
OpMemberDecorate %main_out 0 Offset 0
%float = OpTypeFloat 32
%v4float = OpTypeVector %float 4
%_ptr_Output_v4float = OpTypePointer Output %v4float
%5 = OpConstantNull %v4float
%x_GLF_color_1_1 = OpVariable %_ptr_Output_v4float Output %5
%int = OpTypeInt 32 1
%uint = OpTypeInt 32 0
%uint_4 = OpConstant %uint 4
@@ -40,13 +44,8 @@
%buf0 = OpTypeStruct %_arr_int_uint_4
%_ptr_Uniform_buf0 = OpTypePointer Uniform %buf0
%x_5 = OpVariable %_ptr_Uniform_buf0 Uniform
%float = OpTypeFloat 32
%v4float = OpTypeVector %float 4
%_ptr_Private_v4float = OpTypePointer Private %v4float
%12 = OpConstantNull %v4float
%x_GLF_color = OpVariable %_ptr_Private_v4float Private %12
%_ptr_Output_v4float = OpTypePointer Output %v4float
%tint_symbol_1 = OpVariable %_ptr_Output_v4float Output %12
%x_GLF_color = OpVariable %_ptr_Private_v4float Private %5
%void = OpTypeVoid
%15 = OpTypeFunction %void
%_ptr_Function_int = OpTypePointer Function %int
@@ -59,7 +58,7 @@
%int_0 = OpConstant %int 0
%int_2 = OpConstant %int 2
%main_out = OpTypeStruct %v4float
%82 = OpTypeFunction %void %main_out
%82 = OpTypeFunction %main_out
%main_1 = OpFunction %void None %15
%18 = OpLabel
%x_28 = OpVariable %_ptr_Function_int Function %21
@@ -144,18 +143,17 @@
%68 = OpLabel
OpReturn
OpFunctionEnd
%tint_symbol_2 = OpFunction %void None %82
%tint_symbol = OpFunctionParameter %main_out
%86 = OpLabel
%87 = OpCompositeExtract %v4float %tint_symbol 0
OpStore %tint_symbol_1 %87
OpReturn
%main_inner = OpFunction %main_out None %82
%85 = OpLabel
%86 = OpFunctionCall %void %main_1
%87 = OpLoad %v4float %x_GLF_color
%88 = OpCompositeConstruct %main_out %87
OpReturnValue %88
OpFunctionEnd
%main = OpFunction %void None %15
%89 = OpLabel
%90 = OpFunctionCall %void %main_1
%92 = OpLoad %v4float %x_GLF_color
%93 = OpCompositeConstruct %main_out %92
%91 = OpFunctionCall %void %tint_symbol_2 %93
%90 = OpLabel
%91 = OpFunctionCall %main_out %main_inner
%92 = OpCompositeExtract %v4float %91 0
OpStore %x_GLF_color_1_1 %92
OpReturn
OpFunctionEnd