Merge remote-tracking branch 'origin/master' into clifford/testfast

diff --cc Makefile
Simple merge

diff --cc tests/opt/opt_rmdff.ys
index 0000000000000000000000000000000000000000,081f81782342b15e5b4aec89b1cb88bad2f3e810..83a162f44d3d7fac419cd8f1ab0fd93950101c6e
mode 000000,100644..100644
--- /dev/null
--- 2/tests/opt/opt_rmdff.ys
+++ b/tests/opt/opt_rmdff.ys
@@@ -1,0 -1,26 +1,26 @@@
 -design -load gold
 -stat
 -
 -design -load gate
 -stat
+ read_verilog -icells opt_rmdff.v
+ prep
+ design -stash gold
+ read_verilog -icells opt_rmdff.v
+ proc
+ opt_rmdff
+ 
+ select -assert-count 0 c:remove*
+ select -assert-min 7 c:keep*
+ select -assert-count 0  t:$dffe 7:$_DFFE_* %u c:noenable* %i
+ 
+ design -stash gate
+ 
+ design -import gold -as gold
+ design -import gate -as gate
+ 
+ equiv_make gold gate equiv
+ hierarchy -top equiv
+ equiv_simple -undef
+ equiv_status -assert
+ 
++#design -load gold
++#stat
++#
++#design -load gate
++#stat