Skip to content

Commit

Permalink
wgsl: validate bad arg counts, arg types, must_use for log, log2
Browse files Browse the repository at this point in the history
  • Loading branch information
dneto0 committed Mar 13, 2024
1 parent f1aa942 commit 2f79a24
Show file tree
Hide file tree
Showing 3 changed files with 64 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/webgpu/listing_meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -1892,9 +1892,13 @@
"webgpu:shader,validation,expression,call,builtin,length:vec2:*": { "subcaseMS": 0.319 },
"webgpu:shader,validation,expression,call,builtin,length:vec3:*": { "subcaseMS": 1.401 },
"webgpu:shader,validation,expression,call,builtin,length:vec4:*": { "subcaseMS": 1.301 },
"webgpu:shader,validation,expression,call,builtin,log2:bad_args:*": { "subcaseMS": 4.240 },
"webgpu:shader,validation,expression,call,builtin,log2:integer_argument:*": { "subcaseMS": 1.034 },
"webgpu:shader,validation,expression,call,builtin,log2:must_use:*": { "subcaseMS": 1.149 },
"webgpu:shader,validation,expression,call,builtin,log2:values:*": { "subcaseMS": 0.398 },
"webgpu:shader,validation,expression,call,builtin,log:bad_args:*": { "subcaseMS": 15682.590 },
"webgpu:shader,validation,expression,call,builtin,log:integer_argument:*": { "subcaseMS": 1.134 },
"webgpu:shader,validation,expression,call,builtin,log:must_use:*": { "subcaseMS": 1597.590 },
"webgpu:shader,validation,expression,call,builtin,log:values:*": { "subcaseMS": 0.291 },
"webgpu:shader,validation,expression,call,builtin,modf:integer_argument:*": { "subcaseMS": 1.089 },
"webgpu:shader,validation,expression,call,builtin,modf:values:*": { "subcaseMS": 1.866 },
Expand Down
30 changes: 30 additions & 0 deletions src/webgpu/shader/validation/expression/call/builtin/log.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,33 @@ Validates that scalar and vector integer arguments are rejected by ${builtin}()
'constant'
);
});

const kGoodArgs = '(1.1)';
const kBadArgs = {
no_parens: '',
// Bad number of args
'0args': '()',
'2args': '(1.0,2.0)',
// Bad value for arg 0
'0i32': '(1i)',
'0u32': '(1u)',
'0bool': '(false)',
'0vec2u': '(vec2u())',
'0array': '(array(1.1,2.2))',
'0struct': '(modf(2.2))',
};

g.test('bad_args')
.desc(`Test compilation failure of ${builtin} with bad arguments`)
.params(u => u.combine('arg', keysOf(kBadArgs)))
.fn(t => {
t.expectCompileResult(false, `const c = ${builtin}${kBadArgs[t.params.arg]};`);
});

g.test('must_use')
.desc(`Result of ${builtin} must be used`)
.params(u => u.combine('use', [true, false]))
.fn(t => {
const use_it = t.params.use ? '_ = ' : '';
t.expectCompileResult(t.params.use, `fn f() { ${use_it}${builtin}${kGoodArgs}; }`);
});
30 changes: 30 additions & 0 deletions src/webgpu/shader/validation/expression/call/builtin/log2.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,33 @@ Validates that scalar and vector integer arguments are rejected by ${builtin}()
'constant'
);
});

const kGoodArgs = '(1.1)';
const kBadArgs = {
no_parens: '',
// Bad number of args
'0args': '()',
'2args': '(1.0,2.0)',
// Bad value for arg 0
'0i32': '(1i)',
'0u32': '(1u)',
'0bool': '(false)',
'0vec2u': '(vec2u())',
'0array': '(array(1.1,2.2))',
'0struct': '(modf(2.2))',
};

g.test('bad_args')
.desc(`Test compilation failure of ${builtin} with bad arguments`)
.params(u => u.combine('arg', keysOf(kBadArgs)))
.fn(t => {
t.expectCompileResult(false, `const c = ${builtin}${kBadArgs[t.params.arg]};`);
});

g.test('must_use')
.desc(`Result of ${builtin} must be used`)
.params(u => u.combine('use', [true, false]))
.fn(t => {
const use_it = t.params.use ? '_ = ' : '';
t.expectCompileResult(t.params.use, `fn f() { ${use_it}${builtin}${kGoodArgs}; }`);
});

0 comments on commit 2f79a24

Please sign in to comment.