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-increment-global-counter-loop-function/0-opt.spvasm.expected.spvasm

@@ -1,52 +1,51 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 110
+; Bound: 109
 ; Schema: 0
                OpCapability Shader
                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 %x_GLF_global_loop_count "x_GLF_global_loop_count"
                OpName %buf0 "buf0"
                OpMemberName %buf0 0 "x_GLF_uniform_int_values"
                OpName %x_7 "x_7"
                OpName %x_GLF_color "x_GLF_color"
-               OpName %tint_symbol_1 "tint_symbol_1"
                OpName %func_ "func_"
                OpName %x_66_phi "x_66_phi"
                OpName %x_67 "x_67"
                OpName %main_1 "main_1"
                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_7 NonWritable
                OpDecorate %x_7 DescriptorSet 0
                OpDecorate %x_7 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
 %_ptr_Private_int = OpTypePointer Private %int
-          %4 = OpConstantNull %int
-%x_GLF_global_loop_count = OpVariable %_ptr_Private_int Private %4
+          %9 = OpConstantNull %int
+%x_GLF_global_loop_count = OpVariable %_ptr_Private_int Private %9
        %uint = OpTypeInt 32 0
      %uint_4 = OpConstant %uint 4
 %_arr_int_uint_4 = OpTypeArray %int %uint_4
        %buf0 = OpTypeStruct %_arr_int_uint_4
 %_ptr_Uniform_buf0 = OpTypePointer Uniform %buf0
         %x_7 = OpVariable %_ptr_Uniform_buf0 Uniform
-      %float = OpTypeFloat 32
-    %v4float = OpTypeVector %float 4
 %_ptr_Private_v4float = OpTypePointer Private %v4float
-         %15 = OpConstantNull %v4float
-%x_GLF_color = OpVariable %_ptr_Private_v4float Private %15
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-%tint_symbol_1 = OpVariable %_ptr_Output_v4float Output %15
+%x_GLF_color = OpVariable %_ptr_Private_v4float Private %5
        %void = OpTypeVoid
          %18 = OpTypeFunction %void
 %_ptr_Function_int = OpTypePointer Function %int
@@ -59,11 +58,11 @@
      %int_10 = OpConstant %int 10
       %int_2 = OpConstant %int 2
    %main_out = OpTypeStruct %v4float
-         %98 = OpTypeFunction %void %main_out
+         %98 = OpTypeFunction %main_out
       %func_ = OpFunction %void None %18
          %21 = OpLabel
-   %x_66_phi = OpVariable %_ptr_Function_int Function %4
-       %x_67 = OpVariable %_ptr_Function_int Function %4
+   %x_66_phi = OpVariable %_ptr_Function_int Function %9
+       %x_67 = OpVariable %_ptr_Function_int Function %9
          %27 = OpAccessChain %_ptr_Uniform_int %x_7 %uint_0 %int_1
          %28 = OpLoad %int %27
          %30 = OpAccessChain %_ptr_Uniform_int %x_7 %uint_0 %int_0
@@ -176,18 +175,17 @@
          %84 = OpLabel
                OpReturn
                OpFunctionEnd
-%tint_symbol_2 = OpFunction %void None %98
-%tint_symbol = OpFunctionParameter %main_out
-        %102 = OpLabel
-        %103 = OpCompositeExtract %v4float %tint_symbol 0
-               OpStore %tint_symbol_1 %103
-               OpReturn
+ %main_inner = OpFunction %main_out None %98
+        %101 = OpLabel
+        %102 = OpFunctionCall %void %main_1
+        %103 = OpLoad %v4float %x_GLF_color
+        %104 = OpCompositeConstruct %main_out %103
+               OpReturnValue %104
                OpFunctionEnd
        %main = OpFunction %void None %18
-        %105 = OpLabel
-        %106 = OpFunctionCall %void %main_1
-        %108 = OpLoad %v4float %x_GLF_color
-        %109 = OpCompositeConstruct %main_out %108
-        %107 = OpFunctionCall %void %tint_symbol_2 %109
+        %106 = OpLabel
+        %107 = OpFunctionCall %main_out %main_inner
+        %108 = OpCompositeExtract %v4float %107 0
+               OpStore %x_GLF_color_1_1 %108
                OpReturn
                OpFunctionEnd

