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

Merge pull request #3324 from jix/confusing-select-errors 

select: Fix -assert-none and -assert-any error output and docs
This commit is contained in:
Jannis Harder 2022-05-20 17:40:40 +02:00 committed by GitHub
parent 015ca4ddac fc65ea47df
commit 795c445159
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
passes/cmds/select.cc
View File

@ -944,12 +944,14 @@ static void select_stmt(RTLIL::Design *design, std::string arg, bool disable_emp
} }
} }
static std::string describe_selection_for_assert(RTLIL::Design *design, RTLIL::Selection *sel) static std::string describe_selection_for_assert(RTLIL::Design *design, RTLIL::Selection *sel, bool whole_modules = false)
{ {
std::string desc = "Selection contains:\n"; std::string desc = "Selection contains:\n";
for (auto mod : design->modules()) for (auto mod : design->modules())
{ {
if (sel->selected_module(mod->name)) { if (sel->selected_module(mod->name)) {
if (whole_modules && sel->selected_whole_module(mod->name))
desc += stringf("%s\n", id2cstr(mod->name));
for (auto wire : mod->wires()) for (auto wire : mod->wires())
if (sel->selected_member(mod->name, wire->name)) if (sel->selected_member(mod->name, wire->name))
desc += stringf("%s/%s\n", id2cstr(mod->name), id2cstr(wire->name)); desc += stringf("%s/%s\n", id2cstr(mod->name), id2cstr(wire->name));
@ -1051,17 +1053,17 @@ struct SelectPass : public Pass {
log("\n"); log("\n");
log(" -unset <name>\n"); log(" -unset <name>\n");
log(" do not modify the current selection. instead remove a previously saved\n"); log(" do not modify the current selection. instead remove a previously saved\n");
log(" selection under the given name (see @<name> below)."); log(" selection under the given name (see @<name> below).\n");
log("\n"); log("\n");
log(" -assert-none\n"); log(" -assert-none\n");
log(" do not modify the current selection. instead assert that the given\n"); log(" do not modify the current selection. instead assert that the given\n");
log(" selection is empty. i.e. produce an error if any object matching the\n"); log(" selection is empty. i.e. produce an error if any object or module\n");
log(" selection is found.\n"); log(" matching the selection is found.\n");
log("\n"); log("\n");
log(" -assert-any\n"); log(" -assert-any\n");
log(" do not modify the current selection. instead assert that the given\n"); log(" do not modify the current selection. instead assert that the given\n");
log(" selection is non-empty. i.e. produce an error if no object matching\n"); log(" selection is non-empty. i.e. produce an error if no object or module\n");
log(" the selection is found.\n"); log(" matching the selection is found.\n");
log("\n"); log("\n");
log(" -assert-count N\n"); log(" -assert-count N\n");
log(" do not modify the current selection. instead assert that the given\n"); log(" do not modify the current selection. instead assert that the given\n");
@ -1488,7 +1490,7 @@ struct SelectPass : public Pass {
{ {
RTLIL::Selection *sel = &work_stack.back(); RTLIL::Selection *sel = &work_stack.back();
sel->optimize(design); sel->optimize(design);
std::string desc = describe_selection_for_assert(design, sel); std::string desc = describe_selection_for_assert(design, sel, true);
log_error("Assertion failed: selection is not empty:%s\n%s", sel_str.c_str(), desc.c_str()); log_error("Assertion failed: selection is not empty:%s\n%s", sel_str.c_str(), desc.c_str());
} }
return; return;
@ -1503,7 +1505,7 @@ struct SelectPass : public Pass {
{ {
RTLIL::Selection *sel = &work_stack.back(); RTLIL::Selection *sel = &work_stack.back();
sel->optimize(design); sel->optimize(design);
std::string desc = describe_selection_for_assert(design, sel); std::string desc = describe_selection_for_assert(design, sel, true);
log_error("Assertion failed: selection is empty:%s\n%s", sel_str.c_str(), desc.c_str()); log_error("Assertion failed: selection is empty:%s\n%s", sel_str.c_str(), desc.c_str());
} }
return; return;