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

tint: polyfill remainder to handle negative operands

Browse Source 
Bug: tint:1802
Change-Id: Ie9baa045feda08523e5ca4f5ce94b6db7d4477e5
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/119100
Commit-Queue: Antonio Maiorano <amaiorano@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
This commit is contained in:
Antonio Maiorano
2023-02-10 15:01:02 +00:00
committed by Dawn LUCI CQ
parent 78583a14e6
commit ec20758675
103 changed files with 1660 additions and 554 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/tint/statements/compound_assign/vector/modulo-scalar.wgsl.expected.dxc.hlsl
View File

@@ -7,7 +7,12 @@ RWByteAddressBuffer v : register(u0, space0);
int4 tint_mod(int4 lhs, int rhs) {
const int4 r = int4((rhs).xxxx);
return (lhs % (((r == (0).xxxx) | ((lhs == (-2147483648).xxxx) & (r == (-1).xxxx))) ? (1).xxxx : r));
const int4 rhs_or_one = (((r == (0).xxxx) | ((lhs == (-2147483648).xxxx) & (r == (-1).xxxx))) ? (1).xxxx : r);
if (any(((uint4((lhs | rhs_or_one)) & (2147483648u).xxxx) != (0u).xxxx))) {
return (lhs - ((lhs / rhs_or_one) * rhs_or_one));
} else {
return (lhs % rhs_or_one);
}
}
void foo() {

7
test/tint/statements/compound_assign/vector/modulo-scalar.wgsl.expected.fxc.hlsl
View File

@@ -7,7 +7,12 @@ RWByteAddressBuffer v : register(u0, space0);
int4 tint_mod(int4 lhs, int rhs) {
const int4 r = int4((rhs).xxxx);
return (lhs % (((r == (0).xxxx) | ((lhs == (-2147483648).xxxx) & (r == (-1).xxxx))) ? (1).xxxx : r));
const int4 rhs_or_one = (((r == (0).xxxx) | ((lhs == (-2147483648).xxxx) & (r == (-1).xxxx))) ? (1).xxxx : r);
if (any(((uint4((lhs | rhs_or_one)) & (2147483648u).xxxx) != (0u).xxxx))) {
return (lhs - ((lhs / rhs_or_one) * rhs_or_one));
} else {
return (lhs % rhs_or_one);
}
}
void foo() {

7
test/tint/statements/compound_assign/vector/modulo-scalar.wgsl.expected.glsl
View File

@@ -14,7 +14,12 @@ layout(binding = 0, std430) buffer v_block_ssbo {
ivec4 tint_mod(ivec4 lhs, int rhs) {
ivec4 r = ivec4(rhs);
return (lhs % mix(r, ivec4(1), bvec4(uvec4(equal(r, ivec4(0))) | uvec4(bvec4(uvec4(equal(lhs, ivec4(-2147483648))) & uvec4(equal(r, ivec4(-1))))))));
ivec4 rhs_or_one = mix(r, ivec4(1), bvec4(uvec4(equal(r, ivec4(0))) | uvec4(bvec4(uvec4(equal(lhs, ivec4(-2147483648))) & uvec4(equal(r, ivec4(-1)))))));
if (any(notEqual((uvec4((lhs | rhs_or_one)) & uvec4(2147483648u)), uvec4(0u)))) {
return (lhs - ((lhs / rhs_or_one) * rhs_or_one));
} else {
return (lhs % rhs_or_one);
}
}
void foo() {

7
test/tint/statements/compound_assign/vector/modulo-scalar.wgsl.expected.msl
View File

@@ -7,7 +7,12 @@ struct S {
int4 tint_mod(int4 lhs, int rhs) {
int4 const r = int4(rhs);
return (lhs % select(r, int4(1), ((r == int4(0)) | ((lhs == int4((-2147483647 - 1))) & (r == int4(-1))))));
int4 const rhs_or_one = select(r, int4(1), ((r == int4(0)) | ((lhs == int4((-2147483647 - 1))) & (r == int4(-1)))));
if (any(((uint4((lhs | rhs_or_one)) & uint4(2147483648u)) != uint4(0u)))) {
return as_type<int4>((as_type<uint4>(lhs) - as_type<uint4>(as_type<int4>((as_type<uint4>((lhs / rhs_or_one)) * as_type<uint4>(rhs_or_one))))));
} else {
return (lhs % rhs_or_one);
}
}
void foo(device S* const tint_symbol_1) {

72
test/tint/statements/compound_assign/vector/modulo-scalar.wgsl.expected.spvasm
View File

@@ -1,7 +1,7 @@
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 43
; Bound: 65
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
@@ -16,6 +16,8 @@
OpName %tint_mod "tint_mod"
OpName %lhs "lhs"
OpName %rhs "rhs"
OpName %tint_return_flag "tint_return_flag"
OpName %tint_return_value "tint_return_value"
OpName %foo "foo"
OpDecorate %v_block Block
OpMemberDecorate %v_block 0 Offset 0
@@ -31,16 +33,24 @@
%void = OpTypeVoid
%7 = OpTypeFunction %void
%11 = OpTypeFunction %v4int %v4int %int
%18 = OpConstantNull %v4int
%bool = OpTypeBool
%_ptr_Function_bool = OpTypePointer Function %bool
%19 = OpConstantNull %bool
%_ptr_Function_v4int = OpTypePointer Function %v4int
%22 = OpConstantNull %v4int
%v4bool = OpTypeVector %bool 4
%int_n2147483648 = OpConstant %int -2147483648
%23 = OpConstantComposite %v4int %int_n2147483648 %int_n2147483648 %int_n2147483648 %int_n2147483648
%28 = OpConstantComposite %v4int %int_n2147483648 %int_n2147483648 %int_n2147483648 %int_n2147483648
%int_n1 = OpConstant %int -1
%26 = OpConstantComposite %v4int %int_n1 %int_n1 %int_n1 %int_n1
%31 = OpConstantComposite %v4int %int_n1 %int_n1 %int_n1 %int_n1
%int_1 = OpConstant %int 1
%31 = OpConstantComposite %v4int %int_1 %int_1 %int_1 %int_1
%36 = OpConstantComposite %v4int %int_1 %int_1 %int_1 %int_1
%uint = OpTypeInt 32 0
%v4uint = OpTypeVector %uint 4
%uint_2147483648 = OpConstant %uint 2147483648
%43 = OpConstantComposite %v4uint %uint_2147483648 %uint_2147483648 %uint_2147483648 %uint_2147483648
%45 = OpConstantNull %v4uint
%true = OpConstantTrue %bool
%uint_0 = OpConstant %uint 0
%_ptr_StorageBuffer_v4int = OpTypePointer StorageBuffer %v4int
%int_2 = OpConstant %int 2
@@ -52,22 +62,44 @@
%lhs = OpFunctionParameter %v4int
%rhs = OpFunctionParameter %int
%15 = OpLabel
%16 = OpCompositeConstruct %v4int %rhs %rhs %rhs %rhs
%19 = OpIEqual %v4bool %16 %18
%24 = OpIEqual %v4bool %lhs %23
%27 = OpIEqual %v4bool %16 %26
%28 = OpLogicalAnd %v4bool %24 %27
%29 = OpLogicalOr %v4bool %19 %28
%17 = OpSelect %v4int %29 %31 %16
%32 = OpSRem %v4int %lhs %17
OpReturnValue %32
%tint_return_flag = OpVariable %_ptr_Function_bool Function %19
%tint_return_value = OpVariable %_ptr_Function_v4int Function %22
%23 = OpCompositeConstruct %v4int %rhs %rhs %rhs %rhs
%25 = OpIEqual %v4bool %23 %22
%29 = OpIEqual %v4bool %lhs %28
%32 = OpIEqual %v4bool %23 %31
%33 = OpLogicalAnd %v4bool %29 %32
%34 = OpLogicalOr %v4bool %25 %33
%24 = OpSelect %v4int %34 %36 %23
%41 = OpBitwiseOr %v4int %lhs %24
%38 = OpBitcast %v4uint %41
%44 = OpBitwiseAnd %v4uint %38 %43
%46 = OpINotEqual %v4bool %44 %45
%37 = OpAny %bool %46
OpSelectionMerge %47 None
OpBranchConditional %37 %48 %49
%48 = OpLabel
OpStore %tint_return_flag %true
%51 = OpSDiv %v4int %lhs %24
%52 = OpIMul %v4int %51 %24
%53 = OpISub %v4int %lhs %52
OpStore %tint_return_value %53
OpBranch %47
%49 = OpLabel
OpStore %tint_return_flag %true
%54 = OpSRem %v4int %lhs %24
OpStore %tint_return_value %54
OpBranch %47
%47 = OpLabel
%55 = OpLoad %v4int %tint_return_value
OpReturnValue %55
OpFunctionEnd
%foo = OpFunction %void None %7
%34 = OpLabel
%39 = OpAccessChain %_ptr_StorageBuffer_v4int %v %uint_0 %uint_0
%40 = OpLoad %v4int %39
%35 = OpFunctionCall %v4int %tint_mod %40 %int_2
%42 = OpAccessChain %_ptr_StorageBuffer_v4int %v %uint_0 %uint_0
OpStore %42 %35
%57 = OpLabel
%61 = OpAccessChain %_ptr_StorageBuffer_v4int %v %uint_0 %uint_0
%62 = OpLoad %v4int %61
%58 = OpFunctionCall %v4int %tint_mod %62 %int_2
%64 = OpAccessChain %_ptr_StorageBuffer_v4int %v %uint_0 %uint_0
OpStore %64 %58
OpReturn
OpFunctionEnd

7
test/tint/statements/compound_assign/vector/modulo.wgsl.expected.dxc.hlsl
View File

@@ -6,7 +6,12 @@ void unused_entry_point() {
RWByteAddressBuffer v : register(u0, space0);
int4 tint_mod(int4 lhs, int4 rhs) {
return (lhs % (((rhs == (0).xxxx) | ((lhs == (-2147483648).xxxx) & (rhs == (-1).xxxx))) ? (1).xxxx : rhs));
const int4 rhs_or_one = (((rhs == (0).xxxx) | ((lhs == (-2147483648).xxxx) & (rhs == (-1).xxxx))) ? (1).xxxx : rhs);
if (any(((uint4((lhs | rhs_or_one)) & (2147483648u).xxxx) != (0u).xxxx))) {
return (lhs - ((lhs / rhs_or_one) * rhs_or_one));
} else {
return (lhs % rhs_or_one);
}
}
void foo() {

7
test/tint/statements/compound_assign/vector/modulo.wgsl.expected.fxc.hlsl
View File

@@ -6,7 +6,12 @@ void unused_entry_point() {
RWByteAddressBuffer v : register(u0, space0);
int4 tint_mod(int4 lhs, int4 rhs) {
return (lhs % (((rhs == (0).xxxx) | ((lhs == (-2147483648).xxxx) & (rhs == (-1).xxxx))) ? (1).xxxx : rhs));
const int4 rhs_or_one = (((rhs == (0).xxxx) | ((lhs == (-2147483648).xxxx) & (rhs == (-1).xxxx))) ? (1).xxxx : rhs);
if (any(((uint4((lhs | rhs_or_one)) & (2147483648u).xxxx) != (0u).xxxx))) {
return (lhs - ((lhs / rhs_or_one) * rhs_or_one));
} else {
return (lhs % rhs_or_one);
}
}
void foo() {

7
test/tint/statements/compound_assign/vector/modulo.wgsl.expected.glsl
View File

@@ -13,7 +13,12 @@ layout(binding = 0, std430) buffer v_block_ssbo {
} v;
ivec4 tint_mod(ivec4 lhs, ivec4 rhs) {
return (lhs % mix(rhs, ivec4(1), bvec4(uvec4(equal(rhs, ivec4(0))) | uvec4(bvec4(uvec4(equal(lhs, ivec4(-2147483648))) & uvec4(equal(rhs, ivec4(-1))))))));
ivec4 rhs_or_one = mix(rhs, ivec4(1), bvec4(uvec4(equal(rhs, ivec4(0))) | uvec4(bvec4(uvec4(equal(lhs, ivec4(-2147483648))) & uvec4(equal(rhs, ivec4(-1)))))));
if (any(notEqual((uvec4((lhs | rhs_or_one)) & uvec4(2147483648u)), uvec4(0u)))) {
return (lhs - ((lhs / rhs_or_one) * rhs_or_one));
} else {
return (lhs % rhs_or_one);
}
}
void foo() {

7
test/tint/statements/compound_assign/vector/modulo.wgsl.expected.msl
View File

@@ -6,7 +6,12 @@ struct S {
};
int4 tint_mod(int4 lhs, int4 rhs) {
return (lhs % select(rhs, int4(1), ((rhs == int4(0)) | ((lhs == int4((-2147483647 - 1))) & (rhs == int4(-1))))));
int4 const rhs_or_one = select(rhs, int4(1), ((rhs == int4(0)) | ((lhs == int4((-2147483647 - 1))) & (rhs == int4(-1)))));
if (any(((uint4((lhs | rhs_or_one)) & uint4(2147483648u)) != uint4(0u)))) {
return as_type<int4>((as_type<uint4>(lhs) - as_type<uint4>(as_type<int4>((as_type<uint4>((lhs / rhs_or_one)) * as_type<uint4>(rhs_or_one))))));
} else {
return (lhs % rhs_or_one);
}
}
void foo(device S* const tint_symbol_1) {

72
test/tint/statements/compound_assign/vector/modulo.wgsl.expected.spvasm
View File

@@ -1,7 +1,7 @@
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 43
; Bound: 65
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
@@ -16,6 +16,8 @@
OpName %tint_mod "tint_mod"
OpName %lhs "lhs"
OpName %rhs "rhs"
OpName %tint_return_flag "tint_return_flag"
OpName %tint_return_value "tint_return_value"
OpName %foo "foo"
OpDecorate %v_block Block
OpMemberDecorate %v_block 0 Offset 0
@@ -31,20 +33,28 @@
%void = OpTypeVoid
%7 = OpTypeFunction %void
%11 = OpTypeFunction %v4int %v4int %v4int
%17 = OpConstantNull %v4int
%bool = OpTypeBool
%_ptr_Function_bool = OpTypePointer Function %bool
%19 = OpConstantNull %bool
%_ptr_Function_v4int = OpTypePointer Function %v4int
%22 = OpConstantNull %v4int
%v4bool = OpTypeVector %bool 4
%int_n2147483648 = OpConstant %int -2147483648
%22 = OpConstantComposite %v4int %int_n2147483648 %int_n2147483648 %int_n2147483648 %int_n2147483648
%27 = OpConstantComposite %v4int %int_n2147483648 %int_n2147483648 %int_n2147483648 %int_n2147483648
%int_n1 = OpConstant %int -1
%25 = OpConstantComposite %v4int %int_n1 %int_n1 %int_n1 %int_n1
%30 = OpConstantComposite %v4int %int_n1 %int_n1 %int_n1 %int_n1
%int_1 = OpConstant %int 1
%30 = OpConstantComposite %v4int %int_1 %int_1 %int_1 %int_1
%35 = OpConstantComposite %v4int %int_1 %int_1 %int_1 %int_1
%uint = OpTypeInt 32 0
%v4uint = OpTypeVector %uint 4
%uint_2147483648 = OpConstant %uint 2147483648
%42 = OpConstantComposite %v4uint %uint_2147483648 %uint_2147483648 %uint_2147483648 %uint_2147483648
%44 = OpConstantNull %v4uint
%true = OpConstantTrue %bool
%uint_0 = OpConstant %uint 0
%_ptr_StorageBuffer_v4int = OpTypePointer StorageBuffer %v4int
%int_2 = OpConstant %int 2
%41 = OpConstantComposite %v4int %int_2 %int_2 %int_2 %int_2
%63 = OpConstantComposite %v4int %int_2 %int_2 %int_2 %int_2
%unused_entry_point = OpFunction %void None %7
%10 = OpLabel
OpReturn
@@ -53,21 +63,43 @@
%lhs = OpFunctionParameter %v4int
%rhs = OpFunctionParameter %v4int
%15 = OpLabel
%18 = OpIEqual %v4bool %rhs %17
%23 = OpIEqual %v4bool %lhs %22
%26 = OpIEqual %v4bool %rhs %25
%27 = OpLogicalAnd %v4bool %23 %26
%28 = OpLogicalOr %v4bool %18 %27
%16 = OpSelect %v4int %28 %30 %rhs
%31 = OpSRem %v4int %lhs %16
OpReturnValue %31
%tint_return_flag = OpVariable %_ptr_Function_bool Function %19
%tint_return_value = OpVariable %_ptr_Function_v4int Function %22
%24 = OpIEqual %v4bool %rhs %22
%28 = OpIEqual %v4bool %lhs %27
%31 = OpIEqual %v4bool %rhs %30
%32 = OpLogicalAnd %v4bool %28 %31
%33 = OpLogicalOr %v4bool %24 %32
%23 = OpSelect %v4int %33 %35 %rhs
%40 = OpBitwiseOr %v4int %lhs %23
%37 = OpBitcast %v4uint %40
%43 = OpBitwiseAnd %v4uint %37 %42
%45 = OpINotEqual %v4bool %43 %44
%36 = OpAny %bool %45
OpSelectionMerge %46 None
OpBranchConditional %36 %47 %48
%47 = OpLabel
OpStore %tint_return_flag %true
%50 = OpSDiv %v4int %lhs %23
%51 = OpIMul %v4int %50 %23
%52 = OpISub %v4int %lhs %51
OpStore %tint_return_value %52
OpBranch %46
%48 = OpLabel
OpStore %tint_return_flag %true
%53 = OpSRem %v4int %lhs %23
OpStore %tint_return_value %53
OpBranch %46
%46 = OpLabel
%54 = OpLoad %v4int %tint_return_value
OpReturnValue %54
OpFunctionEnd
%foo = OpFunction %void None %7
%33 = OpLabel
%38 = OpAccessChain %_ptr_StorageBuffer_v4int %v %uint_0 %uint_0
%39 = OpLoad %v4int %38
%34 = OpFunctionCall %v4int %tint_mod %39 %41
%42 = OpAccessChain %_ptr_StorageBuffer_v4int %v %uint_0 %uint_0
OpStore %42 %34
%56 = OpLabel
%60 = OpAccessChain %_ptr_StorageBuffer_v4int %v %uint_0 %uint_0
%61 = OpLoad %v4int %60
%57 = OpFunctionCall %v4int %tint_mod %61 %63
%64 = OpAccessChain %_ptr_StorageBuffer_v4int %v %uint_0 %uint_0
OpStore %64 %57
OpReturn
OpFunctionEnd