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/intrinsics/gen/trunc/562d05.wgsl.expected.spvasm

@@ -1,41 +1,40 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 34
+; Bound: 33
 ; Schema: 0
                OpCapability Shader
          %15 = OpExtInstImport "GLSL.std.450"
                OpMemoryModel Logical GLSL450
-               OpEntryPoint Vertex %vertex_main "vertex_main" %tint_pointsize %tint_symbol_1
+               OpEntryPoint Vertex %vertex_main "vertex_main" %value %vertex_point_size
                OpEntryPoint Fragment %fragment_main "fragment_main"
                OpEntryPoint GLCompute %compute_main "compute_main"
                OpExecutionMode %fragment_main OriginUpperLeft
                OpExecutionMode %compute_main LocalSize 1 1 1
-               OpName %tint_pointsize "tint_pointsize"
-               OpName %tint_symbol_1 "tint_symbol_1"
+               OpName %value "value"
+               OpName %vertex_point_size "vertex_point_size"
                OpName %trunc_562d05 "trunc_562d05"
                OpName %res "res"
-               OpName %tint_symbol_2 "tint_symbol_2"
-               OpName %tint_symbol "tint_symbol"
+               OpName %vertex_main_inner "vertex_main_inner"
                OpName %vertex_main "vertex_main"
                OpName %fragment_main "fragment_main"
                OpName %compute_main "compute_main"
-               OpDecorate %tint_pointsize BuiltIn PointSize
-               OpDecorate %tint_symbol_1 BuiltIn Position
+               OpDecorate %value BuiltIn Position
+               OpDecorate %vertex_point_size BuiltIn PointSize
       %float = OpTypeFloat 32
-%_ptr_Output_float = OpTypePointer Output %float
-          %4 = OpConstantNull %float
-%tint_pointsize = OpVariable %_ptr_Output_float Output %4
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
-          %8 = OpConstantNull %v4float
-%tint_symbol_1 = OpVariable %_ptr_Output_v4float Output %8
+          %5 = OpConstantNull %v4float
+      %value = OpVariable %_ptr_Output_v4float Output %5
+%_ptr_Output_float = OpTypePointer Output %float
+          %8 = OpConstantNull %float
+%vertex_point_size = OpVariable %_ptr_Output_float Output %8
        %void = OpTypeVoid
           %9 = OpTypeFunction %void
     %v3float = OpTypeVector %float 3
          %16 = OpConstantNull %v3float
 %_ptr_Function_v3float = OpTypePointer Function %v3float
-         %19 = OpTypeFunction %void %v4float
+         %19 = OpTypeFunction %v4float
     %float_1 = OpConstant %float 1
 %trunc_562d05 = OpFunction %void None %9
          %12 = OpLabel
@@ -44,26 +43,25 @@
                OpStore %res %13
                OpReturn
                OpFunctionEnd
-%tint_symbol_2 = OpFunction %void None %19
-%tint_symbol = OpFunctionParameter %v4float
-         %22 = OpLabel
-               OpStore %tint_symbol_1 %tint_symbol
-               OpReturn
+%vertex_main_inner = OpFunction %v4float None %19
+         %21 = OpLabel
+         %22 = OpFunctionCall %void %trunc_562d05
+               OpReturnValue %5
                OpFunctionEnd
 %vertex_main = OpFunction %void None %9
          %24 = OpLabel
-               OpStore %tint_pointsize %float_1
-         %26 = OpFunctionCall %void %trunc_562d05
-         %27 = OpFunctionCall %void %tint_symbol_2 %8
+         %25 = OpFunctionCall %v4float %vertex_main_inner
+               OpStore %value %25
+               OpStore %vertex_point_size %float_1
                OpReturn
                OpFunctionEnd
 %fragment_main = OpFunction %void None %9
-         %29 = OpLabel
-         %30 = OpFunctionCall %void %trunc_562d05
+         %28 = OpLabel
+         %29 = OpFunctionCall %void %trunc_562d05
                OpReturn
                OpFunctionEnd
 %compute_main = OpFunction %void None %9
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %trunc_562d05
+         %31 = OpLabel
+         %32 = OpFunctionCall %void %trunc_562d05
                OpReturn
                OpFunctionEnd

test/intrinsics/gen/trunc/e183aa.wgsl.expected.spvasm

@@ -1,67 +1,65 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 32
+; Bound: 31
 ; Schema: 0
                OpCapability Shader
          %14 = OpExtInstImport "GLSL.std.450"
                OpMemoryModel Logical GLSL450
-               OpEntryPoint Vertex %vertex_main "vertex_main" %tint_pointsize %tint_symbol_1
+               OpEntryPoint Vertex %vertex_main "vertex_main" %value %vertex_point_size
                OpEntryPoint Fragment %fragment_main "fragment_main"
                OpEntryPoint GLCompute %compute_main "compute_main"
                OpExecutionMode %fragment_main OriginUpperLeft
                OpExecutionMode %compute_main LocalSize 1 1 1
-               OpName %tint_pointsize "tint_pointsize"
-               OpName %tint_symbol_1 "tint_symbol_1"
+               OpName %value "value"
+               OpName %vertex_point_size "vertex_point_size"
                OpName %trunc_e183aa "trunc_e183aa"
                OpName %res "res"
-               OpName %tint_symbol_2 "tint_symbol_2"
-               OpName %tint_symbol "tint_symbol"
+               OpName %vertex_main_inner "vertex_main_inner"
                OpName %vertex_main "vertex_main"
                OpName %fragment_main "fragment_main"
                OpName %compute_main "compute_main"
-               OpDecorate %tint_pointsize BuiltIn PointSize
-               OpDecorate %tint_symbol_1 BuiltIn Position
+               OpDecorate %value BuiltIn Position
+               OpDecorate %vertex_point_size BuiltIn PointSize
       %float = OpTypeFloat 32
-%_ptr_Output_float = OpTypePointer Output %float
-          %4 = OpConstantNull %float
-%tint_pointsize = OpVariable %_ptr_Output_float Output %4
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
-          %8 = OpConstantNull %v4float
-%tint_symbol_1 = OpVariable %_ptr_Output_v4float Output %8
+          %5 = OpConstantNull %v4float
+      %value = OpVariable %_ptr_Output_v4float Output %5
+%_ptr_Output_float = OpTypePointer Output %float
+          %8 = OpConstantNull %float
+%vertex_point_size = OpVariable %_ptr_Output_float Output %8
        %void = OpTypeVoid
           %9 = OpTypeFunction %void
 %_ptr_Function_v4float = OpTypePointer Function %v4float
-         %17 = OpTypeFunction %void %v4float
+         %17 = OpTypeFunction %v4float
     %float_1 = OpConstant %float 1
 %trunc_e183aa = OpFunction %void None %9
          %12 = OpLabel
-        %res = OpVariable %_ptr_Function_v4float Function %8
-         %13 = OpExtInst %v4float %14 Trunc %8
+        %res = OpVariable %_ptr_Function_v4float Function %5
+         %13 = OpExtInst %v4float %14 Trunc %5
                OpStore %res %13
                OpReturn
                OpFunctionEnd
-%tint_symbol_2 = OpFunction %void None %17
-%tint_symbol = OpFunctionParameter %v4float
-         %20 = OpLabel
-               OpStore %tint_symbol_1 %tint_symbol
-               OpReturn
+%vertex_main_inner = OpFunction %v4float None %17
+         %19 = OpLabel
+         %20 = OpFunctionCall %void %trunc_e183aa
+               OpReturnValue %5
                OpFunctionEnd
 %vertex_main = OpFunction %void None %9
          %22 = OpLabel
-               OpStore %tint_pointsize %float_1
-         %24 = OpFunctionCall %void %trunc_e183aa
-         %25 = OpFunctionCall %void %tint_symbol_2 %8
+         %23 = OpFunctionCall %v4float %vertex_main_inner
+               OpStore %value %23
+               OpStore %vertex_point_size %float_1
                OpReturn
                OpFunctionEnd
 %fragment_main = OpFunction %void None %9
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %trunc_e183aa
+         %26 = OpLabel
+         %27 = OpFunctionCall %void %trunc_e183aa
                OpReturn
                OpFunctionEnd
 %compute_main = OpFunction %void None %9
-         %30 = OpLabel
-         %31 = OpFunctionCall %void %trunc_e183aa
+         %29 = OpLabel
+         %30 = OpFunctionCall %void %trunc_e183aa
                OpReturn
                OpFunctionEnd

