mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-09-30 21:19:30 +00:00
Code Activity

Move OptMerge cell filtering logic to happen while building the cell vector.

Browse source 
This code is quite confusing because there are two "is the cell known" filters
applied, one while building the cell vector and one after building the cell
vector, and they're subtly different. I'm preserving the actual behaviour here
but it looks like there is, or was, a bug here.
This commit is contained in:
Robert O'Callahan 2025-09-23 23:26:47 +00:00
parent 13a2481da7
commit e9aacd8a05
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
passes/opt/opt_merge.cc
View file

@ -249,9 +249,14 @@ struct OptMergeWorker
// mem can have an excessively large parameter holding the init data
continue;
}
if (cell->type == ID($scopeinfo))
continue;
if (mode_keepdc && has_dont_care_initval(cell))
continue;
if (ct.cell_known(cell->type) || (mode_share_all && cell->known()))
if (!cell->known())
continue;
if (!mode_share_all && !ct.cell_known(cell->type))
continue;
cells.push_back(cell);
}
@ -281,12 +286,6 @@ struct OptMergeWorker
for (auto cell : cells)
{
if ((!mode_share_all && !ct.cell_known(cell->type)) || !cell->known())
continue;
if (cell->type == ID($scopeinfo))
continue;
auto [cell_in_map, inserted] = known_cells.insert(cell);
if (!inserted) {
// We've failed to insert since we already have an equivalent cell