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

Undo fanout_split

Browse source
This commit is contained in:
Akash Levy 2024-08-21 22:20:25 -07:00
parent d0529c7eea
commit 8989f2f98c
1 changed files with 6 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
passes/opt/muxpack.cc
View file

@ -132,7 +132,7 @@ struct MuxpackWorker
ExclusiveDatabase excl_db; ExclusiveDatabase excl_db;
void make_sig_chain_next_prev(bool fanout_split) void make_sig_chain_next_prev()
{ {
for (auto wire : module->wires()) for (auto wire : module->wires())
{ {
@ -152,7 +152,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 (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 +161,7 @@ struct MuxpackWorker
} }
if (!b_sig.empty()) { if (!b_sig.empty()) {
if (sig_chain_next.count(b_sig) && !fanout_split) if (sig_chain_next.count(b_sig))
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 {
@ -311,10 +311,10 @@ struct MuxpackWorker
candidate_cells.clear(); candidate_cells.clear();
} }
MuxpackWorker(Module *module, bool ignore_excl, bool fanout_split) : MuxpackWorker(Module *module, bool ignore_excl) :
module(module), sigmap(module), mux_count(0), pmux_count(0), excl_db(module, sigmap, ignore_excl) module(module), sigmap(module), mux_count(0), pmux_count(0), excl_db(module, sigmap, ignore_excl)
{ {
make_sig_chain_next_prev(fanout_split); make_sig_chain_next_prev();
find_chain_start_cells(ignore_excl); find_chain_start_cells(ignore_excl);
for (auto c : chain_start_cells) { for (auto c : chain_start_cells) {
@ -345,14 +345,10 @@ struct MuxpackPass : public Pass {
log(" -ignore_excl\n"); log(" -ignore_excl\n");
log(" ignore mutually exclusive constraint when packing (less conservative)\n"); log(" ignore mutually exclusive constraint when packing (less conservative)\n");
log("\n"); log("\n");
log(" -fanout_split\n");
log(" fanout is already split (via splitfanout), skip non-chain user check\n");
log("\n");
} }
void execute(std::vector<std::string> args, RTLIL::Design *design) override void execute(std::vector<std::string> args, RTLIL::Design *design) override
{ {
bool ignore_excl = false; bool ignore_excl = false;
bool fanout_split = false;
log_header(design, "Executing MUXPACK pass ($mux cell cascades to $pmux).\n"); log_header(design, "Executing MUXPACK pass ($mux cell cascades to $pmux).\n");
@ -363,10 +359,6 @@ struct MuxpackPass : public Pass {
ignore_excl = true; ignore_excl = true;
continue; continue;
} }
if (args[argidx] == "-fanout_split") {
fanout_split = true;
continue;
}
break; break;
} }
extra_args(args, argidx, design); extra_args(args, argidx, design);
@ -375,7 +367,7 @@ struct MuxpackPass : public Pass {
int pmux_count = 0; int pmux_count = 0;
for (auto module : design->selected_modules()) { for (auto module : design->selected_modules()) {
MuxpackWorker worker(module, ignore_excl, fanout_split); MuxpackWorker worker(module, ignore_excl);
mux_count += worker.mux_count; mux_count += worker.mux_count;
pmux_count += worker.pmux_count; pmux_count += worker.pmux_count;
} }