riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2210 from YosysHQ/mwk/fix-opt_merge 

opt_merge: use the master FF type list
This commit is contained in:
clairexen 2020-07-02 17:43:34 +02:00 committed by GitHub
parent 5d740ec4b4 77b15dd8e9
commit 5dbf91847a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
passes/opt/opt_merge.cc
View File

@ -298,9 +298,7 @@ struct OptMergeWorker
module->connect(RTLIL::SigSig(it.second, other_sig)); module->connect(RTLIL::SigSig(it.second, other_sig));
assign_map.add(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") || if (it.first == ID::Q && RTLIL::builtin_ff_cell_types().count(cell->type)) {
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_)))) {
for (auto c : it.second.chunks()) { for (auto c : it.second.chunks()) {
auto jt = c.wire->attributes.find(ID::init); auto jt = c.wire->attributes.find(ID::init);
if (jt == c.wire->attributes.end()) if (jt == c.wire->attributes.end())