encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-07-03 19:55:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve error messages raised by SpvParserTest

Browse Source 
EXPECT_THAT(xxx, Eq(yyy)) << ToString(xxx);

is a less-idiomatic way of writing:

    EXPECT_EQ(xxx, yyy);

The latter also provides a diff when two strings do not match.

Refactor these to:

    auto got = xxx;
    auto expect = yyy;
    EXPECT_EQ(got, expect);

So that the error message clearly shows which one is the generated, and which one is the reference.

Change-Id: I781437ee63abdff3a67798b09e958be603c21313
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/35507
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: dan sinclair <dsinclair@chromium.org>
This commit is contained in:
Ben Clayton 2020-12-14 20:16:29 +00:00 committed by Commit Bot service account
parent f9e8da1d06
commit ed70caf6a5
1 changed files with 57 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
src/reader/spirv/function_var_test.cc
View File

@ -655,8 +655,9 @@ TEST_F(SpvParserTest,
FunctionEmitter fe(p.get(), *spirv_function(p.get(), 100)); FunctionEmitter fe(p.get(), *spirv_function(p.get(), 100));
EXPECT_TRUE(fe.EmitBody()) << p->error(); EXPECT_TRUE(fe.EmitBody()) << p->error();
EXPECT_THAT(ToString(p->get_module(), fe.ast_body()), auto got = ToString(p->get_module(), fe.ast_body());
Eq(R"(VariableDeclStatement{ auto* expect =
R"(VariableDeclStatement{
Variable{ Variable{
x_25 x_25
function function
@ -676,7 +677,8 @@ Assignment{
} }
} }
Return{} Return{}
)")) << ToString(p->get_module(), fe.ast_body()); )";
EXPECT_EQ(expect, got);
} }
TEST_F(SpvParserTest, EmitStatement_CombinatorialValue_Immediate_UsedTwice) { TEST_F(SpvParserTest, EmitStatement_CombinatorialValue_Immediate_UsedTwice) {
@ -701,8 +703,8 @@ TEST_F(SpvParserTest, EmitStatement_CombinatorialValue_Immediate_UsedTwice) {
FunctionEmitter fe(p.get(), *spirv_function(p.get(), 100)); FunctionEmitter fe(p.get(), *spirv_function(p.get(), 100));
EXPECT_TRUE(fe.EmitBody()) << p->error(); EXPECT_TRUE(fe.EmitBody()) << p->error();
EXPECT_THAT(ToString(p->get_module(), fe.ast_body()), auto got = ToString(p->get_module(), fe.ast_body());
Eq(R"(VariableDeclStatement{ auto* expect = R"(VariableDeclStatement{
Variable{ Variable{
x_25 x_25
function function
@ -736,7 +738,8 @@ Assignment{
Identifier[not set]{x_2} Identifier[not set]{x_2}
} }
Return{} Return{}
)")) << ToString(p->get_module(), fe.ast_body()); )";
EXPECT_EQ(expect, got);
} }
TEST_F(SpvParserTest, TEST_F(SpvParserTest,
@ -772,8 +775,8 @@ TEST_F(SpvParserTest,
FunctionEmitter fe(p.get(), *spirv_function(p.get(), 100)); FunctionEmitter fe(p.get(), *spirv_function(p.get(), 100));
EXPECT_TRUE(fe.EmitBody()) << p->error(); EXPECT_TRUE(fe.EmitBody()) << p->error();
EXPECT_THAT(ToString(p->get_module(), fe.ast_body()), auto got = ToString(p->get_module(), fe.ast_body());
Eq(R"(VariableDeclStatement{ auto* expect = R"(VariableDeclStatement{
Variable{ Variable{
x_25 x_25
function function
@ -811,7 +814,8 @@ Assignment{
ScalarConstructor[not set]{2} ScalarConstructor[not set]{2}
} }
Return{} Return{}
)")) << ToString(p->get_module(), fe.ast_body()); )";
EXPECT_EQ(expect, got);
} }
TEST_F( TEST_F(
@ -870,7 +874,8 @@ TEST_F(
FunctionEmitter fe(p.get(), *spirv_function(p.get(), 100)); FunctionEmitter fe(p.get(), *spirv_function(p.get(), 100));
EXPECT_TRUE(fe.EmitBody()) << p->error(); EXPECT_TRUE(fe.EmitBody()) << p->error();
EXPECT_THAT(ToString(p->get_module(), fe.ast_body()), Eq(R"(Assignment{ auto got = ToString(p->get_module(), fe.ast_body());
auto* expect = R"(Assignment{
Identifier[not set]{x_1} Identifier[not set]{x_1}
ScalarConstructor[not set]{0} ScalarConstructor[not set]{0}
} }
@ -942,7 +947,8 @@ Assignment{
ScalarConstructor[not set]{5} ScalarConstructor[not set]{5}
} }
Return{} Return{}
)")) << ToString(p->get_module(), fe.ast_body()); )";
EXPECT_EQ(expect, got);
} }
TEST_F( TEST_F(
@ -986,8 +992,8 @@ TEST_F(
// We don't hoist x_1 into its own mutable variable. It is emitted as // We don't hoist x_1 into its own mutable variable. It is emitted as
// a const definition. // a const definition.
EXPECT_THAT(ToString(p->get_module(), fe.ast_body()), auto got = ToString(p->get_module(), fe.ast_body());
Eq(R"(VariableDeclStatement{ auto* expect = R"(VariableDeclStatement{
VariableConst{ VariableConst{
x_1 x_1
none none
@ -1019,7 +1025,8 @@ Assignment{
Identifier[not set]{x_3} Identifier[not set]{x_3}
} }
Return{} Return{}
)")) << ToString(p->get_module(), fe.ast_body()); )";
EXPECT_EQ(expect, got);
} }
TEST_F(SpvParserTest, TEST_F(SpvParserTest,
@ -1070,7 +1077,8 @@ TEST_F(SpvParserTest,
FunctionEmitter fe(p.get(), *spirv_function(p.get(), 100)); FunctionEmitter fe(p.get(), *spirv_function(p.get(), 100));
EXPECT_TRUE(fe.EmitBody()) << p->error(); EXPECT_TRUE(fe.EmitBody()) << p->error();
EXPECT_THAT(ToString(p->get_module(), fe.ast_body()), Eq(R"(If{ auto got = ToString(p->get_module(), fe.ast_body());
auto* expect = R"(If{
( (
ScalarConstructor[not set]{true} ScalarConstructor[not set]{true}
) )
@ -1109,7 +1117,8 @@ TEST_F(SpvParserTest,
} }
} }
Return{} Return{}
)")) << ToString(p->get_module(), fe.ast_body()); )";
EXPECT_EQ(expect, got);
} }
TEST_F( TEST_F(
@ -1155,7 +1164,8 @@ TEST_F(
FunctionEmitter fe(p.get(), *spirv_function(p.get(), 100)); FunctionEmitter fe(p.get(), *spirv_function(p.get(), 100));
EXPECT_TRUE(fe.EmitBody()) << p->error(); EXPECT_TRUE(fe.EmitBody()) << p->error();
EXPECT_THAT(ToString(p->get_module(), fe.ast_body()), Eq(R"(If{ auto got = ToString(p->get_module(), fe.ast_body());
auto* expect = R"(If{
( (
ScalarConstructor[not set]{true} ScalarConstructor[not set]{true}
) )
@ -1196,7 +1206,8 @@ TEST_F(
} }
} }
Return{} Return{}
)")) << ToString(p->get_module(), fe.ast_body()); )";
EXPECT_EQ(expect, got);
} }
TEST_F(SpvParserTest, TEST_F(SpvParserTest,
@ -1236,8 +1247,8 @@ TEST_F(SpvParserTest,
// We don't hoist x_1 into its own mutable variable. It is emitted as // We don't hoist x_1 into its own mutable variable. It is emitted as
// a const definition. // a const definition.
EXPECT_THAT(ToString(p->get_module(), fe.ast_body()), auto got = ToString(p->get_module(), fe.ast_body());
Eq(R"(VariableDeclStatement{ auto* expect = R"(VariableDeclStatement{
VariableConst{ VariableConst{
x_1 x_1
none none
@ -1265,7 +1276,8 @@ If{
} }
} }
Return{} Return{}
)")) << ToString(p->get_module(), fe.ast_body()); )";
EXPECT_EQ(expect, got);
} }
TEST_F(SpvParserTest, EmitStatement_Phi_SingleBlockLoopIndex) { TEST_F(SpvParserTest, EmitStatement_Phi_SingleBlockLoopIndex) {
@ -1309,7 +1321,8 @@ TEST_F(SpvParserTest, EmitStatement_Phi_SingleBlockLoopIndex) {
FunctionEmitter fe(p.get(), *spirv_function(p.get(), 100)); FunctionEmitter fe(p.get(), *spirv_function(p.get(), 100));
EXPECT_TRUE(fe.EmitBody()) << p->error(); EXPECT_TRUE(fe.EmitBody()) << p->error();
EXPECT_THAT(ToString(p->get_module(), fe.ast_body()), Eq(R"(Loop{ auto got = ToString(p->get_module(), fe.ast_body());
auto* expect = R"(Loop{
VariableDeclStatement{ VariableDeclStatement{
Variable{ Variable{
x_2_phi x_2_phi
@ -1404,7 +1417,8 @@ TEST_F(SpvParserTest, EmitStatement_Phi_SingleBlockLoopIndex) {
} }
} }
Return{} Return{}
)")) << ToString(p->get_module(), fe.ast_body()); )";
EXPECT_EQ(expect, got);
} }
TEST_F(SpvParserTest, EmitStatement_Phi_MultiBlockLoopIndex) { TEST_F(SpvParserTest, EmitStatement_Phi_MultiBlockLoopIndex) {
@ -1451,7 +1465,8 @@ TEST_F(SpvParserTest, EmitStatement_Phi_MultiBlockLoopIndex) {
FunctionEmitter fe(p.get(), *spirv_function(p.get(), 100)); FunctionEmitter fe(p.get(), *spirv_function(p.get(), 100));
EXPECT_TRUE(fe.EmitBody()) << p->error(); EXPECT_TRUE(fe.EmitBody()) << p->error();
EXPECT_THAT(ToString(p->get_module(), fe.ast_body()), Eq(R"(Loop{ auto got = ToString(p->get_module(), fe.ast_body());
auto* expect = R"(Loop{
VariableDeclStatement{ VariableDeclStatement{
Variable{ Variable{
x_2_phi x_2_phi
@ -1559,7 +1574,8 @@ TEST_F(SpvParserTest, EmitStatement_Phi_MultiBlockLoopIndex) {
} }
} }
Return{} Return{}
)")) << ToString(p->get_module(), fe.ast_body()); )";
EXPECT_EQ(expect, got);
} }
TEST_F(SpvParserTest, EmitStatement_Phi_ValueFromLoopBodyAndContinuing) { TEST_F(SpvParserTest, EmitStatement_Phi_ValueFromLoopBodyAndContinuing) {
@ -1607,8 +1623,8 @@ TEST_F(SpvParserTest, EmitStatement_Phi_ValueFromLoopBodyAndContinuing) {
FunctionEmitter fe(p.get(), *spirv_function(p.get(), 100)); FunctionEmitter fe(p.get(), *spirv_function(p.get(), 100));
EXPECT_TRUE(fe.EmitBody()) << p->error(); EXPECT_TRUE(fe.EmitBody()) << p->error();
EXPECT_THAT(ToString(p->get_module(), fe.ast_body()), auto got = ToString(p->get_module(), fe.ast_body());
Eq(R"(VariableDeclStatement{ auto* expect = R"(VariableDeclStatement{
VariableConst{ VariableConst{
x_101 x_101
none none
@ -1726,8 +1742,8 @@ Loop{
} }
} }
Return{} Return{}
)")) << ToString(p->get_module(), fe.ast_body()) )";
<< assembly; EXPECT_EQ(expect, got);
} }
TEST_F(SpvParserTest, EmitStatement_Phi_FromElseAndThen) { TEST_F(SpvParserTest, EmitStatement_Phi_FromElseAndThen) {
@ -1776,8 +1792,8 @@ TEST_F(SpvParserTest, EmitStatement_Phi_FromElseAndThen) {
FunctionEmitter fe(p.get(), *spirv_function(p.get(), 100)); FunctionEmitter fe(p.get(), *spirv_function(p.get(), 100));
EXPECT_TRUE(fe.EmitBody()) << p->error(); EXPECT_TRUE(fe.EmitBody()) << p->error();
EXPECT_THAT(ToString(p->get_module(), fe.ast_body()), auto got = ToString(p->get_module(), fe.ast_body());
Eq(R"(VariableDeclStatement{ auto* expect = R"(VariableDeclStatement{
VariableConst{ VariableConst{
x_101 x_101
none none
@ -1851,7 +1867,8 @@ Loop{
} }
} }
Return{} Return{}
)")) << ToString(p->get_module(), fe.ast_body()); )";
EXPECT_EQ(expect, got);
} }
TEST_F(SpvParserTest, EmitStatement_Phi_FromHeaderAndThen) { TEST_F(SpvParserTest, EmitStatement_Phi_FromHeaderAndThen) {
@ -1897,8 +1914,8 @@ TEST_F(SpvParserTest, EmitStatement_Phi_FromHeaderAndThen) {
FunctionEmitter fe(p.get(), *spirv_function(p.get(), 100)); FunctionEmitter fe(p.get(), *spirv_function(p.get(), 100));
EXPECT_TRUE(fe.EmitBody()) << p->error(); EXPECT_TRUE(fe.EmitBody()) << p->error();
EXPECT_THAT(ToString(p->get_module(), fe.ast_body()), auto got = ToString(p->get_module(), fe.ast_body());
Eq(R"(VariableDeclStatement{ auto* expect = R"(VariableDeclStatement{
VariableConst{ VariableConst{
x_101 x_101
none none
@ -1967,7 +1984,8 @@ Loop{
} }
} }
Return{} Return{}
)")) << ToString(p->get_module(), fe.ast_body()); )";
EXPECT_EQ(expect, got);
} }
TEST_F(SpvParserTest, EmitStatement_UseInPhiCountsAsUse) { TEST_F(SpvParserTest, EmitStatement_UseInPhiCountsAsUse) {
@ -2004,8 +2022,8 @@ TEST_F(SpvParserTest, EmitStatement_UseInPhiCountsAsUse) {
FunctionEmitter fe(p.get(), *spirv_function(p.get(), 100)); FunctionEmitter fe(p.get(), *spirv_function(p.get(), 100));
EXPECT_TRUE(fe.EmitBody()) << p->error(); EXPECT_TRUE(fe.EmitBody()) << p->error();
EXPECT_THAT(ToString(p->get_module(), fe.ast_body()), auto got = ToString(p->get_module(), fe.ast_body());
Eq(R"(VariableDeclStatement{ auto* expect = R"(VariableDeclStatement{
Variable{ Variable{
x_101_phi x_101_phi
function function
@ -2065,7 +2083,8 @@ VariableDeclStatement{
} }
} }
Return{} Return{}
)")) << ToString(p->get_module(), fe.ast_body()); )";
EXPECT_EQ(expect, got);
} }
} // namespace } // namespace