test/intrinsics/gen/trunc/eb83df.wgsl.expected.spvasm

@@ -1,67 +1,65 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 32
+; Bound: 31
 ; Schema: 0
                OpCapability Shader
          %14 = OpExtInstImport "GLSL.std.450"
                OpMemoryModel Logical GLSL450
-               OpEntryPoint Vertex %vertex_main "vertex_main" %tint_pointsize %tint_symbol_1
+               OpEntryPoint Vertex %vertex_main "vertex_main" %value %vertex_point_size
                OpEntryPoint Fragment %fragment_main "fragment_main"
                OpEntryPoint GLCompute %compute_main "compute_main"
                OpExecutionMode %fragment_main OriginUpperLeft
                OpExecutionMode %compute_main LocalSize 1 1 1
-               OpName %tint_pointsize "tint_pointsize"
-               OpName %tint_symbol_1 "tint_symbol_1"
+               OpName %value "value"
+               OpName %vertex_point_size "vertex_point_size"
                OpName %trunc_eb83df "trunc_eb83df"
                OpName %res "res"
-               OpName %tint_symbol_2 "tint_symbol_2"
-               OpName %tint_symbol "tint_symbol"
+               OpName %vertex_main_inner "vertex_main_inner"
                OpName %vertex_main "vertex_main"
                OpName %fragment_main "fragment_main"
                OpName %compute_main "compute_main"
-               OpDecorate %tint_pointsize BuiltIn PointSize
-               OpDecorate %tint_symbol_1 BuiltIn Position
+               OpDecorate %value BuiltIn Position
+               OpDecorate %vertex_point_size BuiltIn PointSize
       %float = OpTypeFloat 32
-%_ptr_Output_float = OpTypePointer Output %float
-          %4 = OpConstantNull %float
-%tint_pointsize = OpVariable %_ptr_Output_float Output %4
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
-          %8 = OpConstantNull %v4float
-%tint_symbol_1 = OpVariable %_ptr_Output_v4float Output %8
+          %5 = OpConstantNull %v4float
+      %value = OpVariable %_ptr_Output_v4float Output %5
+%_ptr_Output_float = OpTypePointer Output %float
+          %8 = OpConstantNull %float
+%vertex_point_size = OpVariable %_ptr_Output_float Output %8
        %void = OpTypeVoid
           %9 = OpTypeFunction %void
     %float_1 = OpConstant %float 1
 %_ptr_Function_float = OpTypePointer Function %float
-         %18 = OpTypeFunction %void %v4float
+         %18 = OpTypeFunction %v4float
 %trunc_eb83df = OpFunction %void None %9
          %12 = OpLabel
-        %res = OpVariable %_ptr_Function_float Function %4
+        %res = OpVariable %_ptr_Function_float Function %8
          %13 = OpExtInst %float %14 Trunc %float_1
                OpStore %res %13
                OpReturn
                OpFunctionEnd
-%tint_symbol_2 = OpFunction %void None %18
-%tint_symbol = OpFunctionParameter %v4float
-         %21 = OpLabel
-               OpStore %tint_symbol_1 %tint_symbol
-               OpReturn
+%vertex_main_inner = OpFunction %v4float None %18
+         %20 = OpLabel
+         %21 = OpFunctionCall %void %trunc_eb83df
+               OpReturnValue %5
                OpFunctionEnd
 %vertex_main = OpFunction %void None %9
          %23 = OpLabel
-               OpStore %tint_pointsize %float_1
-         %24 = OpFunctionCall %void %trunc_eb83df
-         %25 = OpFunctionCall %void %tint_symbol_2 %8
+         %24 = OpFunctionCall %v4float %vertex_main_inner
+               OpStore %value %24
+               OpStore %vertex_point_size %float_1
                OpReturn
                OpFunctionEnd
 %fragment_main = OpFunction %void None %9
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %trunc_eb83df
+         %26 = OpLabel
+         %27 = OpFunctionCall %void %trunc_eb83df
                OpReturn
                OpFunctionEnd
 %compute_main = OpFunction %void None %9
-         %30 = OpLabel
-         %31 = OpFunctionCall %void %trunc_eb83df
+         %29 = OpLabel
+         %30 = OpFunctionCall %void %trunc_eb83df
                OpReturn
                OpFunctionEnd

