Refactoring of memory_bram and xilinx brams

3 files changed, 55 insertions, 468 deletions

diff --git a/techlibs/xilinx/brams.txt b/techlibs/xilinx/brams.txt
index 46a6ab49e..4aa5109f5 100644
--- a/techlibs/xilinx/brams.txt
+++ b/techlibs/xilinx/brams.txt
@@ -1,133 +1,67 @@
 
-bram $__XILINX_RAMB36_SDP72
+bram $__XILINX_RAMB36_SDP
   abits 9
   dbits 72
   groups 2
   ports  1 1
   wrmode 0 1
   enable 0 8
-  transp 2 0
+  transp 0 0
   clocks 2 3
   clkpol 2 3
 endbram
 
-bram $__XILINX_RAMB18_SDP36
+bram $__XILINX_RAMB18_SDP
   abits 9
   dbits 36
   groups 2
   ports  1 1
   wrmode 0 1
   enable 0 4
-  transp 2 0
+  transp 0 0
   clocks 2 3
   clkpol 2 3
 endbram
 
-bram $__XILINX_RAMB18_TDP18
-  abits 10
-  dbits 18
+bram $__XILINX_RAMB18_TDP
+  abits 10     @a10d18
+  dbits 18     @a10d18
+  abits 11     @a11d9
+  dbits  9     @a11d9
+  abits 12     @a12d4
+  dbits  4     @a12d4
+  abits 13     @a13d2
+  dbits  2     @a13d2
+  abits 14     @a14d1
+  dbits  1     @a14d1
   groups 2
   ports  1 1
   wrmode 0 1
-  enable 0 2
-  transp 2 0
+  enable 0 2   @a10d18
+  enable 0 1   @a11d9 @a12d4 @a13d2 @a14d1
+  transp 0 0
   clocks 2 3
   clkpol 2 3
 endbram
 
-bram $__XILINX_RAMB18_TDP9
-  abits 11
-  dbits 9
-  groups 2
-  ports  1 1
-  wrmode 0 1
-  enable 0 1
-  transp 2 0
-  clocks 2 3
-  clkpol 2 3
-endbram
-
-bram $__XILINX_RAMB18_TDP4
-  abits 12
-  dbits 4
-  groups 2
-  ports  1 1
-  wrmode 0 1
-  enable 0 1
-  transp 2 0
-  clocks 2 3
-  clkpol 2 3
-endbram
-
-bram $__XILINX_RAMB18_TDP2
-  abits 13
-  dbits 2
-  groups 2
-  ports  1 1
-  wrmode 0 1
-  enable 0 1
-  transp 2 0
-  clocks 2 3
-  clkpol 2 3
-endbram
-
-bram $__XILINX_RAMB18_TDP1
-  abits 14
-  dbits 1
-  groups 2
-  ports  1 1
-  wrmode 0 1
-  enable 0 1
-  transp 2 0
-  clocks 2 3
-  clkpol 2 3
-endbram
-
-match $__XILINX_RAMB36_SDP72
+match $__XILINX_RAMB36_SDP
   min bits 4096
   min efficiency 5
-  shuffle_enable 8
+  shuffle_enable B
   or_next_if_better
 endmatch
 
-match $__XILINX_RAMB18_SDP36
+match $__XILINX_RAMB18_SDP
   min bits 4096
   min efficiency 5
-  shuffle_enable 4
+  shuffle_enable B
   or_next_if_better
 endmatch
 
-match $__XILINX_RAMB18_TDP18
+match $__XILINX_RAMB18_TDP
   min bits 4096
   min efficiency 5
-  shuffle_enable 2
-  or_next_if_better
+  shuffle_enable B
+  make_transp
 endmatch
  
