From: Eddie Hung <eddie@fpgeh.com>
Date: Tue, 3 Dec 2019 22:27:45 +0000 (-0800)
Subject: techmap abc_unmap.v before xilinx_srl -fixed
X-Git-Tag: working-ls180~881^2^2~109
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0add5965c7bb369bc9dd883c559bcd890d911c14;p=yosys.git

techmap abc_unmap.v before xilinx_srl -fixed
---

diff --git a/techlibs/xilinx/synth_xilinx.cc b/techlibs/xilinx/synth_xilinx.cc
index 554c42d68..3fffd81f6 100644
--- a/techlibs/xilinx/synth_xilinx.cc
+++ b/techlibs/xilinx/synth_xilinx.cc
@@ -538,6 +538,7 @@ struct SynthXilinxPass : public ScriptPass
 				else
 					abc9_opts += " -lut +/xilinx/abc9_xc7.lut";
 				run("abc9" + abc9_opts);
+				run("techmap -map +/xilinx/abc9_unmap.v");
 			}
 			else {
 				if (nowidelut)
@@ -553,12 +554,10 @@ struct SynthXilinxPass : public ScriptPass
 				run("xilinx_srl -fixed -minlen 3", "(skip if '-nosrl')");
 			std::string techmap_args = "-map +/xilinx/lut_map.v -map +/xilinx/cells_map.v";
 			if (help_mode)
-				techmap_args += " [-map " + ff_map_file + "]";
-			else if (abc9)
-				techmap_args += " -map +/xilinx/abc9_unmap.v";
-			else
-				techmap_args += " -map " + ff_map_file;
-			run("techmap " + techmap_args);
+				techmap_args += stringf("[-map %s]", ff_map_file.c_str());
+			else if (!abc9)
+				techmap_args += stringf(" -map %s", ff_map_file.c_str());
+			run("techmap " + techmap_args, "(option without '-abc9')");
 		}
 
 		if (check_label("finalize")) {