mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-06-20 21:03:40 +00:00
Code Activity

Revert "Reapply "Add fanoutlimit""

Browse source 
This reverts commit 7ebc3ed7d2.
This commit is contained in:
Akash Levy 2024-08-27 17:27:23 -07:00
parent 7ebc3ed7d2
commit a32e4dd8f8
3 changed files with 9 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

21
passes/cmds/splitfanout.cc
View file

@ -67,7 +67,7 @@ struct SplitfanoutWorker
} }
} }
int split(Cell *cell, int fanoutlimit) int split(Cell *cell)
{ {
// Get output signal/port // Get output signal/port
SigSpec outsig; SigSpec outsig;
@ -93,8 +93,8 @@ struct SplitfanoutWorker
} }
} }
// Skip if output signal has only one user or too many users // Skip if output signal has only one user
if (GetSize(bit_users) <= 1 || GetSize(bit_users) > fanoutlimit) if (GetSize(bit_users) <= 1)
return 0; return 0;
// Iterate over bit users and create a new cell for each one // Iterate over bit users and create a new cell for each one
@ -148,7 +148,7 @@ struct SplitfanoutPass : public Pass {
{ {
// |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---| // |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
log("\n"); log("\n");
log(" splitfanout [options] [selection]\n"); log(" splitfanout [selection]\n");
log("\n"); log("\n");
log("This command copies selected cells with >1 fanout into cells with fanout 1. It\n"); log("This command copies selected cells with >1 fanout into cells with fanout 1. It\n");
log("is effectively the opposite of the opt_merge pass.\n"); log("is effectively the opposite of the opt_merge pass.\n");
@ -156,23 +156,16 @@ struct SplitfanoutPass : public Pass {
log("This command operates only on cells with 1 output and no \"bit split\" on that\n"); log("This command operates only on cells with 1 output and no \"bit split\" on that\n");
log("output.\n"); log("output.\n");
log("\n"); log("\n");
log(" -fanoutlimit\n");
log(" fanout limit for splitfanout, beyond which no split (default: 10)\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
{ {
int fanoutlimit = 10;
log_header(design, "Executing SPLITFANOUT pass (splitting up cells with >1 fanout into copies).\n"); log_header(design, "Executing SPLITFANOUT pass (splitting up cells with >1 fanout into copies).\n");
size_t argidx; size_t argidx;
for (argidx = 1; argidx < args.size(); argidx++) for (argidx = 1; argidx < args.size(); argidx++)
{ {
if ((args[argidx] == "-fanoutlimit") && ((argidx + 1) < args.size())) { // No options currently. When adding in the future make sure to update docstring with [options]
fanoutlimit = std::stoi(args[++argidx]); break;
continue;
}
} }
extra_args(args, argidx, design); extra_args(args, argidx, design);
@ -185,7 +178,7 @@ struct SplitfanoutPass : public Pass {
SplitfanoutWorker worker(module); SplitfanoutWorker worker(module);
bool did_something = false; bool did_something = false;
for (auto cell : module->selected_cells()) { for (auto cell : module->selected_cells()) {
int n = worker.split(cell, fanoutlimit); int n = worker.split(cell);
did_something |= (n != 0); did_something |= (n != 0);
count_split_pre += (n != 0); count_split_pre += (n != 0);
count_split_post += n; count_split_post += n;

10
passes/opt/muxpack.cc
View file

@ -344,9 +344,6 @@ struct MuxpackPass : public Pass {
log(" -splitfanout\n"); log(" -splitfanout\n");
log(" run splitfanout pass first\n"); log(" run splitfanout pass first\n");
log("\n"); log("\n");
log(" -fanoutlimit\n");
log(" fanout limit for splitfanout, beyond which no split (default: 10)\n");
log("\n");
log(" -assume_excl\n"); log(" -assume_excl\n");
log(" assume mutually exclusive constraint when packing (may result in inequivalence)\n"); log(" assume mutually exclusive constraint when packing (may result in inequivalence)\n");
log("\n"); log("\n");
@ -355,7 +352,6 @@ struct MuxpackPass : public Pass {
{ {
bool splitfanout = false; bool splitfanout = false;
bool assume_excl = false; bool assume_excl = false;
int fanoutlimit = 10;
log_header(design, "Executing MUXPACK pass ($mux cell cascades to $pmux).\n"); log_header(design, "Executing MUXPACK pass ($mux cell cascades to $pmux).\n");
@ -366,10 +362,6 @@ struct MuxpackPass : public Pass {
splitfanout = true; splitfanout = true;
continue; continue;
} }
if ((args[argidx] == "-fanoutlimit") && ((argidx + 1) < args.size())) {
fanoutlimit = std::stoi(args[++argidx]);
continue;
}
if (args[argidx] == "-assume_excl") { if (args[argidx] == "-assume_excl") {
assume_excl = true; assume_excl = true;
continue; continue;
@ -379,7 +371,7 @@ struct MuxpackPass : public Pass {
extra_args(args, argidx, design); extra_args(args, argidx, design);
if (splitfanout) if (splitfanout)
Pass::call(design, stringf("splitfanout -fanoutlimit %d t:$mux t:$pmux", fanoutlimit)); Pass::call(design, "splitfanout t:$mux t:$pmux");
int mux_count = 0; int mux_count = 0;
int pmux_count = 0; int pmux_count = 0;

10
passes/opt/opt_balance_tree.cc
View file

@ -314,13 +314,9 @@ struct OptBalanceTreePass : public Pass {
log(" -splitfanout\n"); log(" -splitfanout\n");
log(" run splitfanout pass first\n"); log(" run splitfanout pass first\n");
log("\n"); log("\n");
log(" -fanoutlimit\n");
log(" fanout limit for splitfanout, beyond which no split (default: 10)\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 splitfanout = false; bool splitfanout = false;
int fanoutlimit = 10;
log_header(design, "Executing OPT_BALANCE_TREE pass (cell cascades to trees).\n"); log_header(design, "Executing OPT_BALANCE_TREE pass (cell cascades to trees).\n");
@ -331,17 +327,13 @@ struct OptBalanceTreePass : public Pass {
splitfanout = true; splitfanout = true;
continue; continue;
} }
if ((args[argidx] == "-fanoutlimit") && ((argidx + 1) < args.size())) {
fanoutlimit = std::stoi(args[++argidx]);
continue;
}
break; break;
} }
extra_args(args, argidx, design); extra_args(args, argidx, design);
// Run splitfanout pass first // Run splitfanout pass first
if (splitfanout) if (splitfanout)
Pass::call(design, stringf("splitfanout -fanoutlimit %d t:$and t:$or t:$xor t:$add t:$mul", fanoutlimit)); Pass::call(design, "splitfanout t:$and t:$or t:$xor t:$add t:$mul");
// Count of all cells that were packed // Count of all cells that were packed
dict<IdString, int> cell_count; dict<IdString, int> cell_count;