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

Tidy up write_xaiger

This commit is contained in:
Eddie Hung 2019-02-16 08:48:33 -08:00
parent 2c1655ae94
commit 0c409e6d8c
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
backends/aiger/xaiger.cc
View File

@ -137,7 +137,7 @@ struct XAigerWriter
if (bit.wire == nullptr) { if (bit.wire == nullptr) {
if (wire->port_output) { if (wire->port_output) {
aig_map[wirebit] = (bit == State::S1) ? 1 : 0; aig_map[wirebit] = (bit == State::S1) ? 1 : 0;
//output_bits.insert(wirebit); output_bits.insert(wirebit);
} }
continue; continue;
} }
@ -151,7 +151,7 @@ struct XAigerWriter
if (wire->port_output) { if (wire->port_output) {
if (bit != wirebit) if (bit != wirebit)
alias_map[wirebit] = bit; alias_map[wirebit] = bit;
//output_bits.insert(wirebit); output_bits.insert(wirebit);
} }
} }
} }
@ -168,8 +168,6 @@ struct XAigerWriter
{ {
SigBit A = sigmap(cell->getPort("\\A").as_bit()); SigBit A = sigmap(cell->getPort("\\A").as_bit());
SigBit Y = sigmap(cell->getPort("\\Y").as_bit()); SigBit Y = sigmap(cell->getPort("\\Y").as_bit());
if (Y.wire->port_output)
output_bits.insert(Y);
unused_bits.erase(A); unused_bits.erase(A);
undriven_bits.erase(Y); undriven_bits.erase(Y);
not_map[Y] = A; not_map[Y] = A;
@ -191,8 +189,6 @@ struct XAigerWriter
SigBit A = sigmap(cell->getPort("\\A").as_bit()); SigBit A = sigmap(cell->getPort("\\A").as_bit());
SigBit B = sigmap(cell->getPort("\\B").as_bit()); SigBit B = sigmap(cell->getPort("\\B").as_bit());
SigBit Y = sigmap(cell->getPort("\\Y").as_bit()); SigBit Y = sigmap(cell->getPort("\\Y").as_bit());
if (Y.wire->port_output)
output_bits.insert(Y);
unused_bits.erase(A); unused_bits.erase(A);
unused_bits.erase(B); unused_bits.erase(B);
undriven_bits.erase(Y); undriven_bits.erase(Y);
@ -229,9 +225,11 @@ struct XAigerWriter
} }
// Do some CI/CO post-processing: // Do some CI/CO post-processing:
// Erase all COs that are undriven // Erase all POs and COs that are undriven
for (auto bit : undriven_bits) for (auto bit : undriven_bits) {
co_bits.erase(bit); co_bits.erase(bit);
output_bits.erase(bit);
}
// Erase all CIs that are also COs or POs // Erase all CIs that are also COs or POs
for (auto bit : co_bits) for (auto bit : co_bits)
ci_bits.erase(bit); ci_bits.erase(bit);