-match $__XILINX_RAMB18_TDP9
-  min bits 4096
-  min efficiency 5
-  shuffle_enable 2
-  or_next_if_better
-endmatch
-
-match $__XILINX_RAMB18_TDP4
-  min bits 4096
-  min efficiency 5
-  shuffle_enable 2
-  or_next_if_better
-endmatch
-
-match $__XILINX_RAMB18_TDP2
-  min bits 4096
-  min efficiency 5
-  shuffle_enable 2
-  or_next_if_better
-endmatch
-
-match $__XILINX_RAMB18_TDP1
-  min bits 4096
-  min efficiency 5
-  shuffle_enable 2
-endmatch
-
diff --git a/techlibs/xilinx/brams.v b/techlibs/xilinx/brams.v
index 89ae07eb6..c5c1bde3e 100644
--- a/techlibs/xilinx/brams.v
+++ b/techlibs/xilinx/brams.v
@@ -1,5 +1,4 @@
-module \$__XILINX_RAMB36_SDP72 (CLK2, CLK3, A1ADDR, A1DATA, B1ADDR, B1DATA, B1EN);
-	parameter TRANSP2 = 1;
+module \$__XILINX_RAMB36_SDP (CLK2, CLK3, A1ADDR, A1DATA, B1ADDR, B1DATA, B1EN);
 	parameter CLKPOL2 = 1;
 	parameter CLKPOL3 = 1;
 
