Merge branch 'master' into xaig

diff --cc tests/tools/autotest.sh
index 0ffa062e3b70958718c9640f7e41de6a9c40d030,6fdd1e80af1c7e2a1594089689214af06994a509..65fd4cb1f40a931d5fe33d8e62f2a4b3c9c5d138
--- 1/tests/tools/autotest.sh
--- 2/tests/tools/autotest.sh
+++ b/tests/tools/autotest.sh
@@@ -112,13 -133,10 +134,14 @@@ d
                fn=$(basename $fn)
                bn=$(basename $bn)
  
 +              if [[ "$ext" == "v" ]]; then
 +                      egrep -v '^\s*`timescale' ../$fn > ${bn}_ref.${ext}
 +              else
 +                      "$toolsdir"/../../yosys -f "$frontend $include_opts" -b "verilog" -o ${bn}_ref.v ../${fn}
 +                      frontend="verilog"
 +              fi
+               rm -f ${bn}_ref.fir
  
 -              egrep -v '^\s*`timescale' ../$fn > ${bn}_ref.v
 -
                if [ ! -f ../${bn}_tb.v ]; then
                        "$toolsdir"/../../yosys -f "$frontend $include_opts" -b "test_autotb $autotb_opts" -o ${bn}_tb.v ${bn}_ref.v
                else