Merge mistake

diff --git a/techlibs/xilinx/synth_xilinx.cc b/techlibs/xilinx/synth_xilinx.cc
index e316c268e59ed21df4e0fe468ecec40766a7646a..4269870d7e16df96276b9e2632304bb2fe60cfaf 100644 (file)
--- 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");
                }