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

write_xaiger to treat unknown cell connections as keep-s

Browse source
This commit is contained in:
Eddie Hung 2019-07-02 19:14:30 -07:00
parent 9c556e3c02
commit 10524064e9
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
backends/aiger/xaiger.cc
View file

@ -138,6 +138,7 @@ struct XAigerWriter
{ {
pool<SigBit> undriven_bits; pool<SigBit> undriven_bits;
pool<SigBit> unused_bits; pool<SigBit> unused_bits;
pool<SigBit> keep_bits;
// promote public wires // promote public wires
for (auto wire : module->wires()) for (auto wire : module->wires())
@ -168,6 +169,9 @@ struct XAigerWriter
unused_bits.insert(bit); unused_bits.insert(bit);
} }
if (keep)
keep_bits.insert(bit);
if (wire->port_input || keep) { if (wire->port_input || keep) {
if (bit != wirebit) if (bit != wirebit)
alias_map[bit] = wirebit; alias_map[bit] = wirebit;
@ -235,7 +239,7 @@ struct XAigerWriter
log_assert(!holes_mode); log_assert(!holes_mode);
RTLIL::Module* inst_module = module->design->module(cell->type); RTLIL::Module* inst_module = module->design->module(cell->type);
if (inst_module && inst_module->attributes.count("\\abc_box_id")) { if (inst_module && inst_module->attributes.count("\\abc_box_id")) {
abc_box_seen = true; abc_box_seen = true;
if (!holes_mode) { if (!holes_mode) {
@ -255,10 +259,11 @@ struct XAigerWriter
} }
} }
else { else {
bool cell_known = cell->known();
for (const auto &c : cell->connections()) { for (const auto &c : cell->connections()) {
if (c.second.is_fully_const()) continue; if (c.second.is_fully_const()) continue;
auto is_input = cell->input(c.first); auto is_input = !cell_known || cell->input(c.first);
auto is_output = cell->output(c.first); auto is_output = !cell_known || cell->output(c.first);
if (!is_input && !is_output) if (!is_input && !is_output)
log_error("Connection '%s' on cell '%s' (type '%s') not recognised!\n", log_id(c.first), log_id(cell), log_id(cell->type)); log_error("Connection '%s' on cell '%s' (type '%s') not recognised!\n", log_id(c.first), log_id(cell), log_id(cell->type));
@ -266,12 +271,15 @@ struct XAigerWriter
for (auto b : c.second.bits()) { for (auto b : c.second.bits()) {
Wire *w = b.wire; Wire *w = b.wire;
if (!w) continue; if (!w) continue;
if (!w->port_output) { if (!w->port_output || !cell_known) {
SigBit I = sigmap(b); SigBit I = sigmap(b);
if (I != b) if (I != b)
alias_map[b] = I; alias_map[b] = I;
output_bits.insert(b); output_bits.insert(b);
unused_bits.erase(b); unused_bits.erase(b);
if (!cell_known)
keep_bits.insert(b);
} }
} }
} }
@ -424,7 +432,7 @@ struct XAigerWriter
auto jt = input_bits.find(b); auto jt = input_bits.find(b);
if (jt != input_bits.end()) { if (jt != input_bits.end()) {
log_assert(b.wire->attributes.count("\\keep")); log_assert(keep_bits.count(O));
input_bits.erase(b); input_bits.erase(b);
} }
} }
@ -444,7 +452,7 @@ struct XAigerWriter
// with $inout.out suffix, make it a PO driven by the existing inout, and // with $inout.out suffix, make it a PO driven by the existing inout, and
// inherit existing inout's drivers // inherit existing inout's drivers
if ((wire->port_input && wire->port_output && !undriven_bits.count(bit)) if ((wire->port_input && wire->port_output && !undriven_bits.count(bit))
|| wire->attributes.count("\\keep")) { || keep_bits.count(bit)) {
RTLIL::IdString wire_name = wire->name.str() + "$inout.out"; RTLIL::IdString wire_name = wire->name.str() + "$inout.out";
RTLIL::Wire *new_wire = module->wire(wire_name); RTLIL::Wire *new_wire = module->wire(wire_name);
if (!new_wire) if (!new_wire)