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/arrayLength/1588cd.wgsl.expected.spvasm

@@ -1,54 +1,53 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 38
+; Bound: 37
 ; Schema: 0
                OpCapability Shader
                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 %value "value"
+               OpName %vertex_point_size "vertex_point_size"
                OpName %SB_RO "SB_RO"
                OpMemberName %SB_RO 0 "arg_0"
                OpName %sb_ro "sb_ro"
-               OpName %tint_symbol_1 "tint_symbol_1"
                OpName %arrayLength_1588cd "arrayLength_1588cd"
                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 %value BuiltIn Position
+               OpDecorate %vertex_point_size BuiltIn PointSize
                OpDecorate %SB_RO Block
                OpMemberDecorate %SB_RO 0 Offset 0
                OpDecorate %_runtimearr_int ArrayStride 4
                OpDecorate %sb_ro NonWritable
                OpDecorate %sb_ro DescriptorSet 0
                OpDecorate %sb_ro Binding 1
-               OpDecorate %tint_symbol_1 BuiltIn Position
       %float = OpTypeFloat 32
+    %v4float = OpTypeVector %float 4
+%_ptr_Output_v4float = OpTypePointer Output %v4float
+          %5 = OpConstantNull %v4float
+      %value = OpVariable %_ptr_Output_v4float Output %5
 %_ptr_Output_float = OpTypePointer Output %float
-          %4 = OpConstantNull %float
-%tint_pointsize = OpVariable %_ptr_Output_float Output %4
+          %8 = OpConstantNull %float
+%vertex_point_size = OpVariable %_ptr_Output_float Output %8
         %int = OpTypeInt 32 1
 %_runtimearr_int = OpTypeRuntimeArray %int
       %SB_RO = OpTypeStruct %_runtimearr_int
 %_ptr_StorageBuffer_SB_RO = OpTypePointer StorageBuffer %SB_RO
       %sb_ro = OpVariable %_ptr_StorageBuffer_SB_RO StorageBuffer
-    %v4float = OpTypeVector %float 4
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-         %13 = OpConstantNull %v4float
-%tint_symbol_1 = OpVariable %_ptr_Output_v4float Output %13
        %void = OpTypeVoid
          %14 = OpTypeFunction %void
        %uint = OpTypeInt 32 0
 %_ptr_Function_uint = OpTypePointer Function %uint
          %22 = OpConstantNull %uint
-         %23 = OpTypeFunction %void %v4float
+         %23 = OpTypeFunction %v4float
     %float_1 = OpConstant %float 1
 %arrayLength_1588cd = OpFunction %void None %14
          %17 = OpLabel
@@ -57,26 +56,25 @@
                OpStore %res %18
                OpReturn
                OpFunctionEnd
-%tint_symbol_2 = OpFunction %void None %23
-%tint_symbol = OpFunctionParameter %v4float
-         %26 = OpLabel
-               OpStore %tint_symbol_1 %tint_symbol
-               OpReturn
+%vertex_main_inner = OpFunction %v4float None %23
+         %25 = OpLabel
+         %26 = OpFunctionCall %void %arrayLength_1588cd
+               OpReturnValue %5
                OpFunctionEnd
 %vertex_main = OpFunction %void None %14
          %28 = OpLabel
-               OpStore %tint_pointsize %float_1
-         %30 = OpFunctionCall %void %arrayLength_1588cd
-         %31 = OpFunctionCall %void %tint_symbol_2 %13
+         %29 = OpFunctionCall %v4float %vertex_main_inner
+               OpStore %value %29
+               OpStore %vertex_point_size %float_1
                OpReturn
                OpFunctionEnd
 %fragment_main = OpFunction %void None %14
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %arrayLength_1588cd
+         %32 = OpLabel
+         %33 = OpFunctionCall %void %arrayLength_1588cd
                OpReturn
                OpFunctionEnd
 %compute_main = OpFunction %void None %14
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %arrayLength_1588cd
+         %35 = OpLabel
+         %36 = OpFunctionCall %void %arrayLength_1588cd
                OpReturn
                OpFunctionEnd

