dataflow_core.v integrates dependency_manager (M6) -> neural_director (M5) -> N_SLOTS x (memory_manager (M4) + neural_processor (M1)) for the first time. A slot's completion (via neural_director's new slot_node_id tracking, an additive port) feeds back as a producer_done event to dependency_manager, waking up any node that depended on it - closing the dataflow loop without external glue. Verified end-to-end (Verilator) on a 3-node DAG: two independent nodes plus a third depending on both, confirmed to dispatch only after both genuinely complete via real neural_processor computation. 4/4 PASS. Real synthesis + nextpnr-ecp5 P&R via a synthesis-only timing harness (bare per-slot backend ports exceed the LFE5U-45F's TRELLIS_IO budget, same pattern as ERR-0005): N_SLOTS=2 -> 165.15 MHz, N_SLOTS=4 -> 133.19 MHz, both PASS at 80MHz, 0 synthesis problems. Scope explicitly deferred to M8 (DEC-0009): M3's BRAM buffers not wired in yet, per-slot Memory Backend Interface ports not arbitrated to one shared PSRAM master yet - both need real measured data before committing to a design, not guessed at here. Logged: simulation/synthesis/timing/benchmark/decisions (DEC-0009)/ experiments (EXP-0008)/errors (ERR-0007, a Yosys chparam-ordering build quirk, not an RTL bug)/development.log, ROADMAP.md updated. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013xXuuRUWZScuo1DeYJxs3v
237 lines
9.7 KiB
Verilog
237 lines
9.7 KiB
Verilog
`timescale 1ns/1ps
|
|
|
|
// ============================================================
|
|
// M7 testbench (docs/v2-description.md §17/§19/§20): dataflow_core.v
|
|
// -- the FULL loop, end-to-end, for the first time: node registration
|
|
// -> Dependency Manager -> Neural Director -> (Memory Manager +
|
|
// Neural Processor) per slot -> completion -> wake-up of dependent
|
|
// nodes -> repeat, with NO external component gluing any of these
|
|
// stages together (all internal to dataflow_core.v).
|
|
//
|
|
// DAG (same shape as tb_dependency_manager.v's own §10-focused test,
|
|
// now driven through the WHOLE system instead of dependency_manager
|
|
// in isolation): node0 and node1 have no dependencies and run
|
|
// concurrently on the 2 available slots; node2 depends on BOTH and
|
|
// must not be dispatched until both have genuinely completed their
|
|
// real neural_processor computation (not just been "marked done" --
|
|
// its own result is checked too).
|
|
//
|
|
// node0 (x=2,w=3,8in -> acc=48) --+
|
|
// +--> node2 (x=1,w=5,8in -> acc=40)
|
|
// node1 (x=1,w=1,8in -> acc=8) --+
|
|
//
|
|
// Verified with Verilator (decisions.log DEC-0004). Each slot gets
|
|
// its own independent behavioral memory (sim_byte_mem, same as
|
|
// tb_neural_director.v/tb_memory_manager.v's own scope decisions --
|
|
// DEC-0006/DEC-0007: shared-PSRAM arbitration across slots is
|
|
// explicitly M8's job, not exercised here).
|
|
// ============================================================
|
|
|
|
module sim_byte_mem #(
|
|
parameter ADDR_WIDTH = 23,
|
|
parameter DEPTH = 4096
|
|
)(
|
|
input wire clk,
|
|
input wire rst,
|
|
input wire req,
|
|
input wire wr,
|
|
input wire [ADDR_WIDTH-1:0] addr,
|
|
input wire signed [7:0] wdata,
|
|
output reg signed [7:0] rdata,
|
|
output reg ready
|
|
);
|
|
reg signed [7:0] mem [0:DEPTH-1];
|
|
reg [1:0] state;
|
|
reg [ADDR_WIDTH-1:0] addr_reg;
|
|
localparam ST_IDLE = 0, ST_WAIT = 1;
|
|
always @(posedge clk) begin
|
|
if (rst) begin
|
|
state <= ST_IDLE; ready <= 1'b0; rdata <= 8'sd0;
|
|
end else begin
|
|
ready <= 1'b0;
|
|
case (state)
|
|
ST_IDLE: if (req) begin
|
|
addr_reg <= addr;
|
|
if (wr) mem[addr] <= wdata;
|
|
state <= ST_WAIT;
|
|
end
|
|
ST_WAIT: begin
|
|
rdata <= mem[addr_reg];
|
|
ready <= 1'b1;
|
|
state <= ST_IDLE;
|
|
end
|
|
endcase
|
|
end
|
|
end
|
|
endmodule
|
|
|
|
module tb;
|
|
|
|
localparam ADDR_WIDTH = 23;
|
|
localparam DATA_WIDTH = 8;
|
|
localparam P_IN = 8;
|
|
localparam ACC_WIDTH = 32;
|
|
localparam N_SLOTS = 2;
|
|
localparam N_NODES = 8;
|
|
localparam MAX_DEPS = 4;
|
|
localparam QUEUE_DEPTH = 4;
|
|
localparam NODE_IDW = $clog2(N_NODES);
|
|
|
|
reg clk, rst;
|
|
initial begin clk = 0; forever #5 clk = ~clk; end
|
|
|
|
reg reg_valid;
|
|
wire reg_ready;
|
|
reg [NODE_IDW-1:0] reg_node_id;
|
|
reg [$clog2(MAX_DEPS+1)-1:0] reg_required;
|
|
reg [MAX_DEPS*NODE_IDW-1:0] reg_producer_ids;
|
|
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 signed [8*N_SLOTS-1:0] slot_mem_wdata, slot_mem_rdata;
|
|
wire [N_SLOTS-1:0] slot_mem_ready;
|
|
|
|
dataflow_core #(
|
|
.DATA_WIDTH(DATA_WIDTH), .P_IN(P_IN), .ACC_WIDTH(ACC_WIDTH), .ADDR_WIDTH(ADDR_WIDTH),
|
|
.N_SLOTS(N_SLOTS), .N_NODES(N_NODES), .MAX_DEPS(MAX_DEPS), .QUEUE_DEPTH(QUEUE_DEPTH)
|
|
) u_core (
|
|
.clk(clk), .rst(rst),
|
|
.reg_valid(reg_valid), .reg_ready(reg_ready), .reg_node_id(reg_node_id),
|
|
.reg_required(reg_required), .reg_producer_ids(reg_producer_ids),
|
|
.reg_x_base(reg_x_base), .reg_w_base(reg_w_base), .reg_n_tiles(reg_n_tiles),
|
|
.reg_result_addr(reg_result_addr),
|
|
.slot_mem_req(slot_mem_req), .slot_mem_wr(slot_mem_wr), .slot_mem_addr(slot_mem_addr),
|
|
.slot_mem_wdata(slot_mem_wdata), .slot_mem_rdata(slot_mem_rdata), .slot_mem_ready(slot_mem_ready)
|
|
);
|
|
|
|
genvar g;
|
|
generate
|
|
for (g = 0; g < N_SLOTS; g = g + 1) begin : GEN_MEM
|
|
sim_byte_mem #(.ADDR_WIDTH(ADDR_WIDTH), .DEPTH(4096)) u_mem (
|
|
.clk(clk), .rst(rst),
|
|
.req(slot_mem_req[g]), .wr(slot_mem_wr[g]),
|
|
.addr(slot_mem_addr[g*ADDR_WIDTH +: ADDR_WIDTH]),
|
|
.wdata(slot_mem_wdata[g*8 +: 8]),
|
|
.rdata(slot_mem_rdata[g*8 +: 8]), .ready(slot_mem_ready[g])
|
|
);
|
|
end
|
|
endgenerate
|
|
|
|
task automatic poke(input integer slot, input [ADDR_WIDTH-1:0] addr, input [7:0] val);
|
|
begin
|
|
case (slot)
|
|
0: tb.GEN_MEM[0].u_mem.mem[addr] = val;
|
|
1: tb.GEN_MEM[1].u_mem.mem[addr] = val;
|
|
default: ;
|
|
endcase
|
|
end
|
|
endtask
|
|
|
|
function automatic signed [7:0] peek(input integer slot, input [ADDR_WIDTH-1:0] addr);
|
|
begin
|
|
case (slot)
|
|
0: peek = tb.GEN_MEM[0].u_mem.mem[addr];
|
|
1: peek = tb.GEN_MEM[1].u_mem.mem[addr];
|
|
default: peek = 8'sdx;
|
|
endcase
|
|
end
|
|
endfunction
|
|
|
|
task automatic register_node(
|
|
input [NODE_IDW-1:0] nid,
|
|
input [$clog2(MAX_DEPS+1)-1:0] required,
|
|
input [NODE_IDW-1:0] p0, input [NODE_IDW-1:0] p1,
|
|
input [ADDR_WIDTH-1:0] xb, input [ADDR_WIDTH-1:0] wb,
|
|
input [15:0] nt, input [ADDR_WIDTH-1:0] resaddr
|
|
);
|
|
begin
|
|
@(posedge clk);
|
|
reg_node_id = nid;
|
|
reg_required = required;
|
|
reg_producer_ids = {NODE_IDW*MAX_DEPS{1'b0}};
|
|
reg_producer_ids[0*NODE_IDW +: NODE_IDW] = p0;
|
|
reg_producer_ids[1*NODE_IDW +: NODE_IDW] = p1;
|
|
reg_x_base = xb; reg_w_base = wb; reg_n_tiles = nt; reg_result_addr = resaddr;
|
|
reg_valid = 1'b1;
|
|
while (!reg_ready) @(posedge clk);
|
|
@(posedge clk);
|
|
reg_valid = 1'b0;
|
|
end
|
|
endtask
|
|
|
|
integer errors, tests;
|
|
integer i, wd;
|
|
|
|
initial begin
|
|
errors = 0; tests = 0;
|
|
rst = 1; reg_valid = 0; reg_node_id = 0; reg_required = 0; reg_producer_ids = 0;
|
|
reg_x_base = 0; reg_w_base = 0; reg_n_tiles = 0; reg_result_addr = 0;
|
|
repeat(4) @(posedge clk);
|
|
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).
|
|
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);
|
|
end
|
|
|
|
// node0, node1: no dependencies. node2: depends on BOTH.
|
|
register_node(0, 0, 0, 0, 23'h10, 23'h20, 16'd1, 23'h70);
|
|
register_node(1, 0, 0, 0, 23'h30, 23'h40, 16'd1, 23'h71);
|
|
register_node(2, 2, 0, 1, 23'h50, 23'h60, 16'd1, 23'h72);
|
|
|
|
// node2 must not complete before node0/node1 do -- checked by
|
|
// polling: as soon as EITHER result byte at 0x70/0x71 is still
|
|
// zero, 0x72 must also still be zero (node2 cannot have run).
|
|
tests = tests + 1;
|
|
wd = 0;
|
|
while ((peek(0,23'h70)==0 && peek(1,23'h70)==0 ||
|
|
peek(0,23'h71)==0 && peek(1,23'h71)==0) && wd < 3000) begin
|
|
if ((peek(0,23'h72) !== 8'sd0) || (peek(1,23'h72) !== 8'sd0)) begin
|
|
$display("FAIL: node2 completed before both node0 and node1 finished");
|
|
errors = errors + 1;
|
|
end
|
|
@(posedge clk); wd = wd + 1;
|
|
end
|
|
$display("PASS: node2 did not complete before both its dependencies did (checked every cycle up to wd=%0d)", wd);
|
|
|
|
// Now wait for node2 itself to complete.
|
|
wd = 0;
|
|
while ((peek(0,23'h72)==0 && peek(1,23'h72)==0) && wd < 3000) begin @(posedge clk); wd = wd + 1; end
|
|
repeat(5) @(posedge clk);
|
|
|
|
tests = tests + 3;
|
|
if (peek(0,23'h70) !== 8'sd48 && peek(1,23'h70) !== 8'sd48) begin
|
|
$display("FAIL node0: result=%0d/%0d expected 48 on one slot", peek(0,23'h70), peek(1,23'h70));
|
|
errors = errors + 1;
|
|
end else $display("PASS node0: result=48 (real neural_processor computation, via full dataflow_core)");
|
|
|
|
if (peek(0,23'h71) !== 8'sd8 && peek(1,23'h71) !== 8'sd8) begin
|
|
$display("FAIL node1: result=%0d/%0d expected 8 on one slot", peek(0,23'h71), peek(1,23'h71));
|
|
errors = errors + 1;
|
|
end else $display("PASS node1: result=8 (real neural_processor computation, via full dataflow_core)");
|
|
|
|
if (peek(0,23'h72) !== 8'sd40 && peek(1,23'h72) !== 8'sd40) begin
|
|
$display("FAIL node2: result=%0d/%0d expected 40 on one slot", peek(0,23'h72), peek(1,23'h72));
|
|
errors = errors + 1;
|
|
end else $display("PASS node2: result=40, dispatched only after BOTH node0 and node1 genuinely completed (full wake-up loop closed end-to-end)");
|
|
|
|
$display("========================================");
|
|
if (errors == 0)
|
|
$display("ALL %0d TESTS PASSED (dataflow_core, full M1-M6 integration end-to-end)", tests);
|
|
else
|
|
$display("FAILED: %0d/%0d test(s) had errors -- see messages above", errors, tests);
|
|
$display("========================================");
|
|
$finish;
|
|
end
|
|
|
|
endmodule
|