Add explanatory comment about inefficient wire removal and remove superfluous call to `fixup_ports()`.

Co-Authored-By: Eddie Hung <eddie@fpgeh.com>
This commit is contained in:
Alberto Gonzalez 2020-03-30 18:08:25 +00:00
parent 6040593994
commit b538c6fbf2
No known key found for this signature in database
GPG Key ID: 8395A8BA109708B2
1 changed files with 8 additions and 4 deletions

View File

@ -1458,12 +1458,17 @@ RTLIL::IdString AstModule::derive(RTLIL::Design *design, dict<RTLIL::IdString, R
// Now that the interfaces have been exploded, we can delete the dummy port related to every interface. // Now that the interfaces have been exploded, we can delete the dummy port related to every interface.
for(auto &intf : interfaces) { for(auto &intf : interfaces) {
if(mod->wire(intf.first) != nullptr) { if(mod->wire(intf.first) != nullptr) {
// Normally, removing wires would be batched together as it's an
// expensive operation, however, in this case doing so would mean
// that a cell with the same name cannot be created (below)...
// Since we won't expect many interfaces to exist in a module,
// we can let this slide...
pool<RTLIL::Wire*> to_remove; pool<RTLIL::Wire*> to_remove;
to_remove.insert(mod->wire(intf.first)); to_remove.insert(mod->wire(intf.first));
mod->remove(to_remove); mod->remove(to_remove);
mod->fixup_ports(); mod->fixup_ports();
// We copy the cell of the interface to the sub-module such that it can further be found if it is propagated // We copy the cell of the interface to the sub-module such that it
// down to sub-sub-modules etc. // can further be found if it is propagated down to sub-sub-modules etc.
RTLIL::Cell *new_subcell = mod->addCell(intf.first, intf.second->name); RTLIL::Cell *new_subcell = mod->addCell(intf.first, intf.second->name);
new_subcell->set_bool_attribute("\\is_interface"); new_subcell->set_bool_attribute("\\is_interface");
} }
@ -1471,7 +1476,6 @@ RTLIL::IdString AstModule::derive(RTLIL::Design *design, dict<RTLIL::IdString, R
log_error("No port with matching name found (%s) in %s. Stopping\n", log_id(intf.first), modname.c_str()); log_error("No port with matching name found (%s) in %s. Stopping\n", log_id(intf.first), modname.c_str());
} }
} }
mod->fixup_ports();
// If any interfaces were replaced, set the attribute 'interfaces_replaced_in_module': // If any interfaces were replaced, set the attribute 'interfaces_replaced_in_module':
if (interfaces.size() > 0) { if (interfaces.size() > 0) {