3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-24 01:25:33 +00:00

Merge remote-tracking branch 'origin/eddie/abc9_refactor' into eddie/abc9_required

This commit is contained in:
Eddie Hung 2020-01-14 16:32:46 -08:00
commit 48984a7605
2 changed files with 19 additions and 27 deletions

View file

@ -226,6 +226,7 @@ struct XAigerWriter
}
if (inst_module) {
bool abc9_flop = inst_module->get_bool_attribute("\\abc9_flop");
auto it = cell->attributes.find("\\abc9_box_seq");
if (it != cell->attributes.end()) {
int abc9_box_seq = it->second.as_int();
@ -234,7 +235,7 @@ struct XAigerWriter
box_list[abc9_box_seq] = cell;
// Only flop boxes may have arrival times
// (all others are combinatorial)
if (!inst_module->get_bool_attribute("\\abc9_flop"))
if (!abc9_flop)
continue;
}
@ -277,6 +278,9 @@ struct XAigerWriter
jt++;
}
}
if (abc9_flop)
continue;
}
}
@ -616,7 +620,7 @@ struct XAigerWriter
// For flops only, create an extra 1-bit input that drives a new wire
// called "<cell>.abc9_ff.Q" that is used below
if (box_module->get_bool_attribute("\\abc9_flop"))
box_inputs++;
box_inputs++;
std::get<0>(v) = box_inputs;
std::get<1>(v) = box_outputs;