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>
2025-12-12 22:56:09 +00:00 · 2021-08-05 17:34:19 +00:00
parent 11e172ab64
commit 11c6fcdb51
1981 changed files with 55207 additions and 57171 deletions
--- a/test/vk-gl-cts/graphicsfuzz/cov-array-copies-loops-with-limiters/0-opt.spvasm.expected.spvasm
+++ b/test/vk-gl-cts/graphicsfuzz/cov-array-copies-loops-with-limiters/0-opt.spvasm.expected.spvasm
@@ -1,12 +1,13 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 321
+; Bound: 320
 ; Schema: 0
               OpCapability Shader
               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_int_values"
               OpName %x_6 "x_6"
@@ -14,7 +15,6 @@
               OpName %buf1 "buf1"
               OpMemberName %buf1 0 "one"
               OpName %x_19 "x_19"
-               OpName %tint_symbol_1 "tint_symbol_1"
               OpName %main_1 "main_1"
               OpName %arr0 "arr0"
               OpName %arr1 "arr1"
@@ -32,9 +32,9 @@
               OpName %x_278_phi "x_278_phi"
               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_int_uint_20 ArrayStride 16
@@ -46,9 +46,13 @@
               OpDecorate %x_19 NonWritable
               OpDecorate %x_19 DescriptorSet 0
               OpDecorate %x_19 Binding 1
-               OpDecorate %tint_symbol_1 Location 0
               OpDecorate %_arr_int_uint_10 ArrayStride 4
               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_20 = OpConstant %uint 20
@@ -56,16 +60,11 @@
       %buf0 = OpTypeStruct %_arr_int_uint_20
 %_ptr_Uniform_buf0 = OpTypePointer Uniform %buf0
        %x_6 = OpVariable %_ptr_Uniform_buf0 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
       %buf1 = OpTypeStruct %int
 %_ptr_Uniform_buf1 = OpTypePointer Uniform %buf1
       %x_19 = OpVariable %_ptr_Uniform_buf1 Uniform
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-%tint_symbol_1 = OpVariable %_ptr_Output_v4float Output %12
       %void = OpTypeVoid
         %18 = OpTypeFunction %void
    %uint_10 = OpConstant %uint 10
@@ -100,7 +99,7 @@
 %_ptr_Function_bool = OpTypePointer Function %bool
        %273 = OpConstantNull %bool
   %main_out = OpTypeStruct %v4float
-        %309 = OpTypeFunction %void %main_out
+        %309 = OpTypeFunction %main_out
     %main_1 = OpFunction %void None %18
         %21 = OpLabel
       %arr0 = OpVariable %_ptr_Function__arr_int_uint_10 Function %26
@@ -460,18 +459,17 @@
        %268 = OpLabel
               OpReturn
               OpFunctionEnd
-%tint_symbol_2 = OpFunction %void None %309
-%tint_symbol = OpFunctionParameter %main_out
-        %313 = OpLabel
-        %314 = OpCompositeExtract %v4float %tint_symbol 0
-               OpStore %tint_symbol_1 %314
-               OpReturn
+ %main_inner = OpFunction %main_out None %309
+        %312 = OpLabel
+        %313 = OpFunctionCall %void %main_1
+        %314 = OpLoad %v4float %x_GLF_color
+        %315 = OpCompositeConstruct %main_out %314
+               OpReturnValue %315
               OpFunctionEnd
       %main = OpFunction %void None %18
-        %316 = OpLabel
-        %317 = OpFunctionCall %void %main_1
-        %319 = OpLoad %v4float %x_GLF_color
-        %320 = OpCompositeConstruct %main_out %319
-        %318 = OpFunctionCall %void %tint_symbol_2 %320
+        %317 = OpLabel
+        %318 = OpFunctionCall %main_out %main_inner
+        %319 = OpCompositeExtract %v4float %318 0
+               OpStore %x_GLF_color_1_1 %319
               OpReturn
               OpFunctionEnd
--- a/test/vk-gl-cts/graphicsfuzz/cov-array-copies-loops-with-limiters/0-opt.wgsl.expected.spvasm
+++ b/test/vk-gl-cts/graphicsfuzz/cov-array-copies-loops-with-limiters/0-opt.wgsl.expected.spvasm
@@ -1,12 +1,13 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 321
+; Bound: 320
 ; Schema: 0
               OpCapability Shader
               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_int_values"
               OpName %x_6 "x_6"
@@ -14,7 +15,6 @@
               OpName %buf1 "buf1"
               OpMemberName %buf1 0 "one"
               OpName %x_19 "x_19"
-               OpName %tint_symbol_1 "tint_symbol_1"
               OpName %main_1 "main_1"
               OpName %arr0 "arr0"
               OpName %arr1 "arr1"
@@ -32,9 +32,9 @@
               OpName %x_278_phi "x_278_phi"
               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_int_uint_20 ArrayStride 16
@@ -46,9 +46,13 @@
               OpDecorate %x_19 NonWritable
               OpDecorate %x_19 DescriptorSet 0
               OpDecorate %x_19 Binding 1
-               OpDecorate %tint_symbol_1 Location 0
               OpDecorate %_arr_int_uint_10 ArrayStride 4
               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_20 = OpConstant %uint 20
@@ -56,16 +60,11 @@
       %buf0 = OpTypeStruct %_arr_int_uint_20
 %_ptr_Uniform_buf0 = OpTypePointer Uniform %buf0
        %x_6 = OpVariable %_ptr_Uniform_buf0 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
       %buf1 = OpTypeStruct %int
 %_ptr_Uniform_buf1 = OpTypePointer Uniform %buf1
       %x_19 = OpVariable %_ptr_Uniform_buf1 Uniform
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-%tint_symbol_1 = OpVariable %_ptr_Output_v4float Output %12
       %void = OpTypeVoid
         %18 = OpTypeFunction %void
    %uint_10 = OpConstant %uint 10
@@ -100,7 +99,7 @@
 %_ptr_Function_bool = OpTypePointer Function %bool
        %273 = OpConstantNull %bool
   %main_out = OpTypeStruct %v4float
-        %309 = OpTypeFunction %void %main_out
+        %309 = OpTypeFunction %main_out
     %main_1 = OpFunction %void None %18
         %21 = OpLabel
       %arr0 = OpVariable %_ptr_Function__arr_int_uint_10 Function %26
@@ -460,18 +459,17 @@
        %268 = OpLabel
               OpReturn
               OpFunctionEnd
-%tint_symbol_2 = OpFunction %void None %309
-%tint_symbol = OpFunctionParameter %main_out
-        %313 = OpLabel
-        %314 = OpCompositeExtract %v4float %tint_symbol 0
-               OpStore %tint_symbol_1 %314
-               OpReturn
+ %main_inner = OpFunction %main_out None %309
+        %312 = OpLabel
+        %313 = OpFunctionCall %void %main_1
+        %314 = OpLoad %v4float %x_GLF_color
+        %315 = OpCompositeConstruct %main_out %314
+               OpReturnValue %315
               OpFunctionEnd
       %main = OpFunction %void None %18
-        %316 = OpLabel
-        %317 = OpFunctionCall %void %main_1
-        %319 = OpLoad %v4float %x_GLF_color
-        %320 = OpCompositeConstruct %main_out %319
-        %318 = OpFunctionCall %void %tint_symbol_2 %320
+        %317 = OpLabel
+        %318 = OpFunctionCall %main_out %main_inner
+        %319 = OpCompositeExtract %v4float %318 0
+               OpStore %x_GLF_color_1_1 %319
               OpReturn
               OpFunctionEnd