@@ -19,29 +18,8 @@ module \$__XILINX_RAMB36_SDP72 (CLK2, CLK3, A1ADDR, A1DATA, B1ADDR, B1DATA, B1EN
 	wire [7:0] DIP, DOP;
 	wire [63:0] DI, DO;
 
-	wire [71:0] A1DATA_BUF;
-	reg [71:0] B1DATA_Q;
-	reg [7:0] transparent_cycle;
-
-	wire [1023:0] _TECHMAP_DO_ = "proc; opt -fast";
-
-	generate if (CLKPOL2)
-		always @(posedge CLK2) begin transparent_cycle <= TRANSP2 && A1ADDR == B1ADDR ? B1EN : 0; B1DATA_Q <= B1DATA; end
-	else
-		always @(negedge CLK2) begin transparent_cycle <= TRANSP2 && A1ADDR == B1ADDR ? B1EN : 0; B1DATA_Q <= B1DATA; end
-	endgenerate
-
-	assign A1DATA[ 8: 0] = transparent_cycle[0] ? B1DATA_Q[ 8: 0] : A1DATA_BUF[ 8: 0];
-	assign A1DATA[17: 9] = transparent_cycle[1] ? B1DATA_Q[17: 9] : A1DATA_BUF[17: 9];
-	assign A1DATA[26:18] = transparent_cycle[2] ? B1DATA_Q[26:18] : A1DATA_BUF[26:18];
-	assign A1DATA[35:27] = transparent_cycle[3] ? B1DATA_Q[35:27] : A1DATA_BUF[35:27];
-	assign A1DATA[44:36] = transparent_cycle[4] ? B1DATA_Q[44:36] : A1DATA_BUF[44:36];
-	assign A1DATA[53:45] = transparent_cycle[5] ? B1DATA_Q[53:45] : A1DATA_BUF[53:45];
-	assign A1DATA[62:54] = transparent_cycle[6] ? B1DATA_Q[62:54] : A1DATA_BUF[62:54];
-	assign A1DATA[71:63] = transparent_cycle[7] ? B1DATA_Q[71:63] : A1DATA_BUF[71:63];
-
-	assign A1DATA_BUF = { DOP[7], DO[63:56], DOP[6], DO[55:48], DOP[5], DO[47:40], DOP[4], DO[39:32],
-	                      DOP[3], DO[31:24], DOP[2], DO[23:16], DOP[1], DO[15: 8], DOP[0], DO[ 7: 0] };
+	assign A1DATA = { DOP[7], DO[63:56], DOP[6], DO[55:48], DOP[5], DO[47:40], DOP[4], DO[39:32],
+	                  DOP[3], DO[31:24], DOP[2], DO[23:16], DOP[1], DO[15: 8], DOP[0], DO[ 7: 0] };
 
 	assign { DIP[7], DI[63:56], DIP[6], DI[55:48], DIP[5], DI[47:40], DIP[4], DI[39:32],
 	         DIP[3], DI[31:24], DIP[2], DI[23:16], DIP[1], DI[15: 8], DIP[0], DI[ 7: 0] } = B1DATA;
@@ -84,8 +62,7 @@ endmodule
 
 // ------------------------------------------------------------------------
 
-module \$__XILINX_RAMB18_SDP36 (CLK2, CLK3, A1ADDR, A1DATA, B1ADDR, B1DATA, B1EN);
-	parameter TRANSP2 = 1;
+module \$__XILINX_RAMB18_SDP (CLK2, CLK3, A1ADDR, A1DATA, B1ADDR, B1DATA, B1EN);
 	parameter CLKPOL2 = 1;
 	parameter CLKPOL3 = 1;
 
@@ -105,24 +82,7 @@ module \$__XILINX_RAMB18_SDP36 (CLK2, CLK3, A1ADDR, A1DATA, B1ADDR, B1DATA, B1EN
 	wire [3:0] DIP, DOP;
 	wire [31:0] DI, DO;
 
-	wire [35:0] A1DATA_BUF;
-	reg [35:0] B1DATA_Q;
-	reg [3:0] transparent_cycle;
-
-	wire [1023:0] _TECHMAP_DO_ = "proc; opt -fast";
-
-	generate if (CLKPOL2)
-		always @(posedge CLK2) begin transparent_cycle <= TRANSP2 && A1ADDR == B1ADDR ? B1EN : 0; B1DATA_Q <= B1DATA; end
-	else
-		always @(negedge CLK2) begin transparent_cycle <= TRANSP2 && A1ADDR == B1ADDR ? B1EN : 0; B1DATA_Q <= B1DATA; end
-	endgenerate
-
-	assign A1DATA[ 8: 0] = transparent_cycle[0] ? B1DATA_Q[ 8: 0] : A1DATA_BUF[ 8: 0];
-	assign A1DATA[17: 9] = transparent_cycle[1] ? B1DATA_Q[17: 9] : A1DATA_BUF[17: 9];
-	assign A1DATA[26:18] = transparent_cycle[2] ? B1DATA_Q[26:18] : A1DATA_BUF[26:18];
-	assign A1DATA[35:27] = transparent_cycle[3] ? B1DATA_Q[35:27] : A1DATA_BUF[35:27];
-
-	assign A1DATA_BUF = { DOP[3], DO[31:24], DOP[2], DO[23:16], DOP[1], DO[15: 8], DOP[0], DO[ 7: 0] };
+	assign A1DATA = { DOP[3], DO[31:24], DOP[2], DO[23:16], DOP[1], DO[15: 8], DOP[0], DO[ 7: 0] };
 	assign { DIP[3], DI[31:24], DIP[2], DI[23:16], DIP[1], DI[15: 8], DIP[0], DI[ 7: 0] } = B1DATA;
 
 	RAMB18E1 #(
@@ -163,351 +123,40 @@ endmodule
 
 // ------------------------------------------------------------------------
 
-module \$__XILINX_RAMB18_TDP18 (CLK2, CLK3, A1ADDR, A1DATA, B1ADDR, B1DATA, B1EN);
-	parameter TRANSP2 = 1;
-	parameter CLKPOL2 = 1;
-	parameter CLKPOL3 = 1;
-
-	input CLK2;
-	input CLK3;
-
-	input [9:0] A1ADDR;
-	output [17:0] A1DATA;
-
-	input [9:0] B1ADDR;
-	input [17:0] B1DATA;
-	input [1:0] B1EN;
-
-	wire [13:0] A1ADDR_14 = {A1ADDR, 4'b0};
-	wire [13:0] B1ADDR_14 = {B1ADDR, 4'b0};
-
-	wire [1:0] DIP, DOP;
-	wire [15:0] DI, DO;
-
-	wire [17:0] A1DATA_BUF;
-	reg [17:0] B1DATA_Q;
-	reg [1:0] transparent_cycle;
-
-	wire [1023:0] _TECHMAP_DO_ = "proc; opt -fast";
-
-	generate if (CLKPOL2)
-		always @(posedge CLK2) begin transparent_cycle <= TRANSP2 && A1ADDR == B1ADDR ? B1EN : 0; B1DATA_Q <= B1DATA; end
-	else
-		always @(negedge CLK2) begin transparent_cycle <= TRANSP2 && A1ADDR == B1ADDR ? B1EN : 0; B1DATA_Q <= B1DATA; end
-	endgenerate
-
-	assign A1DATA[ 8: 0] = transparent_cycle[0] ? B1DATA_Q[ 8: 0] : A1DATA_BUF[ 8: 0];
-	assign A1DATA[17: 9] = transparent_cycle[1] ? B1DATA_Q[17: 9] : A1DATA_BUF[17: 9];
-
-	assign A1DATA_BUF = { DOP[1], DO[15: 8], DOP[0], DO[ 7: 0] };
-	assign { DIP[1], DI[15: 8], DIP[0], DI[ 7: 0] } = B1DATA;
-
-	RAMB18E1 #(
-		.RAM_MODE("TDP"),
-		.READ_WIDTH_A(18),
-		.READ_WIDTH_B(18),
-		.WRITE_WIDTH_A(18),
-		.WRITE_WIDTH_B(18),
-		.WRITE_MODE_A("READ_FIRST"),
-		.WRITE_MODE_B("READ_FIRST"),
-		.IS_CLKARDCLK_INVERTED(!CLKPOL2),
-		.IS_CLKBWRCLK_INVERTED(!CLKPOL3)
-	) _TECHMAP_REPLACE_ (
-		.DIADI(16'b0),
-		.DIPADIP(2'b0),
-		.DOADO(DO),
-		.DOPADOP(DOP),
-		.ADDRARDADDR(A1ADDR_14),
-		.CLKARDCLK(CLK2),
-		.ENARDEN(|1),
-		.REGCEAREGCE(|1),
-		.RSTRAMARSTRAM(|0),
-		.RSTREGARSTREG(|0),
-		.WEA(2'b0),
-
-		.DIBDI(DI),
-		.DIPBDIP(DIP),
-		.ADDRBWRADDR(B1ADDR_14),
-		.CLKBWRCLK(CLK3),
-		.ENBWREN(|1),
-		.REGCEB(|0),
-		.RSTRAMB(|0),
-		.RSTREGB(|0),
-		.WEBWE({2'b00, B1EN})
-	);
-endmodule
-
-// ------------------------------------------------------------------------
+module \$__XILINX_RAMB18_TDP (CLK2, CLK3, A1ADDR, A1DATA, B1ADDR, B1DATA, B1EN);
+	parameter CFG_ABITS = 10;
+	parameter CFG_DBITS = 18;
+	parameter CFG_ENABLE_B = 2;
 
-module \$__XILINX_RAMB18_TDP9 (CLK2, CLK3, A1ADDR, A1DATA, B1ADDR, B1DATA, B1EN);
-	parameter TRANSP2 = 1;
 	parameter CLKPOL2 = 1;
 	parameter CLKPOL3 = 1;
 
 	input CLK2;
 	input CLK3;
 
-	input [10:0] A1ADDR;
-	output [8:0] A1DATA;
+	input [CFG_ABITS-1:0] A1ADDR;
+	output [CFG_DBITS-1:0] A1DATA;
 
-	input [10:0] B1ADDR;
-	input [8:0] B1DATA;
-	input B1EN;
+	input [CFG_ABITS-1:0] B1ADDR;
+	input [CFG_DBITS-1:0] B1DATA;
+	input [CFG_ENABLE_B-1:0] B1EN;
 
-	wire [13:0] A1ADDR_14 = {A1ADDR, 3'b0};
-	wire [13:0] B1ADDR_14 = {B1ADDR, 3'b0};
+	wire [13:0] A1ADDR_14 = A1ADDR << (14 - CFG_ABITS);
+	wire [13:0] B1ADDR_14 = B1ADDR << (14 - CFG_ABITS);
+	wire [3:0] B1EN_4 = B1EN;
 
 	wire [1:0] DIP, DOP;
 	wire [15:0] DI, DO;
 
-	wire [8:0] A1DATA_BUF;
-	reg [8:0] B1DATA_Q;
-	reg transparent_cycle;
-
-	wire [1023:0] _TECHMAP_DO_ = "proc; opt -fast";
-
-	generate if (CLKPOL2)
-		always @(posedge CLK2) begin transparent_cycle <= TRANSP2 && A1ADDR == B1ADDR ? B1EN : 0; B1DATA_Q <= B1DATA; end
-	else
-		always @(negedge CLK2) begin transparent_cycle <= TRANSP2 && A1ADDR == B1ADDR ? B1EN : 0; B1DATA_Q <= B1DATA; end
-	endgenerate
-
-	assign A1DATA = transparent_cycle ? B1DATA_Q : A1DATA_BUF;
-
-	assign A1DATA_BUF = { DOP[1], DO[15: 8], DOP[0], DO[ 7: 0] };
-	assign { DIP[1], DI[15: 8], DIP[0], DI[ 7: 0] } = B1DATA;
-
-	RAMB18E1 #(
-		.RAM_MODE("TDP"),
-		.READ_WIDTH_A(9),
-		.READ_WIDTH_B(9),
-		.WRITE_WIDTH_A(9),
-		.WRITE_WIDTH_B(9),
-		.WRITE_MODE_A("READ_FIRST"),
-		.WRITE_MODE_B("READ_FIRST"),
-		.IS_CLKARDCLK_INVERTED(!CLKPOL2),
-		.IS_CLKBWRCLK_INVERTED(!CLKPOL3)
-	) _TECHMAP_REPLACE_ (
-		.DIADI(16'b0),
-		.DIPADIP(2'b0),
-		.DOADO(DO),
-		.DOPADOP(DOP),
-		.ADDRARDADDR(A1ADDR_14),
-		.CLKARDCLK(CLK2),
-		.ENARDEN(|1),
-		.REGCEAREGCE(|1),
-		.RSTRAMARSTRAM(|0),
-		.RSTREGARSTREG(|0),
-		.WEA(2'b0),
-
-		.DIBDI(DI),
-		.DIPBDIP(DIP),
-		.ADDRBWRADDR(B1ADDR_14),
-		.CLKBWRCLK(CLK3),
-		.ENBWREN(|1),
-		.REGCEB(|0),
-		.RSTRAMB(|0),
-		.RSTREGB(|0),
-		.WEBWE({3'b00, B1EN})
-	);
-endmodule
-
-// ------------------------------------------------------------------------
-
-module \$__XILINX_RAMB18_TDP4 (CLK2, CLK3, A1ADDR, A1DATA, B1ADDR, B1DATA, B1EN);
-	parameter TRANSP2 = 1;
-	parameter CLKPOL2 = 1;
-	parameter CLKPOL3 = 1;
-
-	input CLK2;
-	input CLK3;
-
-	input [11:0] A1ADDR;
-	output [3:0] A1DATA;
-
-	input [11:0] B1ADDR;
-	input [3:0] B1DATA;
-	input B1EN;
-
-	wire [13:0] A1ADDR_14 = {A1ADDR, 2'b0};
-	wire [13:0] B1ADDR_14 = {B1ADDR, 2'b0};
-
-	wire [1:0] DIP, DOP;
-	wire [15:0] DI, DO;
-
-	wire [3:0] A1DATA_BUF;
-	reg [3:0] B1DATA_Q;
-	reg transparent_cycle;
-
-	wire [1023:0] _TECHMAP_DO_ = "proc; opt -fast";
-
-	generate if (CLKPOL2)
-		always @(posedge CLK2) begin transparent_cycle <= TRANSP2 && A1ADDR == B1ADDR ? B1EN : 0; B1DATA_Q <= B1DATA; end
-	else
-		always @(negedge CLK2) begin transparent_cycle <= TRANSP2 && A1ADDR == B1ADDR ? B1EN : 0; B1DATA_Q <= B1DATA; end
-	endgenerate
-
-	assign A1DATA = transparent_cycle ? B1DATA_Q : A1DATA_BUF;
-
-	assign A1DATA_BUF = { DOP[1], DO[15: 8], DOP[0], DO[ 7: 0] };
-	assign { DIP[1], DI[15: 8], DIP[0], DI[ 7: 0] } = B1DATA;
-
-	RAMB18E1 #(
-		.RAM_MODE("TDP"),
-		.READ_WIDTH_A(4),
-		.READ_WIDTH_B(4),
-		.WRITE_WIDTH_A(4),
-		.WRITE_WIDTH_B(4),
-		.WRITE_MODE_A("READ_FIRST"),
-		.WRITE_MODE_B("READ_FIRST"),
-		.IS_CLKARDCLK_INVERTED(!CLKPOL2),
-		.IS_CLKBWRCLK_INVERTED(!CLKPOL3)
-	) _TECHMAP_REPLACE_ (
-		.DIADI(16'b0),
-		.DIPADIP(2'b0),
-		.DOADO(DO),
-		.DOPADOP(DOP),
-		.ADDRARDADDR(A1ADDR_14),
-		.CLKARDCLK(CLK2),
-		.ENARDEN(|1),
-		.REGCEAREGCE(|1),
-		.RSTRAMARSTRAM(|0),
-		.RSTREGARSTREG(|0),
-		.WEA(2'b0),
-
-		.DIBDI(DI),
-		.DIPBDIP(DIP),
-		.ADDRBWRADDR(B1ADDR_14),
-		.CLKBWRCLK(CLK3),
-		.ENBWREN(|1),
-		.REGCEB(|0),
-		.RSTRAMB(|0),
-		.RSTREGB(|0),
-		.WEBWE({3'b00, B1EN})
-	);
-endmodule
-
-// ------------------------------------------------------------------------
-
-module \$__XILINX_RAMB18_TDP2 (CLK2, CLK3, A1ADDR, A1DATA, B1ADDR, B1DATA, B1EN);
-	parameter TRANSP2 = 1;
-	parameter CLKPOL2 = 1;
-	parameter CLKPOL3 = 1;
-
-	input CLK2;
-	input CLK3;
-
-	input [12:0] A1ADDR;
-	output [1:0] A1DATA;
-
-	input [12:0] B1ADDR;
-	input [1:0] B1DATA;
-	input B1EN;
-
-	wire [13:0] A1ADDR_14 = {A1ADDR, 1'b0};
-	wire [13:0] B1ADDR_14 = {B1ADDR, 1'b0};
-
-	wire [1:0] DIP, DOP;
-	wire [15:0] DI, DO;
-
-	wire [3:0] A1DATA_BUF;
-	reg [3:0] B1DATA_Q;
-	reg transparent_cycle;
-
-	wire [1023:0] _TECHMAP_DO_ = "proc; opt -fast";
-
-	generate if (CLKPOL2)
-		always @(posedge CLK2) begin transparent_cycle <= TRANSP2 && A1ADDR == B1ADDR ? B1EN : 0; B1DATA_Q <= B1DATA; end
-	else
-		always @(negedge CLK2) begin transparent_cycle <= TRANSP2 && A1ADDR == B1ADDR ? B1EN : 0; B1DATA_Q <= B1DATA; end
-	endgenerate
-
-	assign A1DATA = transparent_cycle ? B1DATA_Q : A1DATA_BUF;
-
-	assign A1DATA_BUF = { DOP[1], DO[15: 8], DOP[0], DO[ 7: 0] };
-	assign { DIP[1], DI[15: 8], DIP[0], DI[ 7: 0] } = B1DATA;
-
-	RAMB18E1 #(
-		.RAM_MODE("TDP"),
-		.READ_WIDTH_A(2),
-		.READ_WIDTH_B(2),
-		.WRITE_WIDTH_A(2),
-		.WRITE_WIDTH_B(2),
-		.WRITE_MODE_A("READ_FIRST"),
-		.WRITE_MODE_B("READ_FIRST"),
-		.IS_CLKARDCLK_INVERTED(!CLKPOL2),
-		.IS_CLKBWRCLK_INVERTED(!CLKPOL3)
-	) _TECHMAP_REPLACE_ (
-		.DIADI(16'b0),
-		.DIPADIP(2'b0),
-		.DOADO(DO),
-		.DOPADOP(DOP),
-		.ADDRARDADDR(A1ADDR_14),
-		.CLKARDCLK(CLK2),
-		.ENARDEN(|1),
-		.REGCEAREGCE(|1),
-		.RSTRAMARSTRAM(|0),
-		.RSTREGARSTREG(|0),
-		.WEA(2'b0),
-
-		.DIBDI(DI),
-		.DIPBDIP(DIP),
-		.ADDRBWRADDR(B1ADDR_14),
-		.CLKBWRCLK(CLK3),
-		.ENBWREN(|1),
-		.REGCEB(|0),
-		.RSTRAMB(|0),
-		.RSTREGB(|0),
-		.WEBWE({3'b00, B1EN})
-	);
-endmodule
-
-// ------------------------------------------------------------------------
-
-module \$__XILINX_RAMB18_TDP1 (CLK2, CLK3, A1ADDR, A1DATA, B1ADDR, B1DATA, B1EN);
-	parameter TRANSP2 = 1;
-	parameter CLKPOL2 = 1;
-	parameter CLKPOL3 = 1;
-
-	input CLK2;
-	input CLK3;
-
-	input [13:0] A1ADDR;
-	output A1DATA;
-
-	input [13:0] B1ADDR;
-	input B1DATA;
-	input B1EN;
-
-	wire [13:0] A1ADDR_14 = A1ADDR;
-	wire [13:0] B1ADDR_14 = B1ADDR;
-
-	wire [1:0] DIP, DOP;
-	wire [15:0] DI, DO;
-
-	wire [3:0] A1DATA_BUF;
-	reg [3:0] B1DATA_Q;
-	reg transparent_cycle;
-
-	wire [1023:0] _TECHMAP_DO_ = "proc; opt -fast";
-
-	generate if (CLKPOL2)
-		always @(posedge CLK2) begin transparent_cycle <= TRANSP2 && A1ADDR == B1ADDR ? B1EN : 0; B1DATA_Q <= B1DATA; end
-	else
-		always @(negedge CLK2) begin transparent_cycle <= TRANSP2 && A1ADDR == B1ADDR ? B1EN : 0; B1DATA_Q <= B1DATA; end
-	endgenerate
-
-	assign A1DATA = transparent_cycle ? B1DATA_Q : A1DATA_BUF;
-
-	assign A1DATA_BUF = { DOP[1], DO[15: 8], DOP[0], DO[ 7: 0] };
+	assign A1DATA = { DOP[1], DO[15: 8], DOP[0], DO[ 7: 0] };
 	assign { DIP[1], DI[15: 8], DIP[0], DI[ 7: 0] } = B1DATA;
 
 	RAMB18E1 #(
 		.RAM_MODE("TDP"),
-		.READ_WIDTH_A(1),
-		.READ_WIDTH_B(1),
-		.WRITE_WIDTH_A(1),
-		.WRITE_WIDTH_B(1),
+		.READ_WIDTH_A(CFG_DBITS),
+		.READ_WIDTH_B(CFG_DBITS),
+		.WRITE_WIDTH_A(CFG_DBITS),
+		.WRITE_WIDTH_B(CFG_DBITS),
 		.WRITE_MODE_A("READ_FIRST"),
 		.WRITE_MODE_B("READ_FIRST"),
 		.IS_CLKARDCLK_INVERTED(!CLKPOL2),
@@ -533,7 +182,7 @@ module \$__XILINX_RAMB18_TDP1 (CLK2, CLK3, A1ADDR, A1DATA, B1ADDR, B1DATA, B1EN)
 		.REGCEB(|0),
 		.RSTRAMB(|0),
 		.RSTREGB(|0),
-		.WEBWE({3'b00, B1EN})
+		.WEBWE(B1EN_4)
 	);
 endmodule
 
diff --git a/techlibs/xilinx/tests/bram1.sh b/techlibs/xilinx/tests/bram1.sh
index 15c4034aa..05c8ad794 100644
--- a/techlibs/xilinx/tests/bram1.sh
+++ b/techlibs/xilinx/tests/bram1.sh
@@ -2,15 +2,19 @@
 
 set -e
 
+transp_list="0 1"
+abits_list="1 2 4 8 10 16 20"
+dbits_list="1 2 4 8 10 16 20 24 30 32 40 48 50 56 60 64 70 72 80"
+
 use_xsim=false
 unisims=/opt/Xilinx/Vivado/2014.4/data/verilog/src/unisims
 
 echo "all: all_list" > bram1.mk
 all_list=""
 
-for transp in 0 1; do
-for abits in 1 2 4 8 10 16 20; do
-for dbits in 1 2 4 8 10 16 20 24 30 32 40 48 50 56 60 64 70 72 80; do
+for transp in $transp_list; do
+for abits in $abits_list; do
+for dbits in $dbits_list; do
 	if [ $(( (1 << $abits) * $dbits )) -gt 1000000 ]; then continue; fi
 	id=`printf "%d%02d%02d" $transp $abits $dbits`
 	echo "Creating bram1_$id.."