test/intrinsics/gen/arrayLength/61b1c7.wgsl.expected.spvasm

@@ -1,53 +1,52 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 38
+; Bound: 37
 ; Schema: 0
                OpCapability Shader
                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 %value "value"
+               OpName %vertex_point_size "vertex_point_size"
                OpName %SB_RW "SB_RW"
                OpMemberName %SB_RW 0 "arg_0"
                OpName %sb_rw "sb_rw"
-               OpName %tint_symbol_1 "tint_symbol_1"
                OpName %arrayLength_61b1c7 "arrayLength_61b1c7"
                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 %value BuiltIn Position
+               OpDecorate %vertex_point_size BuiltIn PointSize
                OpDecorate %SB_RW Block
                OpMemberDecorate %SB_RW 0 Offset 0
                OpDecorate %_runtimearr_int ArrayStride 4
                OpDecorate %sb_rw DescriptorSet 0
                OpDecorate %sb_rw Binding 0
-               OpDecorate %tint_symbol_1 BuiltIn Position
       %float = OpTypeFloat 32
+    %v4float = OpTypeVector %float 4
+%_ptr_Output_v4float = OpTypePointer Output %v4float
+          %5 = OpConstantNull %v4float
+      %value = OpVariable %_ptr_Output_v4float Output %5
 %_ptr_Output_float = OpTypePointer Output %float
-          %4 = OpConstantNull %float
-%tint_pointsize = OpVariable %_ptr_Output_float Output %4
+          %8 = OpConstantNull %float
+%vertex_point_size = OpVariable %_ptr_Output_float Output %8
         %int = OpTypeInt 32 1
 %_runtimearr_int = OpTypeRuntimeArray %int
       %SB_RW = OpTypeStruct %_runtimearr_int
 %_ptr_StorageBuffer_SB_RW = OpTypePointer StorageBuffer %SB_RW
       %sb_rw = OpVariable %_ptr_StorageBuffer_SB_RW StorageBuffer
-    %v4float = OpTypeVector %float 4
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-         %13 = OpConstantNull %v4float
-%tint_symbol_1 = OpVariable %_ptr_Output_v4float Output %13
        %void = OpTypeVoid
          %14 = OpTypeFunction %void
        %uint = OpTypeInt 32 0
 %_ptr_Function_uint = OpTypePointer Function %uint
          %22 = OpConstantNull %uint
-         %23 = OpTypeFunction %void %v4float
+         %23 = OpTypeFunction %v4float
     %float_1 = OpConstant %float 1
 %arrayLength_61b1c7 = OpFunction %void None %14
          %17 = OpLabel
@@ -56,26 +55,25 @@
                OpStore %res %18
                OpReturn
                OpFunctionEnd
-%tint_symbol_2 = OpFunction %void None %23
-%tint_symbol = OpFunctionParameter %v4float
-         %26 = OpLabel
-               OpStore %tint_symbol_1 %tint_symbol
-               OpReturn
+%vertex_main_inner = OpFunction %v4float None %23
+         %25 = OpLabel
+         %26 = OpFunctionCall %void %arrayLength_61b1c7
+               OpReturnValue %5
                OpFunctionEnd
 %vertex_main = OpFunction %void None %14
          %28 = OpLabel
-               OpStore %tint_pointsize %float_1
-         %30 = OpFunctionCall %void %arrayLength_61b1c7
-         %31 = OpFunctionCall %void %tint_symbol_2 %13
+         %29 = OpFunctionCall %v4float %vertex_main_inner
+               OpStore %value %29
+               OpStore %vertex_point_size %float_1
                OpReturn
                OpFunctionEnd
 %fragment_main = OpFunction %void None %14
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %arrayLength_61b1c7
+         %32 = OpLabel
+         %33 = OpFunctionCall %void %arrayLength_61b1c7
                OpReturn
                OpFunctionEnd
 %compute_main = OpFunction %void None %14
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %arrayLength_61b1c7
+         %35 = OpLabel
+         %36 = OpFunctionCall %void %arrayLength_61b1c7
                OpReturn
                OpFunctionEnd

