feat: DDRManager phase 1 - single-slot look-ahead activation prefetch (EXP-0083)
New ddr_prefetch_mgr.v wraps act_tile_fetch.v with a depth-2 ping-pong buffer, issuing the next tile's DDR3 fetch as soon as the fetch engine is free instead of waiting for packed_slot.v to finish consuming the current tile. Wired into packed_slot.v's tile loop (job-level start instead of per-tile req), simplifying the S_TILEWAIT join in the process (ddrpf_tile_valid is level-held, no separate act_seen latch needed). Verification: new tb_ddr_prefetch_mgr.v (25/25 PASS after fixing a real testbench polling race found via iteration-tagged tracing, not an RTL bug), tb_packed_slot.v re-run unmodified (9/9 PASS, bit-identical results), tb_n2_system_ddr3.v re-run via real xsim against real ddr3_model.sv (8/8 PASS). Real P&R: WNS +0.073ns (up from EXP-0082's +0.068ns), LUTs 5644, DSP48E1 16 unchanged, 0 failing endpoints. Honest result: real A/B on the actual DDR3 backend (same testbench, before/after) shows a real but modest 2.86% reduction in total simulated time - smaller than the original hypothesis suggested, because neural_processor_packed.v already accepts one operand per cycle, so the per-tile dead time being removed was already small relative to real DDR3 fetch latency. Docs updated to report this honestly rather than oversell it; the larger multi-slot DDRManager is deferred pending re-measurement against the (still pending, user-gated) 32-bit channel widening. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01MUG92aM9m68TRc4rG55BcC
This commit is contained in:
@@ -0,0 +1,176 @@
|
||||
`timescale 1ns/1ps
|
||||
|
||||
// ============================================================
|
||||
// V3 -- ddr_prefetch_mgr.v: the DDRManager's real phase-1 deliverable
|
||||
// (EXP-0083), implementing the user's own proposed idea -- "vorrei che
|
||||
// orchestrator potesse 'prenotare' le letture future in RAM ... in modo
|
||||
// da azzerare i tempi di attesa (o almeno ridurli al minimo)" -- scoped,
|
||||
// per this project's own "one variable at a time" discipline and the
|
||||
// validation plan docs/ARCHITECTURE_ANALYSIS.md S5.2 laid out, to a
|
||||
// SINGLE slot's own activation-tile look-ahead first, before attempting
|
||||
// a cross-slot/whole-Director-queue scheduler.
|
||||
//
|
||||
// WHAT THIS DOES: wraps act_tile_fetch.v (unmodified, reused as the
|
||||
// "fetch exactly one tile" engine) with a depth-2 ping-pong buffer and a
|
||||
// sequencer that issues the NEXT tile's fetch the INSTANT the fetch
|
||||
// engine is free and that tile's buffer bank is free -- NOT waiting for
|
||||
// packed_slot.v to have consumed the CURRENT tile first. This overlaps
|
||||
// "fetching tile N+1" with "packed_slot.v consuming tile N", which the
|
||||
// original per-tile req/wait loop (EXP-0079/0081) never did.
|
||||
//
|
||||
// WHAT THIS DOES NOT DO (disclosed, not glossed over): it does not
|
||||
// change the real 1.24 GB/s physical DDR3 ceiling (S3.1 of the
|
||||
// architecture doc) or the per-fetch latency of any SINGLE tile fetch --
|
||||
// it only removes the small, real per-tile RE-REQUEST overhead (the
|
||||
// S_TILEREQ pulse cycle + the S_OPERAND consume cycle packed_slot.v's
|
||||
// own FSM previously spent NOT fetching, between one tile's data
|
||||
// arriving and the next tile's fetch being issued). Given
|
||||
// neural_processor_packed.v's own pipeline accepts one operand PER
|
||||
// CYCLE once in NP_WAIT_OPERANDS (operand_ready is state-only, not
|
||||
// gated on any internal pipeline stall), the real compute-side
|
||||
// consumption cost per tile is ~1 cycle -- meaning this fix's real
|
||||
// ceiling is bounded by that small per-tile overhead, not by hiding a
|
||||
// large compute-bound stall. The real, measured improvement is reported
|
||||
// in the EXP-0083 log entry, not assumed here.
|
||||
//
|
||||
// WHY A DOUBLE BUFFER (depth 2), not deeper: matches
|
||||
// layer_weight_buffer.v's own proven ping-pong pattern in this
|
||||
// codebase, and depth 2 is provably sufficient here -- the fetch
|
||||
// sequencer can be at most 1 tile ahead of the consumer, since issuing
|
||||
// tile N+2's fetch requires bank[(N+2)%2] == bank[N%2] to already be
|
||||
// free, which only happens once tile N has been consumed. No unbounded
|
||||
// lookahead is possible or attempted.
|
||||
//
|
||||
// WHY THIS IS TIMING-SAFE: bank selection for both the fill side
|
||||
// (fetch_idx[0]) and the read side (consume_idx[0]) is a REGISTERED
|
||||
// index bit, exactly the same "select known long before the data it
|
||||
// gates" discipline act_tile_fetch.v's own header (EXP-0081) already
|
||||
// established as safe -- never a bit racing live data. Requires its own
|
||||
// real P&R re-check before being trusted at N>1 scale, per this
|
||||
// project's standing practice (not assumed safe by analogy alone).
|
||||
// ============================================================
|
||||
module ddr_prefetch_mgr #(
|
||||
parameter DATA_WIDTH = 8,
|
||||
parameter P_IN = 8,
|
||||
parameter BURST_LEN = 8,
|
||||
parameter ADDR_WIDTH = 25 // word address, matches act_tile_fetch.v's own convention
|
||||
)(
|
||||
input wire clk,
|
||||
input wire rst,
|
||||
|
||||
// ---- job-level control (packed_slot.v issues this ONCE per job,
|
||||
// not once per tile -- the whole tile loop's lookahead is driven
|
||||
// internally from here) ----
|
||||
input wire job_start, // one-shot pulse
|
||||
input wire [ADDR_WIDTH-1:0] base_a,
|
||||
input wire [ADDR_WIDTH-1:0] base_b,
|
||||
input wire [15:0] n_tiles,
|
||||
|
||||
// ---- per-tile consumption interface (packed_slot.v side) ----
|
||||
// tile_valid is a LEVEL signal (unlike act_tile_fetch.v's one-cycle
|
||||
// `valid` pulse) -- it stays high as long as the current
|
||||
// consume-index's buffer bank holds unconsumed data, which may
|
||||
// already be true the cycle packed_slot.v asks, if the lookahead
|
||||
// fetch completed early. packed_slot.v pulses tile_consume once it
|
||||
// has latched data_a/data_b, which frees this bank for the next
|
||||
// lookahead fetch.
|
||||
output wire tile_valid,
|
||||
output wire signed [DATA_WIDTH*P_IN-1:0] data_a,
|
||||
output wire signed [DATA_WIDTH*P_IN-1:0] data_b,
|
||||
input wire tile_consume, // one-shot pulse
|
||||
|
||||
// ---- shared DDR3 controller port (identical shape to
|
||||
// act_tile_fetch.v's own -- this module is a pure passthrough
|
||||
// wrapper on this side, connects straight through to the inner
|
||||
// act_tile_fetch instance) ----
|
||||
output wire mem_active,
|
||||
input wire mem_grant,
|
||||
output wire ctrl_req,
|
||||
output wire ctrl_wr,
|
||||
output wire [ADDR_WIDTH-1:0] ctrl_addr,
|
||||
output wire [16*BURST_LEN-1:0] ctrl_wdata,
|
||||
output wire [2*BURST_LEN-1:0] ctrl_wmask,
|
||||
input wire [16*BURST_LEN-1:0] ctrl_rdata,
|
||||
input wire ctrl_ready,
|
||||
input wire ctrl_busy
|
||||
);
|
||||
reg [ADDR_WIDTH-1:0] base_a_lat, base_b_lat;
|
||||
reg [15:0] n_tiles_lat;
|
||||
reg [15:0] fetch_idx, consume_idx;
|
||||
reg fetch_inflight;
|
||||
|
||||
// ---- depth-2 ping-pong buffer ----
|
||||
reg signed [DATA_WIDTH*P_IN-1:0] bank_data_a [0:1];
|
||||
reg signed [DATA_WIDTH*P_IN-1:0] bank_data_b [0:1];
|
||||
reg [1:0] bank_valid;
|
||||
|
||||
assign tile_valid = bank_valid[consume_idx[0]];
|
||||
assign data_a = bank_data_a[consume_idx[0]];
|
||||
assign data_b = bank_data_b[consume_idx[0]];
|
||||
|
||||
// ---- inner fetch engine: act_tile_fetch.v, reused unmodified,
|
||||
// driven one tile at a time by this sequencer ----
|
||||
reg act_req;
|
||||
wire act_valid;
|
||||
wire signed [DATA_WIDTH*P_IN-1:0] act_data_a_w, act_data_b_w;
|
||||
|
||||
act_tile_fetch #(
|
||||
.DATA_WIDTH(DATA_WIDTH), .P_IN(P_IN), .BURST_LEN(BURST_LEN), .ADDR_WIDTH(ADDR_WIDTH)
|
||||
) u_act (
|
||||
.clk(clk), .rst(rst),
|
||||
.req(act_req), .base_a(base_a_lat), .base_b(base_b_lat),
|
||||
.tcnt(fetch_idx), .valid(act_valid), .data_a(act_data_a_w), .data_b(act_data_b_w),
|
||||
.mem_active(mem_active), .mem_grant(mem_grant),
|
||||
.ctrl_req(ctrl_req), .ctrl_wr(ctrl_wr), .ctrl_addr(ctrl_addr),
|
||||
.ctrl_wdata(ctrl_wdata), .ctrl_wmask(ctrl_wmask),
|
||||
.ctrl_rdata(ctrl_rdata), .ctrl_ready(ctrl_ready), .ctrl_busy(ctrl_busy)
|
||||
);
|
||||
|
||||
// can_issue: the inner fetch engine is free, there is a next tile
|
||||
// left in this job, and that tile's destination bank has already
|
||||
// been consumed (or was never filled yet, at job start).
|
||||
wire can_issue = !fetch_inflight && (fetch_idx < n_tiles_lat) && !bank_valid[fetch_idx[0]];
|
||||
|
||||
always @(posedge clk) begin
|
||||
if (rst) begin
|
||||
base_a_lat <= {ADDR_WIDTH{1'b0}};
|
||||
base_b_lat <= {ADDR_WIDTH{1'b0}};
|
||||
n_tiles_lat <= 16'd0;
|
||||
fetch_idx <= 16'd0;
|
||||
consume_idx <= 16'd0;
|
||||
fetch_inflight <= 1'b0;
|
||||
act_req <= 1'b0;
|
||||
bank_valid <= 2'b00;
|
||||
end else begin
|
||||
act_req <= 1'b0;
|
||||
|
||||
if (job_start) begin
|
||||
base_a_lat <= base_a;
|
||||
base_b_lat <= base_b;
|
||||
n_tiles_lat <= n_tiles;
|
||||
fetch_idx <= 16'd0;
|
||||
consume_idx <= 16'd0;
|
||||
fetch_inflight <= 1'b0;
|
||||
bank_valid <= 2'b00;
|
||||
end else begin
|
||||
if (can_issue) begin
|
||||
act_req <= 1'b1;
|
||||
fetch_inflight <= 1'b1;
|
||||
end
|
||||
|
||||
if (act_valid) begin
|
||||
bank_data_a[fetch_idx[0]] <= act_data_a_w;
|
||||
bank_data_b[fetch_idx[0]] <= act_data_b_w;
|
||||
bank_valid[fetch_idx[0]] <= 1'b1;
|
||||
fetch_idx <= fetch_idx + 16'd1;
|
||||
fetch_inflight <= 1'b0;
|
||||
end
|
||||
|
||||
if (tile_consume) begin
|
||||
bank_valid[consume_idx[0]] <= 1'b0;
|
||||
consume_idx <= consume_idx + 16'd1;
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
endmodule
|
||||
@@ -15,29 +15,30 @@
|
||||
// node_id_a/b -> job_done/result_data_a/b/result_node_id_a/b).
|
||||
//
|
||||
// ACTIVATION FETCH (EXP-0079, real, closes the gap this header used to
|
||||
// disclose as deferred): act_tile_fetch.v reads each tile's activation
|
||||
// data DIRECTLY from the shared DDR3 bus, one tile at a time -- no
|
||||
// on-chip buffering/prefetch (unlike weights, activation data is read
|
||||
// exactly once per job, so buffering it would add complexity for zero
|
||||
// reuse benefit). It shares THIS slot's own single ctrl_req/addr/etc
|
||||
// port with layer_prefetch_ctrl.v (u_pf): the two are mutually
|
||||
// exclusive in time by FSM construction (weight prefetch always fully
|
||||
// completes, including its own consume_done, before the tile loop
|
||||
// that needs activation data ever starts), muxed below on act_mem_
|
||||
// active. The outer arbiter's grant (mem_active/mem_grant, this
|
||||
// module's own top-level ports) is now also needed during activation
|
||||
// fetch, not just weight prefetch -- held PER TILE (one 2-burst fetch,
|
||||
// lane A then lane B), released between tiles, matching this
|
||||
// project's own established "lock the grant for one whole logical
|
||||
// fetch, not longer" discipline (avoids starving the other slot for
|
||||
// the whole tile loop's duration).
|
||||
// disclose as deferred; EXP-0083 upgrades it to a look-ahead prefetch):
|
||||
// ddr_prefetch_mgr.v wraps act_tile_fetch.v with a depth-2 ping-pong
|
||||
// buffer, issuing tile N+1's fetch the instant the fetch engine is
|
||||
// free rather than waiting for this slot to finish CONSUMING tile N --
|
||||
// overlapping "fetch next tile" with "consume current tile" (see
|
||||
// ddr_prefetch_mgr.v's own header for the real, honest, measured scope
|
||||
// of the benefit -- it does not raise the physical DDR3 ceiling, only
|
||||
// removes small real per-tile re-request overhead). It shares THIS
|
||||
// slot's own single ctrl_req/addr/etc port with layer_prefetch_ctrl.v
|
||||
// (u_pf): the two are mutually exclusive in time by FSM construction
|
||||
// (weight prefetch always fully completes, including its own
|
||||
// consume_done, before the tile loop that needs activation data ever
|
||||
// starts), muxed below on act_mem_active. The outer arbiter's grant
|
||||
// (mem_active/mem_grant, this module's own top-level ports) is now
|
||||
// also needed during activation fetch, not just weight prefetch --
|
||||
// held PER TILE (one 2-burst fetch, lane A then lane B), released
|
||||
// between tiles, matching this project's own established "lock the
|
||||
// grant for one whole logical fetch, not longer" discipline (avoids
|
||||
// starving the other slot for the whole tile loop's duration).
|
||||
//
|
||||
// MEMORY LAYOUT this requires of activation data in DDR3: each tile
|
||||
// occupies its own full BURST_LEN=8-word burst slot (see act_tile_
|
||||
// fetch.v's own header for why -- avoiding a runtime-indexed part-
|
||||
// select, a known Fmax risk this project's already-thin P&R margin,
|
||||
// EXP-0078, can't afford right now). Documented for whoever prepares
|
||||
// host-side data layout in the physical realization doc.
|
||||
// MEMORY LAYOUT this requires of activation data in DDR3 (EXP-0081,
|
||||
// v2 convention): two consecutive tiles share one full BURST_LEN=8-
|
||||
// word burst (even index low 64 bits, odd index high 64 bits) -- see
|
||||
// act_tile_fetch.v's own header and docs/PHYSICAL_REALIZATION.md S4.
|
||||
//
|
||||
// Also disclosed: no result-writeback engine exists yet either --
|
||||
// result_addr_a/b are passed through unused, for a future writeback
|
||||
@@ -153,11 +154,14 @@ module packed_slot #(
|
||||
.ctrl_rdata(ctrl_rdata), .ctrl_ready(ctrl_ready), .ctrl_busy(ctrl_busy)
|
||||
);
|
||||
|
||||
// ---- act_tile_fetch.v (EXP-0079): real activation fetch, shares
|
||||
// this slot's own ctrl port with u_pf above (mutually exclusive in
|
||||
// time -- see header) ----
|
||||
reg act_req;
|
||||
wire act_valid;
|
||||
// ---- ddr_prefetch_mgr.v (EXP-0083): look-ahead activation fetch,
|
||||
// shares this slot's own ctrl port with u_pf above (mutually
|
||||
// exclusive in time -- see header). Job-level start (once per job,
|
||||
// not once per tile -- the whole tile loop's lookahead sequencing
|
||||
// happens inside this module).
|
||||
reg ddrpf_job_start;
|
||||
wire ddrpf_tile_valid;
|
||||
reg ddrpf_tile_consume;
|
||||
wire signed [DATA_WIDTH*P_IN-1:0] act_data_a_w, act_data_b_w;
|
||||
wire act_mem_active;
|
||||
|
||||
@@ -166,12 +170,15 @@ module packed_slot #(
|
||||
wire [16*BURST_LEN-1:0] act_ctrl_wdata;
|
||||
wire [2*BURST_LEN-1:0] act_ctrl_wmask;
|
||||
|
||||
act_tile_fetch #(
|
||||
ddr_prefetch_mgr #(
|
||||
.DATA_WIDTH(DATA_WIDTH), .P_IN(P_IN), .BURST_LEN(BURST_LEN), .ADDR_WIDTH(ADDR_WIDTH-1)
|
||||
) u_act (
|
||||
) u_ddrpf (
|
||||
.clk(clk), .rst(rst),
|
||||
.req(act_req), .base_a(x_base_a_lat[ADDR_WIDTH-2:0]), .base_b(x_base_b_lat[ADDR_WIDTH-2:0]),
|
||||
.tcnt(tcnt), .valid(act_valid), .data_a(act_data_a_w), .data_b(act_data_b_w),
|
||||
.job_start(ddrpf_job_start),
|
||||
.base_a(x_base_a_lat[ADDR_WIDTH-2:0]), .base_b(x_base_b_lat[ADDR_WIDTH-2:0]),
|
||||
.n_tiles(n_tiles_lat),
|
||||
.tile_valid(ddrpf_tile_valid), .data_a(act_data_a_w), .data_b(act_data_b_w),
|
||||
.tile_consume(ddrpf_tile_consume),
|
||||
.mem_active(act_mem_active), .mem_grant(mem_grant),
|
||||
.ctrl_req(act_ctrl_req), .ctrl_wr(act_ctrl_wr), .ctrl_addr(act_ctrl_addr),
|
||||
.ctrl_wdata(act_ctrl_wdata), .ctrl_wmask(act_ctrl_wmask),
|
||||
@@ -180,7 +187,7 @@ module packed_slot #(
|
||||
|
||||
// mutually exclusive by FSM construction (weight prefetch always
|
||||
// fully completes, incl. consume_done, before the tile loop that
|
||||
// triggers act_req ever starts) -- safe to select on act_mem_active alone.
|
||||
// triggers ddrpf_job_start ever fires) -- safe to select on act_mem_active alone.
|
||||
assign ctrl_req = act_mem_active ? act_ctrl_req : pf_ctrl_req;
|
||||
assign ctrl_wr = act_mem_active ? act_ctrl_wr : pf_ctrl_wr;
|
||||
assign ctrl_addr = act_mem_active ? act_ctrl_addr : pf_ctrl_addr;
|
||||
@@ -204,7 +211,9 @@ module packed_slot #(
|
||||
// ---- weight_tile_gather.v ----
|
||||
reg tile_req;
|
||||
reg [BUFADDRW-1:0] tile_base;
|
||||
reg tile_seen, act_seen; // S_TILEWAIT join latches (weight vs activation, see header)
|
||||
reg tile_seen; // S_TILEWAIT join latch (weight side only -- see header;
|
||||
// the activation side, ddrpf_tile_valid, is level-held by
|
||||
// ddr_prefetch_mgr.v so it needs no separate latch)
|
||||
wire tile_valid;
|
||||
wire [DATA_WIDTH*P_IN-1:0] tile_data;
|
||||
|
||||
@@ -261,9 +270,9 @@ module packed_slot #(
|
||||
pf_start <= 1'b0;
|
||||
consume_done <= 1'b0;
|
||||
tile_req <= 1'b0;
|
||||
act_req <= 1'b0;
|
||||
ddrpf_job_start <= 1'b0;
|
||||
ddrpf_tile_consume <= 1'b0;
|
||||
tile_seen <= 1'b0;
|
||||
act_seen <= 1'b0;
|
||||
job_valid_np <= 1'b0;
|
||||
operand_valid<= 1'b0;
|
||||
tile_last <= 1'b0;
|
||||
@@ -276,7 +285,8 @@ module packed_slot #(
|
||||
pf_start <= 1'b0;
|
||||
consume_done <= 1'b0;
|
||||
tile_req <= 1'b0;
|
||||
act_req <= 1'b0;
|
||||
ddrpf_job_start <= 1'b0;
|
||||
ddrpf_tile_consume <= 1'b0;
|
||||
|
||||
case (state)
|
||||
S_IDLE: begin
|
||||
@@ -320,42 +330,43 @@ module packed_slot #(
|
||||
|
||||
S_JOBSTART: begin
|
||||
if (job_valid_np && job_ready_np) begin
|
||||
job_valid_np <= 1'b0;
|
||||
tcnt <= 16'd0;
|
||||
state <= S_TILEREQ;
|
||||
job_valid_np <= 1'b0;
|
||||
tcnt <= 16'd0;
|
||||
ddrpf_job_start <= 1'b1; // one-shot: kicks off the whole job's
|
||||
// look-ahead tile loop inside u_ddrpf
|
||||
state <= S_TILEREQ;
|
||||
end
|
||||
end
|
||||
|
||||
S_TILEREQ: begin
|
||||
tile_req <= 1'b1;
|
||||
tile_base <= tcnt[BUFADDRW-1:0]*P_IN[BUFADDRW-1:0];
|
||||
act_req <= 1'b1;
|
||||
tile_seen <= 1'b0;
|
||||
act_seen <= 1'b0;
|
||||
state <= S_TILEWAIT;
|
||||
end
|
||||
|
||||
// Real join: weight_tile_gather.v's tile_valid (fast,
|
||||
// on-chip) and act_tile_fetch.v's act_valid (real
|
||||
// DDR3 latency, 2 bursts) do NOT arrive on the same
|
||||
// cycle in general -- latch whichever comes first,
|
||||
// proceed only once BOTH have been seen. Handles
|
||||
// either arrival order correctly, not just the
|
||||
// expected-common one (weight first).
|
||||
// on-chip, one-cycle pulse -- latched via tile_seen)
|
||||
// and u_ddrpf's ddrpf_tile_valid (real DDR3 latency,
|
||||
// but LEVEL-held by the prefetch manager's own ping-
|
||||
// pong buffer, possibly already true this cycle if the
|
||||
// look-ahead fetch completed early) do NOT arrive on
|
||||
// the same cycle in general -- proceed once BOTH are
|
||||
// available. ddrpf_tile_valid needs no separate latch
|
||||
// since it stays high until this slot pulses
|
||||
// ddrpf_tile_consume itself.
|
||||
S_TILEWAIT: begin
|
||||
if (tile_valid) begin
|
||||
weight_data_r <= tile_data;
|
||||
tile_seen <= 1'b1;
|
||||
end
|
||||
if (act_valid) begin
|
||||
input_data_a_r <= act_data_a_w;
|
||||
input_data_b_r <= act_data_b_w;
|
||||
act_seen <= 1'b1;
|
||||
end
|
||||
if ((tile_valid || tile_seen) && (act_valid || act_seen)) begin
|
||||
tile_last <= (tcnt == n_tiles_lat - 16'd1);
|
||||
operand_valid <= 1'b1;
|
||||
state <= S_OPERAND;
|
||||
if ((tile_valid || tile_seen) && ddrpf_tile_valid) begin
|
||||
input_data_a_r <= act_data_a_w;
|
||||
input_data_b_r <= act_data_b_w;
|
||||
ddrpf_tile_consume <= 1'b1;
|
||||
tile_last <= (tcnt == n_tiles_lat - 16'd1);
|
||||
operand_valid <= 1'b1;
|
||||
state <= S_OPERAND;
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -0,0 +1,310 @@
|
||||
`timescale 1ns/1ps
|
||||
|
||||
// ============================================================
|
||||
// EXP-0083: (1) isolated correctness test for ddr_prefetch_mgr.v --
|
||||
// same real SDR SDRAM placeholder backend precedent as
|
||||
// tb_act_tile_fetch.v -- and (2) a real, measured, honest A/B cycle-
|
||||
// count comparison against the OLD per-tile req/wait/consume loop
|
||||
// packed_slot.v used before EXP-0083, to get a REAL number for the
|
||||
// look-ahead prefetch's benefit instead of asserting one.
|
||||
//
|
||||
// Both the "baseline" (direct act_tile_fetch.v, one requester per
|
||||
// tile, old packed_slot.v sequencing) and the "prefetch" (ddr_
|
||||
// prefetch_mgr.v, EXP-0083) loops are run against the SAME shared
|
||||
// backend and the SAME preloaded data, back to back, muxed the same
|
||||
// way tb_act_tile_fetch.v's own pre_active mux works -- so the
|
||||
// comparison is apples to apples, not two different simulated
|
||||
// environments.
|
||||
//
|
||||
// Both loops apply the SAME 2-cycle "simulated compute overhead" per
|
||||
// tile (matching packed_slot.v's own real S_TILEREQ + S_OPERAND
|
||||
// single-cycle costs) between a tile becoming available and the next
|
||||
// step being taken -- the honest question this answers is: does
|
||||
// removing the OLD design's serialization of that overhead with the
|
||||
// NEXT tile's DDR3 fetch produce a real, measurable improvement, and
|
||||
// how much.
|
||||
// ============================================================
|
||||
module tb;
|
||||
localparam BURST_LEN = 8;
|
||||
localparam ROW_BITS = 13;
|
||||
localparam COL_BITS = 10;
|
||||
localparam BANK_BITS = 2;
|
||||
localparam ADDR_WIDTH = BANK_BITS + ROW_BITS + COL_BITS; // 25
|
||||
localparam CLK_FREQ_MHZ = 64;
|
||||
localparam CLK_PERIOD_NS = 1000.0/CLK_FREQ_MHZ;
|
||||
localparam DATA_WIDTH = 8;
|
||||
localparam P_IN = 8;
|
||||
localparam N_TILES = 6; // 3 burst-pairs/lane -- enough to see steady-state behavior
|
||||
|
||||
reg clk = 0;
|
||||
always #(CLK_PERIOD_NS/2.0) clk = ~clk;
|
||||
reg rst;
|
||||
|
||||
wire ctrl_req, ctrl_wr;
|
||||
wire [ADDR_WIDTH-1:0] ctrl_addr;
|
||||
wire [16*BURST_LEN-1:0] ctrl_wdata, ctrl_rdata;
|
||||
wire [2*BURST_LEN-1:0] ctrl_wmask;
|
||||
wire ctrl_ready, ctrl_busy;
|
||||
wire cke, cs_n, ras_n, cas_n, we_n;
|
||||
wire [BANK_BITS-1:0] ba;
|
||||
wire [ROW_BITS-1:0] a;
|
||||
wire [15:0] dq;
|
||||
wire [1:0] dqm;
|
||||
|
||||
sdram_controller #(
|
||||
.CLK_FREQ_MHZ(CLK_FREQ_MHZ), .BURST_LEN(BURST_LEN),
|
||||
.ROW_BITS(ROW_BITS), .COL_BITS(COL_BITS), .BANK_BITS(BANK_BITS)
|
||||
) u_ctrl (
|
||||
.clk(clk), .rst(rst),
|
||||
.req(ctrl_req), .wr(ctrl_wr), .addr(ctrl_addr), .wdata(ctrl_wdata), .wmask(ctrl_wmask),
|
||||
.rdata(ctrl_rdata), .ready(ctrl_ready), .busy(ctrl_busy),
|
||||
.sdram_cke(cke), .sdram_cs_n(cs_n), .sdram_ras_n(ras_n), .sdram_cas_n(cas_n), .sdram_we_n(we_n),
|
||||
.sdram_ba(ba), .sdram_a(a), .sdram_dq(dq), .sdram_dqm(dqm)
|
||||
);
|
||||
sdram_model #(
|
||||
.CLK_FREQ_MHZ(CLK_FREQ_MHZ), .ROW_BITS(ROW_BITS), .COL_BITS(COL_BITS), .BANK_BITS(BANK_BITS)
|
||||
) u_mem (
|
||||
.clk(clk), .cke(cke), .cs_n(cs_n), .ras_n(ras_n), .cas_n(cas_n), .we_n(we_n),
|
||||
.ba(ba), .a(a), .dq(dq), .dqm(dqm)
|
||||
);
|
||||
|
||||
// ---- 3-way mux on the shared backend: preload / baseline DUT / prefetch DUT ----
|
||||
localparam SEL_PRELOAD = 2'd0, SEL_BASE = 2'd1, SEL_PF = 2'd2;
|
||||
reg [1:0] sel;
|
||||
|
||||
reg pre_req, pre_wr;
|
||||
reg [ADDR_WIDTH-1:0] pre_addr;
|
||||
reg [16*BURST_LEN-1:0] pre_wdata;
|
||||
|
||||
// ---- baseline DUT: plain act_tile_fetch.v, driven by a per-tile
|
||||
// req/wait/consume loop replicating OLD packed_slot.v sequencing ----
|
||||
reg base_req;
|
||||
reg [ADDR_WIDTH-1:0] base_base_a, base_base_b;
|
||||
reg [15:0] base_tcnt;
|
||||
wire base_valid;
|
||||
wire signed [DATA_WIDTH*P_IN-1:0] base_data_a, base_data_b;
|
||||
wire base_mem_active;
|
||||
wire base_ctrl_req, base_ctrl_wr;
|
||||
wire [ADDR_WIDTH-1:0] base_ctrl_addr;
|
||||
wire [16*BURST_LEN-1:0] base_ctrl_wdata;
|
||||
wire [2*BURST_LEN-1:0] base_ctrl_wmask;
|
||||
|
||||
act_tile_fetch #(
|
||||
.DATA_WIDTH(DATA_WIDTH), .P_IN(P_IN), .BURST_LEN(BURST_LEN), .ADDR_WIDTH(ADDR_WIDTH)
|
||||
) u_base (
|
||||
.clk(clk), .rst(rst),
|
||||
.req(base_req), .base_a(base_base_a), .base_b(base_base_b), .tcnt(base_tcnt),
|
||||
.valid(base_valid), .data_a(base_data_a), .data_b(base_data_b),
|
||||
.mem_active(base_mem_active), .mem_grant(sel == SEL_BASE),
|
||||
.ctrl_req(base_ctrl_req), .ctrl_wr(base_ctrl_wr), .ctrl_addr(base_ctrl_addr),
|
||||
.ctrl_wdata(base_ctrl_wdata), .ctrl_wmask(base_ctrl_wmask),
|
||||
.ctrl_rdata(ctrl_rdata), .ctrl_ready(ctrl_ready), .ctrl_busy(ctrl_busy)
|
||||
);
|
||||
|
||||
// ---- prefetch DUT: ddr_prefetch_mgr.v (EXP-0083) ----
|
||||
reg pf_job_start;
|
||||
reg [ADDR_WIDTH-1:0] pf_base_a, pf_base_b;
|
||||
reg [15:0] pf_n_tiles;
|
||||
wire pf_tile_valid;
|
||||
wire signed [DATA_WIDTH*P_IN-1:0] pf_data_a, pf_data_b;
|
||||
reg pf_tile_consume;
|
||||
wire pf_mem_active;
|
||||
wire pf_ctrl_req, pf_ctrl_wr;
|
||||
wire [ADDR_WIDTH-1:0] pf_ctrl_addr;
|
||||
wire [16*BURST_LEN-1:0] pf_ctrl_wdata;
|
||||
wire [2*BURST_LEN-1:0] pf_ctrl_wmask;
|
||||
|
||||
ddr_prefetch_mgr #(
|
||||
.DATA_WIDTH(DATA_WIDTH), .P_IN(P_IN), .BURST_LEN(BURST_LEN), .ADDR_WIDTH(ADDR_WIDTH)
|
||||
) u_pf (
|
||||
.clk(clk), .rst(rst),
|
||||
.job_start(pf_job_start), .base_a(pf_base_a), .base_b(pf_base_b), .n_tiles(pf_n_tiles),
|
||||
.tile_valid(pf_tile_valid), .data_a(pf_data_a), .data_b(pf_data_b), .tile_consume(pf_tile_consume),
|
||||
.mem_active(pf_mem_active), .mem_grant(sel == SEL_PF),
|
||||
.ctrl_req(pf_ctrl_req), .ctrl_wr(pf_ctrl_wr), .ctrl_addr(pf_ctrl_addr),
|
||||
.ctrl_wdata(pf_ctrl_wdata), .ctrl_wmask(pf_ctrl_wmask),
|
||||
.ctrl_rdata(ctrl_rdata), .ctrl_ready(ctrl_ready), .ctrl_busy(ctrl_busy)
|
||||
);
|
||||
|
||||
assign ctrl_req = (sel==SEL_PRELOAD) ? pre_req : (sel==SEL_BASE) ? base_ctrl_req : pf_ctrl_req;
|
||||
assign ctrl_wr = (sel==SEL_PRELOAD) ? pre_wr : (sel==SEL_BASE) ? base_ctrl_wr : pf_ctrl_wr;
|
||||
assign ctrl_addr = (sel==SEL_PRELOAD) ? pre_addr : (sel==SEL_BASE) ? base_ctrl_addr : pf_ctrl_addr;
|
||||
assign ctrl_wdata = (sel==SEL_PRELOAD) ? pre_wdata : (sel==SEL_BASE) ? base_ctrl_wdata : pf_ctrl_wdata;
|
||||
assign ctrl_wmask = (sel==SEL_BASE) ? base_ctrl_wmask : (sel==SEL_PF) ? pf_ctrl_wmask : {(2*BURST_LEN){1'b0}};
|
||||
|
||||
task automatic sdram_write_burst(input [ADDR_WIDTH-1:0] word_addr, input [16*BURST_LEN-1:0] data);
|
||||
begin
|
||||
@(posedge clk); while (ctrl_busy) @(posedge clk);
|
||||
pre_req = 1'b1; pre_wr = 1'b1; pre_addr = word_addr; pre_wdata = data;
|
||||
@(posedge clk); pre_req = 1'b0;
|
||||
while (!ctrl_ready) @(posedge clk);
|
||||
end
|
||||
endtask
|
||||
|
||||
function automatic signed [7:0] act_byte(input integer base, input integer t, input integer k);
|
||||
act_byte = $signed(8'((base*13 + t*31 + k*7 + 5) & 8'hFF));
|
||||
endfunction
|
||||
|
||||
integer errors, tests;
|
||||
task automatic check(input cond, input [255:0] name);
|
||||
begin
|
||||
tests = tests + 1;
|
||||
if (!cond) begin errors = errors + 1; $display("FAIL: %0s", name); end
|
||||
else $display("PASS: %0s", name);
|
||||
end
|
||||
endtask
|
||||
|
||||
reg signed [DATA_WIDTH*P_IN-1:0] exp_a, exp_b;
|
||||
integer k, wi, cyc;
|
||||
reg [16*BURST_LEN-1:0] burst;
|
||||
integer t_start, t_end, base_cycles, pf_cycles;
|
||||
|
||||
initial begin
|
||||
errors = 0; tests = 0;
|
||||
rst = 1; sel = SEL_PRELOAD;
|
||||
pre_req = 0; pre_wr = 0; pre_addr = 0; pre_wdata = 0;
|
||||
base_req = 0; base_base_a = 0; base_base_b = 0; base_tcnt = 0;
|
||||
pf_job_start = 0; pf_base_a = 0; pf_base_b = 0; pf_n_tiles = 0; pf_tile_consume = 0;
|
||||
repeat(5) @(posedge clk);
|
||||
rst = 0;
|
||||
@(posedge clk); while (ctrl_busy) @(posedge clk);
|
||||
|
||||
$display("=== preload lane A base=0, lane B base=200, %0d tiles (EXP-0081 2-tiles/burst layout) ===", N_TILES);
|
||||
for (wi = 0; wi < N_TILES/2; wi = wi + 1) begin
|
||||
for (k = 0; k < P_IN/2; k = k + 1)
|
||||
burst[k*16 +: 16] = {act_byte(0, 2*wi, 2*k+1), act_byte(0, 2*wi, 2*k)};
|
||||
for (k = 0; k < P_IN/2; k = k + 1)
|
||||
burst[(P_IN/2+k)*16 +: 16] = {act_byte(0, 2*wi+1, 2*k+1), act_byte(0, 2*wi+1, 2*k)};
|
||||
sdram_write_burst(0 + wi*BURST_LEN, burst);
|
||||
|
||||
for (k = 0; k < P_IN/2; k = k + 1)
|
||||
burst[k*16 +: 16] = {act_byte(200, 2*wi, 2*k+1), act_byte(200, 2*wi, 2*k)};
|
||||
for (k = 0; k < P_IN/2; k = k + 1)
|
||||
burst[(P_IN/2+k)*16 +: 16] = {act_byte(200, 2*wi+1, 2*k+1), act_byte(200, 2*wi+1, 2*k)};
|
||||
sdram_write_burst(200 + wi*BURST_LEN, burst);
|
||||
end
|
||||
@(posedge clk);
|
||||
|
||||
// ============================================================
|
||||
// PART 1: baseline correctness + real cycle count, OLD-style
|
||||
// per-tile req -> wait valid -> 2-cycle simulated compute -> next req
|
||||
// ============================================================
|
||||
$display("=== PART 1: baseline (direct act_tile_fetch.v, old packed_slot.v loop) ===");
|
||||
sel = SEL_BASE;
|
||||
@(posedge clk);
|
||||
t_start = $time;
|
||||
for (k = 0; k < N_TILES; k = k + 1) begin
|
||||
@(posedge clk);
|
||||
base_base_a <= 0; base_base_b <= 200; base_tcnt <= k[15:0];
|
||||
base_req <= 1'b1;
|
||||
@(posedge clk);
|
||||
base_req <= 1'b0;
|
||||
while (!base_valid) @(posedge clk);
|
||||
for (wi = 0; wi < P_IN; wi = wi + 1) begin
|
||||
exp_a[wi*DATA_WIDTH +: DATA_WIDTH] = act_byte(0, k, wi);
|
||||
exp_b[wi*DATA_WIDTH +: DATA_WIDTH] = act_byte(200, k, wi);
|
||||
end
|
||||
check(base_data_a === exp_a, "baseline: lane A bit-exact");
|
||||
check(base_data_b === exp_b, "baseline: lane B bit-exact");
|
||||
repeat(2) @(posedge clk); // simulated S_TILEREQ + S_OPERAND overhead
|
||||
end
|
||||
t_end = $time;
|
||||
base_cycles = (t_end - t_start) / CLK_PERIOD_NS;
|
||||
$display("baseline: %0d tiles in %0d cycles (%0.2f cycles/tile)", N_TILES, base_cycles, base_cycles*1.0/N_TILES);
|
||||
|
||||
// ============================================================
|
||||
// PART 2: prefetch correctness + real cycle count, EXP-0083
|
||||
// job-level start, poll tile_valid, 2-cycle simulated compute, consume
|
||||
// ============================================================
|
||||
$display("=== PART 2: prefetch (ddr_prefetch_mgr.v, EXP-0083) ===");
|
||||
sel = SEL_PF;
|
||||
@(posedge clk);
|
||||
pf_base_a <= 0; pf_base_b <= 200; pf_n_tiles <= N_TILES[15:0];
|
||||
pf_job_start <= 1'b1;
|
||||
t_start = $time;
|
||||
@(posedge clk);
|
||||
pf_job_start <= 1'b0;
|
||||
for (k = 0; k < N_TILES; k = k + 1) begin
|
||||
// #1 settle delay: without it, this check can run in the same
|
||||
// simulation delta as the PREVIOUS iteration's tile_consume
|
||||
// pulse being sampled by the DUT (both triggered off the same
|
||||
// @(posedge clk)), reading pf_tile_valid/bank_valid BEFORE the
|
||||
// DUT's own nonblocking update for that consume has been
|
||||
// applied -- a real testbench race, not an RTL bug (found via
|
||||
// an iteration-tagged trace: k=1 was reading k=0's still-
|
||||
// unconsumed bank). #1 (real time, 1ns << the 15.625ns clock
|
||||
// period) forces this poll to always run strictly after that
|
||||
// update has settled.
|
||||
#1;
|
||||
while (!pf_tile_valid) @(posedge clk);
|
||||
for (wi = 0; wi < P_IN; wi = wi + 1) begin
|
||||
exp_a[wi*DATA_WIDTH +: DATA_WIDTH] = act_byte(0, k, wi);
|
||||
exp_b[wi*DATA_WIDTH +: DATA_WIDTH] = act_byte(200, k, wi);
|
||||
end
|
||||
check(pf_data_a === exp_a, "prefetch: lane A bit-exact");
|
||||
check(pf_data_b === exp_b, "prefetch: lane B bit-exact");
|
||||
repeat(2) @(posedge clk); // SAME simulated compute overhead as baseline
|
||||
pf_tile_consume <= 1'b1;
|
||||
@(posedge clk);
|
||||
pf_tile_consume <= 1'b0;
|
||||
end
|
||||
t_end = $time;
|
||||
pf_cycles = (t_end - t_start) / CLK_PERIOD_NS;
|
||||
$display("prefetch: %0d tiles in %0d cycles (%0.2f cycles/tile)", N_TILES, pf_cycles, pf_cycles*1.0/N_TILES);
|
||||
|
||||
$display("=== REAL MEASURED COMPARISON (row-switch-heavy, 3 different burst pairs): baseline=%0d cycles, prefetch=%0d cycles, reduction=%0.1f%% ===",
|
||||
base_cycles, pf_cycles, 100.0*(base_cycles-pf_cycles)/base_cycles);
|
||||
check(pf_cycles < base_cycles, "prefetch is real, measurably faster than baseline (row-switch-heavy)");
|
||||
|
||||
// ============================================================
|
||||
// PART 3 (EXP-0083 addendum): best-case, SAME-ROW comparison --
|
||||
// only tiles 0/1 (both already resident in the FIRST preloaded
|
||||
// burst pair, no row activation needed for either), isolating
|
||||
// the look-ahead benefit from row-switch cost entirely. Answers
|
||||
// honestly whether the small PART-1/2 result is because the
|
||||
// benefit is inherently small, or because row-switch cost
|
||||
// dominates and masks it in that scenario.
|
||||
// ============================================================
|
||||
$display("=== PART 3: same-row best case (2 tiles, single burst pair, no row switch) ===");
|
||||
sel = SEL_BASE;
|
||||
@(posedge clk);
|
||||
t_start = $time;
|
||||
for (k = 0; k < 2; k = k + 1) begin
|
||||
@(posedge clk);
|
||||
base_base_a <= 0; base_base_b <= 200; base_tcnt <= k[15:0];
|
||||
base_req <= 1'b1;
|
||||
@(posedge clk);
|
||||
base_req <= 1'b0;
|
||||
while (!base_valid) @(posedge clk);
|
||||
repeat(2) @(posedge clk);
|
||||
end
|
||||
t_end = $time;
|
||||
base_cycles = (t_end - t_start) / CLK_PERIOD_NS;
|
||||
$display("same-row baseline: 2 tiles in %0d cycles", base_cycles);
|
||||
|
||||
sel = SEL_PF;
|
||||
@(posedge clk);
|
||||
pf_base_a <= 0; pf_base_b <= 200; pf_n_tiles <= 16'd2;
|
||||
pf_job_start <= 1'b1;
|
||||
t_start = $time;
|
||||
@(posedge clk);
|
||||
pf_job_start <= 1'b0;
|
||||
for (k = 0; k < 2; k = k + 1) begin
|
||||
#1;
|
||||
while (!pf_tile_valid) @(posedge clk);
|
||||
repeat(2) @(posedge clk);
|
||||
pf_tile_consume <= 1'b1;
|
||||
@(posedge clk);
|
||||
pf_tile_consume <= 1'b0;
|
||||
end
|
||||
t_end = $time;
|
||||
pf_cycles = (t_end - t_start) / CLK_PERIOD_NS;
|
||||
$display("same-row prefetch: 2 tiles in %0d cycles", pf_cycles);
|
||||
$display("=== REAL MEASURED COMPARISON (same-row, best case): baseline=%0d cycles, prefetch=%0d cycles, reduction=%0.1f%% ===",
|
||||
base_cycles, pf_cycles, 100.0*(base_cycles-pf_cycles)/base_cycles);
|
||||
|
||||
$display("=== %0d/%0d tests, %0d errors ===", tests-errors, tests, errors);
|
||||
if (errors == 0) $display("ALL TESTS PASSED (tb_ddr_prefetch_mgr)");
|
||||
$finish;
|
||||
end
|
||||
endmodule
|
||||
Reference in New Issue
Block a user