encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spir-reader: fix validity of unit tests 

- skip dumping due to SPIR-V Tools validation error for Location
  conflicts for IO variables duplicated on an OpEntryPoint interface
  list (SPIRV-Tools issue #4403)
- Skip dumping for unit test for conversion of RelaxedPrecision
  decoration.

Bug: tint:1043
Change-Id: I8ce3a7660d74b771e3fa62dc39e4e030e4ba6aa1
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/59560
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: James Price <jrprice@google.com>
Commit-Queue: James Price <jrprice@google.com>
Auto-Submit: David Neto <dneto@google.com>
This commit is contained in:
David Neto 2021-07-26 17:18:26 +00:00 committed by Tint LUCI CQ
parent d77c00f419
commit 31579c92b2
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/reader/spirv/parser_impl_get_decorations_test.cc
View File

@ -118,6 +118,7 @@ TEST_F(SpvParserGetDecorationsTest, GetDecorationsForMember_RelaxedPrecision) {
EXPECT_THAT(decorations, EXPECT_THAT(decorations,
UnorderedElementsAre(Decoration{SpvDecorationRelaxedPrecision})); UnorderedElementsAre(Decoration{SpvDecorationRelaxedPrecision}));
EXPECT_TRUE(p->error().empty()); EXPECT_TRUE(p->error().empty());
p->SkipDumpingPending(kSkipReason);
} }
// TODO(dneto): Enable when ArrayStride is handled // TODO(dneto): Enable when ArrayStride is handled

28
src/reader/spirv/parser_impl_module_var_test.cc
View File

@ -5549,15 +5549,22 @@ TEST_F(SpvModuleScopeVarParserTest, RegisterInputOutputVars) {
R"( R"(
OpCapability Shader OpCapability Shader
OpMemoryModel Logical Simple OpMemoryModel Logical Simple
OpEntryPoint GLCompute %1000 "w1000" OpEntryPoint Fragment %1000 "w1000"
OpEntryPoint GLCompute %1100 "w1100" %1 OpEntryPoint Fragment %1100 "w1100" %1
OpEntryPoint GLCompute %1200 "w1200" %2 %15 OpEntryPoint Fragment %1200 "w1200" %2 %15
; duplication is tolerated prior to SPIR-V 1.4 ; duplication is tolerated prior to SPIR-V 1.4
OpEntryPoint GLCompute %1300 "w1300" %1 %15 %2 %1 OpEntryPoint Fragment %1300 "w1300" %1 %15 %2 %1
OpExecutionMode %1000 LocalSize 1 1 1 OpExecutionMode %1000 OriginUpperLeft
OpExecutionMode %1100 LocalSize 1 1 1 OpExecutionMode %1100 OriginUpperLeft
OpExecutionMode %1200 LocalSize 1 1 1 OpExecutionMode %1200 OriginUpperLeft
OpExecutionMode %1300 LocalSize 1 1 1 OpExecutionMode %1300 OriginUpperLeft
OpDecorate %1 Location 1
OpDecorate %2 Location 2
OpDecorate %5 Location 5
OpDecorate %11 Location 1
OpDecorate %12 Location 2
OpDecorate %15 Location 5
)" + CommonTypes() + )" + CommonTypes() +
R"( R"(
@ -5644,6 +5651,11 @@ TEST_F(SpvModuleScopeVarParserTest, RegisterInputOutputVars) {
EXPECT_EQ(1u, info_1300.size()); EXPECT_EQ(1u, info_1300.size());
EXPECT_THAT(info_1300[0].inputs, ElementsAre(1, 2)); EXPECT_THAT(info_1300[0].inputs, ElementsAre(1, 2));
EXPECT_THAT(info_1300[0].outputs, ElementsAre(15)); EXPECT_THAT(info_1300[0].outputs, ElementsAre(15));
// Validation incorrectly reports an overlap for the duplicated variable %1 on
// shader %1300
p->SkipDumpingPending(
"https://github.com/KhronosGroup/SPIRV-Tools/issues/4403");
} }
TEST_F(SpvModuleScopeVarParserTest, InputVarsConvertedToPrivate) { TEST_F(SpvModuleScopeVarParserTest, InputVarsConvertedToPrivate) {