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>

test/vk-gl-cts/graphicsfuzz/vector-values-multiplied-by-fragcoord/0-opt.spvasm.expected.spvasm

@@ -5,15 +5,15 @@
 ; Schema: 0
                OpCapability Shader
                OpMemoryModel Logical GLSL450
-               OpEntryPoint Fragment %main "main" %tint_symbol %tint_symbol_2
+               OpEntryPoint Fragment %main "main" %gl_FragCoord_param_1 %x_GLF_color_1_1
                OpExecutionMode %main OriginUpperLeft
+               OpName %gl_FragCoord_param_1 "gl_FragCoord_param_1"
+               OpName %x_GLF_color_1_1 "x_GLF_color_1_1"
                OpName %gl_FragCoord "gl_FragCoord"
                OpName %buf0 "buf0"
                OpMemberName %buf0 0 "injectionSwitch"
                OpName %x_10 "x_10"
                OpName %x_GLF_color "x_GLF_color"
-               OpName %tint_symbol "tint_symbol"
-               OpName %tint_symbol_2 "tint_symbol_2"
                OpName %func_ "func_"
                OpName %alwaysFalse "alwaysFalse"
                OpName %value "value"
@@ -26,31 +26,31 @@
                OpName %i_1 "i_1"
                OpName %main_out "main_out"
                OpMemberName %main_out 0 "x_GLF_color_1"
-               OpName %tint_symbol_3 "tint_symbol_3"
-               OpName %tint_symbol_1 "tint_symbol_1"
+               OpName %main_inner "main_inner"
+               OpName %gl_FragCoord_param "gl_FragCoord_param"
                OpName %main "main"
+               OpDecorate %gl_FragCoord_param_1 BuiltIn FragCoord
+               OpDecorate %x_GLF_color_1_1 Location 0
                OpDecorate %buf0 Block
                OpMemberDecorate %buf0 0 Offset 0
                OpDecorate %x_10 NonWritable
                OpDecorate %x_10 DescriptorSet 0
                OpDecorate %x_10 Binding 0
-               OpDecorate %tint_symbol BuiltIn FragCoord
-               OpDecorate %tint_symbol_2 Location 0
                OpMemberDecorate %main_out 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
+%_ptr_Input_v4float = OpTypePointer Input %v4float
+%gl_FragCoord_param_1 = OpVariable %_ptr_Input_v4float Input
+%_ptr_Output_v4float = OpTypePointer Output %v4float
+          %7 = OpConstantNull %v4float
+%x_GLF_color_1_1 = OpVariable %_ptr_Output_v4float Output %7
 %_ptr_Private_v4float = OpTypePointer Private %v4float
-          %5 = OpConstantNull %v4float
-%gl_FragCoord = OpVariable %_ptr_Private_v4float Private %5
+%gl_FragCoord = OpVariable %_ptr_Private_v4float Private %7
     %v2float = OpTypeVector %float 2
        %buf0 = OpTypeStruct %v2float
 %_ptr_Uniform_buf0 = OpTypePointer Uniform %buf0
        %x_10 = OpVariable %_ptr_Uniform_buf0 Uniform
-%x_GLF_color = OpVariable %_ptr_Private_v4float Private %5
-%_ptr_Input_v4float = OpTypePointer Input %v4float
-%tint_symbol = OpVariable %_ptr_Input_v4float Input
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-%tint_symbol_2 = OpVariable %_ptr_Output_v4float Output %5
+%x_GLF_color = OpVariable %_ptr_Private_v4float Private %7
          %15 = OpTypeFunction %float
        %bool = OpTypeBool
 %_ptr_Function_bool = OpTypePointer Function %bool
@@ -81,11 +81,11 @@
         %155 = OpConstantComposite %v4float %float_1 %float_0 %float_0 %float_1
         %156 = OpConstantComposite %v4float %float_0 %float_0 %float_0 %float_1
    %main_out = OpTypeStruct %v4float
-        %157 = OpTypeFunction %void %main_out
+        %157 = OpTypeFunction %main_out %v4float
       %func_ = OpFunction %float None %15
          %17 = OpLabel
 %alwaysFalse = OpVariable %_ptr_Function_bool Function %21
