From: Eddie Hung <eddie@fpgeh.com>
Date: Tue, 4 Jun 2019 06:19:22 +0000 (-0700)
Subject: Merge mistake
X-Git-Tag: working-ls180~1208^2~209
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=23a73ca6241381e7272f905d1dcbf01c49ad00a8;p=yosys.git

Merge mistake
---

diff --git a/techlibs/xilinx/synth_xilinx.cc b/techlibs/xilinx/synth_xilinx.cc
index e316c268e..4269870d7 100644
--- a/techlibs/xilinx/synth_xilinx.cc
+++ b/techlibs/xilinx/synth_xilinx.cc
@@ -259,13 +259,6 @@ struct SynthXilinxPass : public ScriptPass
 			run("dff2dffe");
 			run("opt -full");
 
-			if (vpr && !nocarry && !help_mode)
-				run("techmap -map +/xilinx/arith_map.v -D _EXPLICIT_CARRY");
-			else if (abc == "abc9" && !nocarry && !help_mode)
-				run("techmap -map +/xilinx/arith_map.v -D _CLB_CARRY", "(skip if '-nocarry')");
-			else if (!nocarry || help_mode)
-				run("techmap -map +/xilinx/arith_map.v", "(skip if '-nocarry')");
-
 			if (!nosrl || help_mode) {
 				// shregmap operates on bit-level flops, not word-level,
 				//   so break those down here
@@ -274,13 +267,12 @@ struct SynthXilinxPass : public ScriptPass
 				run("shregmap -tech xilinx -minlen 3", "(skip if '-nosrl')");
 			}
 
-			if (!nomux || help_mode)
-				run("techmap -map +/xilinx/cells_map.v");
-
-			if (!vpr || help_mode)
-				run("techmap -map +/techmap.v -map +/xilinx/arith_map.v");
-			else
-				run("techmap -map +/techmap.v +/xilinx/arith_map.v -D _EXPLICIT_CARRY");
+			if (vpr && !nocarry && !help_mode)
+				run("techmap -map +/techmap.v -map +/xilinx/arith_map.v -D _EXPLICIT_CARRY");
+			else if (abc == "abc9" && !nocarry && !help_mode)
+				run("techmap -map +/techmap.v -map +/xilinx/arith_map.v -D _CLB_CARRY", "(skip if '-nocarry')");
+			else if (!nocarry || help_mode)
+				run("techmap -map +/techmap.v -map +/xilinx/arith_map.v", "(skip if '-nocarry')");
 
 			run("opt -fast");
 		}