test/intrinsics/gen/arrayLength/a0f5ca.wgsl.expected.spvasm

@@ -1,53 +1,52 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 37
+; Bound: 36
 ; Schema: 0
                OpCapability Shader
                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 %value "value"
+               OpName %vertex_point_size "vertex_point_size"
                OpName %SB_RO "SB_RO"
                OpMemberName %SB_RO 0 "arg_0"
                OpName %sb_ro "sb_ro"
-               OpName %tint_symbol_1 "tint_symbol_1"
                OpName %arrayLength_a0f5ca "arrayLength_a0f5ca"
                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 %value BuiltIn Position
+               OpDecorate %vertex_point_size BuiltIn PointSize
                OpDecorate %SB_RO Block
                OpMemberDecorate %SB_RO 0 Offset 0
                OpDecorate %_runtimearr_float ArrayStride 4
                OpDecorate %sb_ro NonWritable
                OpDecorate %sb_ro DescriptorSet 0
                OpDecorate %sb_ro Binding 1
-               OpDecorate %tint_symbol_1 BuiltIn Position
       %float = OpTypeFloat 32
+    %v4float = OpTypeVector %float 4
+%_ptr_Output_v4float = OpTypePointer Output %v4float
+          %5 = OpConstantNull %v4float
+      %value = OpVariable %_ptr_Output_v4float Output %5
 %_ptr_Output_float = OpTypePointer Output %float
-          %4 = OpConstantNull %float
-%tint_pointsize = OpVariable %_ptr_Output_float Output %4
+          %8 = OpConstantNull %float
+%vertex_point_size = OpVariable %_ptr_Output_float Output %8
 %_runtimearr_float = OpTypeRuntimeArray %float
       %SB_RO = OpTypeStruct %_runtimearr_float
 %_ptr_StorageBuffer_SB_RO = OpTypePointer StorageBuffer %SB_RO
       %sb_ro = OpVariable %_ptr_StorageBuffer_SB_RO StorageBuffer
-    %v4float = OpTypeVector %float 4
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-         %12 = OpConstantNull %v4float
-%tint_symbol_1 = OpVariable %_ptr_Output_v4float Output %12
        %void = OpTypeVoid
          %13 = OpTypeFunction %void
        %uint = OpTypeInt 32 0
 %_ptr_Function_uint = OpTypePointer Function %uint
          %21 = OpConstantNull %uint
-         %22 = OpTypeFunction %void %v4float
+         %22 = OpTypeFunction %v4float
     %float_1 = OpConstant %float 1
 %arrayLength_a0f5ca = OpFunction %void None %13
          %16 = OpLabel
@@ -56,26 +55,25 @@
                OpStore %res %17
                OpReturn
                OpFunctionEnd
-%tint_symbol_2 = OpFunction %void None %22
-%tint_symbol = OpFunctionParameter %v4float
-         %25 = OpLabel
-               OpStore %tint_symbol_1 %tint_symbol
-               OpReturn
+%vertex_main_inner = OpFunction %v4float None %22
+         %24 = OpLabel
+         %25 = OpFunctionCall %void %arrayLength_a0f5ca
+               OpReturnValue %5
                OpFunctionEnd
 %vertex_main = OpFunction %void None %13
          %27 = OpLabel
-               OpStore %tint_pointsize %float_1
-         %29 = OpFunctionCall %void %arrayLength_a0f5ca
-         %30 = OpFunctionCall %void %tint_symbol_2 %12
+         %28 = OpFunctionCall %v4float %vertex_main_inner
+               OpStore %value %28
+               OpStore %vertex_point_size %float_1
                OpReturn
                OpFunctionEnd
 %fragment_main = OpFunction %void None %13
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %arrayLength_a0f5ca
+         %31 = OpLabel
+         %32 = OpFunctionCall %void %arrayLength_a0f5ca
                OpReturn
                OpFunctionEnd
 %compute_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %arrayLength_a0f5ca
+         %34 = OpLabel
+         %35 = OpFunctionCall %void %arrayLength_a0f5ca
                OpReturn
                OpFunctionEnd

