riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Suppress warnings for empty `select` arguments when `-count` or `-assert-*` options are set.

This commit is contained in:
Alberto Gonzalez 2020-03-23 06:31:41 +00:00
parent 1b333d49ef
commit ca4e5dd56e
No known key found for this signature in database
GPG Key ID: 8395A8BA109708B2
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
passes/cmds/select.cc
View File

@ -625,7 +625,7 @@ static void select_filter_active_mod(RTLIL::Design *design, RTLIL::Selection &se
} }
} }
static void select_stmt(RTLIL::Design *design, std::string arg) static void select_stmt(RTLIL::Design *design, std::string arg, bool disable_empty_warning = false)
{ {
std::string arg_mod, arg_memb; std::string arg_mod, arg_memb;
std::unordered_map<std::string, bool> arg_mod_found; std::unordered_map<std::string, bool> arg_mod_found;
@ -913,12 +913,12 @@ static void select_stmt(RTLIL::Design *design, std::string arg)
select_filter_active_mod(design, work_stack.back()); select_filter_active_mod(design, work_stack.back());
for (auto &it : arg_mod_found) { for (auto &it : arg_mod_found) {
if (it.second == false) { if (it.second == false && !disable_empty_warning) {
log_warning("Selection \"%s\" did not match any module.\n", it.first.c_str()); log_warning("Selection \"%s\" did not match any module.\n", it.first.c_str());
} }
} }
for (auto &it : arg_memb_found) { for (auto &it : arg_memb_found) {
if (it.second == false) { if (it.second == false && !disable_empty_warning) {
log_warning("Selection \"%s\" did not match any object.\n", it.first.c_str()); log_warning("Selection \"%s\" did not match any object.\n", it.first.c_str());
} }
} }
@ -1311,7 +1311,8 @@ struct SelectPass : public Pass {
} }
if (arg.size() > 0 && arg[0] == '-') if (arg.size() > 0 && arg[0] == '-')
log_cmd_error("Unknown option %s.\n", arg.c_str()); log_cmd_error("Unknown option %s.\n", arg.c_str());
select_stmt(design, arg); bool disable_empty_warning = count_mode || assert_none || assert_any || (assert_count != -1) || (assert_max != -1) || (assert_min != -1);
select_stmt(design, arg, disable_empty_warning);
sel_str += " " + arg; sel_str += " " + arg;
} }

2
tests/select/no_warn_assert.ys Normal file
View File

@ -0,0 +1,2 @@
logger -expect-no-warnings
select -assert-count 0 top/t:ff4 top/w:d0 %co:+[d] %i