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/rasterization/line_continuity/line-strip/0.spvasm.expected.spvasm

@@ -1,52 +1,50 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 26
+; Bound: 25
 ; Schema: 0
                OpCapability Shader
                OpMemoryModel Logical GLSL450
-               OpEntryPoint Fragment %main "main" %tint_symbol_1
+               OpEntryPoint Fragment %main "main" %color_1_1
                OpExecutionMode %main OriginUpperLeft
+               OpName %color_1_1 "color_1_1"
                OpName %color "color"
-               OpName %tint_symbol_1 "tint_symbol_1"
                OpName %main_1 "main_1"
                OpName %main_out "main_out"
                OpMemberName %main_out 0 "color_1"
-               OpName %tint_symbol_2 "tint_symbol_2"
-               OpName %tint_symbol "tint_symbol"
+               OpName %main_inner "main_inner"
                OpName %main "main"
-               OpDecorate %tint_symbol_1 Location 0
+               OpDecorate %color_1_1 Location 0
                OpMemberDecorate %main_out 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
-%_ptr_Private_v4float = OpTypePointer Private %v4float
-          %5 = OpConstantNull %v4float
-      %color = OpVariable %_ptr_Private_v4float Private %5
 %_ptr_Output_v4float = OpTypePointer Output %v4float
-%tint_symbol_1 = OpVariable %_ptr_Output_v4float Output %5
+          %5 = OpConstantNull %v4float
+  %color_1_1 = OpVariable %_ptr_Output_v4float Output %5
+%_ptr_Private_v4float = OpTypePointer Private %v4float
+      %color = OpVariable %_ptr_Private_v4float Private %5
        %void = OpTypeVoid
           %8 = OpTypeFunction %void
     %float_1 = OpConstant %float 1
          %13 = OpConstantComposite %v4float %float_1 %float_1 %float_1 %float_1
    %main_out = OpTypeStruct %v4float
-         %14 = OpTypeFunction %void %main_out
+         %14 = OpTypeFunction %main_out
      %main_1 = OpFunction %void None %8
          %11 = OpLabel
                OpStore %color %13
                OpReturn
                OpFunctionEnd
-%tint_symbol_2 = OpFunction %void None %14
-%tint_symbol = OpFunctionParameter %main_out
-         %18 = OpLabel
-         %19 = OpCompositeExtract %v4float %tint_symbol 0
-               OpStore %tint_symbol_1 %19
-               OpReturn
+ %main_inner = OpFunction %main_out None %14
+         %17 = OpLabel
+         %18 = OpFunctionCall %void %main_1
+         %19 = OpLoad %v4float %color
+         %20 = OpCompositeConstruct %main_out %19
+               OpReturnValue %20
                OpFunctionEnd
        %main = OpFunction %void None %8
-         %21 = OpLabel
-         %22 = OpFunctionCall %void %main_1
-         %24 = OpLoad %v4float %color
-         %25 = OpCompositeConstruct %main_out %24
-         %23 = OpFunctionCall %void %tint_symbol_2 %25
+         %22 = OpLabel
+         %23 = OpFunctionCall %main_out %main_inner
+         %24 = OpCompositeExtract %v4float %23 0
+               OpStore %color_1_1 %24
                OpReturn
                OpFunctionEnd

test/vk-gl-cts/rasterization/line_continuity/line-strip/0.wgsl.expected.spvasm

@@ -1,52 +1,50 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 26
+; Bound: 25
 ; Schema: 0
                OpCapability Shader
                OpMemoryModel Logical GLSL450
-               OpEntryPoint Fragment %main "main" %tint_symbol_1
+               OpEntryPoint Fragment %main "main" %color_1_1
                OpExecutionMode %main OriginUpperLeft
+               OpName %color_1_1 "color_1_1"
                OpName %color "color"
-               OpName %tint_symbol_1 "tint_symbol_1"
                OpName %main_1 "main_1"
                OpName %main_out "main_out"
                OpMemberName %main_out 0 "color_1"
-               OpName %tint_symbol_2 "tint_symbol_2"
-               OpName %tint_symbol "tint_symbol"
+               OpName %main_inner "main_inner"
                OpName %main "main"