test/intrinsics/gen/trunc/f370d3.wgsl.expected.spvasm

@@ -1,41 +1,40 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 34
+; Bound: 33
 ; Schema: 0
                OpCapability Shader
          %15 = OpExtInstImport "GLSL.std.450"
                OpMemoryModel Logical GLSL450
-               OpEntryPoint Vertex %vertex_main "vertex_main" %tint_pointsize %tint_symbol_1
+               OpEntryPoint Vertex %vertex_main "vertex_main" %value %vertex_point_size
                OpEntryPoint Fragment %fragment_main "fragment_main"
                OpEntryPoint GLCompute %compute_main "compute_main"
                OpExecutionMode %fragment_main OriginUpperLeft
                OpExecutionMode %compute_main LocalSize 1 1 1
-               OpName %tint_pointsize "tint_pointsize"
-               OpName %tint_symbol_1 "tint_symbol_1"
+               OpName %value "value"
+               OpName %vertex_point_size "vertex_point_size"
                OpName %trunc_f370d3 "trunc_f370d3"
                OpName %res "res"
-               OpName %tint_symbol_2 "tint_symbol_2"
-               OpName %tint_symbol "tint_symbol"
+               OpName %vertex_main_inner "vertex_main_inner"
                OpName %vertex_main "vertex_main"
                OpName %fragment_main "fragment_main"
                OpName %compute_main "compute_main"
-               OpDecorate %tint_pointsize BuiltIn PointSize
-               OpDecorate %tint_symbol_1 BuiltIn Position
+               OpDecorate %value BuiltIn Position
+               OpDecorate %vertex_point_size BuiltIn PointSize
       %float = OpTypeFloat 32
-%_ptr_Output_float = OpTypePointer Output %float
-          %4 = OpConstantNull %float
-%tint_pointsize = OpVariable %_ptr_Output_float Output %4
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
-          %8 = OpConstantNull %v4float
-%tint_symbol_1 = OpVariable %_ptr_Output_v4float Output %8
+          %5 = OpConstantNull %v4float
+      %value = OpVariable %_ptr_Output_v4float Output %5
+%_ptr_Output_float = OpTypePointer Output %float
+          %8 = OpConstantNull %float
+%vertex_point_size = OpVariable %_ptr_Output_float Output %8
        %void = OpTypeVoid
           %9 = OpTypeFunction %void
     %v2float = OpTypeVector %float 2
          %16 = OpConstantNull %v2float
 %_ptr_Function_v2float = OpTypePointer Function %v2float
-         %19 = OpTypeFunction %void %v4float
+         %19 = OpTypeFunction %v4float
     %float_1 = OpConstant %float 1
 %trunc_f370d3 = OpFunction %void None %9
          %12 = OpLabel
@@ -44,26 +43,25 @@
                OpStore %res %13
                OpReturn
                OpFunctionEnd
-%tint_symbol_2 = OpFunction %void None %19
-%tint_symbol = OpFunctionParameter %v4float
-         %22 = OpLabel
-               OpStore %tint_symbol_1 %tint_symbol
-               OpReturn
+%vertex_main_inner = OpFunction %v4float None %19
+         %21 = OpLabel
+         %22 = OpFunctionCall %void %trunc_f370d3
+               OpReturnValue %5
                OpFunctionEnd
 %vertex_main = OpFunction %void None %9
          %24 = OpLabel
-               OpStore %tint_pointsize %float_1
-         %26 = OpFunctionCall %void %trunc_f370d3
-         %27 = OpFunctionCall %void %tint_symbol_2 %8
+         %25 = OpFunctionCall %v4float %vertex_main_inner
+               OpStore %value %25
+               OpStore %vertex_point_size %float_1
                OpReturn
                OpFunctionEnd
 %fragment_main = OpFunction %void None %9
-         %29 = OpLabel
-         %30 = OpFunctionCall %void %trunc_f370d3
+         %28 = OpLabel
+         %29 = OpFunctionCall %void %trunc_f370d3
                OpReturn
                OpFunctionEnd
 %compute_main = OpFunction %void None %9
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %trunc_f370d3
+         %31 = OpLabel
+         %32 = OpFunctionCall %void %trunc_f370d3
                OpReturn
                OpFunctionEnd