-      %value = OpVariable %_ptr_Function_v4float Function %5
+      %value = OpVariable %_ptr_Function_v4float Function %7
           %a = OpVariable %_ptr_Function_v2float Function %26
           %i = OpVariable %_ptr_Function_int Function %30
       %x_121 = OpVariable %_ptr_Function_bool Function %21
@@ -250,20 +250,20 @@
         %152 = OpLabel
                OpReturn
                OpFunctionEnd
-%tint_symbol_3 = OpFunction %void None %157
-%tint_symbol_1 = OpFunctionParameter %main_out
+ %main_inner = OpFunction %main_out None %157
+%gl_FragCoord_param = OpFunctionParameter %v4float
         %161 = OpLabel
-        %162 = OpCompositeExtract %v4float %tint_symbol_1 0
-               OpStore %tint_symbol_2 %162
-               OpReturn
+               OpStore %gl_FragCoord %gl_FragCoord_param
+        %162 = OpFunctionCall %void %main_1
+        %163 = OpLoad %v4float %x_GLF_color
+        %164 = OpCompositeConstruct %main_out %163
+               OpReturnValue %164
                OpFunctionEnd
        %main = OpFunction %void None %124
-        %164 = OpLabel
-        %165 = OpLoad %v4float %tint_symbol
-               OpStore %gl_FragCoord %165
-        %166 = OpFunctionCall %void %main_1
-        %168 = OpLoad %v4float %x_GLF_color
-        %169 = OpCompositeConstruct %main_out %168
-        %167 = OpFunctionCall %void %tint_symbol_3 %169
+        %166 = OpLabel
+        %168 = OpLoad %v4float %gl_FragCoord_param_1
+        %167 = OpFunctionCall %main_out %main_inner %168
+        %169 = OpCompositeExtract %v4float %167 0
+               OpStore %x_GLF_color_1_1 %169
                OpReturn
                OpFunctionEnd

test/vk-gl-cts/graphicsfuzz/vector-values-multiplied-by-fragcoord/0-opt.wgsl.expected.spvasm

@@ -5,15 +5,15 @@
 ; Schema: 0
                OpCapability Shader
                OpMemoryModel Logical GLSL450
-               OpEntryPoint Fragment %main "main" %tint_symbol %tint_symbol_2
+               OpEntryPoint Fragment %main "main" %gl_FragCoord_param_1 %x_GLF_color_1_1
                OpExecutionMode %main OriginUpperLeft
+               OpName %gl_FragCoord_param_1 "gl_FragCoord_param_1"
+               OpName %x_GLF_color_1_1 "x_GLF_color_1_1"
                OpName %gl_FragCoord "gl_FragCoord"
                OpName %buf0 "buf0"
                OpMemberName %buf0 0 "injectionSwitch"
                OpName %x_10 "x_10"
                OpName %x_GLF_color "x_GLF_color"
-               OpName %tint_symbol "tint_symbol"
-               OpName %tint_symbol_2 "tint_symbol_2"
                OpName %func_ "func_"
                OpName %alwaysFalse "alwaysFalse"
                OpName %value "value"
@@ -26,31 +26,31 @@
                OpName %i_1 "i_1"
                OpName %main_out "main_out"
                OpMemberName %main_out 0 "x_GLF_color_1"
-               OpName %tint_symbol_3 "tint_symbol_3"
-               OpName %tint_symbol_1 "tint_symbol_1"
+               OpName %main_inner "main_inner"
+               OpName %gl_FragCoord_param "gl_FragCoord_param"
                OpName %main "main"
+               OpDecorate %gl_FragCoord_param_1 BuiltIn FragCoord
+               OpDecorate %x_GLF_color_1_1 Location 0
                OpDecorate %buf0 Block
                OpMemberDecorate %buf0 0 Offset 0
                OpDecorate %x_10 NonWritable
                OpDecorate %x_10 DescriptorSet 0
                OpDecorate %x_10 Binding 0