test/intrinsics/gen/arrayLength/cdd123.wgsl.expected.spvasm

@@ -1,52 +1,51 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 37
+; Bound: 36
 ; Schema: 0
                OpCapability Shader
                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 %value "value"
+               OpName %vertex_point_size "vertex_point_size"
                OpName %SB_RW "SB_RW"
                OpMemberName %SB_RW 0 "arg_0"
                OpName %sb_rw "sb_rw"
-               OpName %tint_symbol_1 "tint_symbol_1"
                OpName %arrayLength_cdd123 "arrayLength_cdd123"
                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 %value BuiltIn Position
+               OpDecorate %vertex_point_size BuiltIn PointSize
                OpDecorate %SB_RW Block
                OpMemberDecorate %SB_RW 0 Offset 0
                OpDecorate %_runtimearr_float ArrayStride 4
                OpDecorate %sb_rw DescriptorSet 0
                OpDecorate %sb_rw Binding 0
-               OpDecorate %tint_symbol_1 BuiltIn Position
       %float = OpTypeFloat 32
+    %v4float = OpTypeVector %float 4
+%_ptr_Output_v4float = OpTypePointer Output %v4float
+          %5 = OpConstantNull %v4float
+      %value = OpVariable %_ptr_Output_v4float Output %5
 %_ptr_Output_float = OpTypePointer Output %float
-          %4 = OpConstantNull %float
-%tint_pointsize = OpVariable %_ptr_Output_float Output %4
+          %8 = OpConstantNull %float
+%vertex_point_size = OpVariable %_ptr_Output_float Output %8
 %_runtimearr_float = OpTypeRuntimeArray %float
       %SB_RW = OpTypeStruct %_runtimearr_float
 %_ptr_StorageBuffer_SB_RW = OpTypePointer StorageBuffer %SB_RW
       %sb_rw = OpVariable %_ptr_StorageBuffer_SB_RW StorageBuffer
-    %v4float = OpTypeVector %float 4
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-         %12 = OpConstantNull %v4float
-%tint_symbol_1 = OpVariable %_ptr_Output_v4float Output %12
        %void = OpTypeVoid
          %13 = OpTypeFunction %void
        %uint = OpTypeInt 32 0
 %_ptr_Function_uint = OpTypePointer Function %uint
          %21 = OpConstantNull %uint
-         %22 = OpTypeFunction %void %v4float
+         %22 = OpTypeFunction %v4float
     %float_1 = OpConstant %float 1
 %arrayLength_cdd123 = OpFunction %void None %13
          %16 = OpLabel
@@ -55,26 +54,25 @@
                OpStore %res %17
                OpReturn
                OpFunctionEnd
-%tint_symbol_2 = OpFunction %void None %22
-%tint_symbol = OpFunctionParameter %v4float
-         %25 = OpLabel
-               OpStore %tint_symbol_1 %tint_symbol
-               OpReturn
+%vertex_main_inner = OpFunction %v4float None %22
+         %24 = OpLabel
+         %25 = OpFunctionCall %void %arrayLength_cdd123
+               OpReturnValue %5
                OpFunctionEnd
 %vertex_main = OpFunction %void None %13
          %27 = OpLabel
-               OpStore %tint_pointsize %float_1
-         %29 = OpFunctionCall %void %arrayLength_cdd123
-         %30 = OpFunctionCall %void %tint_symbol_2 %12
+         %28 = OpFunctionCall %v4float %vertex_main_inner
+               OpStore %value %28
+               OpStore %vertex_point_size %float_1
                OpReturn
                OpFunctionEnd
 %fragment_main = OpFunction %void None %13
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %arrayLength_cdd123
+         %31 = OpLabel
+         %32 = OpFunctionCall %void %arrayLength_cdd123
                OpReturn
                OpFunctionEnd
 %compute_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %arrayLength_cdd123
+         %34 = OpLabel
+         %35 = OpFunctionCall %void %arrayLength_cdd123
                OpReturn
                OpFunctionEnd

