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-instruction-simplify-sqrt/0.spvasm.expected.spvasm

@@ -1,13 +1,14 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 61
+; Bound: 60
 ; Schema: 0
                OpCapability Shader
          %29 = 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_5 "x_5"
@@ -15,13 +16,12 @@
                OpName %buf1 "buf1"
                OpMemberName %buf1 0 "x_GLF_uniform_int_values"
                OpName %x_7 "x_7"
-               OpName %tint_symbol_1 "tint_symbol_1"
                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_float_uint_2 ArrayStride 16
@@ -34,26 +34,25 @@
                OpDecorate %x_7 NonWritable
                OpDecorate %x_7 DescriptorSet 0
                OpDecorate %x_7 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
        %buf0 = OpTypeStruct %_arr_float_uint_2
 %_ptr_Uniform_buf0 = OpTypePointer Uniform %buf0
         %x_5 = OpVariable %_ptr_Uniform_buf0 Uniform
-    %v4float = OpTypeVector %float 4
 %_ptr_Private_v4float = OpTypePointer Private %v4float
-         %11 = OpConstantNull %v4float
-%x_GLF_color = OpVariable %_ptr_Private_v4float Private %11
+%x_GLF_color = OpVariable %_ptr_Private_v4float Private %5
         %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_7 = OpVariable %_ptr_Uniform_buf1 Uniform
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-%tint_symbol_1 = OpVariable %_ptr_Output_v4float Output %11
        %void = OpTypeVoid
          %19 = OpTypeFunction %void
      %uint_0 = OpConstant %uint 0
@@ -64,7 +63,7 @@
       %int_1 = OpConstant %int 1
 %_ptr_Uniform_int = OpTypePointer Uniform %int
    %main_out = OpTypeStruct %v4float
-         %49 = OpTypeFunction %void %main_out
+         %49 = OpTypeFunction %main_out
      %main_1 = OpFunction %void None %19
          %22 = OpLabel
          %26 = OpAccessChain %_ptr_Uniform_float %x_5 %uint_0 %int_0
@@ -93,18 +92,17 @@
          %33 = OpLabel
                OpReturn
                OpFunctionEnd
-%tint_symbol_2 = OpFunction %void None %49
-%tint_symbol = OpFunctionParameter %main_out
-         %53 = OpLabel
-         %54 = OpCompositeExtract %v4float %tint_symbol 0
-               OpStore %tint_symbol_1 %54
-               OpReturn
+ %main_inner = OpFunction %main_out None %49
+         %52 = OpLabel
+         %53 = OpFunctionCall %void %main_1
+         %54 = OpLoad %v4float %x_GLF_color
+         %55 = OpCompositeConstruct %main_out %54
+               OpReturnValue %55
                OpFunctionEnd
        %main = OpFunction %void None %19
-         %56 = OpLabel
-         %57 = OpFunctionCall %void %main_1
-         %59 = OpLoad %v4float %x_GLF_color
-         %60 = OpCompositeConstruct %main_out %59
-         %58 = OpFunctionCall %void %tint_symbol_2 %60
+         %57 = OpLabel
+         %58 = OpFunctionCall %main_out %main_inner
+         %59 = OpCompositeExtract %v4float %58 0
+               OpStore %x_GLF_color_1_1 %59
                OpReturn
                OpFunctionEnd

test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-sqrt/0.wgsl.expected.spvasm

@@ -1,13 +1,14 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 61
+; Bound: 60
 ; Schema: 0
                OpCapability Shader
          %29 = 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_5 "x_5"
@@ -15,13 +16,12 @@
                OpName %buf1 "buf1"
                OpMemberName %buf1 0 "x_GLF_uniform_int_values"
                OpName %x_7 "x_7"
-               OpName %tint_symbol_1 "tint_symbol_1"
                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_float_uint_2 ArrayStride 16
@@ -34,26 +34,25 @@
                OpDecorate %x_7 NonWritable
                OpDecorate %x_7 DescriptorSet 0
                OpDecorate %x_7 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
        %buf0 = OpTypeStruct %_arr_float_uint_2
 %_ptr_Uniform_buf0 = OpTypePointer Uniform %buf0
         %x_5 = OpVariable %_ptr_Uniform_buf0 Uniform
-    %v4float = OpTypeVector %float 4
 %_ptr_Private_v4float = OpTypePointer Private %v4float
-         %11 = OpConstantNull %v4float
-%x_GLF_color = OpVariable %_ptr_Private_v4float Private %11
+%x_GLF_color = OpVariable %_ptr_Private_v4float Private %5
         %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_7 = OpVariable %_ptr_Uniform_buf1 Uniform
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-%tint_symbol_1 = OpVariable %_ptr_Output_v4float Output %11
        %void = OpTypeVoid
          %19 = OpTypeFunction %void
      %uint_0 = OpConstant %uint 0
@@ -64,7 +63,7 @@
       %int_1 = OpConstant %int 1
 %_ptr_Uniform_int = OpTypePointer Uniform %int
    %main_out = OpTypeStruct %v4float
-         %49 = OpTypeFunction %void %main_out
+         %49 = OpTypeFunction %main_out
      %main_1 = OpFunction %void None %19
          %22 = OpLabel
          %26 = OpAccessChain %_ptr_Uniform_float %x_5 %uint_0 %int_0
@@ -93,18 +92,17 @@
          %33 = OpLabel
                OpReturn
                OpFunctionEnd
-%tint_symbol_2 = OpFunction %void None %49
-%tint_symbol = OpFunctionParameter %main_out
-         %53 = OpLabel
-         %54 = OpCompositeExtract %v4float %tint_symbol 0
-               OpStore %tint_symbol_1 %54
-               OpReturn
+ %main_inner = OpFunction %main_out None %49
+         %52 = OpLabel
+         %53 = OpFunctionCall %void %main_1
+         %54 = OpLoad %v4float %x_GLF_color
+         %55 = OpCompositeConstruct %main_out %54
+               OpReturnValue %55
                OpFunctionEnd
        %main = OpFunction %void None %19
-         %56 = OpLabel
-         %57 = OpFunctionCall %void %main_1
-         %59 = OpLoad %v4float %x_GLF_color
-         %60 = OpCompositeConstruct %main_out %59
-         %58 = OpFunctionCall %void %tint_symbol_2 %60
+         %57 = OpLabel
+         %58 = OpFunctionCall %main_out %main_inner
+         %59 = OpCompositeExtract %v4float %58 0
+               OpStore %x_GLF_color_1_1 %59
                OpReturn
                OpFunctionEnd