From: Eddie Hung <eddie@fpgeh.com>
Date: Tue, 25 Jun 2019 06:04:25 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/xaig' into xc7mux
X-Git-Tag: working-ls180~1208^2~79
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3825068a75b2d7ccb0953c92040474f95274b76a;p=yosys.git

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

3825068a75b2d7ccb0953c92040474f95274b76a
diff --cc techlibs/xilinx/abc_xc7.box
index 39c535303,8c046cdbc..c95ba4969
--- a/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 - -    -   -   -   -   -   -   - -