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

Use a cell_cache to instantiate once rather than opt_merge call

This commit is contained in:
Eddie Hung 2019-09-30 13:21:07 -07:00
parent a6994c5f16
commit 74678227c7
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
backends/aiger/xaiger.cc
View File

@ -804,20 +804,23 @@ struct XAigerWriter
RTLIL::Module *holes_module = module->design->addModule("$__holes__"); RTLIL::Module *holes_module = module->design->addModule("$__holes__");
log_assert(holes_module); log_assert(holes_module);
dict<IdString, Cell*> cell_cache;
int port_id = 1; int port_id = 1;
int box_count = 0; int box_count = 0;
for (auto cell : box_list) { for (auto cell : box_list) {
RTLIL::Module* box_module = module->design->module(cell->type); RTLIL::Module* box_module = module->design->module(cell->type);
if (box_module->get_bool_attribute("\\abc9_flop")) { log_assert(box_module);
auto derived_name = box_module->derive(module->design, cell->parameters); IdString derived_name = box_module->derive(module->design, cell->parameters);
box_module = module->design->module(derived_name); box_module = module->design->module(derived_name);
}
int box_inputs = 0, box_outputs = 0; int box_inputs = 0, box_outputs = 0;
Cell *holes_cell = nullptr; auto r = cell_cache.insert(std::make_pair(derived_name, nullptr));
if (box_module->get_bool_attribute("\\whitebox")) { Cell *holes_cell = r.first->second;
if (r.second && !holes_cell && box_module->get_bool_attribute("\\whitebox")) {
holes_cell = holes_module->addCell(cell->name, cell->type); holes_cell = holes_module->addCell(cell->name, cell->type);
holes_cell->parameters = cell->parameters; holes_cell->parameters = cell->parameters;
r.first->second = holes_cell;
} }
// NB: Assume box_module->ports are sorted alphabetically // NB: Assume box_module->ports are sorted alphabetically
@ -827,7 +830,7 @@ struct XAigerWriter
log_assert(w); log_assert(w);
RTLIL::Wire *holes_wire; RTLIL::Wire *holes_wire;
RTLIL::SigSpec port_wire; RTLIL::SigSpec port_wire;
if (w->port_input) { if (w->port_input)
for (int i = 0; i < GetSize(w); i++) { for (int i = 0; i < GetSize(w); i++) {
box_inputs++; box_inputs++;
holes_wire = holes_module->wire(stringf("\\i%d", box_inputs)); holes_wire = holes_module->wire(stringf("\\i%d", box_inputs));
@ -840,9 +843,6 @@ struct XAigerWriter
if (holes_cell) if (holes_cell)
port_wire.append(holes_wire); port_wire.append(holes_wire);
} }
if (!port_wire.empty())
holes_cell->setPort(w->name, port_wire);
}
if (w->port_output) { if (w->port_output) {
box_outputs += GetSize(w); box_outputs += GetSize(w);
for (int i = 0; i < GetSize(w); i++) { for (int i = 0; i < GetSize(w); i++) {
@ -858,8 +858,12 @@ struct XAigerWriter
else else
holes_module->connect(holes_wire, State::S0); holes_module->connect(holes_wire, State::S0);
} }
if (!port_wire.empty()) }
if (!port_wire.empty()) {
if (r.second)
holes_cell->setPort(w->name, port_wire); holes_cell->setPort(w->name, port_wire);
else
holes_module->connect(port_wire, holes_cell->getPort(w->name));
} }
} }
@ -922,10 +926,6 @@ struct XAigerWriter
design->selected_active_module = holes_module->name.str(); design->selected_active_module = holes_module->name.str();
sel.select(holes_module); sel.select(holes_module);
// TODO: Should not need to opt_merge if we only instantiate
// each box type once...
Pass::call(design, "opt_merge -share_all");
Pass::call(design, "flatten -wb"); Pass::call(design, "flatten -wb");
// TODO: Should techmap/aigmap/check all lib_whitebox-es just once, // TODO: Should techmap/aigmap/check all lib_whitebox-es just once,