mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-10-31 03:32:29 +00:00
Code Activity

Merge pull request #4700 from povik/select-list-mod

Browse source 
Add `select -list-mod`
This commit is contained in:
Lofty 2024-11-04 15:38:42 +00:00 • committed by GitHub
commit 3250f2b82b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
passes/cmds/logger.cc
View file

@ -162,7 +162,8 @@ struct LoggerPass : public Pass {
log_cmd_error("Number of expected messages must be higher then 0 !\n"); log_cmd_error("Number of expected messages must be higher then 0 !\n");
if (type=="error" && count!=1) if (type=="error" && count!=1)
log_cmd_error("Expected error message occurrences must be 1 !\n"); log_cmd_error("Expected error message occurrences must be 1 !\n");
log("Added regex '%s' for warnings to expected %s list.\n", pattern.c_str(), type.c_str()); log("Added regex '%s' to expected %s messages list.\n",
pattern.c_str(), type.c_str());
try { try {
if (type == "error") if (type == "error")
log_expect_error[pattern] = LogExpectedItem(YS_REGEX_COMPILE(pattern), count); log_expect_error[pattern] = LogExpectedItem(YS_REGEX_COMPILE(pattern), count);

12
passes/cmds/select.cc
View file

@ -1041,7 +1041,7 @@ struct SelectPass : public Pass {
log(" select [ -add | -del | -set <name> ] {-read <filename> | <selection>}\n"); log(" select [ -add | -del | -set <name> ] {-read <filename> | <selection>}\n");
log(" select [ -unset <name> ]\n"); log(" select [ -unset <name> ]\n");
log(" select [ <assert_option> ] {-read <filename> | <selection>}\n"); log(" select [ <assert_option> ] {-read <filename> | <selection>}\n");
log(" select [ -list | -write <filename> | -count | -clear ]\n"); log(" select [ -list | -list-mod | -write <filename> | -count | -clear ]\n");
log(" select -module <modname>\n"); log(" select -module <modname>\n");
log("\n"); log("\n");
log("Most commands use the list of currently selected objects to determine which part\n"); log("Most commands use the list of currently selected objects to determine which part\n");
@ -1277,6 +1277,7 @@ struct SelectPass : public Pass {
bool clear_mode = false; bool clear_mode = false;
bool none_mode = false; bool none_mode = false;
bool list_mode = false; bool list_mode = false;
bool list_mod_mode = false;
bool count_mode = false; bool count_mode = false;
bool got_module = false; bool got_module = false;
bool assert_none = false; bool assert_none = false;
@ -1338,6 +1339,11 @@ struct SelectPass : public Pass {
list_mode = true; list_mode = true;
continue; continue;
} }
if (arg == "-list-mod") {
list_mode = true;
list_mod_mode = true;
continue;
}
if (arg == "-write" && argidx+1 < args.size()) { if (arg == "-write" && argidx+1 < args.size()) {
write_file = args[++argidx]; write_file = args[++argidx];
continue; continue;
@ -1416,7 +1422,7 @@ struct SelectPass : public Pass {
log_cmd_error("Options %s can not be combined.\n", common_flagset); log_cmd_error("Options %s can not be combined.\n", common_flagset);
if ((list_mode || !write_file.empty() || count_mode) && common_flagset_tally) if ((list_mode || !write_file.empty() || count_mode) && common_flagset_tally)
log_cmd_error("Options -list, -write and -count can not be combined with %s.\n", common_flagset); log_cmd_error("Options -list, -list-mod, -write and -count can not be combined with %s.\n", common_flagset);
if (!set_name.empty() && (list_mode || !write_file.empty() || count_mode || !unset_name.empty() || common_flagset_tally)) if (!set_name.empty() && (list_mode || !write_file.empty() || count_mode || !unset_name.empty() || common_flagset_tally))
log_cmd_error("Option -set can not be combined with -list, -write, -count, -unset, %s.\n", common_flagset); log_cmd_error("Option -set can not be combined with -list, -write, -count, -unset, %s.\n", common_flagset);
@ -1467,7 +1473,7 @@ struct SelectPass : public Pass {
{ {
if (sel->selected_whole_module(mod->name) && list_mode) if (sel->selected_whole_module(mod->name) && list_mode)
log("%s\n", id2cstr(mod->name)); log("%s\n", id2cstr(mod->name));
if (sel->selected_module(mod->name)) { if (sel->selected_module(mod->name) && !list_mod_mode) {
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))
LOG_OBJECT("%s/%s\n", id2cstr(mod->name), id2cstr(wire->name)) LOG_OBJECT("%s/%s\n", id2cstr(mod->name), id2cstr(wire->name))

13
tests/select/list_mod.ys Normal file
View file

@ -0,0 +1,13 @@
read_verilog <<EOF
module top1;
(* foo *)
wire w;
endmodule
module top2;
(* bar *)
wire w;
endmodule
EOF
logger -expect log top1 1
select -list-mod a:foo %m