AuroraMiddleware/SPIRV-Tools
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Tools synced 2024-11-22 11:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add OpCopyMemory test to SVA. (#2885)

Browse Source 
This CL adds a test for OpCopyMemory and adds the needed IdMemorySemantics and
IdScope in order to extract the parameters.
This commit is contained in:
dan sinclair 2019-09-24 10:49:39 -04:00 committed by Steven Perron
parent 3a762d54f6
commit 71e0ba6065
2 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/sva/src/parser.js
View File

@ -170,8 +170,14 @@ export default class Parser {
// TODO(dsinclair): There are a bunch of missing types here. See
// https://github.com/KhronosGroup/SPIRV-Tools/blob/master/source/text.cpp#L210
//
// LiteralSpecConstantOpInteger
// PairLiteralIntegerIdRef
// PairIdRefLiteralInteger
// PairIdRefIdRef
if (data.kind === "IdResult" || data.kind === "IdRef"
|| data.kind === "IdResultType") {
|| data.kind === "IdResultType" || data.kind === "IdScope"
|| data.kind === "IdMemorySemantics") {
if (t.type !== TokenType.kResultId) {
this.error_ = t.line + ": expected result id";
return undefined;

33
tools/sva/src/parser_test.js
View File

@ -456,9 +456,34 @@ OpKill`;
// let input = "%sum = OpSpecConstantOp %i32 IAdd %a %b";
});
it.skip("handles OpCopyMemory", () => {
// let input = "OpCopyMemory %1 %2 " +
// "Volatile|Nontemporal|MakePointerVisible %3 " +
// "Aligned|MakePointerAvailable|NonPrivatePointer 16 %4";
it("handles OpCopyMemory", () => {
let input = "OpCopyMemory %1 %2 " +
"Volatile|Nontemporal|MakePointerVisible %3 " +
"Aligned|MakePointerAvailable|NonPrivatePointer 16 %4";
let l = new Lexer(input);
let p = new Parser(grammar, l);
let ast = p.parse();
assert.exists(ast, p.error);
assert.lengthOf(ast.instructions(), 1);
let inst = ast.instruction(0);
assert.lengthOf(inst.operands(), 4);
assert.equal(inst.operand(0).value(), 1);
assert.equal(inst.operand(1).value(), 2);
assert.equal(inst.operand(2).name(),
"Volatile|Nontemporal|MakePointerVisible");
assert.equal(inst.operand(2).value(), 21);
assert.lengthOf(inst.operand(2).params(), 1);
assert.equal(inst.operand(2).params()[0].value(), 3);
assert.equal(inst.operand(3).name(),
"Aligned|MakePointerAvailable|NonPrivatePointer");
assert.equal(inst.operand(3).value(), 42);
assert.lengthOf(inst.operand(3).params(), 2);
assert.equal(inst.operand(3).params()[0].value(), 16);
assert.equal(inst.operand(3).params()[1].value(), 4);
});
});