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,13 +1,14 @@
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 155
; Bound: 154
; Schema: 0
OpCapability Shader
%109 = 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 %buf1 "buf1"
OpMemberName %buf1 0 "x_GLF_uniform_int_values"
OpName %x_6 "x_6"
@@ -15,15 +16,14 @@
OpMemberName %buf0 0 "x_GLF_uniform_float_values"
OpName %x_9 "x_9"
OpName %x_GLF_color "x_GLF_color"
OpName %tint_symbol_1 "tint_symbol_1"
OpName %main_1 "main_1"
OpName %v "v"
OpName %i "i"
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 %buf1 Block
OpMemberDecorate %buf1 0 Offset 0
OpDecorate %_arr_int_uint_5 ArrayStride 16
@@ -36,8 +36,12 @@
OpDecorate %x_9 NonWritable
OpDecorate %x_9 DescriptorSet 0
OpDecorate %x_9 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_5 = OpConstant %uint 5
@@ -45,18 +49,13 @@
%buf1 = OpTypeStruct %_arr_int_uint_5
%_ptr_Uniform_buf1 = OpTypePointer Uniform %buf1
%x_6 = OpVariable %_ptr_Uniform_buf1 Uniform
%float = OpTypeFloat 32
%uint_2 = OpConstant %uint 2
%_arr_float_uint_2 = OpTypeArray %float %uint_2
%buf0 = OpTypeStruct %_arr_float_uint_2
%_ptr_Uniform_buf0 = OpTypePointer Uniform %buf0
%x_9 = OpVariable %_ptr_Uniform_buf0 Uniform
%v4float = OpTypeVector %float 4
%_ptr_Private_v4float = OpTypePointer Private %v4float
%17 = OpConstantNull %v4float
%x_GLF_color = OpVariable %_ptr_Private_v4float Private %17
%_ptr_Output_v4float = OpTypePointer Output %v4float
%tint_symbol_1 = OpVariable %_ptr_Output_v4float Output %17
%x_GLF_color = OpVariable %_ptr_Private_v4float Private %5
%void = OpTypeVoid
%20 = OpTypeFunction %void
%_ptr_Function_v4float = OpTypePointer Function %v4float
@@ -75,10 +74,10 @@
%_ptr_Function_float = OpTypePointer Function %float
%v4bool = OpTypeVector %bool 4
%main_out = OpTypeStruct %v4float
%143 = OpTypeFunction %void %main_out
%143 = OpTypeFunction %main_out
%main_1 = OpFunction %void None %20
%23 = OpLabel
%v = OpVariable %_ptr_Function_v4float Function %17
%v = OpVariable %_ptr_Function_v4float Function %5
%i = OpVariable %_ptr_Function_int Function %28
%32 = OpAccessChain %_ptr_Uniform_int %x_6 %uint_0 %int_1
%33 = OpLoad %int %32
@@ -205,18 +204,17 @@
%123 = OpLabel
OpReturn
OpFunctionEnd
%tint_symbol_2 = OpFunction %void None %143
%tint_symbol = OpFunctionParameter %main_out
%147 = OpLabel
%148 = OpCompositeExtract %v4float %tint_symbol 0
OpStore %tint_symbol_1 %148
OpReturn
%main_inner = OpFunction %main_out None %143
%146 = OpLabel
%147 = OpFunctionCall %void %main_1
%148 = OpLoad %v4float %x_GLF_color
%149 = OpCompositeConstruct %main_out %148
OpReturnValue %149
OpFunctionEnd
%main = OpFunction %void None %20
%150 = OpLabel
%151 = OpFunctionCall %void %main_1
%153 = OpLoad %v4float %x_GLF_color
%154 = OpCompositeConstruct %main_out %153
%152 = OpFunctionCall %void %tint_symbol_2 %154
%151 = OpLabel
%152 = OpFunctionCall %main_out %main_inner
%153 = OpCompositeExtract %v4float %152 0
OpStore %x_GLF_color_1_1 %153
OpReturn
OpFunctionEnd

View File

