mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-07-20 03:12:05 +00:00
Code Activity

Keep track of new cells in opt_dff and don't rename if only one cell is sliced

Browse source
This commit is contained in:
Akash Levy 2024-12-17 14:18:51 -08:00
parent 8751c7a028
commit 27d3f41ea6
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
passes/opt/opt_dff.cc
View file

@ -594,6 +594,7 @@ struct OptDffWorker
// Try to merge sync resets. // Try to merge sync resets.
std::map<ctrls_t, std::vector<int>> groups; std::map<ctrls_t, std::vector<int>> groups;
std::vector<int> remaining_indices; std::vector<int> remaining_indices;
std::vector<Cell *> new_cells;
Const val_srst; Const val_srst;
for (int i = 0 ; i < ff.width; i++) { for (int i = 0 ; i < ff.width; i++) {
@ -654,14 +655,19 @@ struct OptDffWorker
if (new_ff.has_ce) if (new_ff.has_ce)
new_ff.ce_over_srst = true; new_ff.ce_over_srst = true;
Cell *new_cell = new_ff.emit(); Cell *new_cell = new_ff.emit();
if (new_cell) if (new_cell) {
new_cells.push_back(new_cell);
dff_cells.push_back(new_cell); dff_cells.push_back(new_cell);
}
log("Adding SRST signal on %s (%s) from module %s (D = %s, Q = %s, rval = %s).\n", log("Adding SRST signal on %s (%s) from module %s (D = %s, Q = %s, rval = %s).\n",
log_id(cell), log_id(cell->type), log_id(module), log_signal(new_ff.sig_d), log_signal(new_ff.sig_q), log_signal(new_ff.val_srst)); log_id(cell), log_id(cell->type), log_id(module), log_signal(new_ff.sig_d), log_signal(new_ff.sig_q), log_signal(new_ff.val_srst));
} }
if (remaining_indices.empty()) { if (remaining_indices.empty()) {
IdString cell_name = cell->name;
module->remove(cell); module->remove(cell);
if (GetSize(new_cells) == 1)
module->rename(new_cells[0], cell_name);
did_something = true; did_something = true;
continue; continue;
} else if (GetSize(remaining_indices) != ff.width) { } else if (GetSize(remaining_indices) != ff.width) {
@ -674,6 +680,7 @@ struct OptDffWorker
// Try to merge enables. // Try to merge enables.
std::map<std::pair<patterns_t, ctrls_t>, std::vector<int>> groups; std::map<std::pair<patterns_t, ctrls_t>, std::vector<int>> groups;
std::vector<int> remaining_indices; std::vector<int> remaining_indices;
std::vector<Cell *> new_cells;
for (int i = 0 ; i < ff.width; i++) { for (int i = 0 ; i < ff.width; i++) {
// First, eat up as many simple muxes as possible. // First, eat up as many simple muxes as possible.
@ -717,14 +724,19 @@ struct OptDffWorker
new_ff.pol_ce = en.second; new_ff.pol_ce = en.second;
new_ff.ce_over_srst = false; new_ff.ce_over_srst = false;
Cell *new_cell = new_ff.emit(); Cell *new_cell = new_ff.emit();
if (new_cell) if (new_cell) {
dff_cells.push_back(new_cell); dff_cells.push_back(new_cell);
new_cells.push_back(new_cell);
}
log("Adding EN signal on %s (%s) from module %s (D = %s, Q = %s).\n", log("Adding EN signal on %s (%s) from module %s (D = %s, Q = %s).\n",
log_id(cell), log_id(cell->type), log_id(module), log_signal(new_ff.sig_d), log_signal(new_ff.sig_q)); log_id(cell), log_id(cell->type), log_id(module), log_signal(new_ff.sig_d), log_signal(new_ff.sig_q));
} }
if (remaining_indices.empty()) { if (remaining_indices.empty()) {
IdString cell_name = cell->name;
module->remove(cell); module->remove(cell);
if (GetSize(new_cells) == 1)
module->rename(new_cells[0], cell_name);
did_something = true; did_something = true;
continue; continue;
} else if (GetSize(remaining_indices) != ff.width) { } else if (GetSize(remaining_indices) != ff.width) {