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

Merge pull request #5555 from rocallahan/defer-redirects 

Defer redirecting cell outputs when merging cells in `opt_merge` untill after we've done a full pass over the cells.
This commit is contained in:
Emil J 2026-01-06 18:48:16 +01:00 committed by GitHub
parent 2e1a2cfacb 042ec1cf60
commit 5c630a366d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
passes/opt/opt_merge.cc
View File

@ -289,6 +289,7 @@ struct OptMergeWorker
CellPtrHash, CellPtrHash,
CellPtrEqual> known_cells (0, CellPtrHash(*this), CellPtrEqual(*this)); CellPtrEqual> known_cells (0, CellPtrHash(*this), CellPtrEqual(*this));
std::vector<RTLIL::SigSig> redirects;
for (auto cell : cells) for (auto cell : cells)
{ {
auto [cell_in_map, inserted] = known_cells.insert(cell); auto [cell_in_map, inserted] = known_cells.insert(cell);
@ -310,12 +311,7 @@ struct OptMergeWorker
RTLIL::SigSpec other_sig = other_cell->getPort(it.first); RTLIL::SigSpec other_sig = other_cell->getPort(it.first);
log_debug(" Redirecting output %s: %s = %s\n", it.first, log_debug(" Redirecting output %s: %s = %s\n", it.first,
log_signal(it.second), log_signal(other_sig)); log_signal(it.second), log_signal(other_sig));
Const init = initvals(other_sig); redirects.push_back(RTLIL::SigSig(it.second, std::move(other_sig)));
initvals.remove_init(it.second);
initvals.remove_init(other_sig);
module->connect(RTLIL::SigSig(it.second, other_sig));
assign_map.add(it.second, other_sig);
initvals.set_init(other_sig, init);
} }
} }
log_debug(" Removing %s cell `%s' from module `%s'.\n", cell->type, cell->name, module->name); log_debug(" Removing %s cell `%s' from module `%s'.\n", cell->type, cell->name, module->name);
@ -323,6 +319,14 @@ struct OptMergeWorker
total_count++; total_count++;
} }
} }
for (const RTLIL::SigSig &redirect : redirects) {
module->connect(redirect);
Const init = initvals(redirect.second);
initvals.remove_init(redirect.first);
initvals.remove_init(redirect.second);
assign_map.add(redirect.first, redirect.second);
initvals.set_init(redirect.second, init);
}
} }
log_suppressed(); log_suppressed();