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-apfloat-undefined-matrix-mul/0-opt.spvasm.expected.spvasm

@@ -1,13 +1,14 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 175
+; Bound: 174
 ; Schema: 0
                OpCapability Shader
          %96 = 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 %buf1 "buf1"
                OpMemberName %buf1 0 "x_GLF_uniform_int_values"
                OpName %x_6 "x_6"
@@ -15,7 +16,6 @@
                OpName %buf0 "buf0"
                OpMemberName %buf0 0 "x_GLF_uniform_float_values"
                OpName %x_15 "x_15"
-               OpName %tint_symbol_1 "tint_symbol_1"
                OpName %main_1 "main_1"
                OpName %m0 "m0"
                OpName %m1 "m1"
@@ -27,9 +27,9 @@
                OpName %v3 "v3"
                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 %buf1 Block
                OpMemberDecorate %buf1 0 Offset 0
                OpDecorate %_arr_int_uint_12 ArrayStride 16
@@ -42,8 +42,12 @@
                OpDecorate %x_15 NonWritable
                OpDecorate %x_15 DescriptorSet 0
                OpDecorate %x_15 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
        %uint = OpTypeInt 32 0
     %uint_12 = OpConstant %uint 12
@@ -51,18 +55,13 @@
        %buf1 = OpTypeStruct %_arr_int_uint_12
 %_ptr_Uniform_buf1 = OpTypePointer Uniform %buf1
         %x_6 = OpVariable %_ptr_Uniform_buf1 Uniform
-      %float = OpTypeFloat 32
-    %v4float = OpTypeVector %float 4
 %_ptr_Private_v4float = OpTypePointer Private %v4float
-         %12 = OpConstantNull %v4float
-%x_GLF_color = OpVariable %_ptr_Private_v4float Private %12
+%x_GLF_color = OpVariable %_ptr_Private_v4float Private %5
      %uint_1 = OpConstant %uint 1
 %_arr_float_uint_1 = OpTypeArray %float %uint_1
        %buf0 = OpTypeStruct %_arr_float_uint_1
 %_ptr_Uniform_buf0 = OpTypePointer Uniform %buf0
        %x_15 = OpVariable %_ptr_Uniform_buf0 Uniform
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-%tint_symbol_1 = OpVariable %_ptr_Output_v4float Output %12
        %void = OpTypeVoid
          %20 = OpTypeFunction %void
 %mat3v4float = OpTypeMatrix %v4float 3
@@ -99,17 +98,17 @@
 %_ptr_Uniform_float = OpTypePointer Uniform %float
 %_ptr_Private_float = OpTypePointer Private %float
    %main_out = OpTypeStruct %v4float
-        %163 = OpTypeFunction %void %main_out
+        %163 = OpTypeFunction %main_out
      %main_1 = OpFunction %void None %20
          %23 = OpLabel
          %m0 = OpVariable %_ptr_Function_mat3v4float Function %27
          %m1 = OpVariable %_ptr_Function_mat3v4float Function %27
   %undefined = OpVariable %_ptr_Function_v3float Function %32
     %defined = OpVariable %_ptr_Function_v3float Function %32
-         %v0 = OpVariable %_ptr_Function_v4float Function %12
-         %v1 = OpVariable %_ptr_Function_v4float Function %12
-         %v2 = OpVariable %_ptr_Function_v4float Function %12
-         %v3 = OpVariable %_ptr_Function_v4float Function %12
+         %v0 = OpVariable %_ptr_Function_v4float Function %5
+         %v1 = OpVariable %_ptr_Function_v4float Function %5
+         %v2 = OpVariable %_ptr_Function_v4float Function %5
+         %v3 = OpVariable %_ptr_Function_v4float Function %5
          %42 = OpAccessChain %_ptr_Uniform_int %x_6 %uint_0 %int_4
          %43 = OpLoad %int %42
          %45 = OpAccessChain %_ptr_Uniform_int %x_6 %uint_0 %int_5
@@ -227,18 +226,17 @@
         %156 = OpLabel
                OpReturn
                OpFunctionEnd
-%tint_symbol_2 = OpFunction %void None %163
-%tint_symbol = OpFunctionParameter %main_out
-        %167 = OpLabel
-        %168 = OpCompositeExtract %v4float %tint_symbol 0
-               OpStore %tint_symbol_1 %168
-               OpReturn
+ %main_inner = OpFunction %main_out None %163
+        %166 = OpLabel
+        %167 = OpFunctionCall %void %main_1
+        %168 = OpLoad %v4float %x_GLF_color
+        %169 = OpCompositeConstruct %main_out %168
+               OpReturnValue %169
                OpFunctionEnd
        %main = OpFunction %void None %20
-        %170 = OpLabel
-        %171 = OpFunctionCall %void %main_1
-        %173 = OpLoad %v4float %x_GLF_color
-        %174 = OpCompositeConstruct %main_out %173
-        %172 = OpFunctionCall %void %tint_symbol_2 %174
+        %171 = OpLabel
+        %172 = OpFunctionCall %main_out %main_inner
+        %173 = OpCompositeExtract %v4float %172 0
+               OpStore %x_GLF_color_1_1 %173
                OpReturn
                OpFunctionEnd

