encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-10 05:57:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

spirv: Use generic transform to process shader IO

Browse Source 
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>
This commit is contained in:
James Price
2021-08-05 17:34:19 +00:00
committed by Tint LUCI CQ
parent 11e172ab64
commit 11c6fcdb51
1981 changed files with 55207 additions and 57171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
test/vk-gl-cts/graphicsfuzz/disc-and-add-in-func-in-loop/0-opt.spvasm.expected.spvasm
View File

@@ -1,17 +1,17 @@
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 93
; Bound: 92
; 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 "injectionSwitch"
OpName %x_5 "x_5"
OpName %x_GLF_color "x_GLF_color"
OpName %tint_symbol_1 "tint_symbol_1"
OpName %x_51 "x_51"
OpName %main_1 "main_1"
OpName %x_31 "x_31"
@@ -22,27 +22,26 @@
OpName %x_55_phi "x_55_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 %x_5 NonWritable
OpDecorate %x_5 DescriptorSet 0
OpDecorate %x_5 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
%v2float = OpTypeVector %float 2
%buf0 = OpTypeStruct %v2float
%_ptr_Uniform_buf0 = OpTypePointer Uniform %buf0
%x_5 = OpVariable %_ptr_Uniform_buf0 Uniform
%v4float = OpTypeVector %float 4
%_ptr_Private_v4float = OpTypePointer Private %v4float
%9 = OpConstantNull %v4float
%x_GLF_color = OpVariable %_ptr_Private_v4float Private %9
%_ptr_Output_v4float = OpTypePointer Output %v4float
%tint_symbol_1 = OpVariable %_ptr_Output_v4float Output %9
%x_GLF_color = OpVariable %_ptr_Private_v4float Private %5
%void = OpTypeVoid
%12 = OpTypeFunction %void
%bool = OpTypeBool
@@ -60,7 +59,7 @@
%66 = OpConstantComposite %v4float %float_1 %float_0 %float_0 %float_1
%true = OpConstantTrue %bool
%main_out = OpTypeStruct %v4float
%81 = OpTypeFunction %void %main_out
%81 = OpTypeFunction %main_out
%x_51 = OpFunction %void None %12
%15 = OpLabel
OpKill
@@ -70,9 +69,9 @@
%x_31 = OpVariable %_ptr_Function_bool Function %25
%x_30_phi = OpVariable %_ptr_Function_bool Function %25
%x_31_phi = OpVariable %_ptr_Function_bool Function %25
%x_52 = OpVariable %_ptr_Function_v4float Function %9
%x_54 = OpVariable %_ptr_Function_v4float Function %9
%x_55_phi = OpVariable %_ptr_Function_v4float Function %9
%x_52 = OpVariable %_ptr_Function_v4float Function %5
%x_54 = OpVariable %_ptr_Function_v4float Function %5
%x_55_phi = OpVariable %_ptr_Function_v4float Function %5
OpBranch %18
%18 = OpLabel
OpLoopMerge %19 %20 None
@@ -162,18 +161,17 @@
%19 = OpLabel
OpReturn
OpFunctionEnd
%tint_symbol_2 = OpFunction %void None %81
%tint_symbol = OpFunctionParameter %main_out
%85 = OpLabel
%86 = OpCompositeExtract %v4float %tint_symbol 0
OpStore %tint_symbol_1 %86
OpReturn
%main_inner = OpFunction %main_out None %81
%84 = OpLabel
%85 = OpFunctionCall %void %main_1
%86 = OpLoad %v4float %x_GLF_color
%87 = OpCompositeConstruct %main_out %86
OpReturnValue %87
OpFunctionEnd
%main = OpFunction %void None %12
%88 = OpLabel
%89 = OpFunctionCall %void %main_1
%91 = OpLoad %v4float %x_GLF_color
%92 = OpCompositeConstruct %main_out %91
%90 = OpFunctionCall %void %tint_symbol_2 %92
%89 = OpLabel
%90 = OpFunctionCall %main_out %main_inner
%91 = OpCompositeExtract %v4float %90 0
OpStore %x_GLF_color_1_1 %91
OpReturn
OpFunctionEnd

