Merge branch 'master' into mwk/xilinx_bufgmap

diff --cc techlibs/xilinx/cells_sim.v
index 26df5bc938137850caeada17d9422687cace149a,e3897d9a69f003ecd53e7675a0ab48208cca245d..f1e019d1e1b82b8a572efb5e3d1786f13e28db06
--- 1/techlibs/xilinx/cells_sim.v
--- 2/techlibs/xilinx/cells_sim.v
+++ b/techlibs/xilinx/cells_sim.v
@@@ -313,9 -300,11 +315,12 @@@ endmodul
  (* abc_box_id = 5 *)
  module RAM32X1D (
    output DPO, SPO,
-   (* abc_scc_break *) input D,
-   (* clkbuf_sink *) input  WCLK,
-   (* abc_scc_break *) input WE,
+   (* abc_scc_break *)
+   input  D,
++  (* clkbuf_sink *)
+   input  WCLK,
+   (* abc_scc_break *)
+   input  WE,
    input  A0, A1, A2, A3, A4,
    input  DPRA0, DPRA1, DPRA2, DPRA3, DPRA4
  );
@@@ -333,9 -322,10 +338,12 @@@ endmodul
  (* abc_box_id = 6 *)
  module RAM64X1D (
    output DPO, SPO,
-   (* abc_scc_break *) input D,
-   (* clkbuf_sink *) input  WCLK,
-   (* abc_scc_break *) input WE,
+   (* abc_scc_break *)
+   input  D,
++  (* clkbuf_sink *)
+   input  WCLK,
 -  (* abc_scc_break *) input WE,
++  (* abc_scc_break *)
++  input WE,
    input  A0, A1, A2, A3, A4, A5,
    input  DPRA0, DPRA1, DPRA2, DPRA3, DPRA4, DPRA5
  );
@@@ -353,9 -343,11 +361,12 @@@ endmodul
  (* abc_box_id = 7 *)
  module RAM128X1D (
    output       DPO, SPO,
-   (* abc_scc_break *) input D,
-   (* clkbuf_sink *) input WCLK,
-   (* abc_scc_break *) input WE,
+   (* abc_scc_break *)
+   input        D,
++  (* clkbuf_sink *)
+   input        WCLK,
+   (* abc_scc_break *)
+   input        WE,
    input  [6:0] A, DPRA
  );
    parameter INIT = 128'h0;