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: 145
; Bound: 144
; Schema: 0
OpCapability Shader
%73 = 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_float_values"
OpName %x_6 "x_6"
@@ -15,7 +16,6 @@
OpMemberName %buf1 0 "x_GLF_uniform_int_values"
OpName %x_10 "x_10"
OpName %x_GLF_color "x_GLF_color"
OpName %tint_symbol_1 "tint_symbol_1"
OpName %main_1 "main_1"
OpName %v0 "v0"
OpName %v1 "v1"
@@ -23,9 +23,9 @@
OpName %c "c"
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_float_uint_2 ArrayStride 16
@@ -38,9 +38,12 @@
OpDecorate %x_10 NonWritable
OpDecorate %x_10 DescriptorSet 0
OpDecorate %x_10 Binding 1
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
%uint = OpTypeInt 32 0
%uint_2 = OpConstant %uint 2
%_arr_float_uint_2 = OpTypeArray %float %uint_2
@@ -53,12 +56,8 @@
%buf1 = OpTypeStruct %_arr_int_uint_4
%_ptr_Uniform_buf1 = OpTypePointer Uniform %buf1
%x_10 = OpVariable %_ptr_Uniform_buf1 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
@@ -77,11 +76,11 @@
%float_1 = OpConstant %float 1
%102 = OpConstantComposite %v4float %float_1 %float_1 %float_1 %float_1
%main_out = OpTypeStruct %v4float
%133 = OpTypeFunction %void %main_out
%133 = OpTypeFunction %main_out
%main_1 = OpFunction %void None %20
%23 = OpLabel
%v0 = OpVariable %_ptr_Function_v4float Function %17
%v1 = OpVariable %_ptr_Function_v4float Function %17
%v0 = OpVariable %_ptr_Function_v4float Function %5
%v1 = OpVariable %_ptr_Function_v4float Function %5
%a = OpVariable %_ptr_Function_int Function %29
%c = OpVariable %_ptr_Function_int Function %29
%34 = OpAccessChain %_ptr_Uniform_float %x_6 %uint_0 %int_1
@@ -210,18 +209,17 @@
%113 = OpLabel
OpReturn
OpFunctionEnd
%tint_symbol_2 = OpFunction %void None %133
%tint_symbol = OpFunctionParameter %main_out
%137 = OpLabel
%138 = OpCompositeExtract %v4float %tint_symbol 0
OpStore %tint_symbol_1 %138
OpReturn
%main_inner = OpFunction %main_out None %133
%136 = OpLabel
%137 = OpFunctionCall %void %main_1
%138 = OpLoad %v4float %x_GLF_color
%139 = OpCompositeConstruct %main_out %138
OpReturnValue %139
OpFunctionEnd
%main = OpFunction %void None %20
%140 = OpLabel
%141 = OpFunctionCall %void %main_1
%143 = OpLoad %v4float %x_GLF_color
%144 = OpCompositeConstruct %main_out %143
%142 = OpFunctionCall %void %tint_symbol_2 %144
%141 = OpLabel
%142 = OpFunctionCall %main_out %main_inner
%143 = OpCompositeExtract %v4float %142 0
OpStore %x_GLF_color_1_1 %143
OpReturn
OpFunctionEnd

View File

@@ -1,13 +1,14 @@
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 145
; Bound: 144
; Schema: 0
OpCapability Shader
%73 = 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_float_values"
OpName %x_6 "x_6"
@@ -15,7 +16,6 @@
OpMemberName %buf1 0 "x_GLF_uniform_int_values"
OpName %x_10 "x_10"
OpName %x_GLF_color "x_GLF_color"
OpName %tint_symbol_1 "tint_symbol_1"
OpName %main_1 "main_1"
OpName %v0 "v0"
OpName %v1 "v1"
@@ -23,9 +23,9 @@
OpName %c "c"
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_float_uint_2 ArrayStride 16
@@ -38,9 +38,12 @@
OpDecorate %x_10 NonWritable
OpDecorate %x_10 DescriptorSet 0
OpDecorate %x_10 Binding 1
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
%uint = OpTypeInt 32 0
%uint_2 = OpConstant %uint 2
%_arr_float_uint_2 = OpTypeArray %float %uint_2
@@ -53,12 +56,8 @@
%buf1 = OpTypeStruct %_arr_int_uint_4
%_ptr_Uniform_buf1 = OpTypePointer Uniform %buf1
%x_10 = OpVariable %_ptr_Uniform_buf1 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
@@ -77,11 +76,11 @@
%float_1 = OpConstant %float 1
%102 = OpConstantComposite %v4float %float_1 %float_1 %float_1 %float_1
%main_out = OpTypeStruct %v4float
%133 = OpTypeFunction %void %main_out
%133 = OpTypeFunction %main_out
%main_1 = OpFunction %void None %20
%23 = OpLabel
%v0 = OpVariable %_ptr_Function_v4float Function %17
%v1 = OpVariable %_ptr_Function_v4float Function %17
%v0 = OpVariable %_ptr_Function_v4float Function %5
%v1 = OpVariable %_ptr_Function_v4float Function %5
%a = OpVariable %_ptr_Function_int Function %29
%c = OpVariable %_ptr_Function_int Function %29
%34 = OpAccessChain %_ptr_Uniform_float %x_6 %uint_0 %int_1
@@ -210,18 +209,17 @@
%113 = OpLabel
OpReturn
OpFunctionEnd
%tint_symbol_2 = OpFunction %void None %133
%tint_symbol = OpFunctionParameter %main_out
%137 = OpLabel
%138 = OpCompositeExtract %v4float %tint_symbol 0
OpStore %tint_symbol_1 %138
OpReturn
%main_inner = OpFunction %main_out None %133
%136 = OpLabel
%137 = OpFunctionCall %void %main_1
%138 = OpLoad %v4float %x_GLF_color
%139 = OpCompositeConstruct %main_out %138
OpReturnValue %139
OpFunctionEnd
%main = OpFunction %void None %20
%140 = OpLabel
%141 = OpFunctionCall %void %main_1
%143 = OpLoad %v4float %x_GLF_color
%144 = OpCompositeConstruct %main_out %143
%142 = OpFunctionCall %void %tint_symbol_2 %144
%141 = OpLabel
%142 = OpFunctionCall %main_out %main_inner
%143 = OpCompositeExtract %v4float %142 0
OpStore %x_GLF_color_1_1 %143
OpReturn
OpFunctionEnd