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

[validation] implement the pair of entry point stage and name must be unique

Browse Source 
This CL implements the following rule:
v-0020: The pair of <entry point name, pipeline stage> must be unique in the module

Bug: tint: 6
Change-Id: Id0c50438861b251d48a9f8dcb8a23556327c965c
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/27380
Reviewed-by: dan sinclair <dsinclair@chromium.org>
Commit-Queue: Sarah Mashayekhi <sarahmashay@google.com>
This commit is contained in:
Sarah Mashayekhi 2020-08-25 21:22:07 +00:00 committed by Commit Bot service account
parent 6a0e28b624
commit fc1327f1d9
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/validator_function_test.cc
View File

@ -313,8 +313,7 @@ TEST_F(ValidateFunctionTest, EntryPointFunctionWithParams_Fail) {
"'vtx_func'"); "'vtx_func'");
} }
TEST_F(ValidateFunctionTest, TEST_F(ValidateFunctionTest, EntryPointFunctionPairMustBeUniqueDuplicate_Fail) {
DISABLED_EntryPointFunctionPairMustBeUniqueDuplicate_Fail) {
// entry_point vertex = vtx_main // entry_point vertex = vtx_main
// entry_point vertex = vtx_main // entry_point vertex = vtx_main
// fn vtx_main() -> void { return; } // fn vtx_main() -> void { return; }
@ -337,11 +336,11 @@ TEST_F(ValidateFunctionTest,
EXPECT_TRUE(td()->Determine()) << td()->error(); EXPECT_TRUE(td()->Determine()) << td()->error();
EXPECT_FALSE(v()->Validate(mod())); EXPECT_FALSE(v()->Validate(mod()));
EXPECT_EQ(v()->error(), EXPECT_EQ(v()->error(),
"12:34: v-0020: Entry point and function pair must be unique"); "12:34: v-0020: The pair of <entry point name, pipeline stage> "
"must be unique");
} }
TEST_F(ValidateFunctionTest, TEST_F(ValidateFunctionTest, EntryPointFunctionPairMustBeUniqueTowVertex_Fail) {
DISABLED_EntryPointFunctionPairMustBeUniqueTowVertex_Fail) {
// entry_point vertex as "main" = vtx_func1 // entry_point vertex as "main" = vtx_func1
// entry_point vertex as "main" = vtx_func0 // entry_point vertex as "main" = vtx_func0
// fn vtx_func1() -> void { return; } // fn vtx_func1() -> void { return; }
@ -373,11 +372,12 @@ TEST_F(ValidateFunctionTest,
EXPECT_TRUE(td()->Determine()) << td()->error(); EXPECT_TRUE(td()->Determine()) << td()->error();
EXPECT_FALSE(v()->Validate(mod())); EXPECT_FALSE(v()->Validate(mod()));
EXPECT_EQ(v()->error(), EXPECT_EQ(v()->error(),
"12:34: v-0020: Entry point and function pair must be unique"); "12:34: v-0020: The pair of <entry point name, pipeline stage> "
"must be unique");
} }
TEST_F(ValidateFunctionTest, TEST_F(ValidateFunctionTest,
DISABLED_EntryPointFunctionPairMustBeUniqueSameFuncDiffStage_Pass) { EntryPointFunctionPairMustBeUniqueSameFuncDiffStage_Pass) {
// entry_point vertex as "main" = vtx_func // entry_point vertex as "main" = vtx_func
// entry_point fragment as "main" = vtx_func // entry_point fragment as "main" = vtx_func
// fn vtx_func() -> void { return; } // fn vtx_func() -> void { return; }

17
src/validator_impl.cc
View File

@ -73,6 +73,8 @@ bool ValidatorImpl::ValidateGlobalVariables(
} }
bool ValidatorImpl::ValidateEntryPoints(const ast::EntryPointList& eps) { bool ValidatorImpl::ValidateEntryPoints(const ast::EntryPointList& eps) {
ScopeStack<ast::PipelineStage> entry_point_map;
entry_point_map.push_scope();
for (const auto& ep : eps) { for (const auto& ep : eps) {
auto* ep_ptr = ep.get(); auto* ep_ptr = ep.get();
if (!function_stack_.has(ep_ptr->function_name())) { if (!function_stack_.has(ep_ptr->function_name())) {
@ -81,6 +83,7 @@ bool ValidatorImpl::ValidateEntryPoints(const ast::EntryPointList& eps) {
ep_ptr->function_name() + "'"); ep_ptr->function_name() + "'");
return false; return false;
} }
ast::Function* func; ast::Function* func;
function_stack_.get(ep_ptr->function_name(), &func); function_stack_.get(ep_ptr->function_name(), &func);
if (!func->return_type()->IsVoid()) { if (!func->return_type()->IsVoid()) {
@ -89,13 +92,27 @@ bool ValidatorImpl::ValidateEntryPoints(const ast::EntryPointList& eps) {
ep_ptr->function_name() + "'"); ep_ptr->function_name() + "'");
return false; return false;
} }
if (func->params().size() != 0) { if (func->params().size() != 0) {
set_error(ep_ptr->source(), set_error(ep_ptr->source(),
"v-0023: Entry point function must accept no parameters: '" + "v-0023: Entry point function must accept no parameters: '" +
ep_ptr->function_name() + "'"); ep_ptr->function_name() + "'");
return false; return false;
} }
ast::PipelineStage pipeline_stage;
if (entry_point_map.get(ep_ptr->name(), &pipeline_stage)) {
if (pipeline_stage == ep_ptr->stage()) {
set_error(ep_ptr->source(),
"v-0020: The pair of <entry point name, pipeline stage> must "
"be unique");
return false;
}
}
entry_point_map.set(ep_ptr->name(), ep_ptr->stage());
} }
entry_point_map.pop_scope();
return true; return true;
} }