From: Marcelina Kościelnicka <mwk@0x04.net>
Date: Tue, 30 Jun 2020 18:57:35 +0000 (+0200)
Subject: opt_merge: use the master FF type list
X-Git-Tag: working-ls180~429^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=77b15dd8e9262f5db6a8154f7ad75a2540e58c60;p=yosys.git

opt_merge: use the master FF type list
---

diff --git a/passes/opt/opt_merge.cc b/passes/opt/opt_merge.cc
index a95aa74c1..f03faa9cf 100644
--- a/passes/opt/opt_merge.cc
+++ b/passes/opt/opt_merge.cc
@@ -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())