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

Fix FXC compile errors on modulo by zero

Browse Source 
Just like for divide, FXC fails with the exact same error when
performing a modulo on a value that FXC determines to be zero. We
address it in the same way as we do for divide.

This also fixes a couple of the vk-gl-cts tests for which I manually
generated expectation files for.

Bug: tint:1083
Change-Id: Ia388bf002112afded542adb791d37e88e35a77ff
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/74220
Reviewed-by: James Price <jrprice@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Antonio Maiorano <amaiorano@google.com>
This commit is contained in:
Antonio Maiorano
2021-12-22 15:02:09 +00:00
committed by Tint LUCI CQ
parent cc4d97b6e3
commit 9943de6813
159 changed files with 1965 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/expressions/binary/mod_by_zero/by_expression/scalar-vec3/i32.wgsl Normal file
View File

@@ -0,0 +1,6 @@
[[stage(compute), workgroup_size(1)]]
fn f() {
var a = 4;
var b = vec3<i32>(0, 2, 0);
let r : vec3<i32> = a % (b + b);
}

11
test/expressions/binary/mod_by_zero/by_expression/scalar-vec3/i32.wgsl.expected.hlsl Normal file
View File

@@ -0,0 +1,11 @@
int3 value_or_one_if_zero_int3(int3 value) {
return value == int3(0, 0, 0) ? int3(1, 1, 1) : value;
}
[numthreads(1, 1, 1)]
void f() {
int a = 4;
int3 b = int3(0, 2, 0);
const int3 r = (a % value_or_one_if_zero_int3((b + b)));
return;
}

10
test/expressions/binary/mod_by_zero/by_expression/scalar-vec3/i32.wgsl.expected.msl Normal file
View File

@@ -0,0 +1,10 @@
#include <metal_stdlib>
using namespace metal;
kernel void f() {
int a = 4;
int3 b = int3(0, 2, 0);
int3 const r = (a % as_type<int3>((as_type<uint3>(b) + as_type<uint3>(b))));
return;
}

39
test/expressions/binary/mod_by_zero/by_expression/scalar-vec3/i32.wgsl.expected.spvasm Normal file
View File

@@ -0,0 +1,39 @@
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 24
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint GLCompute %f "f"
OpExecutionMode %f LocalSize 1 1 1
OpName %f "f"
OpName %a "a"
OpName %b "b"
%void = OpTypeVoid
%1 = OpTypeFunction %void
%int = OpTypeInt 32 1
%int_4 = OpConstant %int 4
%_ptr_Function_int = OpTypePointer Function %int
%9 = OpConstantNull %int
%v3int = OpTypeVector %int 3
%int_0 = OpConstant %int 0
%int_2 = OpConstant %int 2
%13 = OpConstantComposite %v3int %int_0 %int_2 %int_0
%_ptr_Function_v3int = OpTypePointer Function %v3int
%16 = OpConstantNull %v3int
%f = OpFunction %void None %1
%4 = OpLabel
%a = OpVariable %_ptr_Function_int Function %9
%b = OpVariable %_ptr_Function_v3int Function %16
%22 = OpVariable %_ptr_Function_v3int Function %16
OpStore %a %int_4
OpStore %b %13
%17 = OpLoad %int %a
%18 = OpLoad %v3int %b
%19 = OpLoad %v3int %b
%20 = OpIAdd %v3int %18 %19
%23 = OpCompositeConstruct %v3int %17 %17 %17
%21 = OpSMod %v3int %23 %20
OpReturn
OpFunctionEnd

6
test/expressions/binary/mod_by_zero/by_expression/scalar-vec3/i32.wgsl.expected.wgsl Normal file
View File

@@ -0,0 +1,6 @@
[[stage(compute), workgroup_size(1)]]
fn f() {
var a = 4;
var b = vec3<i32>(0, 2, 0);
let r : vec3<i32> = (a % (b + b));
}

6
test/expressions/binary/mod_by_zero/by_expression/scalar-vec3/u32.wgsl Normal file
View File

@@ -0,0 +1,6 @@
[[stage(compute), workgroup_size(1)]]
fn f() {
var a = 4u;
var b = vec3<u32>(0u, 2u, 0u);
let r : vec3<u32> = a % (b + b);
}

11
test/expressions/binary/mod_by_zero/by_expression/scalar-vec3/u32.wgsl.expected.hlsl Normal file
View File

@@ -0,0 +1,11 @@
uint3 value_or_one_if_zero_uint3(uint3 value) {
return value == uint3(0u, 0u, 0u) ? uint3(1u, 1u, 1u) : value;
}
[numthreads(1, 1, 1)]
void f() {
uint a = 4u;
uint3 b = uint3(0u, 2u, 0u);
const uint3 r = (a % value_or_one_if_zero_uint3((b + b)));
return;
}

10
test/expressions/binary/mod_by_zero/by_expression/scalar-vec3/u32.wgsl.expected.msl Normal file
View File

@@ -0,0 +1,10 @@
#include <metal_stdlib>
using namespace metal;
kernel void f() {
uint a = 4u;
uint3 b = uint3(0u, 2u, 0u);
uint3 const r = (a % (b + b));
return;
}

39
test/expressions/binary/mod_by_zero/by_expression/scalar-vec3/u32.wgsl.expected.spvasm Normal file
View File

@@ -0,0 +1,39 @@
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 24
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint GLCompute %f "f"
OpExecutionMode %f LocalSize 1 1 1
OpName %f "f"
OpName %a "a"
OpName %b "b"
%void = OpTypeVoid
%1 = OpTypeFunction %void
%uint = OpTypeInt 32 0
%uint_4 = OpConstant %uint 4
%_ptr_Function_uint = OpTypePointer Function %uint
%9 = OpConstantNull %uint
%v3uint = OpTypeVector %uint 3
%uint_0 = OpConstant %uint 0
%uint_2 = OpConstant %uint 2
%13 = OpConstantComposite %v3uint %uint_0 %uint_2 %uint_0
%_ptr_Function_v3uint = OpTypePointer Function %v3uint
%16 = OpConstantNull %v3uint
%f = OpFunction %void None %1
%4 = OpLabel
%a = OpVariable %_ptr_Function_uint Function %9
%b = OpVariable %_ptr_Function_v3uint Function %16
%22 = OpVariable %_ptr_Function_v3uint Function %16
OpStore %a %uint_4
OpStore %b %13
%17 = OpLoad %uint %a
%18 = OpLoad %v3uint %b
%19 = OpLoad %v3uint %b
%20 = OpIAdd %v3uint %18 %19
%23 = OpCompositeConstruct %v3uint %17 %17 %17
%21 = OpUMod %v3uint %23 %20
OpReturn
OpFunctionEnd

6
test/expressions/binary/mod_by_zero/by_expression/scalar-vec3/u32.wgsl.expected.wgsl Normal file
View File

@@ -0,0 +1,6 @@
[[stage(compute), workgroup_size(1)]]
fn f() {
var a = 4u;
var b = vec3<u32>(0u, 2u, 0u);
let r : vec3<u32> = (a % (b + b));
}