test/vk-gl-cts/graphicsfuzz/cov-increment-global-counter-loop-function/0-opt.wgsl.expected.spvasm

@@ -1,52 +1,51 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 110
+; Bound: 109
 ; Schema: 0
                OpCapability Shader
                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 %x_GLF_global_loop_count "x_GLF_global_loop_count"
                OpName %buf0 "buf0"
                OpMemberName %buf0 0 "x_GLF_uniform_int_values"
                OpName %x_7 "x_7"
                OpName %x_GLF_color "x_GLF_color"
-               OpName %tint_symbol_1 "tint_symbol_1"
                OpName %func_ "func_"
                OpName %x_66_phi "x_66_phi"
                OpName %x_67 "x_67"
                OpName %main_1 "main_1"
                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_7 NonWritable
                OpDecorate %x_7 DescriptorSet 0
                OpDecorate %x_7 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
 %_ptr_Private_int = OpTypePointer Private %int
-          %4 = OpConstantNull %int
-%x_GLF_global_loop_count = OpVariable %_ptr_Private_int Private %4
+          %9 = OpConstantNull %int
+%x_GLF_global_loop_count = OpVariable %_ptr_Private_int Private %9
        %uint = OpTypeInt 32 0
      %uint_4 = OpConstant %uint 4
 %_arr_int_uint_4 = OpTypeArray %int %uint_4
        %buf0 = OpTypeStruct %_arr_int_uint_4
 %_ptr_Uniform_buf0 = OpTypePointer Uniform %buf0
         %x_7 = OpVariable %_ptr_Uniform_buf0 Uniform
-      %float = OpTypeFloat 32
-    %v4float = OpTypeVector %float 4
 %_ptr_Private_v4float = OpTypePointer Private %v4float
-         %15 = OpConstantNull %v4float
-%x_GLF_color = OpVariable %_ptr_Private_v4float Private %15
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-%tint_symbol_1 = OpVariable %_ptr_Output_v4float Output %15
+%x_GLF_color = OpVariable %_ptr_Private_v4float Private %5
        %void = OpTypeVoid
          %18 = OpTypeFunction %void
 %_ptr_Function_int = OpTypePointer Function %int
@@ -59,11 +58,11 @@
      %int_10 = OpConstant %int 10
       %int_2 = OpConstant %int 2
    %main_out = OpTypeStruct %v4float
-         %98 = OpTypeFunction %void %main_out
+         %98 = OpTypeFunction %main_out
       %func_ = OpFunction %void None %18
          %21 = OpLabel
-   %x_66_phi = OpVariable %_ptr_Function_int Function %4
-       %x_67 = OpVariable %_ptr_Function_int Function %4
+   %x_66_phi = OpVariable %_ptr_Function_int Function %9
+       %x_67 = OpVariable %_ptr_Function_int Function %9
          %27 = OpAccessChain %_ptr_Uniform_int %x_7 %uint_0 %int_1
          %28 = OpLoad %int %27
          %30 = OpAccessChain %_ptr_Uniform_int %x_7 %uint_0 %int_0
@@ -176,18 +175,17 @@
          %84 = OpLabel
                OpReturn
                OpFunctionEnd
-%tint_symbol_2 = OpFunction %void None %98
-%tint_symbol = OpFunctionParameter %main_out
-        %102 = OpLabel
-        %103 = OpCompositeExtract %v4float %tint_symbol 0
-               OpStore %tint_symbol_1 %103
-               OpReturn
+ %main_inner = OpFunction %main_out None %98
+        %101 = OpLabel
+        %102 = OpFunctionCall %void %main_1
+        %103 = OpLoad %v4float %x_GLF_color
+        %104 = OpCompositeConstruct %main_out %103
+               OpReturnValue %104
                OpFunctionEnd
        %main = OpFunction %void None %18
-        %105 = OpLabel
-        %106 = OpFunctionCall %void %main_1
-        %108 = OpLoad %v4float %x_GLF_color
-        %109 = OpCompositeConstruct %main_out %108
-        %107 = OpFunctionCall %void %tint_symbol_2 %109
+        %106 = OpLabel
+        %107 = OpFunctionCall %main_out %main_inner
+        %108 = OpCompositeExtract %v4float %107 0
+               OpStore %x_GLF_color_1_1 %108
                OpReturn
                OpFunctionEnd