mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-23 09:05:32 +00:00
Code Activity

proc_prune: Make assign removal and promotion per-bit, remember promoted bits.

Browse source 
Fixes #2962.
This commit is contained in:
Marcelina Kościelnicka 2021-08-14 14:23:12 +02:00
parent 539d4ee907
commit faacc7ad89
2 changed files with 47 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

65
passes/proc/proc_prune.cc
View file

@ -67,51 +67,36 @@ struct PruneWorker
}
for (auto it = cs->actions.rbegin(); it != cs->actions.rend(); ) {
RTLIL::SigSpec lhs = sigmap(it->first);
bool redundant = true;
for (auto &bit : lhs) {
RTLIL::SigSpec rhs = sigmap(it->second);
SigSpec new_lhs, new_rhs;
SigSpec conn_lhs, conn_rhs;
for (int i = 0; i < GetSize(lhs); i++) {
SigBit bit = lhs[i];
if (bit.wire && !assigned[bit]) {
redundant = false;
break;
if (!affected[bit] && root) {
conn_lhs.append(bit);
conn_rhs.append(rhs[i]);
} else {
new_lhs.append(bit);
new_rhs.append(rhs[i]);
}
assigned.insert(bit);
affected.insert(bit);
}
}
bool remove = false;
if (redundant) {
removed_count++;
remove = true;
} else {
if (root) {
bool promotable = true;
for (auto &bit : lhs) {
if (bit.wire && affected[bit] && !assigned[bit]) {
promotable = false;
break;
}
}
if (promotable) {
RTLIL::SigSpec rhs = sigmap(it->second);
RTLIL::SigSig conn;
for (int i = 0; i < GetSize(lhs); i++) {
RTLIL::SigBit lhs_bit = lhs[i];
if (lhs_bit.wire && !assigned[lhs_bit]) {
conn.first.append(lhs_bit);
conn.second.append(rhs.extract(i));
}
}
promoted_count++;
module->connect(conn);
remove = true;
}
}
for (auto &bit : lhs)
if (bit.wire)
assigned.insert(bit);
for (auto &bit : lhs)
if (bit.wire)
affected.insert(bit);
if (GetSize(conn_lhs)) {
promoted_count++;
module->connect(conn_lhs, conn_rhs);
}
if (remove)
if (GetSize(new_lhs) == 0) {
if (GetSize(conn_lhs) == 0)
removed_count++;
cs->actions.erase((it++).base() - 1);
else it++;
} else {
it->first = new_lhs;
it->second = new_rhs;
it++;
}
}
return assigned;
}