riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1882 from boqwxp/cleanup_rename 

Clean up pseudo-private member usage in `passes/cmds/rename.cc`.
This commit is contained in:
whitequark 2020-04-17 02:20:54 +00:00 committed by GitHub
parent 31e3e52988 2e3647f567
commit 5c428996a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 98 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

192
passes/cmds/rename.cc
View File

@ -32,25 +32,25 @@ static void rename_in_module(RTLIL::Module *module, std::string from_name, std::
if (module->count_id(to_name)) if (module->count_id(to_name))
log_cmd_error("There is already an object `%s' in module `%s'.\n", to_name.c_str(), module->name.c_str()); log_cmd_error("There is already an object `%s' in module `%s'.\n", to_name.c_str(), module->name.c_str());
for (auto &it : module->wires_) RTLIL::Wire *wire_to_rename = module->wire(from_name);
if (it.first == from_name) { RTLIL::Cell *cell_to_rename = module->cell(from_name);
Wire *w = it.second;
log("Renaming wire %s to %s in module %s.\n", log_id(w), log_id(to_name), log_id(module)); if (wire_to_rename != nullptr) {
module->rename(w, to_name); log("Renaming wire %s to %s in module %s.\n", log_id(wire_to_rename), log_id(to_name), log_id(module));
if (w->port_id || flag_output) { module->rename(wire_to_rename, to_name);
if (wire_to_rename->port_id || flag_output) {
if (flag_output) if (flag_output)
w->port_output = true; wire_to_rename->port_output = true;
module->fixup_ports(); module->fixup_ports();
} }
return; return;
} }
for (auto &it : module->cells_) if (cell_to_rename != nullptr) {
if (it.first == from_name) {
if (flag_output) if (flag_output)
log_cmd_error("Called with -output but the specified object is a cell.\n"); log_cmd_error("Called with -output but the specified object is a cell.\n");
log("Renaming cell %s to %s in module %s.\n", log_id(it.second), log_id(to_name), log_id(module)); log("Renaming cell %s to %s in module %s.\n", log_id(cell_to_rename), log_id(to_name), log_id(module));
module->rename(it.second, to_name); module->rename(cell_to_rename, to_name);
return; return;
} }
@ -66,26 +66,26 @@ static std::string derive_name_from_src(const std::string &src, int counter)
return stringf("\\%s$%d", src_base.c_str(), counter); return stringf("\\%s$%d", src_base.c_str(), counter);
} }
static IdString derive_name_from_wire(const RTLIL::Cell &cell) static IdString derive_name_from_cell_output_wire(const RTLIL::Cell *cell)
{ {
// Find output // Find output
const SigSpec *output = nullptr; const SigSpec *output = nullptr;
int num_outputs = 0; int num_outputs = 0;
for (auto &connection : cell.connections()) { for (auto &connection : cell->connections()) {
if (cell.output(connection.first)) { if (cell->output(connection.first)) {
output = &connection.second; output = &connection.second;
num_outputs++; num_outputs++;
} }
} }
if (num_outputs != 1) // Skip cells thad drive multiple outputs if (num_outputs != 1) // Skip cells thad drive multiple outputs
return cell.name; return cell->name;
std::string name = ""; std::string name = "";
for (auto &chunk : output->chunks()) { for (auto &chunk : output->chunks()) {
// Skip cells that drive privately named wires // Skip cells that drive privately named wires
if (!chunk.wire || chunk.wire->name.str()[0] == '$') if (!chunk.wire || chunk.wire->name.str()[0] == '$')
return cell.name; return cell->name;
if (name != "") if (name != "")
name += "$"; name += "$";
@ -99,7 +99,7 @@ static IdString derive_name_from_wire(const RTLIL::Cell &cell)
} }
} }
return name + cell.type.str(); return name + cell->type.str();
} }
struct RenamePass : public Pass { struct RenamePass : public Pass {
@ -210,30 +210,25 @@ struct RenamePass : public Pass {
{ {
extra_args(args, argidx, design); extra_args(args, argidx, design);
for (auto &mod : design->modules_) for (auto module : design->selected_modules())
{ {
int counter = 0; int counter = 0;
dict<RTLIL::Wire *, IdString> new_wire_names;
dict<RTLIL::Cell *, IdString> new_cell_names;
RTLIL::Module *module = mod.second; for (auto wire : module->selected_wires())
if (!design->selected(module)) if (wire->name[0] == '$')
continue; new_wire_names.emplace(wire, derive_name_from_src(wire->get_src_attribute(), counter++));
dict<RTLIL::IdString, RTLIL::Wire*> new_wires; for (auto cell : module->selected_cells())
for (auto &it : module->wires_) { if (cell->name[0] == '$')
if (it.first[0] == '$' && design->selected(module, it.second)) new_cell_names.emplace(cell, derive_name_from_src(cell->get_src_attribute(), counter++));
it.second->name = derive_name_from_src(it.second->get_src_attribute(), counter++);
new_wires[it.second->name] = it.second;
}
module->wires_.swap(new_wires);
module->fixup_ports();
dict<RTLIL::IdString, RTLIL::Cell*> new_cells; for (auto &it : new_wire_names)
for (auto &it : module->cells_) { module->rename(it.first, it.second);
if (it.first[0] == '$' && design->selected(module, it.second))
it.second->name = derive_name_from_src(it.second->get_src_attribute(), counter++); for (auto &it : new_cell_names)
new_cells[it.second->name] = it.second; module->rename(it.first, it.second);
}
module->cells_.swap(new_cells);
} }
} }
else else
@ -241,19 +236,13 @@ struct RenamePass : public Pass {
{ {
extra_args(args, argidx, design); extra_args(args, argidx, design);
for (auto &mod : design->modules_) for (auto module : design->selected_modules()) {
{ dict<RTLIL::Cell *, IdString> new_cell_names;
RTLIL::Module *module = mod.second; for (auto cell : module->selected_cells())
if (!design->selected(module)) if (cell->name[0] == '$')
continue; new_cell_names[cell] = derive_name_from_cell_output_wire(cell);
for (auto &it : new_cell_names)
dict<RTLIL::IdString, RTLIL::Cell*> new_cells; module->rename(it.first, it.second);
for (auto &it : module->cells_) {
if (it.first[0] == '$' && design->selected(module, it.second))
it.second->name = derive_name_from_wire(*it.second);
new_cells[it.second->name] = it.second;
}
module->cells_.swap(new_cells);
} }
} }
else else
@ -261,32 +250,33 @@ struct RenamePass : public Pass {
{ {
extra_args(args, argidx, design); extra_args(args, argidx, design);
for (auto &mod : design->modules_) for (auto module : design->selected_modules())
{ {
int counter = 0; int counter = 0;
dict<RTLIL::Wire *, IdString> new_wire_names;
dict<RTLIL::Cell *, IdString> new_cell_names;
RTLIL::Module *module = mod.second; for (auto wire : module->selected_wires())
if (!design->selected(module)) if (wire->name[0] == '$') {
continue; RTLIL::IdString buf;
do buf = stringf("\\%s%d%s", pattern_prefix.c_str(), counter++, pattern_suffix.c_str());
dict<RTLIL::IdString, RTLIL::Wire*> new_wires; while (module->wire(buf) != nullptr);
for (auto &it : module->wires_) { new_wire_names[wire] = buf;
if (it.first[0] == '$' && design->selected(module, it.second))
do it.second->name = stringf("\\%s%d%s", pattern_prefix.c_str(), counter++, pattern_suffix.c_str());
while (module->count_id(it.second->name) > 0);
new_wires[it.second->name] = it.second;
} }
module->wires_.swap(new_wires);
module->fixup_ports();
dict<RTLIL::IdString, RTLIL::Cell*> new_cells; for (auto cell : module->selected_cells())
for (auto &it : module->cells_) { if (cell->name[0] == '$') {
if (it.first[0] == '$' && design->selected(module, it.second)) RTLIL::IdString buf;
do it.second->name = stringf("\\%s%d%s", pattern_prefix.c_str(), counter++, pattern_suffix.c_str()); do buf = stringf("\\%s%d%s", pattern_prefix.c_str(), counter++, pattern_suffix.c_str());
while (module->count_id(it.second->name) > 0); while (module->cell(buf) != nullptr);
new_cells[it.second->name] = it.second; new_cell_names[cell] = buf;
} }
module->cells_.swap(new_cells);
for (auto &it : new_wire_names)
module->rename(it.first, it.second);
for (auto &it : new_cell_names)
module->rename(it.first, it.second);
} }
} }
else else
@ -294,30 +284,24 @@ struct RenamePass : public Pass {
{ {
extra_args(args, argidx, design); extra_args(args, argidx, design);
for (auto &mod : design->modules_) for (auto module : design->selected_modules())
{ {
RTLIL::Module *module = mod.second; dict<RTLIL::Wire *, IdString> new_wire_names;
if (!design->selected(module)) dict<RTLIL::Cell *, IdString> new_cell_names;
continue;
dict<RTLIL::IdString, RTLIL::Wire*> new_wires; for (auto wire : module->selected_wires())
for (auto &it : module->wires_) { if (wire->name[0] == '\\' && wire->port_id == 0)
if (design->selected(module, it.second)) new_wire_names[wire] = NEW_ID;
if (it.first[0] == '\\' && it.second->port_id == 0)
it.second->name = NEW_ID;
new_wires[it.second->name] = it.second;
}
module->wires_.swap(new_wires);
module->fixup_ports();
dict<RTLIL::IdString, RTLIL::Cell*> new_cells; for (auto cell : module->selected_cells())
for (auto &it : module->cells_) { if (cell->name[0] == '\\')
if (design->selected(module, it.second)) new_cell_names[cell] = NEW_ID;
if (it.first[0] == '\\')
it.second->name = NEW_ID; for (auto &it : new_wire_names)
new_cells[it.second->name] = it.second; module->rename(it.first, it.second);
}
module->cells_.swap(new_cells); for (auto &it : new_cell_names)
module->rename(it.first, it.second);
} }
} }
else else
@ -329,7 +313,7 @@ struct RenamePass : public Pass {
IdString new_name = RTLIL::escape_id(args[argidx]); IdString new_name = RTLIL::escape_id(args[argidx]);
RTLIL::Module *module = design->top_module(); RTLIL::Module *module = design->top_module();
if (module == NULL) if (module == nullptr)
log_cmd_error("No top module found!\n"); log_cmd_error("No top module found!\n");
log("Renaming module %s to %s.\n", log_id(module), log_id(new_name)); log("Renaming module %s to %s.\n", log_id(module), log_id(new_name));
@ -345,27 +329,27 @@ struct RenamePass : public Pass {
if (!design->selected_active_module.empty()) if (!design->selected_active_module.empty())
{ {
if (design->modules_.count(design->selected_active_module) > 0) if (design->module(design->selected_active_module) != nullptr)
rename_in_module(design->modules_.at(design->selected_active_module), from_name, to_name, flag_output); rename_in_module(design->module(design->selected_active_module), from_name, to_name, flag_output);
} }
else else
{ {
if (flag_output) if (flag_output)
log_cmd_error("Mode -output requires that there is an active module selected.\n"); log_cmd_error("Mode -output requires that there is an active module selected.\n");
for (auto &mod : design->modules_) {
if (mod.first == from_name || RTLIL::unescape_id(mod.first) == from_name) { RTLIL::Module *module_to_rename = nullptr;
to_name = RTLIL::escape_id(to_name); for (auto module : design->modules())
log("Renaming module %s to %s.\n", mod.first.c_str(), to_name.c_str()); if (module->name == from_name || RTLIL::unescape_id(module->name) == from_name) {
RTLIL::Module *module = mod.second; module_to_rename = module;
design->modules_.erase(module->name); break;
module->name = to_name;
design->modules_[module->name] = module;
goto rename_ok;
}
} }
if (module_to_rename != nullptr) {
to_name = RTLIL::escape_id(to_name);
log("Renaming module %s to %s.\n", module_to_rename->name.c_str(), to_name.c_str());
design->rename(module_to_rename, to_name);
} else
log_cmd_error("Object `%s' not found!\n", from_name.c_str()); log_cmd_error("Object `%s' not found!\n", from_name.c_str());
rename_ok:;
} }
} }
} }