opt_merge: use the master FF type list

This commit is contained in:
Marcelina Kościelnicka 2020-06-30 20:57:35 +02:00
parent 817ae04ee0
commit 77b15dd8e9
1 changed files with 1 additions and 3 deletions

View File

@ -298,9 +298,7 @@ struct OptMergeWorker
module->connect(RTLIL::SigSig(it.second, other_sig));
assign_map.add(it.second, other_sig);
if (it.first == ID::Q && (cell->type.begins_with("$dff") || cell->type.begins_with("$dlatch") ||
cell->type.begins_with("$_DFF") || cell->type.begins_with("$_DLATCH") || cell->type.begins_with("$_SR_") ||
cell->type.in(ID($adff), ID($sr), ID($ff), ID($_FF_)))) {
if (it.first == ID::Q && RTLIL::builtin_ff_cell_types().count(cell->type)) {
for (auto c : it.second.chunks()) {
auto jt = c.wire->attributes.find(ID::init);
if (jt == c.wire->attributes.end())