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

diff --cc techlibs/ice40/synth_ice40.cc
index f77ea7f801e59c5266f1824c7bc59f3fc2d3473b,d6d047fe7b60423c6748631b65074c96e922718b..a13a81246ae7e4f607fe2386f2263ea82328d6c2
--- 1/techlibs/ice40/synth_ice40.cc
--- 2/techlibs/ice40/synth_ice40.cc
+++ b/techlibs/ice40/synth_ice40.cc
@@@ -98,8 -98,8 +101,9 @@@ struct SynthIce40Pass : public ScriptPa
                log("\n");
        }
  
 -      string top_opt, blif_file, edif_file, json_file;
++
 +      string top_opt, blif_file, edif_file, json_file, abc;
-       bool nocarry, nodffe, nobram, flatten, retime, relut, noabc, abc2, vpr;
+       bool nocarry, nodffe, nobram, dsp, flatten, retime, relut, noabc, abc2, vpr;
        int min_ce_use;
  
        void clear_flags() YS_OVERRIDE

diff --cc tests/tools/autotest.sh
Simple merge