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

Fix AIGER back-end for multiple symbols per input/latch/output/property

Browse source
This commit is contained in:
Clifford Wolf 2017-05-30 19:09:11 +02:00
parent 05df3dbee4
commit c365e33fd7
1 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
backends/aiger/aiger.cc
View file

@ -484,6 +484,8 @@ struct AigerWriter
if (symbols_mode) if (symbols_mode)
{ {
dict<string, vector<string>> symbols;
for (auto wire : module->wires()) for (auto wire : module->wires())
{ {
if (wire->name[0] == '$') if (wire->name[0] == '$')
@ -500,38 +502,48 @@ struct AigerWriter
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)
f << stringf("i%d %s[%d]\n", (a >> 1)-1, log_id(wire), i); symbols[stringf("i%d", (a >> 1)-1)].push_back(stringf("%s[%d]", log_id(wire), i));
else else
f << stringf("i%d %s\n", (a >> 1)-1, log_id(wire)); symbols[stringf("i%d", (a >> 1)-1)].push_back(stringf("%s", log_id(wire)));
} }
if (wire->port_output) { if (wire->port_output) {
int o = ordered_outputs.at(sig[i]); int o = ordered_outputs.at(sig[i]);
if (GetSize(wire) != 1) if (GetSize(wire) != 1)
f << stringf("%c%d %s[%d]\n", miter_mode ? 'b' : 'o', o, log_id(wire), i); symbols[stringf("%c%d", miter_mode ? 'b' : 'o', o)].push_back(stringf("%s[%d]", log_id(wire), i));
else else
f << stringf("%c%d %s\n", miter_mode ? 'b' : 'o', o, log_id(wire)); symbols[stringf("%c%d", miter_mode ? 'b' : 'o', o)].push_back(stringf("%s", log_id(wire)));
} }
if (init_inputs.count(sig[i])) { if (init_inputs.count(sig[i])) {
int a = init_inputs.at(sig[i]); int a = init_inputs.at(sig[i]);
log_assert((a & 1) == 0); log_assert((a & 1) == 0);
if (GetSize(wire) != 1) if (GetSize(wire) != 1)
f << stringf("i%d init:%s[%d]\n", (a >> 1)-1, log_id(wire), i); symbols[stringf("i%d", (a >> 1)-1)].push_back(stringf("init:%s[%d]", log_id(wire), i));
else else
f << stringf("i%d init:%s\n", (a >> 1)-1, log_id(wire)); symbols[stringf("i%d", (a >> 1)-1)].push_back(stringf("init:%s", log_id(wire)));
} }
if (ordered_latches.count(sig[i])) { if (ordered_latches.count(sig[i])) {
int l = ordered_latches.at(sig[i]); int l = ordered_latches.at(sig[i]);
const char *p = (zinit_mode && (aig_latchinit.at(l) == 1)) ? "!" : ""; const char *p = (zinit_mode && (aig_latchinit.at(l) == 1)) ? "!" : "";
if (GetSize(wire) != 1) if (GetSize(wire) != 1)
f << stringf("l%d %s%s[%d]\n", l, p, log_id(wire), i); symbols[stringf("l%d", l)].push_back(stringf("%s%s[%d]", p, log_id(wire), i));
else else
f << stringf("l%d %s%s\n", l, p, log_id(wire)); symbols[stringf("l%d", l)].push_back(stringf("%s%s", p, log_id(wire)));
} }
} }
} }
symbols.sort();
for (auto &sym : symbols) {
f << sym.first;
std::sort(sym.second.begin(), sym.second.end());
for (auto &s : sym.second)
f << " " << s;
f << std::endl;
}
} }
f << stringf("c\nGenerated by %s\n", yosys_version_str); f << stringf("c\nGenerated by %s\n", yosys_version_str);