@@ -1,13 +1,14 @@
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 155
; Bound: 154
; Schema: 0
OpCapability Shader
%109 = 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 %buf1 "buf1"
OpMemberName %buf1 0 "x_GLF_uniform_int_values"
OpName %x_6 "x_6"
@@ -15,15 +16,14 @@
OpMemberName %buf0 0 "x_GLF_uniform_float_values"
OpName %x_9 "x_9"
OpName %x_GLF_color "x_GLF_color"
OpName %tint_symbol_1 "tint_symbol_1"
OpName %main_1 "main_1"
OpName %v "v"
OpName %i "i"
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 %buf1 Block
OpMemberDecorate %buf1 0 Offset 0
OpDecorate %_arr_int_uint_5 ArrayStride 16
@@ -36,8 +36,12 @@
OpDecorate %x_9 NonWritable
OpDecorate %x_9 DescriptorSet 0
OpDecorate %x_9 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_5 = OpConstant %uint 5
@@ -45,18 +49,13 @@
%buf1 = OpTypeStruct %_arr_int_uint_5
%_ptr_Uniform_buf1 = OpTypePointer Uniform %buf1
%x_6 = OpVariable %_ptr_Uniform_buf1 Uniform
%float = OpTypeFloat 32
%uint_2 = OpConstant %uint 2
%_arr_float_uint_2 = OpTypeArray %float %uint_2
%buf0 = OpTypeStruct %_arr_float_uint_2
%_ptr_Uniform_buf0 = OpTypePointer Uniform %buf0
%x_9 = OpVariable %_ptr_Uniform_buf0 Uniform
%v4float = OpTypeVector %float 4
%_ptr_Private_v4float = OpTypePointer Private %v4float
%17 = OpConstantNull %v4float
%x_GLF_color = OpVariable %_ptr_Private_v4float Private %17
%_ptr_Output_v4float = OpTypePointer Output %v4float
%tint_symbol_1 = OpVariable %_ptr_Output_v4float Output %17
%x_GLF_color = OpVariable %_ptr_Private_v4float Private %5
%void = OpTypeVoid
%20 = OpTypeFunction %void
%_ptr_Function_v4float = OpTypePointer Function %v4float
@@ -75,10 +74,10 @@
%_ptr_Function_float = OpTypePointer Function %float
%v4bool = OpTypeVector %bool 4
%main_out = OpTypeStruct %v4float
%143 = OpTypeFunction %void %main_out
%143 = OpTypeFunction %main_out
%main_1 = OpFunction %void None %20
%23 = OpLabel
%v = OpVariable %_ptr_Function_v4float Function %17
%v = OpVariable %_ptr_Function_v4float Function %5
%i = OpVariable %_ptr_Function_int Function %28
%32 = OpAccessChain %_ptr_Uniform_int %x_6 %uint_0 %int_1
%33 = OpLoad %int %32
@@ -205,18 +204,17 @@
%123 = OpLabel
OpReturn
OpFunctionEnd
%tint_symbol_2 = OpFunction %void None %143
%tint_symbol = OpFunctionParameter %main_out
%147 = OpLabel
%148 = OpCompositeExtract %v4float %tint_symbol 0
OpStore %tint_symbol_1 %148
OpReturn
%main_inner = OpFunction %main_out None %143
%146 = OpLabel
%147 = OpFunctionCall %void %main_1
%148 = OpLoad %v4float %x_GLF_color
%149 = OpCompositeConstruct %main_out %148
OpReturnValue %149
OpFunctionEnd
%main = OpFunction %void None %20
%150 = OpLabel
%151 = OpFunctionCall %void %main_1
%153 = OpLoad %v4float %x_GLF_color
%154 = OpCompositeConstruct %main_out %153
%152 = OpFunctionCall %void %tint_symbol_2 %154
%151 = OpLabel
%152 = OpFunctionCall %main_out %main_inner
%153 = OpCompositeExtract %v4float %152 0
OpStore %x_GLF_color_1_1 %153
OpReturn
OpFunctionEnd