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/cov-if-switch-fallthrough/0.spvasm.expected.spvasm

@@ -5,8 +5,10 @@
 ; 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 %x_GLF_color "x_GLF_color"
                OpName %buf0 "buf0"
                OpMemberName %buf0 0 "x_GLF_uniform_float_values"
@@ -15,14 +17,14 @@
                OpName %buf1 "buf1"
                OpMemberName %buf1 0 "x_GLF_uniform_int_values"
                OpName %x_8 "x_8"
-               OpName %tint_symbol "tint_symbol"
-               OpName %tint_symbol_2 "tint_symbol_2"
                OpName %main_1 "main_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 %_arr_float_uint_2 ArrayStride 16
@@ -35,30 +37,28 @@
                OpDecorate %x_8 NonWritable
                OpDecorate %x_8 DescriptorSet 0
                OpDecorate %x_8 Binding 1
-               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
-%x_GLF_color = OpVariable %_ptr_Private_v4float Private %5
+%x_GLF_color = OpVariable %_ptr_Private_v4float Private %7
        %uint = OpTypeInt 32 0
      %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_6 = OpVariable %_ptr_Uniform_buf0 Uniform
-%gl_FragCoord = OpVariable %_ptr_Private_v4float Private %5
+%gl_FragCoord = OpVariable %_ptr_Private_v4float Private %7
         %int = OpTypeInt 32 1
 %_arr_int_uint_2 = OpTypeArray %int %uint_2
        %buf1 = OpTypeStruct %_arr_int_uint_2
 %_ptr_Uniform_buf1 = OpTypePointer Uniform %buf1
         %x_8 = OpVariable %_ptr_Uniform_buf1 Uniform
-%_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
        %void = OpTypeVoid
          %22 = OpTypeFunction %void
      %uint_0 = OpConstant %uint 0
@@ -70,7 +70,7 @@
        %bool = OpTypeBool
 %_ptr_Uniform_int = OpTypePointer Uniform %int
    %main_out = OpTypeStruct %v4float
-         %62 = OpTypeFunction %void %main_out
+         %62 = OpTypeFunction %main_out %v4float
      %main_1 = OpFunction %void None %22
          %25 = OpLabel
          %29 = OpAccessChain %_ptr_Uniform_float %x_6 %uint_0 %int_1
@@ -116,20 +116,20 @@
          %59 = OpLabel
                OpReturn
                OpFunctionEnd
-%tint_symbol_3 = OpFunction %void None %62
-%tint_symbol_1 = OpFunctionParameter %main_out
+ %main_inner = OpFunction %main_out None %62
+%gl_FragCoord_param = OpFunctionParameter %v4float
          %66 = OpLabel
-         %67 = OpCompositeExtract %v4float %tint_symbol_1 0
-               OpStore %tint_symbol_2 %67
-               OpReturn
+               OpStore %gl_FragCoord %gl_FragCoord_param
+         %67 = OpFunctionCall %void %main_1
+         %68 = OpLoad %v4float %x_GLF_color
+         %69 = OpCompositeConstruct %main_out %68
+               OpReturnValue %69
                OpFunctionEnd
        %main = OpFunction %void None %22
-         %69 = OpLabel
-         %70 = OpLoad %v4float %tint_symbol
-               OpStore %gl_FragCoord %70
-         %71 = OpFunctionCall %void %main_1
-         %73 = OpLoad %v4float %x_GLF_color
-         %74 = OpCompositeConstruct %main_out %73
-         %72 = OpFunctionCall %void %tint_symbol_3 %74
+         %71 = OpLabel
+         %73 = OpLoad %v4float %gl_FragCoord_param_1
+         %72 = OpFunctionCall %main_out %main_inner %73
+         %74 = OpCompositeExtract %v4float %72 0
+               OpStore %x_GLF_color_1_1 %74
                OpReturn
                OpFunctionEnd