-               OpDecorate %tint_symbol_1 Location 0
+               OpDecorate %color_1_1 Location 0
                OpMemberDecorate %main_out 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
-%_ptr_Private_v4float = OpTypePointer Private %v4float
-          %5 = OpConstantNull %v4float
-      %color = OpVariable %_ptr_Private_v4float Private %5
 %_ptr_Output_v4float = OpTypePointer Output %v4float
-%tint_symbol_1 = OpVariable %_ptr_Output_v4float Output %5
+          %5 = OpConstantNull %v4float
+  %color_1_1 = OpVariable %_ptr_Output_v4float Output %5
+%_ptr_Private_v4float = OpTypePointer Private %v4float
+      %color = OpVariable %_ptr_Private_v4float Private %5
        %void = OpTypeVoid
           %8 = OpTypeFunction %void
     %float_1 = OpConstant %float 1
          %13 = OpConstantComposite %v4float %float_1 %float_1 %float_1 %float_1
    %main_out = OpTypeStruct %v4float
-         %14 = OpTypeFunction %void %main_out
+         %14 = OpTypeFunction %main_out
      %main_1 = OpFunction %void None %8
          %11 = OpLabel
                OpStore %color %13
                OpReturn
                OpFunctionEnd
-%tint_symbol_2 = OpFunction %void None %14
-%tint_symbol = OpFunctionParameter %main_out
-         %18 = OpLabel
-         %19 = OpCompositeExtract %v4float %tint_symbol 0
-               OpStore %tint_symbol_1 %19
-               OpReturn
+ %main_inner = OpFunction %main_out None %14
+         %17 = OpLabel
+         %18 = OpFunctionCall %void %main_1
+         %19 = OpLoad %v4float %color
+         %20 = OpCompositeConstruct %main_out %19
+               OpReturnValue %20
                OpFunctionEnd
        %main = OpFunction %void None %8
-         %21 = OpLabel
-         %22 = OpFunctionCall %void %main_1
-         %24 = OpLoad %v4float %color
-         %25 = OpCompositeConstruct %main_out %24
-         %23 = OpFunctionCall %void %tint_symbol_2 %25
+         %22 = OpLabel
+         %23 = OpFunctionCall %main_out %main_inner
+         %24 = OpCompositeExtract %v4float %23 0
+               OpStore %color_1_1 %24
                OpReturn
                OpFunctionEnd

test/vk-gl-cts/rasterization/line_continuity/line-strip/1.spvasm.expected.spvasm

@@ -6,49 +6,49 @@ warning: use of deprecated intrinsic
 ; Schema: 0
                OpCapability Shader
                OpMemoryModel Logical GLSL450
-               OpEntryPoint Fragment %main "main" %tint_symbol %tint_symbol_2
+               OpEntryPoint Fragment %main "main" %gl_FragCoord_param_1 %color_out_1_1
                OpExecutionMode %main OriginUpperLeft
+               OpName %gl_FragCoord_param_1 "gl_FragCoord_param_1"
+               OpName %color_out_1_1 "color_out_1_1"
                OpName %color_out "color_out"
                OpName %texture "texture"
                OpName %gl_FragCoord "gl_FragCoord"
-               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 "color_out_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 %color_out_1_1 Location 0
                OpDecorate %texture NonWritable
                OpDecorate %texture DescriptorSet 0
                OpDecorate %texture 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_Private_v4float = OpTypePointer Private %v4float
-          %5 = OpConstantNull %v4float
-  %color_out = OpVariable %_ptr_Private_v4float Private %5
-          %8 = OpTypeImage %float 2D 0 0 0 2 Rgba8
-%_ptr_UniformConstant_8 = OpTypePointer UniformConstant %8
-    %texture = OpVariable %_ptr_UniformConstant_8 UniformConstant
-%gl_FragCoord = OpVariable %_ptr_Private_v4float Private %5
 %_ptr_Input_v4float = OpTypePointer Input %v4float
