test/tint/builtins/gen: Use returned value
It appears that FXC and DXC do some validation post dead-code-elimination.
These tests have been updated so that the return value is assigned to a storage buffer, ensuring that all validation is performed.
Many DXC tests are affected by https://github.com/microsoft/DirectXShaderCompiler/issues/5082, which have been SKIP'ed.
Fixed: tint:1859
Change-Id: I0001a9a9821846cd0855c3d8ce2bec79ab8e64ef
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/122662
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: James Price <jrprice@google.com>
Commit-Queue: James Price <jrprice@google.com>
Auto-Submit: Ben Clayton <bclayton@google.com>
diff --git a/test/tint/builtins/gen/var/mix/38cbbb.wgsl.expected.spvasm b/test/tint/builtins/gen/var/mix/38cbbb.wgsl.expected.spvasm
index eac22c3..511c951 100644
--- a/test/tint/builtins/gen/var/mix/38cbbb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/mix/38cbbb.wgsl.expected.spvasm
@@ -1,14 +1,14 @@
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
-; Bound: 40
+; Bound: 48
; Schema: 0
OpCapability Shader
OpCapability Float16
OpCapability UniformAndStorageBuffer16BitAccess
OpCapability StorageBuffer16BitAccess
OpCapability StorageInputOutput16
- %21 = OpExtInstImport "GLSL.std.450"
+ %24 = OpExtInstImport "GLSL.std.450"
OpMemoryModel Logical GLSL450
OpEntryPoint Vertex %vertex_main "vertex_main" %value %vertex_point_size
OpEntryPoint Fragment %fragment_main "fragment_main"
@@ -17,6 +17,9 @@
OpExecutionMode %compute_main LocalSize 1 1 1
OpName %value "value"
OpName %vertex_point_size "vertex_point_size"
+ OpName %prevent_dce_block "prevent_dce_block"
+ OpMemberName %prevent_dce_block 0 "inner"
+ OpName %prevent_dce "prevent_dce"
OpName %mix_38cbbb "mix_38cbbb"
OpName %arg_0 "arg_0"
OpName %arg_1 "arg_1"
@@ -28,6 +31,10 @@
OpName %compute_main "compute_main"
OpDecorate %value BuiltIn Position
OpDecorate %vertex_point_size BuiltIn PointSize
+ OpDecorate %prevent_dce_block Block
+ OpMemberDecorate %prevent_dce_block 0 Offset 0
+ OpDecorate %prevent_dce DescriptorSet 2
+ OpDecorate %prevent_dce Binding 0
%float = OpTypeFloat 32
%v4float = OpTypeVector %float 4
%_ptr_Output_v4float = OpTypePointer Output %v4float
@@ -36,49 +43,58 @@
%_ptr_Output_float = OpTypePointer Output %float
%8 = OpConstantNull %float
%vertex_point_size = OpVariable %_ptr_Output_float Output %8
- %void = OpTypeVoid
- %9 = OpTypeFunction %void
%half = OpTypeFloat 16
+%prevent_dce_block = OpTypeStruct %half
+%_ptr_StorageBuffer_prevent_dce_block = OpTypePointer StorageBuffer %prevent_dce_block
+%prevent_dce = OpVariable %_ptr_StorageBuffer_prevent_dce_block StorageBuffer
+ %void = OpTypeVoid
+ %13 = OpTypeFunction %void
%half_0x1p_0 = OpConstant %half 0x1p+0
%_ptr_Function_half = OpTypePointer Function %half
- %17 = OpConstantNull %half
- %26 = OpTypeFunction %v4float
+ %20 = OpConstantNull %half
+ %uint = OpTypeInt 32 0
+ %uint_0 = OpConstant %uint 0
+%_ptr_StorageBuffer_half = OpTypePointer StorageBuffer %half
+ %34 = OpTypeFunction %v4float
%float_1 = OpConstant %float 1
- %mix_38cbbb = OpFunction %void None %9
- %12 = OpLabel
- %arg_0 = OpVariable %_ptr_Function_half Function %17
- %arg_1 = OpVariable %_ptr_Function_half Function %17
- %arg_2 = OpVariable %_ptr_Function_half Function %17
- %res = OpVariable %_ptr_Function_half Function %17
+ %mix_38cbbb = OpFunction %void None %13
+ %16 = OpLabel
+ %arg_0 = OpVariable %_ptr_Function_half Function %20
+ %arg_1 = OpVariable %_ptr_Function_half Function %20
+ %arg_2 = OpVariable %_ptr_Function_half Function %20
+ %res = OpVariable %_ptr_Function_half Function %20
OpStore %arg_0 %half_0x1p_0
OpStore %arg_1 %half_0x1p_0
OpStore %arg_2 %half_0x1p_0
- %22 = OpLoad %half %arg_0
- %23 = OpLoad %half %arg_1
- %24 = OpLoad %half %arg_2
- %20 = OpExtInst %half %21 FMix %22 %23 %24
- OpStore %res %20
+ %25 = OpLoad %half %arg_0
+ %26 = OpLoad %half %arg_1
+ %27 = OpLoad %half %arg_2
+ %23 = OpExtInst %half %24 FMix %25 %26 %27
+ OpStore %res %23
+ %32 = OpAccessChain %_ptr_StorageBuffer_half %prevent_dce %uint_0
+ %33 = OpLoad %half %res
+ OpStore %32 %33
OpReturn
OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %26
- %28 = OpLabel
- %29 = OpFunctionCall %void %mix_38cbbb
+%vertex_main_inner = OpFunction %v4float None %34
+ %36 = OpLabel
+ %37 = OpFunctionCall %void %mix_38cbbb
OpReturnValue %5
OpFunctionEnd
-%vertex_main = OpFunction %void None %9
- %31 = OpLabel
- %32 = OpFunctionCall %v4float %vertex_main_inner
- OpStore %value %32
+%vertex_main = OpFunction %void None %13
+ %39 = OpLabel
+ %40 = OpFunctionCall %v4float %vertex_main_inner
+ OpStore %value %40
OpStore %vertex_point_size %float_1
OpReturn
OpFunctionEnd
-%fragment_main = OpFunction %void None %9
- %35 = OpLabel
- %36 = OpFunctionCall %void %mix_38cbbb
+%fragment_main = OpFunction %void None %13
+ %43 = OpLabel
+ %44 = OpFunctionCall %void %mix_38cbbb
OpReturn
OpFunctionEnd
-%compute_main = OpFunction %void None %9
- %38 = OpLabel
- %39 = OpFunctionCall %void %mix_38cbbb
+%compute_main = OpFunction %void None %13
+ %46 = OpLabel
+ %47 = OpFunctionCall %void %mix_38cbbb
OpReturn
OpFunctionEnd