test/vk-gl-cts/graphicsfuzz/cov-if-switch-fallthrough/0.wgsl.expected.spvasm

@@ -5,8 +5,10 @@
 ; 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 %x_GLF_color "x_GLF_color"
                OpName %buf0 "buf0"
                OpMemberName %buf0 0 "x_GLF_uniform_float_values"
@@ -15,14 +17,14 @@
                OpName %buf1 "buf1"
                OpMemberName %buf1 0 "x_GLF_uniform_int_values"
                OpName %x_8 "x_8"
-               OpName %tint_symbol "tint_symbol"
-               OpName %tint_symbol_2 "tint_symbol_2"
                OpName %main_1 "main_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 %_arr_float_uint_2 ArrayStride 16
@@ -35,30 +37,28 @@
                OpDecorate %x_8 NonWritable
                OpDecorate %x_8 DescriptorSet 0
                OpDecorate %x_8 Binding 1
-               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
-%x_GLF_color = OpVariable %_ptr_Private_v4float Private %5
+%x_GLF_color = OpVariable %_ptr_Private_v4float Private %7
        %uint = OpTypeInt 32 0
      %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_6 = OpVariable %_ptr_Uniform_buf0 Uniform
-%gl_FragCoord = OpVariable %_ptr_Private_v4float Private %5
+%gl_FragCoord = OpVariable %_ptr_Private_v4float Private %7
         %int = OpTypeInt 32 1
 %_arr_int_uint_2 = OpTypeArray %int %uint_2
        %buf1 = OpTypeStruct %_arr_int_uint_2
 %_ptr_Uniform_buf1 = OpTypePointer Uniform %buf1
         %x_8 = OpVariable %_ptr_Uniform_buf1 Uniform
-%_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
        %void = OpTypeVoid
          %22 = OpTypeFunction %void
      %uint_0 = OpConstant %uint 0
@@ -70,7 +70,7 @@
        %bool = OpTypeBool
 %_ptr_Uniform_int = OpTypePointer Uniform %int
    %main_out = OpTypeStruct %v4float
-         %62 = OpTypeFunction %void %main_out
+         %62 = OpTypeFunction %main_out %v4float
      %main_1 = OpFunction %void None %22
          %25 = OpLabel
          %29 = OpAccessChain %_ptr_Uniform_float %x_6 %uint_0 %int_1
@@ -116,20 +116,20 @@
          %59 = OpLabel
                OpReturn
                OpFunctionEnd
-%tint_symbol_3 = OpFunction %void None %62
-%tint_symbol_1 = OpFunctionParameter %main_out
+ %main_inner = OpFunction %main_out None %62
+%gl_FragCoord_param = OpFunctionParameter %v4float
          %66 = OpLabel
-         %67 = OpCompositeExtract %v4float %tint_symbol_1 0
-               OpStore %tint_symbol_2 %67
-               OpReturn
+               OpStore %gl_FragCoord %gl_FragCoord_param
+         %67 = OpFunctionCall %void %main_1
+         %68 = OpLoad %v4float %x_GLF_color
+         %69 = OpCompositeConstruct %main_out %68
+               OpReturnValue %69
                OpFunctionEnd
        %main = OpFunction %void None %22
-         %69 = OpLabel
-         %70 = OpLoad %v4float %tint_symbol
-               OpStore %gl_FragCoord %70
-         %71 = OpFunctionCall %void %main_1
-         %73 = OpLoad %v4float %x_GLF_color
-         %74 = OpCompositeConstruct %main_out %73
-         %72 = OpFunctionCall %void %tint_symbol_3 %74
+         %71 = OpLabel
+         %73 = OpLoad %v4float %gl_FragCoord_param_1
+         %72 = OpFunctionCall %main_out %main_inner %73
+         %74 = OpCompositeExtract %v4float %72 0
+               OpStore %x_GLF_color_1_1 %74
                OpReturn
                OpFunctionEnd