3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-06-23 06:13:41 +00:00

Try updated muxpack

This commit is contained in:
Akash Levy 2024-08-21 21:37:28 -07:00
parent a945edc7a0
commit 7d44234d80

View file

@ -151,8 +151,7 @@ struct MuxpackWorker
b_sig = sigmap(cell->getPort(ID::B)); b_sig = sigmap(cell->getPort(ID::B));
SigSpec y_sig = sigmap(cell->getPort(ID::Y)); SigSpec y_sig = sigmap(cell->getPort(ID::Y));
if (!fanout_split) { if (sig_chain_next.count(a_sig) && !fanout_split)
if (sig_chain_next.count(a_sig))
for (auto a_bit : a_sig.bits()) for (auto a_bit : a_sig.bits())
sigbit_with_non_chain_users.insert(a_bit); sigbit_with_non_chain_users.insert(a_bit);
else { else {
@ -161,7 +160,7 @@ struct MuxpackWorker
} }
if (!b_sig.empty()) { if (!b_sig.empty()) {
if (sig_chain_next.count(b_sig)) if (sig_chain_next.count(b_sig) && !fanout_split)
for (auto b_bit : b_sig.bits()) for (auto b_bit : b_sig.bits())
sigbit_with_non_chain_users.insert(b_bit); sigbit_with_non_chain_users.insert(b_bit);
else { else {
@ -169,13 +168,6 @@ struct MuxpackWorker
candidate_cells.insert(cell); candidate_cells.insert(cell);
} }
} }
}
else {
sig_chain_next[a_sig] = cell;
if (!b_sig.empty())
sig_chain_next[b_sig] = cell;
candidate_cells.insert(cell);
}
sig_chain_prev[y_sig] = cell; sig_chain_prev[y_sig] = cell;
continue; continue;
@ -218,7 +210,7 @@ struct MuxpackWorker
log_assert(prev_cell); log_assert(prev_cell);
SigSpec s_sig = sigmap(cell->getPort(ID::S)); SigSpec s_sig = sigmap(cell->getPort(ID::S));
s_sig.append(sigmap(prev_cell->getPort(ID::S))); s_sig.append(sigmap(prev_cell->getPort(ID::S)));
if (!excl_db.query(s_sig) && !ignore_excl) if (!ignore_excl && !excl_db.query(s_sig))
goto start_cell; goto start_cell;
} }