Re-measured ddr_prefetch_mgr.v's (EXP-0083) real benefit against the now-closed 32-bit DDR3 channel (EXP-0086), per this project's own standing plan. Real result: the 2.86% benefit measured at the old 16-bit channel is GONE at 32-bit (WITH: 100663.1335ns vs WITHOUT: 100656.6835ns -- a 0.0064% regression, statistically a wash). The wider channel's lower per-tile latency already absorbs the gap the look-ahead prefetch used to hide. Kept wired in for correctness/ timing-neutrality (real P&R already signs off with it included), but it's no longer a real performance win. Updated docs/ARCHITECTURE_ ANALYSIS.md and docs/PHYSICAL_REALIZATION.md accordingly. Found and fixed 3 real testbench/simulation-setup bugs along the way: - tb_n2_system_ddr3.v and tb_mig_native_adapter.v still had a stale CLKIN_PERIOD=2900 (the FAILED EXP-0084 clock period) instead of the current real, closed 3225ps (EXP-0086). - tb_n2_system_ddr3.v used SystemVerilog-only $signed(8'(...)) cast syntax, invalid for xvlog's default plain-Verilog mode -- fixed via an intermediate 8-bit reg. - Building a fresh sim_1 fileset needs the real MIG simulation dependency set added explicitly (mig_7series_0_mig.v is marked USED_IN_SIMULATION=0 in the project since testbenches bypass the public wrapper); verilog_define is a fileset-level property, not per-file, in this Vivado version. New measurement-only fork (not part of the real synthesis target, per fork-before-promote discipline): packed_slot_noprefetch.v + tb_n2_system_ddr3_noprefetch.v, reproducing the pre-EXP-0083 direct per-tile activation-fetch sequencing for a fair A/B baseline. Also adds docs/BOM.md and docs/PINOUT.md: a real component list (DDR3 x2, flash, FPGA already verified; clk_ref oscillator and an ESP32-S3- WROOM-1 module newly verified in-stock on LCSC; sys_clk oscillator flagged as needing a custom-programmed order, no off-the-shelf SKU at the required 310.077MHz) and a consolidated, board-layout-ready pinout extract of PHYSICAL_REALIZATION.md's own pin tables. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01MUG92aM9m68TRc4rG55BcC
522 lines
24 KiB
Verilog
522 lines
24 KiB
Verilog
`timescale 1ps/100fs
|
|
|
|
// ============================================================
|
|
// MILESTONE: the full N=2 multi-core system (EXP-0066/0067, real
|
|
// neural_director_packed.v + 2 real packed_slot.v instances + real
|
|
// sdram_arbiter_n.v) running against REAL DDR3 (mig_native_adapter.v,
|
|
// EXP-0068, verified against MIG's own ddr3_model.sv) instead of the
|
|
// SDR SDRAM placeholder used everywhere until now.
|
|
//
|
|
// Runs entirely in the ui_clk domain (MIG's own generated clock is
|
|
// now this whole system's clock, per mig_native_adapter.v's own
|
|
// documented convention). Everything downstream of the memory
|
|
// backend (Director, packed_slot, weight-reuse path, packed core) is
|
|
// UNCHANGED, byte-for-byte, from EXP-0066/0067 -- only the physical
|
|
// memory backend is swapped, isolating that as the one variable
|
|
// under test.
|
|
//
|
|
// EXP-0079 UPDATE: activations are now fetched via a REAL act_tile_
|
|
// fetch.v inside each packed_slot.v instance (real DDR3 reads, same
|
|
// physical bus each slot already uses for weights) -- no more stand-
|
|
// in. This test now preloads real activation data into the SAME real
|
|
// DDR3 model too (preload_ddr3_activations), on top of the weight
|
|
// preload that was already here.
|
|
//
|
|
// Uses mig_7series_0_mig_sim (SIM_BYPASS_INIT_CAL="FAST" default,
|
|
// EXP-0068's own real vendor-shipped fast-calibration simulation
|
|
// variant), real ddr3_model.sv, real WireDelay pass-through -- same
|
|
// proven instantiation pattern as tb_mig_native_adapter.v.
|
|
//
|
|
// EXP-0084 UPDATE: real 32-bit DDR3 channel widening -- dq/dqs/dm pin
|
|
// widths doubled (two MT41J128M16 chips ganged in parallel), TWO real
|
|
// ddr3_model.sv components instantiated (one per chip, exact real
|
|
// pattern confirmed against the real regenerated sim_tb_top.v), both
|
|
// sys_clk and clk_ref are now real differential pairs on the inner
|
|
// mig_7series_0_mig module (the user's own wizard choice), and the
|
|
// weight/activation preload tasks rewritten for the new
|
|
// BYTES_PER_BURST=4*BURST_LEN / 4-tiles-per-burst real layouts (same
|
|
// rewrite already verified in tb_packed_slot.v).
|
|
//
|
|
// EXP-0086 UPDATE: CLKIN_PERIOD reverted 2900->3225ps, matching the
|
|
// real, current, timing-CLOSED MIG config (WNS=+0.096ns, EXP-0086) --
|
|
// the 2900ps value was the FAILED intermediate attempt (WNS=-0.618ns,
|
|
// EXP-0084) and must not be simulated as if it were the real, current
|
|
// hardware.
|
|
// ============================================================
|
|
module tb;
|
|
localparam CLKIN_PERIOD = 3225; // ps, this project's real, CLOSED MIG config (EXP-0086)
|
|
localparam REFCLK_FREQ = 200.0; // MHz
|
|
localparam real REFCLK_PERIOD = (1000000.0/(2*REFCLK_FREQ));
|
|
localparam RESET_PERIOD = 200000; // ps
|
|
|
|
localparam DATA_WIDTH = 8;
|
|
localparam P_IN = 8;
|
|
localparam ACC_WIDTH = 32;
|
|
localparam ADDR_WIDTH = 26; // this project's byte-address convention (Director/packed_slot)
|
|
localparam MIG_ADDR_WIDTH = 25; // word-address convention (BURST_LEN=8) at the arbiter/adapter
|
|
localparam BURST_LEN = 8;
|
|
localparam N_INPUTS = 128;
|
|
localparam N_TILES = N_INPUTS/P_IN;
|
|
localparam LAYER_BYTES = N_INPUTS;
|
|
localparam WORDS_PER_LAYER = LAYER_BYTES/2;
|
|
localparam N_SLOTS = 2;
|
|
localparam QUEUE_DEPTH = 8;
|
|
|
|
localparam L = 2; // layers (kept small -- real DDR3 calibration + JEDEC timing already
|
|
localparam M = 4; // costs real simulated time; this is an integration check, not a
|
|
// repeat of EXP-0066's own fuller correctness sweep)
|
|
|
|
// ---- clock/reset (mirrors tb_mig_native_adapter.v's own proven pattern) ----
|
|
reg sys_rst_n;
|
|
wire sys_rst = sys_rst_n;
|
|
reg sys_clk_i = 1'b0;
|
|
always #(CLKIN_PERIOD/2.0) sys_clk_i = ~sys_clk_i;
|
|
wire sys_clk_p = sys_clk_i;
|
|
wire sys_clk_n = ~sys_clk_i;
|
|
reg clk_ref_i = 1'b0;
|
|
always #REFCLK_PERIOD clk_ref_i = ~clk_ref_i;
|
|
wire clk_ref_p = clk_ref_i;
|
|
wire clk_ref_n = ~clk_ref_i;
|
|
initial begin
|
|
sys_rst_n = 1'b0;
|
|
#RESET_PERIOD sys_rst_n = 1'b1;
|
|
end
|
|
|
|
// ---- real DDR3 pins + model (identical to tb_mig_native_adapter.v) ----
|
|
wire ddr3_reset_n;
|
|
wire [31:0] ddr3_dq_fpga;
|
|
wire [3:0] ddr3_dqs_p_fpga, ddr3_dqs_n_fpga;
|
|
wire [13:0] ddr3_addr_fpga;
|
|
wire [2:0] ddr3_ba_fpga;
|
|
wire ddr3_ras_n_fpga, ddr3_cas_n_fpga, ddr3_we_n_fpga;
|
|
wire [0:0] ddr3_cke_fpga, ddr3_ck_p_fpga, ddr3_ck_n_fpga, ddr3_cs_n_fpga;
|
|
wire [3:0] ddr3_dm_fpga;
|
|
wire [0:0] ddr3_odt_fpga;
|
|
|
|
wire [31:0] ddr3_dq_sdram;
|
|
reg [13:0] ddr3_addr_sdram;
|
|
reg [2:0] ddr3_ba_sdram;
|
|
reg ddr3_ras_n_sdram, ddr3_cas_n_sdram, ddr3_we_n_sdram;
|
|
wire [0:0] ddr3_cs_n_sdram;
|
|
wire [0:0] ddr3_odt_sdram;
|
|
reg [0:0] ddr3_cke_sdram;
|
|
wire [3:0] ddr3_dm_sdram;
|
|
wire [3:0] ddr3_dqs_p_sdram, ddr3_dqs_n_sdram;
|
|
reg [0:0] ddr3_ck_p_sdram, ddr3_ck_n_sdram;
|
|
reg [0:0] ddr3_cs_n_sdram_tmp;
|
|
reg [3:0] ddr3_dm_sdram_tmp;
|
|
reg [0:0] ddr3_odt_sdram_tmp;
|
|
|
|
always @(*) begin
|
|
ddr3_ck_p_sdram <= ddr3_ck_p_fpga;
|
|
ddr3_ck_n_sdram <= ddr3_ck_n_fpga;
|
|
ddr3_addr_sdram <= ddr3_addr_fpga;
|
|
ddr3_ba_sdram <= ddr3_ba_fpga;
|
|
ddr3_ras_n_sdram <= ddr3_ras_n_fpga;
|
|
ddr3_cas_n_sdram <= ddr3_cas_n_fpga;
|
|
ddr3_we_n_sdram <= ddr3_we_n_fpga;
|
|
ddr3_cke_sdram <= ddr3_cke_fpga;
|
|
end
|
|
always @(*) ddr3_cs_n_sdram_tmp <= ddr3_cs_n_fpga;
|
|
assign ddr3_cs_n_sdram = ddr3_cs_n_sdram_tmp;
|
|
always @(*) ddr3_dm_sdram_tmp <= ddr3_dm_fpga;
|
|
assign ddr3_dm_sdram = ddr3_dm_sdram_tmp;
|
|
always @(*) ddr3_odt_sdram_tmp <= ddr3_odt_fpga;
|
|
assign ddr3_odt_sdram = ddr3_odt_sdram_tmp;
|
|
|
|
genvar dqwd;
|
|
generate
|
|
for (dqwd = 0; dqwd < 32; dqwd = dqwd + 1) begin : dq_delay
|
|
WireDelay #(.Delay_g(0.00), .Delay_rd(0.00), .ERR_INSERT("OFF")) u_delay_dq (
|
|
.A(ddr3_dq_fpga[dqwd]), .B(ddr3_dq_sdram[dqwd]),
|
|
.reset(sys_rst_n), .phy_init_done(init_calib_complete)
|
|
);
|
|
end
|
|
endgenerate
|
|
genvar dqswd;
|
|
generate
|
|
for (dqswd = 0; dqswd < 4; dqswd = dqswd + 1) begin : dqs_delay
|
|
WireDelay #(.Delay_g(0.00), .Delay_rd(0.00), .ERR_INSERT("OFF")) u_delay_dqs_p (
|
|
.A(ddr3_dqs_p_fpga[dqswd]), .B(ddr3_dqs_p_sdram[dqswd]),
|
|
.reset(sys_rst_n), .phy_init_done(init_calib_complete)
|
|
);
|
|
WireDelay #(.Delay_g(0.00), .Delay_rd(0.00), .ERR_INSERT("OFF")) u_delay_dqs_n (
|
|
.A(ddr3_dqs_n_fpga[dqswd]), .B(ddr3_dqs_n_sdram[dqswd]),
|
|
.reset(sys_rst_n), .phy_init_done(init_calib_complete)
|
|
);
|
|
end
|
|
endgenerate
|
|
|
|
genvar ci;
|
|
generate
|
|
for (ci = 0; ci < 2; ci = ci + 1) begin : gen_mem
|
|
ddr3_model u_comp_ddr3 (
|
|
.rst_n(ddr3_reset_n), .ck(ddr3_ck_p_sdram), .ck_n(ddr3_ck_n_sdram),
|
|
.cke(ddr3_cke_sdram[0]), .cs_n(ddr3_cs_n_sdram[0]),
|
|
.ras_n(ddr3_ras_n_sdram), .cas_n(ddr3_cas_n_sdram), .we_n(ddr3_we_n_sdram),
|
|
.dm_tdqs(ddr3_dm_sdram[2*ci +: 2]), .ba(ddr3_ba_sdram), .addr(ddr3_addr_sdram),
|
|
.dq(ddr3_dq_sdram[16*ci +: 16]),
|
|
.dqs(ddr3_dqs_p_sdram[2*ci +: 2]), .dqs_n(ddr3_dqs_n_sdram[2*ci +: 2]),
|
|
.tdqs_n(), .odt(ddr3_odt_sdram[0])
|
|
);
|
|
end
|
|
endgenerate
|
|
|
|
wire [27:0] app_addr;
|
|
wire [2:0] app_cmd;
|
|
wire app_en, app_rdy;
|
|
wire [127:0] app_wdf_data;
|
|
wire app_wdf_end;
|
|
wire [15:0] app_wdf_mask;
|
|
wire app_wdf_wren, app_wdf_rdy;
|
|
wire [127:0] app_rd_data;
|
|
wire app_rd_data_end, app_rd_data_valid;
|
|
wire ui_clk, ui_clk_sync_rst, init_calib_complete;
|
|
|
|
mig_7series_0_mig #(
|
|
.SIM_BYPASS_INIT_CAL("FAST")
|
|
) u_mig (
|
|
.ddr3_dq(ddr3_dq_fpga), .ddr3_dqs_n(ddr3_dqs_n_fpga), .ddr3_dqs_p(ddr3_dqs_p_fpga),
|
|
.ddr3_addr(ddr3_addr_fpga), .ddr3_ba(ddr3_ba_fpga),
|
|
.ddr3_ras_n(ddr3_ras_n_fpga), .ddr3_cas_n(ddr3_cas_n_fpga), .ddr3_we_n(ddr3_we_n_fpga),
|
|
.ddr3_reset_n(ddr3_reset_n),
|
|
.ddr3_ck_p(ddr3_ck_p_fpga), .ddr3_ck_n(ddr3_ck_n_fpga),
|
|
.ddr3_cke(ddr3_cke_fpga), .ddr3_cs_n(ddr3_cs_n_fpga),
|
|
.ddr3_dm(ddr3_dm_fpga), .ddr3_odt(ddr3_odt_fpga),
|
|
.sys_clk_p(sys_clk_p), .sys_clk_n(sys_clk_n), .clk_ref_p(clk_ref_p), .clk_ref_n(clk_ref_n),
|
|
.app_addr(app_addr), .app_cmd(app_cmd), .app_en(app_en),
|
|
.app_wdf_data(app_wdf_data), .app_wdf_end(app_wdf_end),
|
|
.app_wdf_mask(app_wdf_mask), .app_wdf_wren(app_wdf_wren),
|
|
.app_rd_data(app_rd_data), .app_rd_data_end(app_rd_data_end),
|
|
.app_rd_data_valid(app_rd_data_valid), .app_rdy(app_rdy), .app_wdf_rdy(app_wdf_rdy),
|
|
.app_sr_req(1'b0), .app_ref_req(1'b0), .app_zq_req(1'b0),
|
|
.app_sr_active(), .app_ref_ack(), .app_zq_ack(),
|
|
.ui_clk(ui_clk), .ui_clk_sync_rst(ui_clk_sync_rst),
|
|
.init_calib_complete(init_calib_complete),
|
|
.device_temp(),
|
|
.sys_rst(sys_rst)
|
|
);
|
|
|
|
// ---- preload path: direct access to mig_native_adapter.v,
|
|
// bypassing the arbiter, exactly like every prior testbench's own
|
|
// "pre_active" mux (EXP-0057 onward) -- used only before job
|
|
// submission begins. ----
|
|
reg pre_active;
|
|
reg pre_req, pre_wr;
|
|
reg [MIG_ADDR_WIDTH-1:0] pre_addr;
|
|
reg [32*BURST_LEN-1:0] pre_wdata;
|
|
|
|
wire adp_req, adp_wr;
|
|
wire [MIG_ADDR_WIDTH-1:0] adp_addr;
|
|
wire [32*BURST_LEN-1:0] adp_wdata;
|
|
wire [4*BURST_LEN-1:0] adp_wmask;
|
|
wire [32*BURST_LEN-1:0] adp_rdata;
|
|
wire adp_ready, adp_busy;
|
|
|
|
wire arb_ctrl_req_o, arb_ctrl_wr_o;
|
|
wire [MIG_ADDR_WIDTH-1:0] arb_ctrl_addr_o;
|
|
wire [32*BURST_LEN-1:0] arb_ctrl_wdata_o;
|
|
wire [4*BURST_LEN-1:0] arb_ctrl_wmask_o;
|
|
|
|
assign adp_req = pre_active ? pre_req : arb_ctrl_req_o;
|
|
assign adp_wr = pre_active ? pre_wr : arb_ctrl_wr_o;
|
|
assign adp_addr = pre_active ? pre_addr : arb_ctrl_addr_o;
|
|
assign adp_wdata = pre_active ? pre_wdata : arb_ctrl_wdata_o;
|
|
assign adp_wmask = pre_active ? {(4*BURST_LEN){1'b0}} : arb_ctrl_wmask_o;
|
|
|
|
mig_native_adapter #(.BURST_LEN(BURST_LEN), .ADDR_WIDTH(MIG_ADDR_WIDTH)) u_adapter (
|
|
.clk(ui_clk), .rst(ui_clk_sync_rst),
|
|
.req(adp_req), .wr(adp_wr), .addr(adp_addr), .wdata(adp_wdata), .wmask(adp_wmask),
|
|
.rdata(adp_rdata), .ready(adp_ready), .busy(adp_busy),
|
|
.app_addr(app_addr), .app_cmd(app_cmd), .app_en(app_en), .app_rdy(app_rdy),
|
|
.app_wdf_data(app_wdf_data), .app_wdf_end(app_wdf_end), .app_wdf_mask(app_wdf_mask),
|
|
.app_wdf_wren(app_wdf_wren), .app_wdf_rdy(app_wdf_rdy),
|
|
.app_rd_data(app_rd_data), .app_rd_data_end(app_rd_data_end), .app_rd_data_valid(app_rd_data_valid)
|
|
);
|
|
|
|
// EXP-0086 fix: the original `8'(expr)` SystemVerilog sized-cast
|
|
// syntax was silently never valid plain Verilog (CLAUDE.md's own
|
|
// "no SV-only syntax in a plain .v file" lesson) -- xvlog in default
|
|
// (non `-sv`) mode rejects it outright. An intermediate 8-bit reg
|
|
// does the same width-truncation-before-$signed() job portably.
|
|
function automatic signed [7:0] weight_byte(input integer li, input integer t);
|
|
reg [7:0] tmp;
|
|
begin
|
|
tmp = (li*17 + t*29 + 13) & 8'hFF;
|
|
weight_byte = $signed(tmp);
|
|
end
|
|
endfunction
|
|
function automatic signed [7:0] input_byte(input integer li, input integer pos, input integer t);
|
|
reg [7:0] tmp;
|
|
begin
|
|
tmp = (li*11 + pos*41 + t*7 + 3) & 8'hFF;
|
|
input_byte = $signed(tmp);
|
|
end
|
|
endfunction
|
|
|
|
task automatic sdram_write_burst(input [MIG_ADDR_WIDTH-1:0] word_addr, input [32*BURST_LEN-1:0] data);
|
|
begin
|
|
@(posedge ui_clk); while (adp_busy) @(posedge ui_clk);
|
|
pre_req = 1'b1; pre_wr = 1'b1; pre_addr = word_addr; pre_wdata = data;
|
|
@(posedge ui_clk); pre_req = 1'b0;
|
|
while (!adp_ready) @(posedge ui_clk);
|
|
end
|
|
endtask
|
|
|
|
// EXP-0084: BYTES_PER_BURST = 4*BURST_LEN (32 bytes/burst, up from
|
|
// 16) -- 4 consecutive weight bytes pack into each 32-bit word now.
|
|
task automatic preload_sdram_layers;
|
|
integer li, bi, wb, tt;
|
|
reg [32*BURST_LEN-1:0] burst_data;
|
|
begin
|
|
for (li = 0; li < L; li = li + 1) begin
|
|
for (bi = 0; bi < (LAYER_BYTES/(4*BURST_LEN)); bi = bi + 1) begin
|
|
for (wb = 0; wb < BURST_LEN; wb = wb + 1) begin
|
|
tt = bi*(4*BURST_LEN) + wb*4;
|
|
burst_data[wb*32 +: 32] = {weight_byte(li, tt+3), weight_byte(li, tt+2),
|
|
weight_byte(li, tt+1), weight_byte(li, tt)};
|
|
end
|
|
sdram_write_burst((li*WORDS_PER_LAYER + bi*BURST_LEN), burst_data);
|
|
end
|
|
end
|
|
end
|
|
endtask
|
|
|
|
// ---- real activation preload (EXP-0084 layout: FOUR consecutive
|
|
// tiles share one BURST_LEN=8-word (256-bit) burst -- tile parity
|
|
// 0/1/2/3 -> quarters [63:0]/[127:64]/[191:128]/[255:192], see
|
|
// act_tile_fetch.v's own header). ----
|
|
localparam [MIG_ADDR_WIDTH-1:0] ACT_MEM_BASE = 25'h10000;
|
|
function automatic [ADDR_WIDTH-1:0] act_x_base(input integer li, input integer pos);
|
|
act_x_base = {{(ADDR_WIDTH-MIG_ADDR_WIDTH){1'b0}}, ACT_MEM_BASE} + (li*M + pos) * ((N_TILES/4)*BURST_LEN);
|
|
endfunction
|
|
|
|
task automatic preload_ddr3_activations;
|
|
integer li, pos, tq, qi;
|
|
reg [32*BURST_LEN-1:0] burst_data;
|
|
reg [ADDR_WIDTH-1:0] base;
|
|
begin
|
|
for (li = 0; li < L; li = li + 1) begin
|
|
for (pos = 0; pos < M; pos = pos + 1) begin
|
|
base = act_x_base(li, pos);
|
|
for (tq = 0; tq < N_TILES/4; tq = tq + 1) begin
|
|
burst_data = {(32*BURST_LEN){1'b0}};
|
|
for (qi = 0; qi < 4; qi = qi + 1)
|
|
burst_data[qi*64 +: 64] = {input_byte(li, pos, (4*tq+qi)*P_IN + 7), input_byte(li, pos, (4*tq+qi)*P_IN + 6),
|
|
input_byte(li, pos, (4*tq+qi)*P_IN + 5), input_byte(li, pos, (4*tq+qi)*P_IN + 4),
|
|
input_byte(li, pos, (4*tq+qi)*P_IN + 3), input_byte(li, pos, (4*tq+qi)*P_IN + 2),
|
|
input_byte(li, pos, (4*tq+qi)*P_IN + 1), input_byte(li, pos, (4*tq+qi)*P_IN + 0)};
|
|
sdram_write_burst(base[MIG_ADDR_WIDTH-1:0] + tq*BURST_LEN, burst_data);
|
|
end
|
|
end
|
|
end
|
|
end
|
|
endtask
|
|
|
|
// ---- neural_director_packed.v ----
|
|
reg job_in_valid;
|
|
wire job_in_ready;
|
|
reg [ADDR_WIDTH-1:0] job_in_x_base, job_in_w_base, job_in_result_addr;
|
|
reg [15:0] job_in_n_tiles, job_in_node_id;
|
|
|
|
wire [N_SLOTS-1:0] slot_job_start;
|
|
wire [ADDR_WIDTH*N_SLOTS-1:0] slot_x_base_a, slot_x_base_b, slot_w_base;
|
|
wire [ADDR_WIDTH*N_SLOTS-1:0] slot_result_addr_a, slot_result_addr_b;
|
|
wire [16*N_SLOTS-1:0] slot_n_tiles, slot_node_id_a, slot_node_id_b;
|
|
wire [N_SLOTS-1:0] slot_job_done;
|
|
wire job_out_done;
|
|
wire [$clog2(N_SLOTS)-1:0] job_out_slot;
|
|
wire [3:0] dir_state;
|
|
wire dir_error;
|
|
|
|
neural_director_packed #(
|
|
.ADDR_WIDTH(ADDR_WIDTH), .N_SLOTS(N_SLOTS), .QUEUE_DEPTH(QUEUE_DEPTH)
|
|
) u_dir (
|
|
.clk(ui_clk), .rst(ui_clk_sync_rst),
|
|
.job_in_valid(job_in_valid), .job_in_ready(job_in_ready),
|
|
.job_in_x_base(job_in_x_base), .job_in_w_base(job_in_w_base),
|
|
.job_in_n_tiles(job_in_n_tiles), .job_in_result_addr(job_in_result_addr),
|
|
.job_in_node_id(job_in_node_id),
|
|
.slot_job_start(slot_job_start),
|
|
.slot_x_base_a(slot_x_base_a), .slot_x_base_b(slot_x_base_b),
|
|
.slot_w_base(slot_w_base), .slot_n_tiles(slot_n_tiles),
|
|
.slot_result_addr_a(slot_result_addr_a), .slot_result_addr_b(slot_result_addr_b),
|
|
.slot_node_id_a(slot_node_id_a), .slot_node_id_b(slot_node_id_b),
|
|
.slot_job_done(slot_job_done),
|
|
.job_out_done(job_out_done), .job_out_slot(job_out_slot),
|
|
.dir_state(dir_state), .dir_error(dir_error)
|
|
);
|
|
|
|
// ---- 2 real packed_slot.v instances + real N-way arbiter (NUM_REQ=2) ----
|
|
wire [1:0] mem_active, mem_grant;
|
|
wire [1:0] s_ctrl_req, s_ctrl_wr;
|
|
wire [1:0] s_ctrl_ready, s_ctrl_busy;
|
|
wire [MIG_ADDR_WIDTH*2-1:0] s_ctrl_addr_flat;
|
|
wire [32*BURST_LEN*2-1:0] s_ctrl_wdata_flat, s_ctrl_rdata_flat;
|
|
wire [4*BURST_LEN*2-1:0] s_ctrl_wmask_flat;
|
|
|
|
sdram_arbiter_n #(.NUM_REQ(2), .ADDR_WIDTH(MIG_ADDR_WIDTH), .BURST_LEN(BURST_LEN)) u_arb (
|
|
.clk(ui_clk), .rst(ui_clk_sync_rst),
|
|
.req_active(mem_active), .req_grant(mem_grant),
|
|
.req_req(s_ctrl_req), .req_wr(s_ctrl_wr), .req_addr(s_ctrl_addr_flat),
|
|
.req_wdata(s_ctrl_wdata_flat), .req_wmask(s_ctrl_wmask_flat),
|
|
.req_rdata(s_ctrl_rdata_flat), .req_ready(s_ctrl_ready), .req_busy(s_ctrl_busy),
|
|
.ctrl_req(arb_ctrl_req_o), .ctrl_wr(arb_ctrl_wr_o), .ctrl_addr(arb_ctrl_addr_o),
|
|
.ctrl_wdata(arb_ctrl_wdata_o), .ctrl_wmask(arb_ctrl_wmask_o),
|
|
.ctrl_rdata(adp_rdata), .ctrl_ready(adp_ready), .ctrl_busy(adp_busy)
|
|
);
|
|
|
|
genvar gi;
|
|
generate
|
|
for (gi = 0; gi < N_SLOTS; gi = gi + 1) begin : GEN_SLOT
|
|
wire signed [DATA_WIDTH-1:0] res_a, res_b;
|
|
wire [15:0] res_nid_a, res_nid_b;
|
|
wire [ADDR_WIDTH-1:0] res_addr_a_out, res_addr_b_out;
|
|
|
|
packed_slot #(
|
|
.DATA_WIDTH(DATA_WIDTH), .P_IN(P_IN), .ACC_WIDTH(ACC_WIDTH),
|
|
.BURST_LEN(BURST_LEN), .ADDR_WIDTH(ADDR_WIDTH), .LAYER_BYTES(LAYER_BYTES)
|
|
) u_slot (
|
|
.clk(ui_clk), .rst(ui_clk_sync_rst),
|
|
.job_start(slot_job_start[gi]),
|
|
.x_base_a(slot_x_base_a[gi*ADDR_WIDTH +: ADDR_WIDTH]),
|
|
.x_base_b(slot_x_base_b[gi*ADDR_WIDTH +: ADDR_WIDTH]),
|
|
.w_base(slot_w_base[gi*ADDR_WIDTH +: ADDR_WIDTH]),
|
|
.n_tiles(slot_n_tiles[gi*16 +: 16]),
|
|
.result_addr_a(slot_result_addr_a[gi*ADDR_WIDTH +: ADDR_WIDTH]),
|
|
.result_addr_b(slot_result_addr_b[gi*ADDR_WIDTH +: ADDR_WIDTH]),
|
|
.node_id_a(slot_node_id_a[gi*16 +: 16]), .node_id_b(slot_node_id_b[gi*16 +: 16]),
|
|
.job_done(slot_job_done[gi]),
|
|
.result_data_a(res_a), .result_data_b(res_b),
|
|
.result_node_id_a(res_nid_a), .result_node_id_b(res_nid_b),
|
|
.result_addr_a_out(res_addr_a_out), .result_addr_b_out(res_addr_b_out),
|
|
.mem_active(mem_active[gi]), .mem_grant(mem_grant[gi]),
|
|
.ctrl_req(s_ctrl_req[gi]), .ctrl_wr(s_ctrl_wr[gi]),
|
|
.ctrl_addr(s_ctrl_addr_flat[gi*MIG_ADDR_WIDTH +: MIG_ADDR_WIDTH]),
|
|
.ctrl_wdata(s_ctrl_wdata_flat[gi*32*BURST_LEN +: 32*BURST_LEN]),
|
|
.ctrl_wmask(s_ctrl_wmask_flat[gi*4*BURST_LEN +: 4*BURST_LEN]),
|
|
.ctrl_rdata(s_ctrl_rdata_flat[gi*32*BURST_LEN +: 32*BURST_LEN]),
|
|
.ctrl_ready(s_ctrl_ready[gi]), .ctrl_busy(s_ctrl_busy[gi])
|
|
);
|
|
end
|
|
endgenerate
|
|
|
|
integer errors, tests, completions, n_expected, si;
|
|
reg [15:0] expect_node [0:31];
|
|
reg signed [7:0] expect_val [0:31];
|
|
|
|
function automatic signed [7:0] golden_result(input integer li, input integer pos);
|
|
integer t, acc;
|
|
reg signed [7:0] r;
|
|
begin
|
|
acc = 0;
|
|
for (t = 0; t < N_INPUTS; t = t + 1)
|
|
acc = acc + (input_byte(li, pos, t) * weight_byte(li, t));
|
|
if (acc <= 0) r = 0; else if (acc > 127) r = 8'sd127; else r = acc[7:0];
|
|
golden_result = r;
|
|
end
|
|
endfunction
|
|
|
|
task automatic check_completion(input integer slot, input [15:0] nid, input signed [7:0] val);
|
|
integer idx, found;
|
|
begin
|
|
found = 0;
|
|
for (idx = 0; idx < n_expected; idx = idx + 1) begin
|
|
if (expect_node[idx] === nid && !found) begin
|
|
found = 1;
|
|
tests = tests + 1;
|
|
if (expect_val[idx] !== val) begin
|
|
$display("FAIL slot=%0d node_id=%0d: got=%0d expected=%0d", slot, nid, $signed(val), $signed(expect_val[idx]));
|
|
errors = errors + 1;
|
|
end else begin
|
|
$display("PASS slot=%0d node_id=%0d: result=%0d", slot, nid, $signed(val));
|
|
end
|
|
end
|
|
end
|
|
end
|
|
endtask
|
|
|
|
always @(posedge ui_clk) begin
|
|
if (!ui_clk_sync_rst) begin
|
|
for (si = 0; si < N_SLOTS; si = si + 1) begin
|
|
if (slot_job_done[si]) begin
|
|
completions = completions + 2;
|
|
case (si)
|
|
0: begin
|
|
check_completion(0, GEN_SLOT[0].u_slot.result_node_id_a, GEN_SLOT[0].u_slot.result_data_a);
|
|
check_completion(0, GEN_SLOT[0].u_slot.result_node_id_b, GEN_SLOT[0].u_slot.result_data_b);
|
|
end
|
|
1: begin
|
|
check_completion(1, GEN_SLOT[1].u_slot.result_node_id_a, GEN_SLOT[1].u_slot.result_data_a);
|
|
check_completion(1, GEN_SLOT[1].u_slot.result_node_id_b, GEN_SLOT[1].u_slot.result_data_b);
|
|
end
|
|
endcase
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
task automatic submit_job(
|
|
input [ADDR_WIDTH-1:0] xb, input [ADDR_WIDTH-1:0] wb,
|
|
input [15:0] nt, input [ADDR_WIDTH-1:0] resaddr, input [15:0] nid
|
|
);
|
|
begin
|
|
@(posedge ui_clk);
|
|
job_in_x_base = xb; job_in_w_base = wb; job_in_n_tiles = nt;
|
|
job_in_result_addr = resaddr; job_in_node_id = nid;
|
|
job_in_valid = 1'b1;
|
|
while (!job_in_ready) @(posedge ui_clk);
|
|
@(posedge ui_clk);
|
|
job_in_valid = 1'b0;
|
|
end
|
|
endtask
|
|
|
|
integer li_i, pp_i, wd;
|
|
|
|
initial begin
|
|
errors = 0; tests = 0; completions = 0; n_expected = 0;
|
|
pre_active = 1'b1; pre_req = 0; pre_wr = 0; pre_addr = 0; pre_wdata = 0;
|
|
job_in_valid = 0; job_in_x_base = 0; job_in_w_base = 0;
|
|
job_in_n_tiles = 0; job_in_result_addr = 0; job_in_node_id = 0;
|
|
|
|
$display("=== waiting for real DDR3 init_calib_complete ===");
|
|
wait (init_calib_complete);
|
|
$display("=== calibration done at time %0t ===", $time);
|
|
repeat (10) @(posedge ui_clk);
|
|
|
|
$display("=== preload SDRAM with %0d resident-filter weight sets ===", L);
|
|
preload_sdram_layers;
|
|
$display("=== preload SDRAM with real activation data (EXP-0079) ===");
|
|
preload_ddr3_activations;
|
|
@(posedge ui_clk);
|
|
pre_active = 1'b0;
|
|
repeat (5) @(posedge ui_clk);
|
|
|
|
$display("=== N=2 system on REAL DDR3: submitting %0d layers x %0d positions ===", L, M);
|
|
for (li_i = 0; li_i < L; li_i = li_i + 1) begin
|
|
for (pp_i = 0; pp_i < M; pp_i = pp_i + 1) begin
|
|
submit_job(act_x_base(li_i, pp_i), li_i*WORDS_PER_LAYER, N_TILES[15:0],
|
|
26'h9000 + li_i*10 + pp_i, (li_i*M + pp_i));
|
|
expect_node[n_expected] = (li_i*M + pp_i);
|
|
expect_val[n_expected] = golden_result(li_i, pp_i);
|
|
n_expected = n_expected + 1;
|
|
end
|
|
end
|
|
|
|
wd = 0;
|
|
while (completions < n_expected && wd < 200000) begin
|
|
@(posedge ui_clk);
|
|
wd = wd + 1;
|
|
end
|
|
|
|
if (completions < n_expected) begin
|
|
$display("FAIL: only %0d/%0d position-results completed within watchdog", completions, n_expected);
|
|
errors = errors + 1;
|
|
end
|
|
|
|
$display("=== %0d/%0d tests, %0d errors, %0d/%0d positions completed ===", tests-errors, tests, errors, completions, n_expected);
|
|
if (errors == 0 && completions == n_expected) $display("ALL TESTS PASSED (tb_n2_system_ddr3, REAL DDR3)");
|
|
$finish;
|
|
end
|
|
endmodule
|