mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-11-04 05:19:11 +00:00
Code Activity

quicklogic: testing 1:4 assymetric memory

Browse source
This commit is contained in:
Krystine Sherwin 2023-11-30 11:17:24 +13:00 • committed by Martin Povišer
parent 7513bfcbfe
commit 1a843b2a86
2 changed files with 102 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

62
tests/arch/common/blockram.v
View file

@ -45,32 +45,45 @@ 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) // wd=16, wa=9 module sync_ram_sdp_wwr #(parameter DATA_WIDTH=8, ADDRESS_WIDTH=10, WRITE_SHIFT=1) // wd=16, wa=9
(input wire clk, write_enable, (
input wire [(DATA_WIDTH*2)-1:0] data_in, input wire clk_w, clk_r, write_enable,
input wire [ADDRESS_WIDTH-2:0] address_in_w, input wire [WORD-1:0] data_in,
input wire [ADDRESS_WIDTH_W-1:0] address_in_w,
input wire [ADDRESS_WIDTH-1:0] address_in_r, input wire [ADDRESS_WIDTH-1:0] address_in_r,
output wire [DATA_WIDTH-1:0] data_out); output wire [DATA_WIDTH-1:0] data_out
);
localparam WORD = ((DATA_WIDTH*2)-1); localparam ADDRESS_WIDTH_W = ADDRESS_WIDTH-WRITE_SHIFT;
localparam DEPTH = (2**(ADDRESS_WIDTH-1)-1); localparam BYTE = DATA_WIDTH;
localparam WORD = DATA_WIDTH<<WRITE_SHIFT;
localparam DEPTH = 2**ADDRESS_WIDTH_W;
localparam SUB_DEPTH = 2**WRITE_SHIFT;
reg [WORD:0] data_out_r; reg [WORD-1:0] data_out_r;
reg [WORD:0] memory [0:DEPTH]; reg [WORD-1:0] memory [0:DEPTH-1];
always @(posedge clk) begin always @(posedge clk_w) begin
if (write_enable) begin if (write_enable)
memory[address_in_w] <= data_in; memory[address_in_w] <= data_in;
end end
data_out_r <= memory[address_in_r>>1];
always @(posedge clk_r) begin
data_out_r <= memory[address_in_r>>WRITE_SHIFT];
end end
assign data_out = address_in_r[0] ? data_out_r[WORD:DATA_WIDTH] : data_out_r[DATA_WIDTH-1:0]; wire [WRITE_SHIFT-1:0] inner_address;
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) // rd=16, ra=9 module sync_ram_sdp_wrr #(parameter DATA_WIDTH=8, ADDRESS_WIDTH=10, READ_SHIFT=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,
@ -78,20 +91,27 @@ module sync_ram_sdp_wrr #(parameter DATA_WIDTH=8, ADDRESS_WIDTH=10) // rd=16, ra
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-1; localparam ADDRESS_WIDTH_R = ADDRESS_WIDTH-READ_SHIFT;
localparam HWORD = DATA_WIDTH; localparam BYTE = DATA_WIDTH;
localparam WORD = 2*DATA_WIDTH; localparam WORD = BYTE<<READ_SHIFT;
localparam DEPTH = 2**ADDRESS_WIDTH_R; localparam DEPTH = 2**ADDRESS_WIDTH_R;
localparam SUB_DEPTH = 2**READ_SHIFT;
reg [WORD-1:0] data_out_r; reg [WORD-1:0] data_out_r;
reg [WORD-1:0] memory [0:DEPTH-1]; reg [WORD-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)
if (address_in_w[0]) // upper HWORD for (i=0; i<SUB_DEPTH; i = i+1)
memory[address_in_w>>1][WORD-1:HWORD] <= data_in; if (inner_address == i)
else // lower HWORD memory[outer_address][i*BYTE+:BYTE] <= data_in;
memory[address_in_w>>1][HWORD-1:0] <= data_in;
end end
always @(posedge clk_r) begin always @(posedge clk_r) begin

46
tests/arch/quicklogic/qlf_k6n10f/gen_memories.py
View file