-%tint_symbol = OpVariable %_ptr_Input_v4float Input
+%gl_FragCoord_param_1 = OpVariable %_ptr_Input_v4float Input
 %_ptr_Output_v4float = OpTypePointer Output %v4float
-%tint_symbol_2 = OpVariable %_ptr_Output_v4float Output %5
+          %7 = OpConstantNull %v4float
+%color_out_1_1 = OpVariable %_ptr_Output_v4float Output %7
+%_ptr_Private_v4float = OpTypePointer Private %v4float
+  %color_out = OpVariable %_ptr_Private_v4float Private %7
+         %12 = OpTypeImage %float 2D 0 0 0 2 Rgba8
+%_ptr_UniformConstant_12 = OpTypePointer UniformConstant %12
+    %texture = OpVariable %_ptr_UniformConstant_12 UniformConstant
+%gl_FragCoord = OpVariable %_ptr_Private_v4float Private %7
        %void = OpTypeVoid
          %14 = OpTypeFunction %void
         %int = OpTypeInt 32 1
       %v2int = OpTypeVector %int 2
     %v2float = OpTypeVector %float 2
    %main_out = OpTypeStruct %v4float
-         %28 = OpTypeFunction %void %main_out
+         %28 = OpTypeFunction %main_out %v4float
      %main_1 = OpFunction %void None %14
          %17 = OpLabel
          %18 = OpLoad %v4float %gl_FragCoord
-         %20 = OpLoad %8 %texture
+         %20 = OpLoad %12 %texture
          %25 = OpCompositeExtract %float %18 0
          %26 = OpCompositeExtract %float %18 1
          %27 = OpCompositeConstruct %v2float %25 %26
@@ -57,20 +57,20 @@ warning: use of deprecated intrinsic
                OpStore %color_out %19
                OpReturn
                OpFunctionEnd
-%tint_symbol_3 = OpFunction %void None %28
-%tint_symbol_1 = OpFunctionParameter %main_out
+ %main_inner = OpFunction %main_out None %28
+%gl_FragCoord_param = OpFunctionParameter %v4float
          %32 = OpLabel
-         %33 = OpCompositeExtract %v4float %tint_symbol_1 0
-               OpStore %tint_symbol_2 %33
-               OpReturn
+               OpStore %gl_FragCoord %gl_FragCoord_param
+         %33 = OpFunctionCall %void %main_1
+         %34 = OpLoad %v4float %color_out
+         %35 = OpCompositeConstruct %main_out %34
+               OpReturnValue %35
                OpFunctionEnd
        %main = OpFunction %void None %14
-         %35 = OpLabel
-         %36 = OpLoad %v4float %tint_symbol
-               OpStore %gl_FragCoord %36
-         %37 = OpFunctionCall %void %main_1
-         %39 = OpLoad %v4float %color_out
-         %40 = OpCompositeConstruct %main_out %39
-         %38 = OpFunctionCall %void %tint_symbol_3 %40
+         %37 = OpLabel
+         %39 = OpLoad %v4float %gl_FragCoord_param_1
+         %38 = OpFunctionCall %main_out %main_inner %39
+         %40 = OpCompositeExtract %v4float %38 0
+               OpStore %color_out_1_1 %40
                OpReturn
                OpFunctionEnd

test/vk-gl-cts/rasterization/line_continuity/line-strip/1.wgsl.expected.spvasm

@@ -9,49 +9,49 @@ vk-gl-cts/rasterization/line_continuity/line-strip/1.wgsl:9:26 warning: use of d
 ; Schema: 0
                OpCapability Shader
                OpMemoryModel Logical GLSL450
-               OpEntryPoint Fragment %main "main" %tint_symbol %tint_symbol_2
+               OpEntryPoint Fragment %main "main" %gl_FragCoord_param_1 %color_out_1_1
                OpExecutionMode %main OriginUpperLeft
+               OpName %gl_FragCoord_param_1 "gl_FragCoord_param_1"
+               OpName %color_out_1_1 "color_out_1_1"
                OpName %color_out "color_out"
                OpName %texture "texture"
                OpName %gl_FragCoord "gl_FragCoord"
