encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-06-06 14:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-enable spirv reader tests after spirv-tools roll.

Browse Source 
The SPIR-V tools roll to pull in the correct spelling of `preceded` has
landed. This CL re-enables the SPIRV-Reader tests with the correct
spelling.

Bug: tint:1406
Change-Id: I303b4b6d742f4bfcc76c6fcce66e4e1cef37b1af
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/104464
Commit-Queue: Dan Sinclair <dsinclair@chromium.org>
Reviewed-by: David Neto <dneto@google.com>
This commit is contained in:
dan sinclair 2022-10-03 18:58:09 +00:00 committed by Dawn LUCI CQ
parent 01b885bfde
commit d94a10ba7e
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/tint/reader/spirv/function_cfg_test.cc
View File

@ -2210,9 +2210,7 @@ TEST_F(SpvParserCFGTest, ComputeBlockOrder_Loop_Body_Switch_CaseContinues) {
EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 30, 45, 40, 49, 50, 99)) << assembly; EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 30, 45, 40, 49, 50, 99)) << assembly;
} }
// TODO(crbug.com/tint/1406): Re-enable with the typo fix (preceeded->preceded) TEST_F(SpvParserCFGTest, ComputeBlockOrder_Loop_BodyHasSwitchContinueBreak) {
// once that typo fix is rolled in Tint's SPIRV-Tools.
TEST_F(SpvParserCFGTest, DISABLED_ComputeBlockOrder_Loop_BodyHasSwitchContinueBreak) {
auto assembly = CommonTypes() + R"( auto assembly = CommonTypes() + R"(
%100 = OpFunction %void None %voidfn %100 = OpFunction %void None %voidfn
@ -2227,9 +2225,6 @@ TEST_F(SpvParserCFGTest, DISABLED_ComputeBlockOrder_Loop_BodyHasSwitchContinueBr
; OpSwitch must be preceded by a selection merge ; OpSwitch must be preceded by a selection merge
OpSwitch %selector %99 50 %50 ; default is break, 50 is continue OpSwitch %selector %99 50 %50 ; default is break, 50 is continue
%40 = OpLabel
OpBranch %50
%50 = OpLabel %50 = OpLabel
OpBranch %20 OpBranch %20
@ -2241,7 +2236,7 @@ TEST_F(SpvParserCFGTest, DISABLED_ComputeBlockOrder_Loop_BodyHasSwitchContinueBr
auto p = parser(test::Assemble(assembly)); auto p = parser(test::Assemble(assembly));
EXPECT_FALSE(p->Parse()); EXPECT_FALSE(p->Parse());
EXPECT_FALSE(p->success()); EXPECT_FALSE(p->success());
EXPECT_THAT(p->error(), HasSubstr("OpSwitch must be preceeded by an OpSelectionMerge")); EXPECT_THAT(p->error(), HasSubstr("OpSwitch must be preceded by an OpSelectionMerge"));
} }
TEST_F(SpvParserCFGTest, ComputeBlockOrder_Loop_Continue_Sequence) { TEST_F(SpvParserCFGTest, ComputeBlockOrder_Loop_Continue_Sequence) {
@ -2381,9 +2376,7 @@ TEST_F(SpvParserCFGTest, ComputeBlockOrder_Loop_Continue_HasBreakUnless) {
EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 30, 50, 99)); EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 30, 50, 99));
} }
// TODO(crbug.com/tint/1406): Re-enable with the typo fix (preceeded->preceded) TEST_F(SpvParserCFGTest, ComputeBlockOrder_Loop_Continue_SwitchBreak) {
// once that typo fix is rolled in Tint's SPIRV-Tools.
TEST_F(SpvParserCFGTest, DISABLED_ComputeBlockOrder_Loop_Continue_SwitchBreak) {
auto assembly = CommonTypes() + R"( auto assembly = CommonTypes() + R"(
%100 = OpFunction %void None %voidfn %100 = OpFunction %void None %voidfn
@ -2410,7 +2403,7 @@ TEST_F(SpvParserCFGTest, DISABLED_ComputeBlockOrder_Loop_Continue_SwitchBreak) {
auto p = parser(test::Assemble(assembly)); auto p = parser(test::Assemble(assembly));
EXPECT_FALSE(p->Parse()); EXPECT_FALSE(p->Parse());
EXPECT_FALSE(p->success()); EXPECT_FALSE(p->success());
EXPECT_THAT(p->error(), HasSubstr("OpSwitch must be preceeded by an OpSelectionMerge")); EXPECT_THAT(p->error(), HasSubstr("OpSwitch must be preceded by an OpSelectionMerge"));
} }
TEST_F(SpvParserCFGTest, ComputeBlockOrder_Loop_Loop) { TEST_F(SpvParserCFGTest, ComputeBlockOrder_Loop_Loop) {