mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-15 13:28:59 +00:00
Code Activity

Add -hidden option to submod

Browse source
This commit is contained in:
Eddie Hung 2019-11-26 11:35:15 -08:00
parent eb666b4677
commit 435d33c373
1 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
passes/hierarchy/submod.cc
View file

@ -37,6 +37,7 @@ struct SubmodWorker
pool<SigBit> outputs; pool<SigBit> outputs;
bool copy_mode; bool copy_mode;
bool hidden_mode;
std::string opt_name; std::string opt_name;
struct SubModule struct SubModule
@ -149,13 +150,16 @@ struct SubmodWorker
else else
new_wire_name = stringf("%s[%d]", wire->name.c_str(), bit.offset); new_wire_name = stringf("%s[%d]", wire->name.c_str(), bit.offset);
if (new_wire_port_input || new_wire_port_output) { if (new_wire_port_input || new_wire_port_output) {
while (new_wire_name[0] == '$') { if (new_wire_name[0] == '$')
std::string next_wire_name = stringf("\\n%d", auto_name_counter++); do {
if (all_wire_names.count(next_wire_name) == 0) { std::string next_wire_name = stringf("%s\\n%d", hidden_mode ? "$submod" : ":", auto_name_counter++);
all_wire_names.insert(next_wire_name); if (all_wire_names.count(next_wire_name) == 0) {
new_wire_name = next_wire_name; all_wire_names.insert(next_wire_name);
} new_wire_name = next_wire_name;
} }
} while (new_wire_name[0] == '$');
else
new_wire_name = stringf("$submod%s\n", new_wire_name.c_str());
} }
RTLIL::Wire *new_wire = new_mod->addWire(new_wire_name); RTLIL::Wire *new_wire = new_mod->addWire(new_wire_name);
@ -211,8 +215,8 @@ struct SubmodWorker
} }
} }
SubmodWorker(RTLIL::Design *design, RTLIL::Module *module, bool copy_mode = false, std::string opt_name = std::string()) : SubmodWorker(RTLIL::Design *design, RTLIL::Module *module, bool copy_mode = false, bool hidden_mode = false, std::string opt_name = std::string()) :
design(design), module(module), sigmap(module), copy_mode(copy_mode), opt_name(opt_name) design(design), module(module), sigmap(module), copy_mode(copy_mode), hidden_mode(hidden_mode), opt_name(opt_name)
{ {
if (!design->selected_whole_module(module->name) && opt_name.empty()) if (!design->selected_whole_module(module->name) && opt_name.empty())
return; return;
@ -318,6 +322,11 @@ struct SubmodPass : public Pass {
log(" objects from one module might be selected. the value of the -name option\n"); log(" objects from one module might be selected. the value of the -name option\n");
log(" is used as the value of the 'submod' attribute instead.\n"); log(" is used as the value of the 'submod' attribute instead.\n");
log("\n"); log("\n");
log(" -hidden\n");
log(" instead of creating submodule ports with public names, create ports with\n");
log(" private names so that a subsequent 'flatten; clean' call will restore the\n");
log(" original module with original public names.\n");
log("\n");
} }
void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE
{ {
@ -326,6 +335,7 @@ struct SubmodPass : public Pass {
std::string opt_name; std::string opt_name;
bool copy_mode = false; bool copy_mode = false;
bool hidden_mode = false;
size_t argidx; size_t argidx;
for (argidx = 1; argidx < args.size(); argidx++) { for (argidx = 1; argidx < args.size(); argidx++) {
@ -337,6 +347,10 @@ struct SubmodPass : public Pass {
copy_mode = true; copy_mode = true;
continue; continue;
} }
if (args[argidx] == "-hidden") {
hidden_mode = true;
continue;
}
break; break;
} }
extra_args(args, argidx, design); extra_args(args, argidx, design);
@ -357,7 +371,7 @@ struct SubmodPass : public Pass {
queued_modules.push_back(mod_it.first); queued_modules.push_back(mod_it.first);
for (auto &modname : queued_modules) for (auto &modname : queued_modules)
if (design->modules_.count(modname) != 0) { if (design->modules_.count(modname) != 0) {
SubmodWorker worker(design, design->modules_[modname], copy_mode); SubmodWorker worker(design, design->modules_[modname], copy_mode, hidden_mode);
handled_modules.insert(modname); handled_modules.insert(modname);
did_something = true; did_something = true;
} }
@ -380,7 +394,7 @@ struct SubmodPass : public Pass {
else { else {
Pass::call_on_module(design, module, "opt_clean"); Pass::call_on_module(design, module, "opt_clean");
log_header(design, "Continuing SUBMOD pass.\n"); log_header(design, "Continuing SUBMOD pass.\n");
SubmodWorker worker(design, module, copy_mode, opt_name); SubmodWorker worker(design, module, copy_mode, hidden_mode, opt_name);
} }
} }