-               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 "color_out_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 %color_out_1_1 Location 0
                OpDecorate %texture NonWritable
                OpDecorate %texture DescriptorSet 0
                OpDecorate %texture 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_Private_v4float = OpTypePointer Private %v4float
-          %5 = OpConstantNull %v4float
-  %color_out = OpVariable %_ptr_Private_v4float Private %5
-          %8 = OpTypeImage %float 2D 0 0 0 2 Rgba8
-%_ptr_UniformConstant_8 = OpTypePointer UniformConstant %8
-    %texture = OpVariable %_ptr_UniformConstant_8 UniformConstant
-%gl_FragCoord = OpVariable %_ptr_Private_v4float Private %5
 %_ptr_Input_v4float = OpTypePointer Input %v4float
-%tint_symbol = OpVariable %_ptr_Input_v4float Input
+%gl_FragCoord_param_1 = OpVariable %_ptr_Input_v4float Input
 %_ptr_Output_v4float = OpTypePointer Output %v4float
-%tint_symbol_2 = OpVariable %_ptr_Output_v4float Output %5
+          %7 = OpConstantNull %v4float
+%color_out_1_1 = OpVariable %_ptr_Output_v4float Output %7
+%_ptr_Private_v4float = OpTypePointer Private %v4float
+  %color_out = OpVariable %_ptr_Private_v4float Private %7
+         %12 = OpTypeImage %float 2D 0 0 0 2 Rgba8
+%_ptr_UniformConstant_12 = OpTypePointer UniformConstant %12
+    %texture = OpVariable %_ptr_UniformConstant_12 UniformConstant
+%gl_FragCoord = OpVariable %_ptr_Private_v4float Private %7
        %void = OpTypeVoid
          %14 = OpTypeFunction %void
         %int = OpTypeInt 32 1
       %v2int = OpTypeVector %int 2
     %v2float = OpTypeVector %float 2
    %main_out = OpTypeStruct %v4float
-         %28 = OpTypeFunction %void %main_out
+         %28 = OpTypeFunction %main_out %v4float
      %main_1 = OpFunction %void None %14
          %17 = OpLabel
          %18 = OpLoad %v4float %gl_FragCoord
-         %20 = OpLoad %8 %texture
+         %20 = OpLoad %12 %texture
          %25 = OpCompositeExtract %float %18 0
          %26 = OpCompositeExtract %float %18 1
          %27 = OpCompositeConstruct %v2float %25 %26
@@ -60,20 +60,20 @@ vk-gl-cts/rasterization/line_continuity/line-strip/1.wgsl:9:26 warning: use of d
                OpStore %color_out %19
                OpReturn
                OpFunctionEnd
-%tint_symbol_3 = OpFunction %void None %28
-%tint_symbol_1 = OpFunctionParameter %main_out
+ %main_inner = OpFunction %main_out None %28
+%gl_FragCoord_param = OpFunctionParameter %v4float
          %32 = OpLabel
-         %33 = OpCompositeExtract %v4float %tint_symbol_1 0
-               OpStore %tint_symbol_2 %33
-               OpReturn
+               OpStore %gl_FragCoord %gl_FragCoord_param
+         %33 = OpFunctionCall %void %main_1
+         %34 = OpLoad %v4float %color_out
+         %35 = OpCompositeConstruct %main_out %34
+               OpReturnValue %35
                OpFunctionEnd
        %main = OpFunction %void None %14
-         %35 = OpLabel
-         %36 = OpLoad %v4float %tint_symbol
-               OpStore %gl_FragCoord %36
-         %37 = OpFunctionCall %void %main_1
-         %39 = OpLoad %v4float %color_out
-         %40 = OpCompositeConstruct %main_out %39
-         %38 = OpFunctionCall %void %tint_symbol_3 %40
+         %37 = OpLabel
+         %39 = OpLoad %v4float %gl_FragCoord_param_1
+         %38 = OpFunctionCall %main_out %main_inner %39
+         %40 = OpCompositeExtract %v4float %38 0
+               OpStore %color_out_1_1 %40
                OpReturn
                OpFunctionEnd