From: Eddie Hung <eddie@fpgeh.com>
Date: Sat, 20 Apr 2019 19:23:49 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/master' into xaig
X-Git-Tag: working-ls180~1237^2~173
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=caec7f9d2c87e3978c51d0a4171b24cc4b363885;p=yosys.git

Merge remote-tracking branch 'origin/master' into xaig
---

caec7f9d2c87e3978c51d0a4171b24cc4b363885
diff --cc techlibs/xilinx/synth_xilinx.cc
index 090bcce85,397c83ac6..8a531c497
--- a/techlibs/xilinx/synth_xilinx.cc
+++ b/techlibs/xilinx/synth_xilinx.cc
@@@ -275,9 -268,10 +276,10 @@@ struct SynthXilinxPass : public Pas
  
  		if (check_label(active, run_from, run_to, "map_luts"))
  		{
+ 			Pass::call(design, "techmap -map +/techmap.v -map +/xilinx/ff_map.v t:$_DFF_?N?");
 -			Pass::call(design, "abc -luts 2:2,3,6:5,10,20" + string(retime ? " -dff" : ""));
 +			Pass::call(design, abc + " -luts 2:2,3,6:5,10,20" + string(retime ? " -dff" : ""));
  			Pass::call(design, "clean");
- 			Pass::call(design, "techmap -map +/xilinx/lut_map.v");
+ 			Pass::call(design, "techmap -map +/xilinx/lut_map.v -map +/xilinx/ff_map.v");
  		}
  
  		if (check_label(active, run_from, run_to, "map_cells"))