From: Eddie Hung <eddie@fpgeh.com>
Date: Thu, 23 Apr 2020 00:37:07 +0000 (-0700)
Subject: abc9: update to =_$abc9_flops pattern which includes whiteboxes
X-Git-Tag: working-ls180~549^2~9
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8d34aee3d5addfc796ca7057d38e77628c6a77b4;p=yosys.git

abc9: update to =_$abc9_flops pattern which includes whiteboxes
---

diff --git a/passes/techmap/abc9.cc b/passes/techmap/abc9.cc
index 60a88f729..06097a6f7 100644
--- a/passes/techmap/abc9.cc
+++ b/passes/techmap/abc9.cc
@@ -323,8 +323,8 @@ struct Abc9Pass : public ScriptPass
 						active_design->selected_active_module.clear();
 					}
 					run("abc9_ops -prep_dff_unmap", "                                                  (only if -dff)");
-					run("design -copy-to $abc9 *_$abc9_flop", "                                        (only if -dff)"); // copy submod out
-					run("delete *_$abc9_flop", "                                                       (only if -dff)");
+					run("design -copy-to $abc9 =*_$abc9_flop", "                                       (only if -dff)"); // copy submod out
+					run("delete =*_$abc9_flop", "                                                      (only if -dff)");
 				}
 			}
 			run("design -stash $abc9_map");
@@ -333,7 +333,7 @@ struct Abc9Pass : public ScriptPass
 			if (help_mode)
 				run("techmap -wb -max_iter 1 -map %$abc9_map -map +/abc9_map.v [-D DFF]", "(option if -dff)");
 			else
-				run(stringf("techmap -wb -max_iter 1 -map %$abc9_map -map +/abc9_map.v %s", dff_mode ? "-D DFF" : ""));
+				run(stringf("techmap -wb -max_iter 1 -map %%$abc9_map -map +/abc9_map.v %s", dff_mode ? "-D DFF" : ""));
 			run("design -delete $abc9_map");
 		}