From: Eddie Hung <eddieh@ece.ubc.ca>
Date: Tue, 26 Feb 2019 21:16:03 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/master' into xaig
X-Git-Tag: working-ls180~1237^2~249
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f7c7003a193361285ba59d1315c1e7c26c4c52f1;p=yosys.git

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

f7c7003a193361285ba59d1315c1e7c26c4c52f1
diff --cc techlibs/ice40/synth_ice40.cc
index a13a81246,34501b335..621b0b2bc
--- a/techlibs/ice40/synth_ice40.cc
+++ b/techlibs/ice40/synth_ice40.cc
@@@ -315,7 -306,7 +315,7 @@@ struct SynthIce40Pass : public ScriptPa
  				run("techmap -map +/gate2lut.v -D LUT_WIDTH=4", "(only if -noabc)");
  			}
  			if (!noabc) {
- 				run(abc + " -lut 4", "(skip if -noabc)");
 -				run("abc -dress -lut 4", "(skip if -noabc)");
++				run(abc + " -dress -lut 4", "(skip if -noabc)");
  			}
  			run("clean");
  			if (relut || help_mode) {