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

Fix abc9's scc breaker, also break on abc_scc_break attr

This commit is contained in:
Eddie Hung 2019-06-24 21:53:18 -07:00
parent 9dca024a30
commit 49a762ba46
1 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
passes/techmap/abc9.cc
View File

@ -80,9 +80,6 @@ void handle_loops(RTLIL::Design *design)
{ {
Pass::call(design, "scc -set_attr abc_scc_id {}"); Pass::call(design, "scc -set_attr abc_scc_id {}");
design->selection_stack.emplace_back(false);
RTLIL::Selection& sel = design->selection_stack.back();
// For every unique SCC found, (arbitrarily) find the first // For every unique SCC found, (arbitrarily) find the first
// cell in the component, and select (and mark) all its output // cell in the component, and select (and mark) all its output
// wires // wires
@ -92,24 +89,49 @@ void handle_loops(RTLIL::Design *design)
if (it != cell->attributes.end()) { if (it != cell->attributes.end()) {
auto r = ids_seen.insert(it->second); auto r = ids_seen.insert(it->second);
if (r.second) { if (r.second) {
for (const auto &c : cell->connections()) { for (auto &c : cell->connections_) {
if (c.second.is_fully_const()) continue; if (c.second.is_fully_const()) continue;
if (cell->output(c.first)) { if (cell->output(c.first)) {
SigBit b = c.second.as_bit(); SigBit b = c.second.as_bit();
Wire *w = b.wire; Wire *w = b.wire;
log_assert(!w->port_input);
w->port_input = true;
w = module->wire(stringf("%s.abci", log_id(w->name)));
if (!w)
w = module->addWire(stringf("%s.abci", log_id(b.wire->name)), GetSize(b.wire));
log_assert(b.offset < GetSize(w));
w->port_output = true;
w->set_bool_attribute("\\abc_scc_break"); w->set_bool_attribute("\\abc_scc_break");
sel.select(module, w); module->swap_names(b.wire, w);
c.second = RTLIL::SigBit(w, b.offset);
} }
} }
} }
cell->attributes.erase(it); cell->attributes.erase(it);
} }
RTLIL::Module* box_module = design->module(cell->type);
if (box_module) {
auto jt = box_module->attributes.find("\\abc_scc_break");
if (jt != box_module->attributes.end()) {
auto it = cell->connections_.find(RTLIL::escape_id(jt->second.decode_string()));
log_assert(it != cell->connections_.end());
auto &c = *it;
SigBit b = cell->getPort(RTLIL::escape_id(jt->second.decode_string()));
Wire *w = b.wire;
log_assert(!w->port_output);
w->port_output = true;
w->set_bool_attribute("\\abc_scc_break");
w = module->wire(stringf("%s.abci", log_id(w->name)));
if (!w)
w = module->addWire(stringf("%s.abci", log_id(b.wire->name)), GetSize(b.wire));
log_assert(b.offset < GetSize(w));
w->port_input = true;
c.second = RTLIL::SigBit(w, b.offset);
}
}
} }
// Then cut those selected wires to expose them as new PO/PI module->fixup_ports();
Pass::call(design, "expose -cut -sep .abc");
design->selection_stack.pop_back();
} }
std::string add_echos_to_abc_cmd(std::string str) std::string add_echos_to_abc_cmd(std::string str)