diff options
| author | Marcelina Kościelnicka <mwk@0x04.net> | 2020-07-15 02:30:25 +0200 |
|---|---|---|
| committer | Marcelina Kościelnicka <mwk@0x04.net> | 2020-07-15 06:19:18 +0200 |
| commit | 61a7ec4768a3d0d0c8875bb4d9b6160f8697c0d6 (patch) | |
| tree | c11dfee69688754942b860603e0fb746c4d3f053 /passes/opt | |
| parent | a786091b469b1327f9676745370b2e67b1c35023 (diff) | |
| download | yosys-61a7ec4768a3d0d0c8875bb4d9b6160f8697c0d6.tar.gz yosys-61a7ec4768a3d0d0c8875bb4d9b6160f8697c0d6.tar.bz2 yosys-61a7ec4768a3d0d0c8875bb4d9b6160f8697c0d6.zip | |
opt_merge: Dedup one more use of FF cell type list.
Diffstat (limited to 'passes/opt')
| -rw-r--r-- | passes/opt/opt_merge.cc | 4 |
1 files changed, 1 insertions, 3 deletions
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]; |