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

abc: Fix handling of postfixed names (e.g. for retiming) 

Signed-off-by: David Shah <dave@ds0.me>
This commit is contained in:
David Shah 2019-05-04 17:17:30 +01:00
parent 5ce9113eda
commit a84256aa36
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
passes/techmap/abc.cc
View File

@ -338,12 +338,13 @@ std::string remap_name(RTLIL::IdString abc_name, RTLIL::Wire **orig_wire = nullp
} }
if (abc_sname.substr(0, 5) == "ys__n") 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); abc_sname.erase(0, 5);
if (std::isdigit(abc_sname.at(0))) if (std::isdigit(abc_sname.at(0)))
{ {
int sid = std::stoi(abc_sname); int sid = std::stoi(abc_sname);
size_t postfix_start = abc_sname.find_first_not_of("0123456789");
std::string postfix = postfix_start != std::string::npos ? abc_sname.substr(postfix_start) : "";
if (sid < GetSize(signal_list)) if (sid < GetSize(signal_list))
{ {
auto sig = signal_list.at(sid); auto sig = signal_list.at(sid);
@ -355,8 +356,7 @@ std::string remap_name(RTLIL::IdString abc_name, RTLIL::Wire **orig_wire = nullp
sstr << "[" << sig.bit.offset << "]"; sstr << "[" << sig.bit.offset << "]";
if (isnew) if (isnew)
sstr << "_new"; sstr << "_new";
if (inv) sstr << postfix;
sstr << "_inv";
if (orig_wire != nullptr) if (orig_wire != nullptr)
*orig_wire = sig.bit.wire; *orig_wire = sig.bit.wire;
return sstr.str(); return sstr.str();