From: Marcelina Kościelnicka <mwk@0x04.net>
Date: Wed, 15 Jul 2020 00:30:25 +0000 (+0200)
Subject: opt_merge: Dedup one more use of FF cell type list.
X-Git-Tag: working-ls180~382
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=61a7ec4768a3d0d0c8875bb4d9b6160f8697c0d6;p=yosys.git

opt_merge: Dedup one more use of FF cell type list.
---

diff --git a/passes/opt/opt_merge.cc b/passes/opt/opt_merge.cc
index f03faa9cf..9086943dc 100644
--- a/passes/opt/opt_merge.cc
+++ b/passes/opt/opt_merge.cc
@@ -173,9 +173,7 @@ struct OptMergeWorker
 
 		for (const auto &it : cell1->connections_) {
 			if (cell1->output(it.first)) {
-				if (it.first == ID::Q && (cell1->type.begins_with("$dff") || cell1->type.begins_with("$dlatch") ||
-						cell1->type.begins_with("$_DFF") || cell1->type.begins_with("$_DLATCH") || cell1->type.begins_with("$_SR_") ||
-						cell1->type.in(ID($adff), ID($sr), ID($ff), ID($_FF_)))) {
+				if (it.first == ID::Q && RTLIL::builtin_ff_cell_types().count(cell1->type)) {
 					// For the 'Q' output of state elements,
 					//   use the (* init *) attribute value
 					auto &sig1 = conn1[it.first];