diff options
| author | David Shah <dave@ds0.me> | 2019-05-04 16:53:25 +0100 |
|---|---|---|
| committer | David Shah <dave@ds0.me> | 2019-05-04 16:53:25 +0100 |
| commit | 5ce9113eda2e82034fd47106d6f75b8f30fd79ab (patch) | |
| tree | ea4f115abd4f24dc6736e4a08124e2f5152a0f10 /passes/techmap/abc.cc | |
| parent | a01386c0e45b4eee5295db440740a1ab271396fe (diff) | |
| download | yosys-5ce9113eda2e82034fd47106d6f75b8f30fd79ab.tar.gz yosys-5ce9113eda2e82034fd47106d6f75b8f30fd79ab.tar.bz2 yosys-5ce9113eda2e82034fd47106d6f75b8f30fd79ab.zip | |
abc: Improve name recovery
Signed-off-by: David Shah <dave@ds0.me>
Diffstat (limited to 'passes/techmap/abc.cc')
| -rw-r--r-- | passes/techmap/abc.cc | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/passes/techmap/abc.cc b/passes/techmap/abc.cc index 547115459..d7500f3c3 100644 --- a/passes/techmap/abc.cc +++ b/passes/techmap/abc.cc @@ -330,18 +330,31 @@ void extract_cell(RTLIL::Cell *cell, bool keepff) std::string remap_name(RTLIL::IdString abc_name, RTLIL::Wire **orig_wire = nullptr) { std::string abc_sname = abc_name.substr(1); - if (abc_sname.substr(0, 5) == "ys__n") { + bool isnew = false; + if (abc_sname.substr(0, 4) == "new_") + { + abc_sname.erase(0, 4); + isnew = true; + } + if (abc_sname.substr(0, 5) == "ys__n") + { bool inv = abc_sname.back() == 'v'; if (inv) abc_sname.pop_back(); abc_sname.erase(0, 5); - if (abc_sname.find_last_not_of("012345689") == std::string::npos) { + if (std::isdigit(abc_sname.at(0))) + { int sid = std::stoi(abc_sname); - for (auto sig : signal_list) { - if (sig.id == sid && sig.bit.wire != nullptr) { + if (sid < GetSize(signal_list)) + { + auto sig = signal_list.at(sid); + if (sig.bit.wire != nullptr) + { std::stringstream sstr; sstr << "$abc$" << map_autoidx << "$" << sig.bit.wire->name.substr(1); if (sig.bit.wire->width != 1) sstr << "[" << sig.bit.offset << "]"; + if (isnew) + sstr << "_new"; if (inv) sstr << "_inv"; if (orig_wire != nullptr) |