encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tint/tests: Actually validate the generated WGSL 

We weren't actually enabling WGSL validating in Tint in the E2E test
runner.

Mark a few tests as SKIP for cases that do not actually validate.

Change-Id: I62a55ce701f704d744c32f2cd5cb97683e270e96
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/117960
Commit-Queue: James Price <jrprice@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Kokoro: James Price <jrprice@google.com>
Kokoro: Ben Clayton <bclayton@google.com>
This commit is contained in:
James Price 2023-01-27 16:33:30 +00:00 committed by Dawn LUCI CQ
parent 89b78094e6
commit 61feebef38
4 changed files with 179 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/tint/bug/chromium/1395241.wgsl.expected.wgsl
View File

@ -1,3 +1,8 @@
SKIP: WGSL generator adds parenthesis which increases nesting depth
fn fr6snorm() {
var bzbxttch = (~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(-(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(-(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(9223372036854775807)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))) % 5);
}
bug/chromium/1395241.wgsl:2:145 error: maximum parser recursive depth reached
var bzbxttch = (~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(-(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(-(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(~(9223372036854775807)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))) % 5);
^

42
test/tint/vk-gl-cts/graphicsfuzz/cov-fold-negate-min-int-value/0-opt.spvasm.expected.wgsl Normal file
View File

@ -0,0 +1,42 @@
SKIP: triggers crbug.com/tint/1818
struct buf0 {
/* @offset(0) */
minusOne : i32,
}
@group(0) @binding(0) var<uniform> x_7 : buf0;
var<private> x_GLF_color : vec4<f32>;
fn main_1() {
var minValue : i32;
var negMinValue : i32;
minValue = -2147483648i;
let x_25 : i32 = minValue;
negMinValue = -(x_25);
let x_27 : i32 = negMinValue;
let x_28 : i32 = minValue;
let x_30 : i32 = x_7.minusOne;
if ((x_27 == (x_28 * x_30))) {
x_GLF_color = vec4<f32>(1.0f, 0.0f, 0.0f, 1.0f);
} else {
x_GLF_color = vec4<f32>(0.0f, 0.0f, 0.0f, 0.0f);
}
return;
}
struct main_out {
@location(0)
x_GLF_color_1 : vec4<f32>,
}
@fragment
fn main() -> main_out {
main_1();
return main_out(x_GLF_color);
}
vk-gl-cts/graphicsfuzz/cov-fold-negate-min-int-value/0-opt.spvasm:13:15 error: value cannot be represented as 'i32'
minValue = -2147483648i;
^

131
test/tint/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-negative-left-shift/0-opt.spvasm.expected.wgsl Normal file
View File

@ -0,0 +1,131 @@
SKIP: triggers crbug.com/tint/1818
struct strided_arr {
@size(16)
el : f32,
}
alias Arr = array<strided_arr, 3u>;
struct buf1 {
/* @offset(0) */
x_GLF_uniform_float_values : Arr,
}
struct strided_arr_1 {
@size(16)
el : i32,
}
alias Arr_1 = array<strided_arr_1, 4u>;
struct buf0 {
/* @offset(0) */
x_GLF_uniform_int_values : Arr_1,
}
@group(0) @binding(1) var<uniform> x_6 : buf1;
@group(0) @binding(0) var<uniform> x_9 : buf0;
var<private> x_GLF_color : vec4<f32>;
fn main_1() {
var A : array<f32, 2u>;
var i : i32;
var j : i32;
var x_101 : bool;
var x_102 : bool;
let x_39 : f32 = x_6.x_GLF_uniform_float_values[1i].el;
A[0i] = x_39;
let x_42 : f32 = x_6.x_GLF_uniform_float_values[1i].el;
A[1i] = x_42;
let x_45 : i32 = x_9.x_GLF_uniform_int_values[0i].el;
i = x_45;
loop {
let x_50 : i32 = i;
let x_52 : i32 = x_9.x_GLF_uniform_int_values[3i].el;
if ((x_50 < x_52)) {
} else {
break;
}
let x_56 : i32 = x_9.x_GLF_uniform_int_values[0i].el;
j = x_56;
loop {
let x_61 : i32 = j;
let x_63 : i32 = x_9.x_GLF_uniform_int_values[2i].el;
if ((x_61 < x_63)) {
} else {
break;
}
let x_66 : i32 = j;
switch(x_66) {
case 1i: {
let x_78 : i32 = i;
let x_80 : f32 = x_6.x_GLF_uniform_float_values[0i].el;
A[x_78] = x_80;
}
case 0i: {
let x_70 : i32 = i;
if ((-2147483648i < x_70)) {
continue;
}
let x_74 : i32 = i;
let x_76 : f32 = x_6.x_GLF_uniform_float_values[2i].el;
A[x_74] = x_76;
}
default: {
}
}
continuing {
let x_82 : i32 = j;
j = (x_82 + 1i);
}
}
continuing {
let x_84 : i32 = i;
i = (x_84 + 1i);
}
}
let x_87 : i32 = x_9.x_GLF_uniform_int_values[0i].el;
let x_89 : f32 = A[x_87];
let x_91 : f32 = x_6.x_GLF_uniform_float_values[0i].el;
let x_92 : bool = (x_89 == x_91);
x_102 = x_92;
if (x_92) {
let x_96 : i32 = x_9.x_GLF_uniform_int_values[1i].el;
let x_98 : f32 = A[x_96];
let x_100 : f32 = x_6.x_GLF_uniform_float_values[0i].el;
x_101 = (x_98 == x_100);
x_102 = x_101;
}
if (x_102) {
let x_107 : i32 = x_9.x_GLF_uniform_int_values[1i].el;
let x_110 : i32 = x_9.x_GLF_uniform_int_values[0i].el;
let x_113 : i32 = x_9.x_GLF_uniform_int_values[0i].el;
let x_116 : i32 = x_9.x_GLF_uniform_int_values[1i].el;
x_GLF_color = vec4<f32>(f32(x_107), f32(x_110), f32(x_113), f32(x_116));
} else {
let x_120 : i32 = x_9.x_GLF_uniform_int_values[1i].el;
let x_121 : f32 = f32(x_120);
x_GLF_color = vec4<f32>(x_121, x_121, x_121, x_121);
}
return;
}
struct main_out {
@location(0)
x_GLF_color_1 : vec4<f32>,
}
@fragment
fn main() -> main_out {
main_1();
return main_out(x_GLF_color);
}
vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-negative-left-shift/0-opt.spvasm:68:17 error: value cannot be represented as 'i32'
if ((-2147483648i < x_70)) {
^

1
tools/src/cmd/test-runner/main.go
View File

@ -607,6 +607,7 @@ func (j job) run(cfg runConfig) {
validate := false
switch j.format {
case wgsl:
args = append(args, "--validate") // wgsl validation uses Tint, so is always available
validate = true
case spvasm, glsl:
args = append(args, "--validate") // spirv-val and glslang are statically linked, always available