@ -32,11 +32,47 @@ blockram_tests: "list[tuple[list[tuple[str, int]], str, list[str]]]" = [
([("ADDRESS_WIDTH", 15), ("DATA_WIDTH", 1)], "sync_ram_*dp", ["-assert-count 1 t:TDP36K", "-assert-count 1 t:TDP36K a:port_a_width=1 %i"]), ([("ADDRESS_WIDTH", 15), ("DATA_WIDTH", 1)], "sync_ram_*dp", ["-assert-count 1 t:TDP36K", "-assert-count 1 t:TDP36K a:port_a_width=1 %i"]),
# 2x write width (1024x36bit write / 2048x18bit read = 1TDP36K) # 2x write width (1024x36bit write / 2048x18bit read = 1TDP36K)
([("ADDRESS_WIDTH", 11), ("DATA_WIDTH", 18)], "sync_ram_sdp_wwr", ["-assert-count 1 t:TDP36K"]), ([("ADDRESS_WIDTH", 11), ("DATA_WIDTH", 18), ("WRITE_SHIFT", 1)], "sync_ram_sdp_wwr", ["-assert-count 1 t:TDP36K"]),
([("ADDRESS_WIDTH", 11), ("DATA_WIDTH", 9)], "sync_ram_sdp_wwr", ["-assert-count 1 t:TDP36K"]), ([("ADDRESS_WIDTH", 11), ("DATA_WIDTH", 16), ("WRITE_SHIFT", 1)], "sync_ram_sdp_wwr", ["-assert-count 1 t:TDP36K"]),
# 2x read width (1024x36bit read / 2048x18bit write = 1TDP36K) ([("ADDRESS_WIDTH", 12), ("DATA_WIDTH", 9), ("WRITE_SHIFT", 1)], "sync_ram_sdp_wwr", ["-assert-count 1 t:TDP36K"]),
([("ADDRESS_WIDTH", 11), ("DATA_WIDTH", 18)], "sync_ram_sdp_wrr", ["-assert-count 1 t:TDP36K"]), ([("ADDRESS_WIDTH", 12), ("DATA_WIDTH", 8), ("WRITE_SHIFT", 1)], "sync_ram_sdp_wwr", ["-assert-count 1 t:TDP36K"]),
([("ADDRESS_WIDTH", 12), ("DATA_WIDTH", 9)], "sync_ram_sdp_wrr", ["-assert-count 1 t:TDP36K"]), # same for read
([("ADDRESS_WIDTH", 11), ("DATA_WIDTH", 18), ( "READ_SHIFT", 1)], "sync_ram_sdp_wrr", ["-assert-count 1 t:TDP36K"]),
([("ADDRESS_WIDTH", 11), ("DATA_WIDTH", 16), ( "READ_SHIFT", 1)], "sync_ram_sdp_wrr", ["-assert-count 1 t:TDP36K"]),
([("ADDRESS_WIDTH", 12), ("DATA_WIDTH", 9), ( "READ_SHIFT", 1)], "sync_ram_sdp_wrr", ["-assert-count 1 t:TDP36K"]),
([("ADDRESS_WIDTH", 12), ("DATA_WIDTH", 8), ( "READ_SHIFT", 1)], "sync_ram_sdp_wrr", ["-assert-count 1 t:TDP36K"]),
# 4x write width (1024x36bit write / 4096x9bit read = 1TDP36K)
([("ADDRESS_WIDTH", 11), ("DATA_WIDTH", 4), ("WRITE_SHIFT", 2)], "sync_ram_sdp_wwr", ["-assert-count 1 t:TDP36K"]),
([("ADDRESS_WIDTH", 12), ("DATA_WIDTH", 9), ("WRITE_SHIFT", 2)], "sync_ram_sdp_wwr", ["-assert-count 1 t:TDP36K"]),
([("ADDRESS_WIDTH", 12), ("DATA_WIDTH", 8), ("WRITE_SHIFT", 2)], "sync_ram_sdp_wwr", ["-assert-count 1 t:TDP36K"]),
# and again for read
([("ADDRESS_WIDTH", 11), ("DATA_WIDTH", 4), ( "READ_SHIFT", 2)], "sync_ram_sdp_wrr", ["-assert-count 1 t:TDP36K"]),
([("ADDRESS_WIDTH", 12), ("DATA_WIDTH", 9), ( "READ_SHIFT", 2)], "sync_ram_sdp_wrr", ["-assert-count 1 t:TDP36K"]),
([("ADDRESS_WIDTH", 12), ("DATA_WIDTH", 8), ( "READ_SHIFT", 2)], "sync_ram_sdp_wrr", ["-assert-count 1 t:TDP36K"]),
# etc
([("ADDRESS_WIDTH", 11), ("DATA_WIDTH", 16), ("WRITE_SHIFT", 1)], "sync_ram_sdp_wwr", ["-assert-count 1 t:TDP36K"]),
([("ADDRESS_WIDTH", 11), ("DATA_WIDTH", 16), ( "READ_SHIFT", 1)], "sync_ram_sdp_wrr", ["-assert-count 1 t:TDP36K"]),
([("ADDRESS_WIDTH", 12), ("DATA_WIDTH", 8), ("WRITE_SHIFT", 2)], "sync_ram_sdp_wwr", ["-assert-count 1 t:TDP36K"]),
([("ADDRESS_WIDTH", 12), ("DATA_WIDTH", 8), ( "READ_SHIFT", 2)], "sync_ram_sdp_wrr", ["-assert-count 1 t:TDP36K"]),
# can also use an extra TDP36K for higher width
([("ADDRESS_WIDTH", 10), ("DATA_WIDTH", 36), ("WRITE_SHIFT", 1)], "sync_ram_sdp_wwr", ["-assert-count 2 t:TDP36K"]),
([("ADDRESS_WIDTH", 10), ("DATA_WIDTH", 36), ( "READ_SHIFT", 1)], "sync_ram_sdp_wrr", ["-assert-count 2 t:TDP36K"]),
# not sure why these are different but apparently wide writes pack better?
([("ADDRESS_WIDTH", 10), ("DATA_WIDTH", 36), ("WRITE_SHIFT", 2)], "sync_ram_sdp_wwr", ["-assert-count 2 t:TDP36K"]),
([("ADDRESS_WIDTH", 10), ("DATA_WIDTH", 36), ( "READ_SHIFT", 2)], "sync_ram_sdp_wrr", ["-assert-count 4 t:TDP36K"]),
([("ADDRESS_WIDTH", 9), ("DATA_WIDTH", 36), ("WRITE_SHIFT", 2)], "sync_ram_sdp_wwr", ["-assert-count 2 t:TDP36K"]),
([("ADDRESS_WIDTH", 9), ("DATA_WIDTH", 36), ( "READ_SHIFT", 2)], "sync_ram_sdp_wrr", ["-assert-count 4 t:TDP36K"]),
# SHIFT=0 should be identical to sync_ram_sdp
([("ADDRESS_WIDTH", 10), ("DATA_WIDTH", 36), ( "READ_SHIFT", 0)], "sync_ram_sdp_wrr", ["-assert-count 1 t:TDP36K"]),
([("ADDRESS_WIDTH", 11), ("DATA_WIDTH", 18), ( "READ_SHIFT", 0)], "sync_ram_sdp_wrr", ["-assert-count 1 t:TDP36K"]),
# but WRITE_SHIFT=0 doesn't generate any read circuitry and optimises the memory away
# ([("ADDRESS_WIDTH", 10), ("DATA_WIDTH", 36), ("WRITE_SHIFT", 0)], "sync_ram_sdp_wwr", ["-assert-count 1 t:TDP36K"]),
# ([("ADDRESS_WIDTH", 11), ("DATA_WIDTH", 18), ("WRITE_SHIFT", 0)], "sync_ram_sdp_wwr", ["-assert-count 1 t:TDP36K"]),
# two disjoint 18K memories can share a single TDP36K # two disjoint 18K memories can share a single TDP36K
([("ADDRESS_WIDTH_A", 10), ("DATA_WIDTH_A", 18), ([("ADDRESS_WIDTH_A", 10), ("DATA_WIDTH_A", 18),