diff options
| author | clairexen <claire@symbioticeda.com> | 2020-07-02 17:43:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-02 17:43:34 +0200 |
| commit | 5dbf91847a79b5e2639078c1cbdbfadcbe439ea0 (patch) | |
| tree | cb10b3569a92e9b0236e9104a36040896d8d4933 | |
| parent | 5d740ec4b45bcf9c25e4314830f39fee8f1c39f9 (diff) | |
| parent | 77b15dd8e9262f5db6a8154f7ad75a2540e58c60 (diff) | |
| download | yosys-5dbf91847a79b5e2639078c1cbdbfadcbe439ea0.tar.gz yosys-5dbf91847a79b5e2639078c1cbdbfadcbe439ea0.tar.bz2 yosys-5dbf91847a79b5e2639078c1cbdbfadcbe439ea0.zip | |
Merge pull request #2210 from YosysHQ/mwk/fix-opt_merge
opt_merge: use the master FF type list
| -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 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()) |