From: Anton Blanchard <anton@linux.ibm.com>
Date: Wed, 23 Feb 2022 07:54:28 +0000 (+1100)
Subject: abc: Fix {I} and {P} substitution
X-Git-Tag: yosys-0.16~44^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=89300b2dca56e5d8e82a516376abc89a9e18d9db;p=yosys.git

abc: Fix {I} and {P} substitution

We were searching for {D} after the first match of {I} or {P}.
---

diff --git a/passes/techmap/abc.cc b/passes/techmap/abc.cc
index 80c6282c4..2c91f3a48 100644
--- a/passes/techmap/abc.cc
+++ b/passes/techmap/abc.cc
@@ -757,10 +757,10 @@ void abc_module(RTLIL::Design *design, RTLIL::Module *current_module, std::strin
 	for (size_t pos = abc_script.find("{D}"); pos != std::string::npos; pos = abc_script.find("{D}", pos))
 		abc_script = abc_script.substr(0, pos) + delay_target + abc_script.substr(pos+3);
 
-	for (size_t pos = abc_script.find("{I}"); pos != std::string::npos; pos = abc_script.find("{D}", pos))
+	for (size_t pos = abc_script.find("{I}"); pos != std::string::npos; pos = abc_script.find("{I}", pos))
 		abc_script = abc_script.substr(0, pos) + sop_inputs + abc_script.substr(pos+3);
 
-	for (size_t pos = abc_script.find("{P}"); pos != std::string::npos; pos = abc_script.find("{D}", pos))
+	for (size_t pos = abc_script.find("{P}"); pos != std::string::npos; pos = abc_script.find("{P}", pos))
 		abc_script = abc_script.substr(0, pos) + sop_products + abc_script.substr(pos+3);
 
 	for (size_t pos = abc_script.find("{S}"); pos != std::string::npos; pos = abc_script.find("{S}", pos))