mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-06 17:44:09 +00:00
Code Activity

Speed up the autoname pass by 3x. (#3945)

Browse source 
* Speed up the autoname pass by 2x. This is accomplished by only constructing IdString objects for plain strings that have a higher score.

* Defer creating IdStrings even further. This increases the speedup to 3x.
This commit is contained in:
Rasmus Munk Larsen 2023-09-21 02:46:49 -07:00 committed by GitHub
parent aa06809d64
commit 9ed38bf9b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
passes/cmds/autoname.cc
View file

@ -24,8 +24,8 @@ PRIVATE_NAMESPACE_BEGIN
int autoname_worker(Module *module, const dict<Wire*, int>& wire_score) int autoname_worker(Module *module, const dict<Wire*, int>& wire_score)
{ {
dict<Cell*, pair<int, IdString>> proposed_cell_names; dict<Cell*, pair<int, string>> proposed_cell_names;
dict<Wire*, pair<int, IdString>> proposed_wire_names; dict<Wire*, pair<int, string>> proposed_wire_names;
int best_score = -1; int best_score = -1;
for (auto cell : module->selected_cells()) { for (auto cell : module->selected_cells()) {
@ -36,7 +36,7 @@ int autoname_worker(Module *module, const dict<Wire*, int>& wire_score)
if (bit.wire != nullptr && bit.wire->name[0] != '$') { if (bit.wire != nullptr && bit.wire->name[0] != '$') {
if (suffix.empty()) if (suffix.empty())
suffix = stringf("_%s_%s", log_id(cell->type), log_id(conn.first)); suffix = stringf("_%s_%s", log_id(cell->type), log_id(conn.first));
IdString new_name(bit.wire->name.str() + suffix); string new_name(bit.wire->name.str() + suffix);
int score = wire_score.at(bit.wire); int score = wire_score.at(bit.wire);
if (cell->output(conn.first)) score = 0; if (cell->output(conn.first)) score = 0;
score = 10000*score + new_name.size(); score = 10000*score + new_name.size();
@ -54,7 +54,7 @@ int autoname_worker(Module *module, const dict<Wire*, int>& wire_score)
if (bit.wire != nullptr && bit.wire->name[0] == '$' && !bit.wire->port_id) { if (bit.wire != nullptr && bit.wire->name[0] == '$' && !bit.wire->port_id) {
if (suffix.empty()) if (suffix.empty())
suffix = stringf("_%s", log_id(conn.first)); suffix = stringf("_%s", log_id(conn.first));
IdString new_name(cell->name.str() + suffix); string new_name(cell->name.str() + suffix);
int score = wire_score.at(bit.wire); int score = wire_score.at(bit.wire);
if (cell->output(conn.first)) score = 0; if (cell->output(conn.first)) score = 0;
score = 10000*score + new_name.size(); score = 10000*score + new_name.size();
@ -71,7 +71,7 @@ int autoname_worker(Module *module, const dict<Wire*, int>& wire_score)
for (auto &it : proposed_cell_names) { for (auto &it : proposed_cell_names) {
if (best_score*2 < it.second.first) if (best_score*2 < it.second.first)
continue; continue;
IdString n = module->uniquify(it.second.second); IdString n = module->uniquify(IdString(it.second.second));
log_debug("Rename cell %s in %s to %s.\n", log_id(it.first), log_id(module), log_id(n)); log_debug("Rename cell %s in %s to %s.\n", log_id(it.first), log_id(module), log_id(n));
module->rename(it.first, n); module->rename(it.first, n);
} }
@ -79,7 +79,7 @@ int autoname_worker(Module *module, const dict<Wire*, int>& wire_score)
for (auto &it : proposed_wire_names) { for (auto &it : proposed_wire_names) {
if (best_score*2 < it.second.first) if (best_score*2 < it.second.first)
continue; continue;
IdString n = module->uniquify(it.second.second); IdString n = module->uniquify(IdString(it.second.second));
log_debug("Rename wire %s in %s to %s.\n", log_id(it.first), log_id(module), log_id(n)); log_debug("Rename wire %s in %s to %s.\n", log_id(it.first), log_id(module), log_id(n));
module->rename(it.first, n); module->rename(it.first, n);
} }