From: David Shah <dave@ds0.me>
Date: Sat, 4 May 2019 15:53:25 +0000 (+0100)
Subject: abc: Improve name recovery
X-Git-Tag: yosys-0.9~147^2~1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5ce9113eda2e82034fd47106d6f75b8f30fd79ab;p=yosys.git

abc: Improve name recovery

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

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)