test/vk-gl-cts/graphicsfuzz/cov-apfloat-undefined-matrix-mul/0-opt.wgsl.expected.spvasm

@@ -1,13 +1,14 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 175
+; Bound: 174
 ; Schema: 0
                OpCapability Shader
          %96 = 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 %buf1 "buf1"
                OpMemberName %buf1 0 "x_GLF_uniform_int_values"
                OpName %x_6 "x_6"
@@ -15,7 +16,6 @@
                OpName %buf0 "buf0"
                OpMemberName %buf0 0 "x_GLF_uniform_float_values"
                OpName %x_15 "x_15"
-               OpName %tint_symbol_1 "tint_symbol_1"
                OpName %main_1 "main_1"
                OpName %m0 "m0"
                OpName %m1 "m1"
@@ -27,9 +27,9 @@
                OpName %v3 "v3"
                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 %buf1 Block
                OpMemberDecorate %buf1 0 Offset 0
                OpDecorate %_arr_int_uint_12 ArrayStride 16
@@ -42,8 +42,12 @@
                OpDecorate %x_15 NonWritable
                OpDecorate %x_15 DescriptorSet 0
                OpDecorate %x_15 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
        %uint = OpTypeInt 32 0
     %uint_12 = OpConstant %uint 12
@@ -51,18 +55,13 @@
        %buf1 = OpTypeStruct %_arr_int_uint_12
 %_ptr_Uniform_buf1 = OpTypePointer Uniform %buf1
         %x_6 = OpVariable %_ptr_Uniform_buf1 Uniform
-      %float = OpTypeFloat 32
-    %v4float = OpTypeVector %float 4
 %_ptr_Private_v4float = OpTypePointer Private %v4float
-         %12 = OpConstantNull %v4float
-%x_GLF_color = OpVariable %_ptr_Private_v4float Private %12
+%x_GLF_color = OpVariable %_ptr_Private_v4float Private %5
      %uint_1 = OpConstant %uint 1
 %_arr_float_uint_1 = OpTypeArray %float %uint_1
        %buf0 = OpTypeStruct %_arr_float_uint_1
 %_ptr_Uniform_buf0 = OpTypePointer Uniform %buf0
        %x_15 = OpVariable %_ptr_Uniform_buf0 Uniform
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-%tint_symbol_1 = OpVariable %_ptr_Output_v4float Output %12
        %void = OpTypeVoid
          %20 = OpTypeFunction %void
 %mat3v4float = OpTypeMatrix %v4float 3
@@ -99,17 +98,17 @@
 %_ptr_Uniform_float = OpTypePointer Uniform %float
 %_ptr_Private_float = OpTypePointer Private %float
    %main_out = OpTypeStruct %v4float
-        %163 = OpTypeFunction %void %main_out
+        %163 = OpTypeFunction %main_out
      %main_1 = OpFunction %void None %20
          %23 = OpLabel
          %m0 = OpVariable %_ptr_Function_mat3v4float Function %27
          %m1 = OpVariable %_ptr_Function_mat3v4float Function %27
   %undefined = OpVariable %_ptr_Function_v3float Function %32
     %defined = OpVariable %_ptr_Function_v3float Function %32
-         %v0 = OpVariable %_ptr_Function_v4float Function %12
-         %v1 = OpVariable %_ptr_Function_v4float Function %12
-         %v2 = OpVariable %_ptr_Function_v4float Function %12
-         %v3 = OpVariable %_ptr_Function_v4float Function %12
+         %v0 = OpVariable %_ptr_Function_v4float Function %5
+         %v1 = OpVariable %_ptr_Function_v4float Function %5
+         %v2 = OpVariable %_ptr_Function_v4float Function %5
+         %v3 = OpVariable %_ptr_Function_v4float Function %5
          %42 = OpAccessChain %_ptr_Uniform_int %x_6 %uint_0 %int_4
          %43 = OpLoad %int %42
          %45 = OpAccessChain %_ptr_Uniform_int %x_6 %uint_0 %int_5
@@ -227,18 +226,17 @@
         %156 = OpLabel
                OpReturn
                OpFunctionEnd
-%tint_symbol_2 = OpFunction %void None %163
-%tint_symbol = OpFunctionParameter %main_out
-        %167 = OpLabel
-        %168 = OpCompositeExtract %v4float %tint_symbol 0
-               OpStore %tint_symbol_1 %168
-               OpReturn
+ %main_inner = OpFunction %main_out None %163
+        %166 = OpLabel
+        %167 = OpFunctionCall %void %main_1
+        %168 = OpLoad %v4float %x_GLF_color
+        %169 = OpCompositeConstruct %main_out %168
+               OpReturnValue %169
                OpFunctionEnd
        %main = OpFunction %void None %20
-        %170 = OpLabel
-        %171 = OpFunctionCall %void %main_1
-        %173 = OpLoad %v4float %x_GLF_color
-        %174 = OpCompositeConstruct %main_out %173
-        %172 = OpFunctionCall %void %tint_symbol_2 %174
+        %171 = OpLabel
+        %172 = OpFunctionCall %main_out %main_inner
+        %173 = OpCompositeExtract %v4float %172 0
+               OpStore %x_GLF_color_1_1 %173
                OpReturn
                OpFunctionEnd