mirror of
https://github.com/YosysHQ/yosys
synced 2025-04-24 01:25:33 +00:00
Fix for less pessimism in muxpack and opt_tree_balance
This commit is contained in:
parent
ab20bbbe8e
commit
8f26fa9077
2 changed files with 8 additions and 8 deletions
|
@ -152,23 +152,22 @@ struct MuxpackWorker
|
|||
b_sig = sigmap(cell->getPort(ID::B));
|
||||
SigSpec y_sig = sigmap(cell->getPort(ID::Y));
|
||||
|
||||
if (sig_chain_next.count(a_sig) && !a_sig.is_fully_const())
|
||||
if (sig_chain_next.count(a_sig))
|
||||
for (auto a_bit : a_sig.bits())
|
||||
sigbit_with_non_chain_users.insert(a_bit);
|
||||
else {
|
||||
sig_chain_next[a_sig] = cell;
|
||||
candidate_cells.insert(cell);
|
||||
}
|
||||
|
||||
if (!b_sig.empty()) {
|
||||
if (sig_chain_next.count(b_sig) && !b_sig.is_fully_const())
|
||||
if (sig_chain_next.count(b_sig))
|
||||
for (auto b_bit : b_sig.bits())
|
||||
sigbit_with_non_chain_users.insert(b_bit);
|
||||
else {
|
||||
sig_chain_next[b_sig] = cell;
|
||||
candidate_cells.insert(cell);
|
||||
}
|
||||
}
|
||||
candidate_cells.insert(cell);
|
||||
|
||||
sig_chain_prev[y_sig] = cell;
|
||||
continue;
|
||||
|
|
|
@ -63,26 +63,27 @@ struct OptBalanceTreeWorker {
|
|||
SigSpec y_sig = sigmap(cell->getPort(ID::Y));
|
||||
|
||||
// If a_sig already has a chain user, mark its bits as having non-chain users
|
||||
if (sig_chain_next.count(a_sig) && !a_sig.is_fully_const()) // ok if a_sig is fully const
|
||||
if (sig_chain_next.count(a_sig))
|
||||
for (auto a_bit : a_sig.bits())
|
||||
sigbit_with_non_chain_users.insert(a_bit);
|
||||
// Otherwise, mark cell as the next in the chain relative to a_sig
|
||||
else {
|
||||
sig_chain_next[a_sig] = cell;
|
||||
candidate_cells.insert(cell);
|
||||
}
|
||||
|
||||
if (!b_sig.empty()) {
|
||||
// If b_sig already has a chain user, mark its bits as having non-chain users
|
||||
if (sig_chain_next.count(b_sig) && !b_sig.is_fully_const()) // ok if b_sig is fully const
|
||||
if (sig_chain_next.count(b_sig))
|
||||
for (auto b_bit : b_sig.bits())
|
||||
sigbit_with_non_chain_users.insert(b_bit);
|
||||
// Otherwise, mark cell as the next in the chain relative to b_sig
|
||||
else {
|
||||
sig_chain_next[b_sig] = cell;
|
||||
candidate_cells.insert(cell);
|
||||
}
|
||||
}
|
||||
|
||||
// Add cell as candidate
|
||||
candidate_cells.insert(cell);
|
||||
|
||||
// Mark cell as the previous in the chain relative to y_sig
|
||||
sig_chain_prev[y_sig] = cell;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue