perf(v2): shared activation cache - further 1.66-2.00x real speedup (DEC-0016)
Implements optimization #2 from the final benchmark campaign's own recommendation, on top of DEC-0015's word-level burst rewrite: a new shared activation_cache.v module fetches a given activation (X) vector from PSRAM once instead of once per neuron sharing it - the exact redundant traffic pattern the dense-layer workloads in this project's benchmark suite exhibit. Each memory_manager's own prefetch_engine now fetches WEIGHTS only; the activation half is requested from the shared cache instead (single-tag, tile-granular, N_SLOTS request ports, its own real word-level PSRAM backend via a new dedicated arbiter port). dataflow_core.v/slot_mem_arbiter.v/neural_multiprocessor.v widened to N_SLOTS+1 ports to arbitrate the cache's traffic alongside each slot's weight traffic. Two real bugs found and fixed during implementation (ERR-0010): a target-bank/pending-bank race in memory_manager.v's activation-cache wiring (the same bug class ERR-0006 already fixed once for pf_target_bank - a later handoff's queued request can overwrite which bank an earlier, still-in-flight request's ack applies to), and a repeat of ERR-0009's N_SLOTS=1 zero-width replication bug in activation_cache.v itself. Real, measured results: the full final-benchmark campaign (24/24 workload/config combinations) re-verified bit-exact. D-Stress cycles fall a further 1.66-2.00x on top of DEC-0015 (~4x combined vs the original byte-level baseline). But the cache's real Fmax cost is much steeper than DEC-0015's own: N_SLOTS=2 (the recommended default, DEC-0014) drops from 133.58 to 87.72 MHz (-34%, margin over 80MHz shrinks from +67% to +9.7%), and N_SLOTS=4 drops to 65.01 MHz - now FAILING the 80MHz target it previously passed. Combined real wall-clock speedup vs the original baseline: N=1 3.86x, N=2 2.45x (both real net wins); N=4 is a real regression once its own now-failing Fmax is honestly used, though N=4 was never the recommended configuration. N_SLOTS=2 remains the recommended default (DEC-0014 unaffected) with a thinner but still real Fmax margin. Cache hit-detection pipelining is flagged as concrete follow-up work if N_SLOTS>2 is ever needed with the cache active - not attempted this round. Logged: simulation/synthesis/timing/benchmark/decisions (DEC-0016)/ experiments (EXP-0016)/errors (ERR-0010)/development.log, ROADMAP.md updated. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013xXuuRUWZScuo1DeYJxs3v
This commit is contained in:
@@ -96,11 +96,21 @@ module tb;
|
||||
reg [ADDR_WIDTH-1:0] reg_x_base, reg_w_base, reg_result_addr;
|
||||
reg [15:0] reg_n_tiles;
|
||||
|
||||
wire [N_SLOTS-1:0] slot_mem_req, slot_mem_wr;
|
||||
wire [ADDR_WIDTH*N_SLOTS-1:0] slot_mem_addr;
|
||||
wire [16*N_SLOTS-1:0] slot_mem_wdata, slot_mem_rdata;
|
||||
wire [N_SLOTS-1:0] slot_mem_lb_n, slot_mem_ub_n;
|
||||
wire [N_SLOTS-1:0] slot_mem_ready;
|
||||
// Arrays sized N_SLOTS+1 post-M10 (decisions.log DEC-0016) -- index
|
||||
// N_SLOTS is the shared activation_cache's own backend port. Each
|
||||
// index still gets its OWN independent behavioral memory (matches
|
||||
// this testbench's own pre-existing scope: real shared-PSRAM
|
||||
// arbitration across slots is M8's job, not exercised here) --
|
||||
// X data is poked ONCE into memory index N_SLOTS (the cache's own,
|
||||
// single shared backing store) rather than duplicated per-slot,
|
||||
// since X now genuinely flows through ONE shared path regardless
|
||||
// of which slot a job lands on; W data is still poked into every
|
||||
// slot's own memory (unchanged), since W is not shared.
|
||||
wire [N_SLOTS:0] slot_mem_req, slot_mem_wr;
|
||||
wire [ADDR_WIDTH*(N_SLOTS+1)-1:0] slot_mem_addr;
|
||||
wire [16*(N_SLOTS+1)-1:0] slot_mem_wdata, slot_mem_rdata;
|
||||
wire [N_SLOTS:0] slot_mem_lb_n, slot_mem_ub_n;
|
||||
wire [N_SLOTS:0] slot_mem_ready;
|
||||
|
||||
dataflow_core #(
|
||||
.DATA_WIDTH(DATA_WIDTH), .P_IN(P_IN), .ACC_WIDTH(ACC_WIDTH), .ADDR_WIDTH(ADDR_WIDTH),
|
||||
@@ -118,7 +128,7 @@ module tb;
|
||||
|
||||
genvar g;
|
||||
generate
|
||||
for (g = 0; g < N_SLOTS; g = g + 1) begin : GEN_MEM
|
||||
for (g = 0; g < N_SLOTS+1; g = g + 1) begin : GEN_MEM
|
||||
sim_word_mem #(.ADDR_WIDTH(ADDR_WIDTH), .DEPTH(4096)) u_mem (
|
||||
.clk(clk), .rst(rst),
|
||||
.req(slot_mem_req[g]), .wr(slot_mem_wr[g]),
|
||||
@@ -143,6 +153,8 @@ module tb;
|
||||
else tb.GEN_MEM[0].u_mem.mem[word_addr][15:8] = val;
|
||||
1: if (byte_addr[0]==1'b0) tb.GEN_MEM[1].u_mem.mem[word_addr][7:0] = val;
|
||||
else tb.GEN_MEM[1].u_mem.mem[word_addr][15:8] = val;
|
||||
2: if (byte_addr[0]==1'b0) tb.GEN_MEM[2].u_mem.mem[word_addr][7:0] = val; // shared activation_cache backing store (N_SLOTS index)
|
||||
else tb.GEN_MEM[2].u_mem.mem[word_addr][15:8] = val;
|
||||
default: ;
|
||||
endcase
|
||||
end
|
||||
@@ -155,6 +167,7 @@ module tb;
|
||||
case (slot)
|
||||
0: peek = (byte_addr[0]==1'b0) ? tb.GEN_MEM[0].u_mem.mem[word_addr][7:0] : tb.GEN_MEM[0].u_mem.mem[word_addr][15:8];
|
||||
1: peek = (byte_addr[0]==1'b0) ? tb.GEN_MEM[1].u_mem.mem[word_addr][7:0] : tb.GEN_MEM[1].u_mem.mem[word_addr][15:8];
|
||||
2: peek = (byte_addr[0]==1'b0) ? tb.GEN_MEM[2].u_mem.mem[word_addr][7:0] : tb.GEN_MEM[2].u_mem.mem[word_addr][15:8];
|
||||
default: peek = 8'sdx;
|
||||
endcase
|
||||
end
|
||||
@@ -193,15 +206,15 @@ module tb;
|
||||
rst = 0;
|
||||
@(posedge clk);
|
||||
|
||||
// Pre-load PSRAM-equivalent memory for both slots (a job could
|
||||
// land on either slot, first-free, so both need the data).
|
||||
// Pre-load PSRAM-equivalent memory. W (per-slot, not shared)
|
||||
// still needs to land in EVERY slot's own memory (a job could
|
||||
// land on either slot, first-free). X (post-DEC-0016) flows
|
||||
// through the ONE shared activation_cache instead -- poked
|
||||
// once into memory index N_SLOTS(=2)'s backing store.
|
||||
for (i = 0; i < 8; i = i + 1) begin
|
||||
poke(0, 23'h10+i, 8'sd2); poke(0, 23'h20+i, 8'sd3); // node0: x=2,w=3
|
||||
poke(1, 23'h10+i, 8'sd2); poke(1, 23'h20+i, 8'sd3);
|
||||
poke(0, 23'h30+i, 8'sd1); poke(0, 23'h40+i, 8'sd1); // node1: x=1,w=1
|
||||
poke(1, 23'h30+i, 8'sd1); poke(1, 23'h40+i, 8'sd1);
|
||||
poke(0, 23'h50+i, 8'sd1); poke(0, 23'h60+i, 8'sd5); // node2: x=1,w=5
|
||||
poke(1, 23'h50+i, 8'sd1); poke(1, 23'h60+i, 8'sd5);
|
||||
poke(2, 23'h10+i, 8'sd2); poke(0, 23'h20+i, 8'sd3); poke(1, 23'h20+i, 8'sd3); // node0: x=2,w=3
|
||||
poke(2, 23'h30+i, 8'sd1); poke(0, 23'h40+i, 8'sd1); poke(1, 23'h40+i, 8'sd1); // node1: x=1,w=1
|
||||
poke(2, 23'h50+i, 8'sd1); poke(0, 23'h60+i, 8'sd5); poke(1, 23'h60+i, 8'sd5); // node2: x=1,w=5
|
||||
end
|
||||
|
||||
// node0, node1: no dependencies. node2: depends on BOTH.
|
||||
|
||||
@@ -50,15 +50,73 @@ module tb;
|
||||
wire mm_result_valid, mm_result_ready;
|
||||
wire signed [DATA_WIDTH-1:0] mm_result_data;
|
||||
|
||||
// ---- memory_manager <-> memory_interface (word-level Memory
|
||||
// Backend Interface, post-M10 DEC-0015 -- int8_memory_access is no
|
||||
// longer in this datapath, see memory_manager.v's own header) ----
|
||||
wire mem_req, mem_wr;
|
||||
wire [ADDR_WIDTH-1:0] mem_addr; // WORD address
|
||||
wire [15:0] mem_wdata;
|
||||
wire mem_lb_n, mem_ub_n;
|
||||
wire [15:0] mem_rdata;
|
||||
wire mem_ready;
|
||||
// ---- memory_manager's own WEIGHT backend port (word-level Memory
|
||||
// Backend Interface, post-M10 DEC-0015) ----
|
||||
wire mm_mem_req, mm_mem_wr;
|
||||
wire [ADDR_WIDTH-1:0] mm_mem_addr; // WORD address
|
||||
wire [15:0] mm_mem_wdata;
|
||||
wire mm_mem_lb_n, mm_mem_ub_n;
|
||||
wire [15:0] mm_mem_rdata;
|
||||
wire mm_mem_ready;
|
||||
|
||||
// ---- shared activation_cache (M10+, DEC-0016) -- N_SLOTS=1 here
|
||||
// (a single memory_manager instance), routed through a real 2-port
|
||||
// arbiter (weight port + cache port) into the SAME real
|
||||
// memory_interface, mirroring dataflow_core.v/neural_multiprocessor.v's
|
||||
// own real structure exactly, just scoped down to one slot. ----
|
||||
wire xc_req;
|
||||
wire [ADDR_WIDTH-1:0] xc_x_base;
|
||||
wire [15:0] xc_tile_idx;
|
||||
wire xc_ack;
|
||||
wire signed [DATA_WIDTH*P_IN-1:0] xc_tile_x;
|
||||
|
||||
wire xc_mem_req, xc_mem_wr;
|
||||
wire [ADDR_WIDTH-1:0] xc_mem_addr;
|
||||
wire [15:0] xc_mem_wdata;
|
||||
wire xc_mem_lb_n, xc_mem_ub_n;
|
||||
wire [15:0] xc_mem_rdata;
|
||||
wire xc_mem_ready;
|
||||
|
||||
activation_cache #(
|
||||
.DATA_WIDTH(DATA_WIDTH), .P_IN(P_IN), .ADDR_WIDTH(ADDR_WIDTH), .N_SLOTS(1)
|
||||
) u_xcache (
|
||||
.clk(clk), .rst(rst),
|
||||
.req(xc_req), .req_x_base(xc_x_base), .req_tile_idx(xc_tile_idx),
|
||||
.ack(xc_ack), .tile_x_out(xc_tile_x),
|
||||
.mem_req(xc_mem_req), .mem_wr(xc_mem_wr), .mem_addr(xc_mem_addr), .mem_wdata(xc_mem_wdata),
|
||||
.mem_lb_n(xc_mem_lb_n), .mem_ub_n(xc_mem_ub_n),
|
||||
.mem_rdata(xc_mem_rdata), .mem_ready(xc_mem_ready)
|
||||
);
|
||||
|
||||
wire [1:0] arb2_req = {xc_mem_req, mm_mem_req};
|
||||
wire [1:0] arb2_wr = {xc_mem_wr, mm_mem_wr};
|
||||
wire [ADDR_WIDTH*2-1:0] arb2_addr = {xc_mem_addr, mm_mem_addr};
|
||||
wire [31:0] arb2_wdata = {xc_mem_wdata, mm_mem_wdata};
|
||||
wire [1:0] arb2_lb_n = {xc_mem_lb_n, mm_mem_lb_n};
|
||||
wire [1:0] arb2_ub_n = {xc_mem_ub_n, mm_mem_ub_n};
|
||||
wire [31:0] arb2_rdata;
|
||||
wire [1:0] arb2_ready;
|
||||
assign mm_mem_rdata = arb2_rdata[15:0];
|
||||
assign mm_mem_ready = arb2_ready[0];
|
||||
assign xc_mem_rdata = arb2_rdata[31:16];
|
||||
assign xc_mem_ready = arb2_ready[1];
|
||||
|
||||
wire arb_m_req, arb_m_wr;
|
||||
wire [ADDR_WIDTH-1:0] arb_m_addr;
|
||||
wire [15:0] arb_m_wdata;
|
||||
wire arb_m_lb_n, arb_m_ub_n;
|
||||
wire [15:0] arb_m_rdata;
|
||||
wire arb_m_ready;
|
||||
|
||||
slot_mem_arbiter #(.ADDR_WIDTH(ADDR_WIDTH), .N_PORTS(2)) u_arb2 (
|
||||
.clk(clk), .rst(rst),
|
||||
.s_req(arb2_req), .s_wr(arb2_wr), .s_addr(arb2_addr),
|
||||
.s_wdata(arb2_wdata), .s_lb_n(arb2_lb_n), .s_ub_n(arb2_ub_n),
|
||||
.s_rdata(arb2_rdata), .s_ready(arb2_ready),
|
||||
.m_req(arb_m_req), .m_wr(arb_m_wr), .m_addr(arb_m_addr), .m_wdata(arb_m_wdata),
|
||||
.m_lb_n(arb_m_lb_n), .m_ub_n(arb_m_ub_n),
|
||||
.m_rdata(arb_m_rdata), .m_ready(arb_m_ready)
|
||||
);
|
||||
|
||||
memory_manager #(
|
||||
.DATA_WIDTH(DATA_WIDTH), .P_IN(P_IN), .ADDR_WIDTH(ADDR_WIDTH)
|
||||
@@ -69,9 +127,11 @@ module tb;
|
||||
.operand_valid(mm_operand_valid), .operand_ready(mm_operand_ready),
|
||||
.input_data(mm_input_data), .weight_data(mm_weight_data), .tile_last(mm_tile_last),
|
||||
.result_valid(mm_result_valid), .result_ready(mm_result_ready), .result_data(mm_result_data),
|
||||
.mem_req(mem_req), .mem_wr(mem_wr), .mem_addr(mem_addr), .mem_wdata(mem_wdata),
|
||||
.mem_lb_n(mem_lb_n), .mem_ub_n(mem_ub_n),
|
||||
.mem_rdata(mem_rdata), .mem_ready(mem_ready)
|
||||
.xc_req(xc_req), .xc_x_base(xc_x_base), .xc_tile_idx(xc_tile_idx),
|
||||
.xc_ack(xc_ack), .xc_tile_x(xc_tile_x),
|
||||
.mem_req(mm_mem_req), .mem_wr(mm_mem_wr), .mem_addr(mm_mem_addr), .mem_wdata(mm_mem_wdata),
|
||||
.mem_lb_n(mm_mem_lb_n), .mem_ub_n(mm_mem_ub_n),
|
||||
.mem_rdata(mm_mem_rdata), .mem_ready(mm_mem_ready)
|
||||
);
|
||||
|
||||
// ---- real Neural Processor (M1), driven entirely by memory_manager ----
|
||||
@@ -121,9 +181,9 @@ module tb;
|
||||
|
||||
memory_interface #(.ADDR_WIDTH(ADDR_WIDTH), .DATA_WIDTH(PSRAM_DATA_WIDTH)) u_memif (
|
||||
.clk(clk), .rst(rst),
|
||||
.req(mem_req), .wr(mem_wr), .addr(mem_addr), .wdata(mem_wdata),
|
||||
.lb_n(mem_lb_n), .ub_n(mem_ub_n),
|
||||
.rdata(mem_rdata), .ready(mem_ready),
|
||||
.req(arb_m_req), .wr(arb_m_wr), .addr(arb_m_addr), .wdata(arb_m_wdata),
|
||||
.lb_n(arb_m_lb_n), .ub_n(arb_m_ub_n),
|
||||
.rdata(arb_m_rdata), .ready(arb_m_ready),
|
||||
.mem_req(pc_mem_req), .mem_wr(pc_mem_wr), .mem_addr(pc_mem_addr), .mem_wdata(pc_mem_wdata),
|
||||
.mem_lb_n(pc_mem_lb_n), .mem_ub_n(pc_mem_ub_n),
|
||||
.mem_rdata(pc_mem_rdata), .mem_ready(pc_mem_ready)
|
||||
|
||||
Reference in New Issue
Block a user