50
test/vk-gl-cts/graphicsfuzz/disc-and-add-in-func-in-loop/0-opt.wgsl.expected.spvasm
View File

@@ -1,17 +1,17 @@
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 93
; Bound: 92
; 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 "injectionSwitch"
OpName %x_5 "x_5"
OpName %x_GLF_color "x_GLF_color"
OpName %tint_symbol_1 "tint_symbol_1"
OpName %x_51 "x_51"
OpName %main_1 "main_1"
OpName %x_31 "x_31"
@@ -22,27 +22,26 @@
OpName %x_55_phi "x_55_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 %x_5 NonWritable
OpDecorate %x_5 DescriptorSet 0
OpDecorate %x_5 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
%v2float = OpTypeVector %float 2
%buf0 = OpTypeStruct %v2float
%_ptr_Uniform_buf0 = OpTypePointer Uniform %buf0
%x_5 = OpVariable %_ptr_Uniform_buf0 Uniform
%v4float = OpTypeVector %float 4
%_ptr_Private_v4float = OpTypePointer Private %v4float
%9 = OpConstantNull %v4float
%x_GLF_color = OpVariable %_ptr_Private_v4float Private %9
%_ptr_Output_v4float = OpTypePointer Output %v4float
%tint_symbol_1 = OpVariable %_ptr_Output_v4float Output %9
%x_GLF_color = OpVariable %_ptr_Private_v4float Private %5
%void = OpTypeVoid
%12 = OpTypeFunction %void
%bool = OpTypeBool
@@ -60,7 +59,7 @@
%66 = OpConstantComposite %v4float %float_1 %float_0 %float_0 %float_1
%true = OpConstantTrue %bool
%main_out = OpTypeStruct %v4float
%81 = OpTypeFunction %void %main_out
%81 = OpTypeFunction %main_out
%x_51 = OpFunction %void None %12
%15 = OpLabel
OpKill
@@ -70,9 +69,9 @@
%x_31 = OpVariable %_ptr_Function_bool Function %25
%x_30_phi = OpVariable %_ptr_Function_bool Function %25
%x_31_phi = OpVariable %_ptr_Function_bool Function %25
%x_52 = OpVariable %_ptr_Function_v4float Function %9
%x_54 = OpVariable %_ptr_Function_v4float Function %9
%x_55_phi = OpVariable %_ptr_Function_v4float Function %9
%x_52 = OpVariable %_ptr_Function_v4float Function %5
%x_54 = OpVariable %_ptr_Function_v4float Function %5
%x_55_phi = OpVariable %_ptr_Function_v4float Function %5
OpBranch %18
%18 = OpLabel
OpLoopMerge %19 %20 None
@@ -162,18 +161,17 @@
%19 = OpLabel
OpReturn
OpFunctionEnd
%tint_symbol_2 = OpFunction %void None %81
%tint_symbol = OpFunctionParameter %main_out
%85 = OpLabel
%86 = OpCompositeExtract %v4float %tint_symbol 0
OpStore %tint_symbol_1 %86
OpReturn
%main_inner = OpFunction %main_out None %81
%84 = OpLabel
%85 = OpFunctionCall %void %main_1
%86 = OpLoad %v4float %x_GLF_color
%87 = OpCompositeConstruct %main_out %86
OpReturnValue %87
OpFunctionEnd
%main = OpFunction %void None %12
%88 = OpLabel
%89 = OpFunctionCall %void %main_1
%91 = OpLoad %v4float %x_GLF_color
%92 = OpCompositeConstruct %main_out %91
%90 = OpFunctionCall %void %tint_symbol_2 %92
%89 = OpLabel
%90 = OpFunctionCall %main_out %main_inner
%91 = OpCompositeExtract %v4float %90 0
OpStore %x_GLF_color_1_1 %91
OpReturn
OpFunctionEnd