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

Added select -assert-none and -assert-any

This commit is contained in:
Clifford Wolf 2014-01-17 16:34:50 +01:00
parent f3154f5694
commit 651ce67d97
2 changed files with 47 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/rtlil.h
View File

@ -227,6 +227,9 @@ struct RTLIL::Selection {
if (!full_selection && selected_modules.count(module->name) == 0) if (!full_selection && selected_modules.count(module->name) == 0)
selected_members[module->name].insert(member->name); selected_members[module->name].insert(member->name);
} }
bool empty() const {
return !full_selection && selected_modules.empty() && selected_members.empty();
}
}; };
struct RTLIL::Design { struct RTLIL::Design {

51
passes/cmds/select.cc
View File

@ -656,6 +656,7 @@ struct SelectPass : public Pass {
// |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---| // |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
log("\n"); log("\n");
log(" select [ -add | -del | -set <name> ] <selection>\n"); log(" select [ -add | -del | -set <name> ] <selection>\n");
log(" select [ -assert-none | -assert-any ] <selection>\n");
log(" select [ -list | -write <filename> | -count | -clear ]\n"); log(" select [ -list | -write <filename> | -count | -clear ]\n");
log(" select -module <modname>\n"); log(" select -module <modname>\n");
log("\n"); log("\n");
@ -676,6 +677,14 @@ struct SelectPass : public Pass {
log(" do not modify the current selection. instead save the new selection\n"); log(" do not modify the current selection. instead save the new selection\n");
log(" under the given name (see @<name> below).\n"); log(" under the given name (see @<name> below).\n");
log("\n"); log("\n");
log(" -assert-none\n");
log(" asserts that the given selection is empty. i.e. produce an error if\n");
log(" any object matching the selection is found.\n");
log("\n");
log(" -assert-any\n");
log(" asserts that the given selection is non-empty. i.e. produce an error\n");
log(" if no object matching the selection is found.\n");
log("\n");
log(" -list\n"); log(" -list\n");
log(" list all objects in the current selection\n"); log(" list all objects in the current selection\n");
log("\n"); log("\n");
@ -802,6 +811,8 @@ struct SelectPass : public Pass {
bool list_mode = false; bool list_mode = false;
bool count_mode = false; bool count_mode = false;
bool got_module = false; bool got_module = false;
bool assert_none = false;
bool assert_any = false;
std::string write_file; std::string write_file;
std::string set_name; std::string set_name;
@ -819,6 +830,14 @@ struct SelectPass : public Pass {
del_mode = true; del_mode = true;
continue; continue;
} }
if (arg == "-assert-none") {
assert_none = true;
continue;
}
if (arg == "-assert-any") {
assert_any = true;
continue;
}
if (arg == "-clear") { if (arg == "-clear") {
clear_mode = true; clear_mode = true;
continue; continue;
@ -853,16 +872,16 @@ struct SelectPass : public Pass {
} }
if (clear_mode && args.size() != 2) if (clear_mode && args.size() != 2)
log_cmd_error("Option -clear can not be combined with other options.\n"); log_cmd_error("Option -clear can not be combined with any other options.\n");
if (add_mode && del_mode) if (add_mode + del_mode + assert_none + assert_any > 1)
log_cmd_error("Options -add and -del can not be combined.\n"); log_cmd_error("Options -add, -del, -assert-none or -assert-any can not be combined.\n");
if ((list_mode || !write_file.empty() || count_mode) && (add_mode || del_mode)) if ((list_mode || !write_file.empty() || count_mode) && (add_mode || del_mode || assert_none || assert_any))
log_cmd_error("Options -list, -write and -count can not be combined with -add or -del.\n"); log_cmd_error("Options -list, -write and -count can not be combined with -add, -del, -assert-none or -assert-any.\n");
if (!set_name.empty() && (list_mode || !write_file.empty() || count_mode || add_mode || del_mode)) if (!set_name.empty() && (list_mode || !write_file.empty() || count_mode || add_mode || del_mode || assert_none || assert_any))
log_cmd_error("Option -set can not be combined with -list, -write, -count, -add or -del.\n"); log_cmd_error("Option -set can not be combined with -list, -write, -count, -add, -del, -assert-none or -assert-any.\n");
if (work_stack.size() == 0 && got_module) { if (work_stack.size() == 0 && got_module) {
RTLIL::Selection sel; RTLIL::Selection sel;
@ -943,6 +962,24 @@ struct SelectPass : public Pass {
return; return;
} }
if (assert_none)
{
if (work_stack.size() == 0)
log_cmd_error("No selection to check.\n");
if (!work_stack.back().empty())
log_error("Assertation failed: selection is not empty.\n");
return;
}
if (assert_any)
{
if (work_stack.size() == 0)
log_cmd_error("No selection to check.\n");
if (work_stack.back().empty())
log_error("Assertation failed: selection is empty.\n");
return;
}
if (!set_name.empty()) if (!set_name.empty())
{ {
if (work_stack.size() == 0) if (work_stack.size() == 0)