diff --git a/finn-rtllib/memstream/hdl/ramb18_wf_dualport.v b/finn-rtllib/memstream/hdl/ramb18_wf_dualport.v
index 4ddb7c6f1c62a015e0468cb651f1f4b19944d172..e107c400565f9f500e7902117a1eb2223b7dbc4c 100644
--- a/finn-rtllib/memstream/hdl/ramb18_wf_dualport.v
+++ b/finn-rtllib/memstream/hdl/ramb18_wf_dualport.v
@@ -1,87 +1,99 @@
-/*
- Copyright (c) 2020, Xilinx
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- * Neither the name of FINN nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-module ramb18_wf_dualport
-#(
- parameter ID = 0,
- parameter DWIDTH = 18,
- parameter AWIDTH = 10,
- parameter MEM_INIT = ""
-)
-(
- input clk,
-
- input wea,
- input [AWIDTH-1:0] addra,
- input [DWIDTH-1:0] wdataa,
- output reg [DWIDTH-1:0] rdqa,
-
- input web,
- input [AWIDTH-1:0] addrb,
- input [DWIDTH-1:0] wdatab,
- output reg [DWIDTH-1:0] rdqb
-);
-
-(* ram_style = "block" *) reg [DWIDTH-1:0] mem[0:2**AWIDTH-1];
-reg [DWIDTH-1:0] rdataa;
-reg [DWIDTH-1:0] rdatab;
-
-reg [15:0] idx;
-//initialize memory
-initial begin
- //note the hacky way of adding a filename memblock_ID.dat to the path provided in MEM_INIT
- //ID can go up to 99
- if (ID < 0 && ID > 99) begin
- $display("ID out of range [0-99]");
- $finish();
- end
- //MEM_INIT path must be terminated by /
- $sformat(idx,"%0d",ID);
- if (ID < 10)
- $readmemh({MEM_INIT,"memblock_",idx[7:0],".dat"}, mem, 0, 1023);
- else
- $readmemh({MEM_INIT,"memblock_",idx,".dat"}, mem, 0, 1023);
-end
-
-//memory ports, with output pipeline register
-always @(posedge clk) begin
- if(wea)
- mem[addra] <= wdataa;
- rdataa <= mem[addra];
- rdqa <= rdataa;
-end
-always @(posedge clk) begin
- if(web)
- mem[addrb] <= wdatab;
- rdatab <= mem[addrb];
- rdqb <= rdatab;
-end
-
-endmodule
+/*
+ Copyright (c) 2020, Xilinx
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ * Neither the name of FINN nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+module ramb18_wf_dualport
+#(
+ parameter ID = 0,
+ parameter DWIDTH = 18,
+ parameter AWIDTH = 10,
+ parameter MEM_INIT = ""
+)
+(
+ input clk,
+
+ input wea,
+ input [AWIDTH-1:0] addra,
+ input [DWIDTH-1:0] wdataa,
+ output reg [DWIDTH-1:0] rdqa,
+
+ input web,
+ input [AWIDTH-1:0] addrb,
+ input [DWIDTH-1:0] wdatab,
+ output reg [DWIDTH-1:0] rdqb
+);
+
+(* ram_style = "block" *) reg [DWIDTH-1:0] mem[0:2**AWIDTH-1];
+reg [DWIDTH-1:0] rdataa;
+reg [DWIDTH-1:0] rdatab;
+
+`ifdef SYNTHESIS
+reg [7:0] idx = ID;
+`else
+reg [15:0] idx;
+`endif
+
+//initialize memory
+initial begin
+ //note the hacky way of adding a filename memblock_ID.dat to the path provided in MEM_INIT
+ //ID can go up to 99
+ if (ID < 0 && ID > 99) begin
+ $display("ID out of range [0-99]");
+ $finish();
+ end
+ //MEM_INIT path must be terminated by /
+ `ifdef SYNTHESIS
+ if (ID < 10)
+ $readmemh({MEM_INIT,"memblock_",idx+8'd48,".dat"}, mem, 0, 1023);
+ else
+ $readmemh({MEM_INIT,"memblock_",(idx/10)+8'd48,(idx%10)+8'd48,".dat"}, mem, 0, 1023);
+ `else
+ $sformat(idx,"%0d",ID);
+ if (ID < 10)
+ $readmemh({MEM_INIT,"memblock_",idx[7:0],".dat"}, mem, 0, 1023);
+ else
+ $readmemh({MEM_INIT,"memblock_",idx,".dat"}, mem, 0, 1023);
+ `endif
+end
+
+//memory ports, with output pipeline register
+always @(posedge clk) begin
+ if(wea)
+ mem[addra] <= wdataa;
+ rdataa <= mem[addra];
+ rdqa <= rdataa;
+end
+always @(posedge clk) begin
+ if(web)
+ mem[addrb] <= wdatab;
+ rdatab <= mem[addrb];
+ rdqb <= rdatab;
+end
+
+endmodule