-               OpDecorate %tint_symbol BuiltIn FragCoord
-               OpDecorate %tint_symbol_2 Location 0
                OpMemberDecorate %main_out 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
+%_ptr_Input_v4float = OpTypePointer Input %v4float
+%gl_FragCoord_param_1 = OpVariable %_ptr_Input_v4float Input
+%_ptr_Output_v4float = OpTypePointer Output %v4float
+          %7 = OpConstantNull %v4float
+%x_GLF_color_1_1 = OpVariable %_ptr_Output_v4float Output %7
 %_ptr_Private_v4float = OpTypePointer Private %v4float
-          %5 = OpConstantNull %v4float
-%gl_FragCoord = OpVariable %_ptr_Private_v4float Private %5
+%gl_FragCoord = OpVariable %_ptr_Private_v4float Private %7
     %v2float = OpTypeVector %float 2
        %buf0 = OpTypeStruct %v2float
 %_ptr_Uniform_buf0 = OpTypePointer Uniform %buf0
        %x_10 = OpVariable %_ptr_Uniform_buf0 Uniform
-%x_GLF_color = OpVariable %_ptr_Private_v4float Private %5
-%_ptr_Input_v4float = OpTypePointer Input %v4float
-%tint_symbol = OpVariable %_ptr_Input_v4float Input
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-%tint_symbol_2 = OpVariable %_ptr_Output_v4float Output %5
+%x_GLF_color = OpVariable %_ptr_Private_v4float Private %7
          %15 = OpTypeFunction %float
        %bool = OpTypeBool
 %_ptr_Function_bool = OpTypePointer Function %bool
@@ -81,11 +81,11 @@
         %155 = OpConstantComposite %v4float %float_1 %float_0 %float_0 %float_1
         %156 = OpConstantComposite %v4float %float_0 %float_0 %float_0 %float_1
    %main_out = OpTypeStruct %v4float
-        %157 = OpTypeFunction %void %main_out
+        %157 = OpTypeFunction %main_out %v4float
       %func_ = OpFunction %float None %15
          %17 = OpLabel
 %alwaysFalse = OpVariable %_ptr_Function_bool Function %21
-      %value = OpVariable %_ptr_Function_v4float Function %5
+      %value = OpVariable %_ptr_Function_v4float Function %7
           %a = OpVariable %_ptr_Function_v2float Function %26
           %i = OpVariable %_ptr_Function_int Function %30
       %x_121 = OpVariable %_ptr_Function_bool Function %21
@@ -250,20 +250,20 @@
         %152 = OpLabel
                OpReturn
                OpFunctionEnd
-%tint_symbol_3 = OpFunction %void None %157
-%tint_symbol_1 = OpFunctionParameter %main_out
+ %main_inner = OpFunction %main_out None %157
+%gl_FragCoord_param = OpFunctionParameter %v4float
         %161 = OpLabel
-        %162 = OpCompositeExtract %v4float %tint_symbol_1 0
-               OpStore %tint_symbol_2 %162
-               OpReturn
+               OpStore %gl_FragCoord %gl_FragCoord_param
+        %162 = OpFunctionCall %void %main_1
+        %163 = OpLoad %v4float %x_GLF_color
+        %164 = OpCompositeConstruct %main_out %163
+               OpReturnValue %164
                OpFunctionEnd
        %main = OpFunction %void None %124
-        %164 = OpLabel
-        %165 = OpLoad %v4float %tint_symbol
-               OpStore %gl_FragCoord %165
-        %166 = OpFunctionCall %void %main_1
-        %168 = OpLoad %v4float %x_GLF_color
-        %169 = OpCompositeConstruct %main_out %168
-        %167 = OpFunctionCall %void %tint_symbol_3 %169
+        %166 = OpLabel
+        %168 = OpLoad %v4float %gl_FragCoord_param_1
+        %167 = OpFunctionCall %main_out %main_inner %168
+        %169 = OpCompositeExtract %v4float %167 0
+               OpStore %x_GLF_color_1_1 %169
                OpReturn
                OpFunctionEnd