riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tests: asymmetric sync rams now correctly asymmetric 

Also both use the same named parameters for better mirroring.
This commit is contained in:
Krystine Sherwin 2023-11-30 12:36:21 +13:00 committed by Martin Povišer
parent ba09866217
commit 8ded7020f4
1 changed files with 23 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
tests/arch/common/blockram.v
View File

@ -45,7 +45,7 @@ module sync_ram_sdp #(parameter DATA_WIDTH=8, ADDRESS_WIDTH=10)
endmodule // sync_ram_sdp endmodule // sync_ram_sdp
module sync_ram_sdp_wwr #(parameter DATA_WIDTH=8, ADDRESS_WIDTH=10, WRITE_SHIFT=1) // wd=16, wa=9 module sync_ram_sdp_wwr #(parameter DATA_WIDTH=8, ADDRESS_WIDTH=10, SHIFT_VAL=1) // wd=16, wa=9
( (
input wire clk_w, clk_r, write_enable, input wire clk_w, clk_r, write_enable,
input wire [WORD-1:0] data_in, input wire [WORD-1:0] data_in,
@ -54,36 +54,32 @@ module sync_ram_sdp_wwr #(parameter DATA_WIDTH=8, ADDRESS_WIDTH=10, WRITE_SHIFT=
output wire [DATA_WIDTH-1:0] data_out output wire [DATA_WIDTH-1:0] data_out
); );
localparam ADDRESS_WIDTH_W = ADDRESS_WIDTH-WRITE_SHIFT; localparam ADDRESS_WIDTH_W = ADDRESS_WIDTH-SHIFT_VAL;
localparam BYTE = DATA_WIDTH; localparam BYTE = DATA_WIDTH;
localparam WORD = DATA_WIDTH<<WRITE_SHIFT; localparam WORD = DATA_WIDTH<<SHIFT_VAL;
localparam DEPTH = 2**ADDRESS_WIDTH_W; localparam DEPTH = 2**ADDRESS_WIDTH_W;
localparam SUB_DEPTH = 2**WRITE_SHIFT; localparam SUB_DEPTH = 2**SHIFT_VAL;
reg [WORD-1:0] data_out_r; reg [BYTE-1:0] data_out_r;
reg [WORD-1:0] memory [0:DEPTH-1]; reg [BYTE-1:0] memory [0:DEPTH-1];
integer i;
always @(posedge clk_w) begin always @(posedge clk_w) begin
for (i=0; i<SUB_DEPTH; i=i+1)
if (write_enable) if (write_enable)
memory[address_in_w] <= data_in; memory[{address_in_w, i}] <= data_in[i*BYTE+:BYTE];
end end
always @(posedge clk_r) begin always @(posedge clk_r) begin
data_out_r <= memory[address_in_r>>WRITE_SHIFT]; data_out_r <= memory[address_in_r];
end end
wire [WRITE_SHIFT-1:0] inner_address; assign data_out = data_out_r;
assign inner_address = address_in_r[WRITE_SHIFT-1:0];
genvar i;
generate
for (i=0; i<SUB_DEPTH; i=i+1)
assign data_out = (inner_address == i) ? data_out_r[i*BYTE+:BYTE] : 0;
endgenerate
endmodule // sync_ram_sdp_wwr endmodule // sync_ram_sdp_wwr
module sync_ram_sdp_wrr #(parameter DATA_WIDTH=8, ADDRESS_WIDTH=10, READ_SHIFT=1) // rd=16, ra=9 module sync_ram_sdp_wrr #(parameter DATA_WIDTH=8, ADDRESS_WIDTH=10, SHIFT_VAL=1) // rd=16, ra=9
( (
input wire clk_w, clk_r, write_enable, input wire clk_w, clk_r, write_enable,
input wire [DATA_WIDTH-1:0] data_in, input wire [DATA_WIDTH-1:0] data_in,
@ -91,31 +87,24 @@ module sync_ram_sdp_wrr #(parameter DATA_WIDTH=8, ADDRESS_WIDTH=10, READ_SHIFT=1
input wire [ADDRESS_WIDTH_R-1:0] address_in_r, input wire [ADDRESS_WIDTH_R-1:0] address_in_r,
output wire [WORD-1:0] data_out output wire [WORD-1:0] data_out
); );
localparam ADDRESS_WIDTH_R = ADDRESS_WIDTH-READ_SHIFT; localparam ADDRESS_WIDTH_R = ADDRESS_WIDTH-SHIFT_VAL;
localparam BYTE = DATA_WIDTH; localparam BYTE = DATA_WIDTH;
localparam WORD = BYTE<<READ_SHIFT; localparam WORD = BYTE<<SHIFT_VAL;
localparam DEPTH = 2**ADDRESS_WIDTH_R; localparam DEPTH = 2**ADDRESS_WIDTH;
localparam SUB_DEPTH = 2**READ_SHIFT; localparam SUB_DEPTH = 2**SHIFT_VAL;
reg [WORD-1:0] data_out_r; reg [WORD-1:0] data_out_r;
reg [WORD-1:0] memory [0:DEPTH-1]; reg [BYTE-1:0] memory [0:DEPTH-1];
integer i;
wire [ADDRESS_WIDTH_R-1:0] outer_address;
wire [READ_SHIFT-1:0] inner_address;
assign outer_address = address_in_w>>READ_SHIFT;
assign inner_address = address_in_w[READ_SHIFT-1:0];
always @(posedge clk_w) begin always @(posedge clk_w) begin
if (write_enable) if (write_enable)
for (i=0; i<SUB_DEPTH; i = i+1) memory[address_in_w] <= data_in;
if (inner_address == i)
memory[outer_address][i*BYTE+:BYTE] <= data_in;
end end
integer i;
always @(posedge clk_r) begin always @(posedge clk_r) begin
data_out_r <= memory[address_in_r]; for (i=0; i<SUB_DEPTH; i=i+1)
data_out_r[i*BYTE+:BYTE] <= memory[{address_in_r, i}];
end end
assign data_out = data_out_r; assign data_out = data_out_r;