test/intrinsics/gen/arrayLength/cfca0a.wgsl.expected.spvasm

@@ -1,53 +1,52 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 37
+; Bound: 36
 ; Schema: 0
                OpCapability Shader
                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 %value "value"
+               OpName %vertex_point_size "vertex_point_size"
                OpName %SB_RO "SB_RO"
                OpMemberName %SB_RO 0 "arg_0"
                OpName %sb_ro "sb_ro"
-               OpName %tint_symbol_1 "tint_symbol_1"
                OpName %arrayLength_cfca0a "arrayLength_cfca0a"
                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 %value BuiltIn Position
+               OpDecorate %vertex_point_size BuiltIn PointSize
                OpDecorate %SB_RO Block
                OpMemberDecorate %SB_RO 0 Offset 0
                OpDecorate %_runtimearr_uint ArrayStride 4
                OpDecorate %sb_ro NonWritable
                OpDecorate %sb_ro DescriptorSet 0
                OpDecorate %sb_ro Binding 1
-               OpDecorate %tint_symbol_1 BuiltIn Position
       %float = OpTypeFloat 32
+    %v4float = OpTypeVector %float 4
+%_ptr_Output_v4float = OpTypePointer Output %v4float
+          %5 = OpConstantNull %v4float
+      %value = OpVariable %_ptr_Output_v4float Output %5
 %_ptr_Output_float = OpTypePointer Output %float
-          %4 = OpConstantNull %float
-%tint_pointsize = OpVariable %_ptr_Output_float Output %4
+          %8 = OpConstantNull %float
+%vertex_point_size = OpVariable %_ptr_Output_float Output %8
        %uint = OpTypeInt 32 0
 %_runtimearr_uint = OpTypeRuntimeArray %uint
       %SB_RO = OpTypeStruct %_runtimearr_uint
 %_ptr_StorageBuffer_SB_RO = OpTypePointer StorageBuffer %SB_RO
       %sb_ro = OpVariable %_ptr_StorageBuffer_SB_RO StorageBuffer
-    %v4float = OpTypeVector %float 4
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-         %13 = OpConstantNull %v4float
-%tint_symbol_1 = OpVariable %_ptr_Output_v4float Output %13
        %void = OpTypeVoid
          %14 = OpTypeFunction %void
 %_ptr_Function_uint = OpTypePointer Function %uint
          %21 = OpConstantNull %uint
-         %22 = OpTypeFunction %void %v4float
+         %22 = OpTypeFunction %v4float
     %float_1 = OpConstant %float 1
 %arrayLength_cfca0a = OpFunction %void None %14
          %17 = OpLabel
@@ -56,26 +55,25 @@
                OpStore %res %18
                OpReturn
                OpFunctionEnd
-%tint_symbol_2 = OpFunction %void None %22
-%tint_symbol = OpFunctionParameter %v4float
-         %25 = OpLabel
-               OpStore %tint_symbol_1 %tint_symbol
-               OpReturn
+%vertex_main_inner = OpFunction %v4float None %22
+         %24 = OpLabel
+         %25 = OpFunctionCall %void %arrayLength_cfca0a
+               OpReturnValue %5
                OpFunctionEnd
 %vertex_main = OpFunction %void None %14
          %27 = OpLabel
-               OpStore %tint_pointsize %float_1
-         %29 = OpFunctionCall %void %arrayLength_cfca0a
-         %30 = OpFunctionCall %void %tint_symbol_2 %13
+         %28 = OpFunctionCall %v4float %vertex_main_inner
+               OpStore %value %28
+               OpStore %vertex_point_size %float_1
                OpReturn
                OpFunctionEnd
 %fragment_main = OpFunction %void None %14
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %arrayLength_cfca0a
+         %31 = OpLabel
+         %32 = OpFunctionCall %void %arrayLength_cfca0a
                OpReturn
                OpFunctionEnd
 %compute_main = OpFunction %void None %14
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %arrayLength_cfca0a
+         %34 = OpLabel
+         %35 = OpFunctionCall %void %arrayLength_cfca0a
                OpReturn
                OpFunctionEnd

