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

Signed-off-by: David Shah <dave@ds0.me>

diff --git a/passes/techmap/abc.cc b/passes/techmap/abc.cc
index d7500f3c3db042248ea4b175381c618fba5b0bd8..5b19d84fbefe3a4b27d144fdc0feb850b48a494c 100644 (file)
--- a/passes/techmap/abc.cc
+++ b/passes/techmap/abc.cc
@@ -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")
        {
-               bool inv = abc_sname.back() == 'v';
-               if (inv) abc_sname.pop_back();
                abc_sname.erase(0, 5);
                if (std::isdigit(abc_sname.at(0)))
                {
                        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))
                        {
                                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 << "]";
                                        if (isnew)
                                                sstr << "_new";
-                                       if (inv)
-                                               sstr << "_inv";
+                                       sstr << postfix;
                                        if (orig_wire != nullptr)
                                                *orig_wire = sig.bit.wire;
                                        return sstr.str();