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

diff --cc techlibs/xilinx/abc_xc7.box
index 39c535303f9c63c4bdd60755c7f9e165d86cd99e,8c046cdbcc9083cf7c53f755ac5057d886c538a4..c95ba49693d4d635ed50764c2370a2072ecfc402
--- 1/techlibs/xilinx/abc_xc7.box
--- 2/techlibs/xilinx/abc_xc7.box
+++ b/techlibs/xilinx/abc_xc7.box
@@@ -45,13 -33,13 +45,13 @@@ RAM32X1D 4 0 13 
  # SLICEM/A6LUT
  # Inputs: A0 A1 A2 A3 A4 A5 D DPRA0 DPRA1 DPRA2 DPRA3 DPRA4 DPRA5 WCLK WE
  # Outputs: DPO SPO
 -RAM64X1D 4 0 15 2
 +RAM64X1D 5 0 15 2
- -   -   -   -   -   -   - 124 124 124 124 124 124 - -
- 124 124 124 124 124 124 - -   -   -   -   -   124 - -
+ -   -   -   -   -   -   - 642 631 472 407 238 127 - -
+ 642 631 472 407 238 127 - -   -   -   -   -   -   - -
  
  # SLICEM/A6LUT + F7[AB]MUX
  # Inputs: A0 A1 A2 A3 A4 A5 A6 D DPRA0 DPRA1 DPRA2 DPRA3 DPRA4 DPRA5 DPRA6 WCLK WE
  # Outputs: DPO SPO
 -RAM128X1D 5 0 17 2
 +RAM128X1D 6 0 17 2
- -   -   -   -   -   -   -   - 314 314 314 314 314 314 292 - -
- 347 347 347 347 347 347 296 - -   -   -   -   -   -   -   - -
+ -    -    -   -   -   -   -   - 1009 998 839 774 605 494 450 - -
+ 1047 1036 877 812 643 532 478 - -    -   -   -   -   -   -   - -