mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-11-03 21:09:12 +00:00
Code Activity

abc9 to stitch results with CI/CO properly

Browse source
This commit is contained in:
Eddie Hung 2019-02-15 11:52:34 -08:00
parent 8d757224ee
commit 956ee545c5
1 changed files with 32 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

48
passes/techmap/abc9.cc
View file

@ -645,7 +645,7 @@ void abc9_module(RTLIL::Design *design, RTLIL::Module *current_module, std::stri
for (auto &c : conn.second.chunks()) { for (auto &c : conn.second.chunks()) {
if (c.width == 0) if (c.width == 0)
continue; continue;
log_assert(c.width == 1); //log_assert(c.width == 1);
newsig.append(module->wires_[remap_name(c.wire->name)]); newsig.append(module->wires_[remap_name(c.wire->name)]);
} }
cell->setPort(conn.first, newsig); cell->setPort(conn.first, newsig);
@ -653,9 +653,7 @@ void abc9_module(RTLIL::Design *design, RTLIL::Module *current_module, std::stri
design->select(module, cell); design->select(module, cell);
} }
// FIXME: Better way to clean out module contents? // Copy connections (and rename) from mapped_mod to module
module->connections_.clear();
for (auto conn : mapped_mod->connections()) { for (auto conn : mapped_mod->connections()) {
if (!conn.first.is_fully_const()) { if (!conn.first.is_fully_const()) {
auto chunks = conn.first.chunks(); auto chunks = conn.first.chunks();
@ -701,30 +699,46 @@ void abc9_module(RTLIL::Design *design, RTLIL::Module *current_module, std::stri
// module->connect(conn); // module->connect(conn);
// } // }
pool<RTLIL::SigBit> output_bits;
std::vector<RTLIL::SigSig> connections;
// Stitch in mapped_mod's inputs/outputs into module
for (auto &it : mapped_mod->wires_) { for (auto &it : mapped_mod->wires_) {
RTLIL::Wire *w = it.second; RTLIL::Wire *w = it.second;
if (!w->port_input && !w->port_output) if (!w->port_input && !w->port_output)
continue; continue;
RTLIL::Wire *wire = module->wire(remap_name(w->name)); RTLIL::Wire *wire = module->wire(w->name);
RTLIL::Wire *remap_wire = module->wire(remap_name(w->name));
if (w->port_input) { if (w->port_input) {
RTLIL::SigSig conn; RTLIL::SigSig conn;
conn.first = wire; log_assert(GetSize(wire) >= GetSize(remap_wire));
conn.second = module->wire(w->name); conn.first = remap_wire;
if (conn.second.empty()) conn.second = RTLIL::SigSpec(wire, 0, GetSize(remap_wire));
log_error("Input port %s not found in original module.\n", w->name.c_str());
in_wires++; in_wires++;
module->connect(conn); connections.emplace_back(std::move(conn));
printf("INPUT: assign %s = %s\n", remap_wire->name.c_str(), w->name.c_str());
} }
else if (w->port_output) { else if (w->port_output) {
RTLIL::SigSig conn; RTLIL::SigSig conn;
conn.first = module->wire(w->name); log_assert(GetSize(wire) >= GetSize(remap_wire));
if (conn.first.empty()) conn.first = RTLIL::SigSpec(wire, 0, GetSize(remap_wire));
log_error("Output port %s not found in original module.\n", w->name.c_str()); conn.second = remap_wire;
conn.second = wire; for (int i = 0; i < GetSize(remap_wire); i++)
out_wires++; output_bits.insert({wire, i});
module->connect(conn); printf("OUTPUT: assign %s = %s\n", w->name.c_str(), remap_wire->name.c_str());
connections.emplace_back(std::move(conn));
} }
else log_abort();
} }
auto f = [&output_bits](RTLIL::SigSpec &s) {
if (!s.is_bit()) return;
RTLIL::SigBit b = s.as_bit();
if (output_bits.count(b))
s = RTLIL::State::Sx;
};
module->rewrite_sigspecs(f);
for (const auto &c : connections)
module->connect(c);
//log("ABC RESULTS: internal signals: %8d\n", int(signal_list.size()) - in_wires - out_wires); //log("ABC RESULTS: internal signals: %8d\n", int(signal_list.size()) - in_wires - out_wires);
log("ABC RESULTS: input signals: %8d\n", in_wires); log("ABC RESULTS: input signals: %8d\n", in_wires);
log("ABC RESULTS: output signals: %8d\n", out_wires); log("ABC RESULTS: output signals: %8d\n", out_wires);
@ -736,6 +750,8 @@ void abc9_module(RTLIL::Design *design, RTLIL::Module *current_module, std::stri
// log("Don't call ABC as there is nothing to map.\n"); // log("Don't call ABC as there is nothing to map.\n");
//} //}
Pass::call(design, "clean");
if (cleanup) if (cleanup)
{ {
log("Removing temp directory.\n"); log("Removing temp directory.\n");