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 write __dummy_o__ for -symbols too

Browse source
This commit is contained in:
Eddie Hung 2019-02-21 17:03:18 -08:00
parent 07036b8bf7
commit 5180338e80
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
backends/aiger/xaiger.cc
View file

@ -368,7 +368,7 @@ struct XAigerWriter
} }
} }
void write_aiger(std::ostream &f, bool ascii_mode, bool miter_mode, bool symbols_mode) void write_aiger(std::ostream &f, bool ascii_mode, bool miter_mode, bool symbols_mode, bool omode)
{ {
int aig_obc = aig_o; int aig_obc = aig_o;
int aig_obcj = aig_obc; int aig_obcj = aig_obc;
@ -449,6 +449,7 @@ struct XAigerWriter
{ {
dict<string, vector<string>> symbols; dict<string, vector<string>> symbols;
bool output_seen = false;
for (auto wire : module->wires()) for (auto wire : module->wires())
{ {
//if (wire->name[0] == '$') //if (wire->name[0] == '$')
@ -458,14 +459,8 @@ struct XAigerWriter
for (int i = 0; i < GetSize(wire); i++) for (int i = 0; i < GetSize(wire); i++)
{ {
if (sig[i].wire == nullptr) { RTLIL::SigBit b(wire, i);
if (wire->port_output) if (input_bits.count(b) || ci_bits.count(b)) {
sig[i] = SigBit(wire, i);
else
continue;
}
if (input_bits.count(sig[i]) || ci_bits.count(SigSpec(sig[i]))) {
int a = aig_map.at(sig[i]); int a = aig_map.at(sig[i]);
log_assert((a & 1) == 0); log_assert((a & 1) == 0);
if (GetSize(wire) != 1) if (GetSize(wire) != 1)
@ -474,8 +469,9 @@ struct XAigerWriter
symbols[stringf("i%d", (a >> 1)-1)].push_back(stringf("%s", log_id(wire))); symbols[stringf("i%d", (a >> 1)-1)].push_back(stringf("%s", log_id(wire)));
} }
if (output_bits.count(SigSpec(wire, i)) || co_bits.count(SigSpec(wire, i))) { if (output_bits.count(b) || co_bits.count(b)) {
int o = ordered_outputs.at(SigSpec(wire, i)); int o = ordered_outputs.at(b);
output_seen = !miter_mode;
if (GetSize(wire) != 1) if (GetSize(wire) != 1)
symbols[stringf("%c%d", miter_mode ? 'b' : 'o', o)].push_back(stringf("%s[%d]", log_id(wire), i)); symbols[stringf("%c%d", miter_mode ? 'b' : 'o', o)].push_back(stringf("%s[%d]", log_id(wire), i));
else else
@ -502,6 +498,9 @@ struct XAigerWriter
} }
} }
if (omode && !output_seen)
symbols["o0"].push_back("__dummy_o__");
symbols.sort(); symbols.sort();
for (auto &sym : symbols) { for (auto &sym : symbols) {
@ -692,7 +691,7 @@ struct XAigerBackend : public Backend {
log_error("Can't find top module in current design!\n"); log_error("Can't find top module in current design!\n");
XAigerWriter writer(top_module, zinit_mode, imode, omode, bmode); XAigerWriter writer(top_module, zinit_mode, imode, omode, bmode);
writer.write_aiger(*f, ascii_mode, miter_mode, symbols_mode); writer.write_aiger(*f, ascii_mode, miter_mode, symbols_mode, omode);
if (!map_filename.empty()) { if (!map_filename.empty()) {
std::ofstream mapf; std::ofstream mapf;