test/intrinsics/gen/arrayLength/eb510f.wgsl.expected.spvasm

@@ -1,52 +1,51 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 37
+; Bound: 36
 ; Schema: 0
                OpCapability Shader
                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 %value "value"
+               OpName %vertex_point_size "vertex_point_size"
                OpName %SB_RW "SB_RW"
                OpMemberName %SB_RW 0 "arg_0"
                OpName %sb_rw "sb_rw"
-               OpName %tint_symbol_1 "tint_symbol_1"
                OpName %arrayLength_eb510f "arrayLength_eb510f"
                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 %value BuiltIn Position
+               OpDecorate %vertex_point_size BuiltIn PointSize
                OpDecorate %SB_RW Block
                OpMemberDecorate %SB_RW 0 Offset 0
                OpDecorate %_runtimearr_uint ArrayStride 4
                OpDecorate %sb_rw DescriptorSet 0
                OpDecorate %sb_rw Binding 0
-               OpDecorate %tint_symbol_1 BuiltIn Position
       %float = OpTypeFloat 32
+    %v4float = OpTypeVector %float 4
+%_ptr_Output_v4float = OpTypePointer Output %v4float
+          %5 = OpConstantNull %v4float
+      %value = OpVariable %_ptr_Output_v4float Output %5
 %_ptr_Output_float = OpTypePointer Output %float
-          %4 = OpConstantNull %float
-%tint_pointsize = OpVariable %_ptr_Output_float Output %4
+          %8 = OpConstantNull %float
+%vertex_point_size = OpVariable %_ptr_Output_float Output %8
        %uint = OpTypeInt 32 0
 %_runtimearr_uint = OpTypeRuntimeArray %uint
       %SB_RW = OpTypeStruct %_runtimearr_uint
 %_ptr_StorageBuffer_SB_RW = OpTypePointer StorageBuffer %SB_RW
       %sb_rw = OpVariable %_ptr_StorageBuffer_SB_RW StorageBuffer
-    %v4float = OpTypeVector %float 4
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-         %13 = OpConstantNull %v4float
-%tint_symbol_1 = OpVariable %_ptr_Output_v4float Output %13
        %void = OpTypeVoid
          %14 = OpTypeFunction %void
 %_ptr_Function_uint = OpTypePointer Function %uint
          %21 = OpConstantNull %uint
-         %22 = OpTypeFunction %void %v4float
+         %22 = OpTypeFunction %v4float
     %float_1 = OpConstant %float 1
 %arrayLength_eb510f = OpFunction %void None %14
          %17 = OpLabel
@@ -55,26 +54,25 @@
                OpStore %res %18
                OpReturn
                OpFunctionEnd
-%tint_symbol_2 = OpFunction %void None %22
-%tint_symbol = OpFunctionParameter %v4float
-         %25 = OpLabel
-               OpStore %tint_symbol_1 %tint_symbol
-               OpReturn
+%vertex_main_inner = OpFunction %v4float None %22
+         %24 = OpLabel
+         %25 = OpFunctionCall %void %arrayLength_eb510f
+               OpReturnValue %5
                OpFunctionEnd
 %vertex_main = OpFunction %void None %14
          %27 = OpLabel
-               OpStore %tint_pointsize %float_1
-         %29 = OpFunctionCall %void %arrayLength_eb510f
-         %30 = OpFunctionCall %void %tint_symbol_2 %13
+         %28 = OpFunctionCall %v4float %vertex_main_inner
+               OpStore %value %28
+               OpStore %vertex_point_size %float_1
                OpReturn
                OpFunctionEnd
 %fragment_main = OpFunction %void None %14
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %arrayLength_eb510f
+         %31 = OpLabel
+         %32 = OpFunctionCall %void %arrayLength_eb510f
                OpReturn
                OpFunctionEnd
 %compute_main = OpFunction %void None %14
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %arrayLength_eb510f
+         %34 = OpLabel
+         %35 = OpFunctionCall %void %arrayLength_eb510f
                OpReturn
                OpFunctionEnd