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

Bugfix: report the correct location for wrong opcode.

Browse Source 
Also add more tests for the "<result-id> = <opcode> <operand>.."
format.
This commit is contained in:
Lei Zhang 2015-08-21 11:52:03 -04:00 committed by Dejan Mircevski
parent ee87cc2a1e
commit 977e9bcfc6
2 changed files with 83 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/text.cpp
View File

@ -540,10 +540,11 @@ spv_result_t spvTextEncodeOpcode(
spvCheck(spvTextAdvance(text, position),
DIAGNOSTIC << "Expected opcode, found end of stream.";
return SPV_ERROR_INVALID_TEXT);
error = spvTextWordGet(text, position, opcodeName, &nextPosition);
spvCheck(error, return error);
spvCheck(!spvStartsWithOp(text, position),
DIAGNOSTIC << "Invalid Opcode prefix '" << opcodeName << "'.";
return SPV_ERROR_INVALID_TEXT);
error = spvTextWordGet(text, position, opcodeName, &nextPosition);
}
// NOTE: The table contains Opcode names without the "Op" prefix.

81
test/TextToBinary.cpp
View File

@ -343,6 +343,39 @@ TEST_F(TextToBinaryTest, StringSpace) {
}
}
// TODO(antiagainst): we might not want to support both instruction formats in
// the future. Only the "<result-id> = <opcode> <operand>.." one may survive.
TEST_F(TextToBinaryTest, InstructionTwoFormats) {
SetText(R"(
OpCapability Shader
%glsl450 = OpExtInstImport "GLSL.std.450"
OpMemoryModel Logical Simple
OpTypeBool %3
%4 = OpTypeInt 8 0
OpTypeInt %5 8 1
%6 = OpTypeInt 16 0
OpTypeInt %7 16 1
%void = OpTypeVoid
OpTypeFloat %float 32
%const1.5 = OpConstant $float 1.5
OpTypeFunction %fnMain $void
%main = OpFunction $void None $fnMain
OpLabel %lbMain
%result = OpExtInst $float $glsl450 Round $const1.5
OpReturn
OpFunctionEnd
)");
EXPECT_EQ(SPV_SUCCESS, spvTextToBinary(&text, opcodeTable, operandTable,
extInstTable, &binary, &diagnostic));
if (binary) {
spvBinaryDestroy(binary);
}
if (diagnostic) {
spvDiagnosticPrint(diagnostic);
}
}
TEST_F(TextToBinaryTest, UnknownBeginningOfInsruction) {
SetText(R"(
OpSource OpenCL 12
@ -361,3 +394,51 @@ Google
diagnostic->error);
if (binary) spvBinaryDestroy(binary);
}
TEST_F(TextToBinaryTest, NoEqualSign) {
SetText(R"(
OpSource OpenCL 12
OpMemoryModel Physical64 OpenCL
%2
)");
EXPECT_EQ(SPV_ERROR_INVALID_TEXT,
spvTextToBinary(&text, opcodeTable, operandTable, extInstTable,
&binary, &diagnostic));
EXPECT_EQ(5, diagnostic->position.line + 1);
EXPECT_EQ(1, diagnostic->position.column + 1);
EXPECT_STREQ("Expected '=', found end of stream.", diagnostic->error);
if (binary) spvBinaryDestroy(binary);
}
TEST_F(TextToBinaryTest, NoOpCode) {
SetText(R"(
OpSource OpenCL 12
OpMemoryModel Physical64 OpenCL
%2 =
)");
EXPECT_EQ(SPV_ERROR_INVALID_TEXT,
spvTextToBinary(&text, opcodeTable, operandTable, extInstTable,
&binary, &diagnostic));
EXPECT_EQ(5, diagnostic->position.line + 1);
EXPECT_EQ(1, diagnostic->position.column + 1);
EXPECT_STREQ("Expected opcode, found end of stream.", diagnostic->error);
if (binary) spvBinaryDestroy(binary);
}
TEST_F(TextToBinaryTest, WrongOpCode) {
SetText(R"(
OpSource OpenCL 12
OpMemoryModel Physical64 OpenCL
%2 = Wahahaha
)");
EXPECT_EQ(SPV_ERROR_INVALID_TEXT,
spvTextToBinary(&text, opcodeTable, operandTable, extInstTable,
&binary, &diagnostic));
EXPECT_EQ(4, diagnostic->position.line + 1);
EXPECT_EQ(6, diagnostic->position.column + 1);
EXPECT_STREQ("Invalid Opcode prefix 'Wahahaha'.", diagnostic->error);
if (binary) spvBinaryDestroy(binary);
}