Merge remote-tracking branch 'origin/master' into eddie/abc9_refactor

diff --cc frontends/aiger/aigerparse.cc
Simple merge

diff --cc tests/techmap/abc9.ys
index d5a63e1cbd61c63e2f8073eb57362c64635a0001,62b5dfef630e4421a3de24558d8aa30234fb48f1..2140dde2672cc82813ff2588e8a93e146c1df7db
--- 1/tests/techmap/abc9.ys
--- 2/tests/techmap/abc9.ys
+++ b/tests/techmap/abc9.ys
@@@ -39,30 -39,14 +39,43 @@@ design -load gol
  scratchpad -copy abc9.script.flow3 abc9.script
  abc9 -lut 4
  
 +design -reset
 +read_verilog <<EOT
 +module top(input a, b, output o);
 +(* keep *) wire w = a & b;
 +assign o = ~w;
 +endmodule
 +EOT
 +
 +simplemap
 +equiv_opt -assert abc9 -lut 4
 +design -load postopt
 +select -assert-count 2 t:$lut
 +
++
 +design -reset
 +read_verilog -icells <<EOT
 +module top(input a, b, output o);
 +wire w;
 +(* keep *) $_AND_ gate (.Y(w), .A(a), .B(b));
 +assign o = ~w;
 +endmodule
 +EOT
 +
 +simplemap
 +equiv_opt -assert abc9 -lut 4
 +design -load postopt
 +select -assert-count 1 t:$lut
 +select -assert-count 1 t:$_AND_
++
+ 
+ design -reset
+ read_verilog -icells <<EOT
+ module top(input a, b, output o);
+ assign o = ~(a & b);
+ endmodule
+ EOT
+ abc9 -lut 4
+ clean
+ select -assert-count 1 t:$lut
+ select -assert-none t:$lut t:* %D