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

Merge pull request #3742 from jix/fix_rename_witness_cell_renames

This commit is contained in:
N. Engelhardt 2023-05-08 16:13:28 +02:00 committed by GitHub
parent 4251d37f4f 7bff8b63b3
commit ec56e625f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
passes/cmds/rename.cc
View File

@ -116,6 +116,8 @@ static bool rename_witness(RTLIL::Design *design, dict<RTLIL::Module *, int> &ca
} }
cache.emplace(module, -1); cache.emplace(module, -1);
std::vector<std::pair<Cell *, IdString>> renames;
bool has_witness_signals = false; bool has_witness_signals = false;
for (auto cell : module->cells()) for (auto cell : module->cells())
{ {
@ -130,8 +132,9 @@ static bool rename_witness(RTLIL::Design *design, dict<RTLIL::Module *, int> &ca
c = '_'; c = '_';
auto new_id = module->uniquify("\\_witness_." + name); auto new_id = module->uniquify("\\_witness_." + name);
cell->set_hdlname_attribute({ "_witness_", strstr(new_id.c_str(), ".") + 1 }); cell->set_hdlname_attribute({ "_witness_", strstr(new_id.c_str(), ".") + 1 });
module->rename(cell, new_id); renames.emplace_back(cell, new_id);
} }
break;
} }
if (cell->type.in(ID($anyconst), ID($anyseq), ID($anyinit), ID($allconst), ID($allseq))) { if (cell->type.in(ID($anyconst), ID($anyseq), ID($anyinit), ID($allconst), ID($allseq))) {
@ -155,6 +158,9 @@ static bool rename_witness(RTLIL::Design *design, dict<RTLIL::Module *, int> &ca
} }
} }
} }
for (auto rename : renames) {
module->rename(rename.first, rename.second);
}
cache[module] = has_witness_signals; cache[module] = has_witness_signals;
return has_witness_signals; return has_witness_signals;