encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-14 07:36:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

spirv-reader: fix mapping of OpLogicalOr, OpLogicalAnd

Browse Source 
These work on scalar and vector of bool, and map to ast::BinaryOp::kOr
and kAnd.

Bug: tint:1043
Change-Id: I009edf8e43c21cb75ccfdcde1106ec177d2fe50e
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/59561
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: James Price <jrprice@google.com>
Commit-Queue: James Price <jrprice@google.com>
Auto-Submit: David Neto <dneto@google.com>
This commit is contained in:
David Neto
2021-07-26 17:34:58 +00:00
committed by Tint LUCI CQ
parent 5f3063359c
commit 1444a2e117
188 changed files with 2306 additions and 3080 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/vk-gl-cts/graphicsfuzz/cov-reduce-load-array-replace-extract/0.spvasm.expected.hlsl
View File

@@ -19,11 +19,7 @@ void main_1() {
break;
}
const int x_10 = x_10_phi;
bool tint_tmp = (x_10 == 1);
if (!tint_tmp) {
tint_tmp = (x_10 == 2);
}
if ((tint_tmp)) {
if (((x_10 == 1) | (x_10 == 2))) {
x_GLF_color = float4(1.0f, 0.0f, 0.0f, 1.0f);
} else {
x_GLF_color = float4(0.0f, 0.0f, 0.0f, 0.0f);

2
test/vk-gl-cts/graphicsfuzz/cov-reduce-load-array-replace-extract/0.spvasm.expected.msl
View File

@@ -31,7 +31,7 @@ void main_1(constant buf0& x_5, thread float4* const tint_symbol_4) {
break;
}
int const x_10 = x_10_phi;
if (((x_10 == 1) || (x_10 == 2))) {
if (((x_10 == 1) | (x_10 == 2))) {
*(tint_symbol_4) = float4(1.0f, 0.0f, 0.0f, 1.0f);
} else {
*(tint_symbol_4) = float4(0.0f, 0.0f, 0.0f, 0.0f);

49
test/vk-gl-cts/graphicsfuzz/cov-reduce-load-array-replace-extract/0.spvasm.expected.spvasm
View File

@@ -1,7 +1,7 @@
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 68
; Bound: 66
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
@@ -56,9 +56,9 @@
%int_1 = OpConstant %int 1
%int_2 = OpConstant %int 2
%float_1 = OpConstant %float 1
%55 = OpConstantComposite %v4float %float_1 %float_0 %float_0 %float_1
%53 = OpConstantComposite %v4float %float_1 %float_0 %float_0 %float_1
%main_out = OpTypeStruct %v4float
%56 = OpTypeFunction %void %main_out
%54 = OpTypeFunction %void %main_out
%main_1 = OpFunction %void None %12
%15 = OpLabel
%x_9 = OpVariable %_ptr_Function__arr_int_uint_1 Function %21
@@ -89,36 +89,31 @@
%29 = OpLabel
%45 = OpLoad %int %x_10_phi
%46 = OpIEqual %bool %45 %int_1
OpSelectionMerge %47 None
OpBranchConditional %46 %47 %48
%48 = OpLabel
%49 = OpIEqual %bool %45 %int_2
OpBranch %47
%47 = OpLabel
%50 = OpPhi %bool %46 %29 %49 %48
OpSelectionMerge %51 None
OpBranchConditional %50 %52 %53
%52 = OpLabel
OpStore %x_GLF_color %55
OpBranch %51
%53 = OpLabel
OpStore %x_GLF_color %33
OpBranch %51
%47 = OpIEqual %bool %45 %int_2
%48 = OpLogicalOr %bool %46 %47
OpSelectionMerge %49 None
OpBranchConditional %48 %50 %51
%50 = OpLabel
OpStore %x_GLF_color %53
OpBranch %49
%51 = OpLabel
OpStore %x_GLF_color %33
OpBranch %49
%49 = OpLabel
OpReturn
OpFunctionEnd
%tint_symbol_2 = OpFunction %void None %56
%tint_symbol_2 = OpFunction %void None %54
%tint_symbol = OpFunctionParameter %main_out
%60 = OpLabel
%61 = OpCompositeExtract %v4float %tint_symbol 0
OpStore %tint_symbol_1 %61
%58 = OpLabel
%59 = OpCompositeExtract %v4float %tint_symbol 0
OpStore %tint_symbol_1 %59
OpReturn
OpFunctionEnd
%main = OpFunction %void None %12
%63 = OpLabel
%64 = OpFunctionCall %void %main_1
%66 = OpLoad %v4float %x_GLF_color
%67 = OpCompositeConstruct %main_out %66
%65 = OpFunctionCall %void %tint_symbol_2 %67
%61 = OpLabel
%62 = OpFunctionCall %void %main_1
%64 = OpLoad %v4float %x_GLF_color
%65 = OpCompositeConstruct %main_out %64
%63 = OpFunctionCall %void %tint_symbol_2 %65
OpReturn
OpFunctionEnd

2
test/vk-gl-cts/graphicsfuzz/cov-reduce-load-array-replace-extract/0.spvasm.expected.wgsl
View File

@@ -24,7 +24,7 @@ fn main_1() {
break;
}
let x_10 : i32 = x_10_phi;
if (((x_10 == 1) || (x_10 == 2))) {
if (((x_10 == 1) | (x_10 == 2))) {
x_GLF_color = vec4<f32>(1.0, 0.0, 0.0, 1.0);
} else {
x_GLF_color = vec4<f32>(0.0, 0.0, 0.0, 0.0);