DEC-0043: slot_mem_arbiter.v/slot_mem_arbiter_wide.v both still had the exact runtime-variable-indexed part-select anti-pattern (pending_addr[grant_idx*ADDR_WIDTH +: ADDR_WIDTH], grant_idx a runtime register) that neural_director.v had already found and fixed once before -- ADDR_WIDTH=26 not being a power of 2 means this synthesizes as a real multiplier + wide crossbar, sitting right on the arbiter<->backend boundary this project's own N=8 congestion diagnosis names, growing with N_PORTS=N_SLOTS(+1). Also fixed the cheaper but same-class dir_job_out_slot*16 mux in nms_dataflow_core_sdram.v, feeding directly into dependency_manager -- this exact signal was DEC-0042's own diagnosed N=4 critical path. Fix: N_PORTS/N_SLOTS parallel constant-indexed comparisons (unrolled for-loop) instead of a runtime-indexed read -- same technique already proven in neural_director.v. Purely an internal-implementation change. Verified bit-exact via Verilator: tb_fpga_neural_v2_top_smoke.v 11/11 PASS; tb_nms_dstress_sdram_unified.v (256-neuron stress) at both N_SLOTS_CFG=4 and =8, 256/256 bit-exact vs golden, total_cycles IDENTICAL to pre-fix historical values (49927/49909, exact match to DEC-0042's own recorded numbers). Bonus finding from the same D-Stress run (not this commit's main point, logged for Phase 3/4): sdram_busy_cycles ~81.6% and useful-MAC-cycle fraction HALVING from N=4 to N=8 (2.04%->1.02%) -- real existing evidence the system is memory-bound on a single SDRAM bank well before N=8, independent of Fmax. Re-synthesis (8-seed sweep, N=4/N=8) in progress to measure the actual Fmax delta from this fix -- committed separately once complete. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
220 lines
9.8 KiB
Verilog
220 lines
9.8 KiB
Verilog
`timescale 1ns/1ps
|
|
|
|
// ================================================================
|
|
// FPGA-Neural V2 -- Slot Memory Arbiter (M8, docs/v2-description.md §15)
|
|
//
|
|
// Generic N_PORTS-way arbiter for dataflow_core.v's per-slot Memory
|
|
// Backend Interface ports (docs/v2-description.md §15's "Memory
|
|
// Manager -> Memory Backend Interface -> PSRAM Controller" layering),
|
|
// funneling N_SLOTS independent memory_manager backend ports down to
|
|
// the ONE physical PSRAM port a real chip actually has.
|
|
//
|
|
// WORD-level (16-bit, + lb_n/ub_n) post-M10 (decisions.log DEC-0015):
|
|
// arbitrates hardware/v1/rtl/memory_interface.v's own port shape
|
|
// directly (int8_memory_access.v is no longer in this datapath -- see
|
|
// memory_manager.v/prefetch_engine.v's own headers for why).
|
|
//
|
|
// Inspired by (NOT copied from -- see hardware/v2/logs/decisions.log
|
|
// DEC-0006's own note) hardware/v1/rtl/mem_arbiter.v: same
|
|
// single-owner-until-ready-pulse discipline (a port, once granted,
|
|
// holds the shared master port until ITS OWN transaction's m_ready
|
|
// pulse, then releases -- no queuing/pipelining needed, since every
|
|
// requester already issues a clean one-cycle req pulse matching
|
|
// memory_interface's own contract). Generalized from V1's fixed
|
|
// 4 named ports (A/B/C/D) to a parametric N_PORTS array, since
|
|
// dataflow_core.v's N_SLOTS is itself a parameter.
|
|
//
|
|
// Priority: fixed, lowest port index wins on a cycle where more than
|
|
// one port requests simultaneously while the arbiter is idle -- same
|
|
// "first-found, lowest index" convention already used by
|
|
// neural_director's free-slot scan and dependency_manager's
|
|
// first-ready scan (not fairness-balanced; see decisions.log DEC-0010
|
|
// for why that is an acceptable starting point, same rationale as
|
|
// neural_director's own "first-free, not load-balanced" choice).
|
|
//
|
|
// IMPORTANT (found via real concurrent-slot simulation, see
|
|
// hardware/v2/logs/errors.log ERR-0008): each port's own s_req is a
|
|
// FIRE-AND-FORGET single-cycle pulse (prefetch_engine.v/
|
|
// memory_manager.v's own backend protocol -- M4 verified it only
|
|
// against a DIRECT 1:1 connection to the backend, which is always
|
|
// free to accept it since there is exactly one requester). A naive
|
|
// "grant only while req is live" arbiter silently DROPS a pulse that
|
|
// arrives while the shared bus is owned by another port, hanging that
|
|
// slot's prefetch/writeback forever. Every incoming s_req is therefore
|
|
// LATCHED into a per-port `pending` register (capturing wr/addr/wdata/
|
|
// lb_n/ub_n the same cycle) regardless of arbiter state -- the same
|
|
// single-entry "queue, don't drop the request" idiom already used by
|
|
// memory_manager's own pf_pending register (ERR-0006 fix #1). Grants
|
|
// are drawn from `pending`, never from a live s_req directly, which
|
|
// adds a uniform minimum 1-cycle latency to every transaction (a real,
|
|
// measured cost of sharing one PSRAM port -- see timing.log/
|
|
// benchmark.log EXP-0009) but never drops a request.
|
|
// ================================================================
|
|
|
|
module slot_mem_arbiter #(
|
|
parameter ADDR_WIDTH = 26,
|
|
parameter N_PORTS = 4
|
|
)(
|
|
input wire clk,
|
|
input wire rst,
|
|
|
|
// ---- N_PORTS requester side (one per dataflow_core slot) ----
|
|
input wire [N_PORTS-1:0] s_req,
|
|
input wire [N_PORTS-1:0] s_wr,
|
|
input wire [ADDR_WIDTH*N_PORTS-1:0] s_addr, // WORD address
|
|
input wire [16*N_PORTS-1:0] s_wdata,
|
|
input wire [N_PORTS-1:0] s_lb_n,
|
|
input wire [N_PORTS-1:0] s_ub_n,
|
|
output reg [16*N_PORTS-1:0] s_rdata,
|
|
output reg [N_PORTS-1:0] s_ready,
|
|
|
|
// ---- single shared master port (-> memory_interface.v) ----
|
|
output reg m_req,
|
|
output reg m_wr,
|
|
output reg [ADDR_WIDTH-1:0] m_addr,
|
|
output reg [15:0] m_wdata,
|
|
output reg m_lb_n,
|
|
output reg m_ub_n,
|
|
input wire [15:0] m_rdata,
|
|
input wire m_ready
|
|
);
|
|
|
|
localparam PIDXW = $clog2(N_PORTS+1);
|
|
localparam OWNER_NONE = {PIDXW{1'b0}}; // 0 = no owner; port i owned = i+1
|
|
|
|
reg [PIDXW-1:0] owner;
|
|
|
|
// Per-port pending-request latch (see file header/ERR-0008): every
|
|
// s_req pulse is captured here, regardless of arbiter state, so it
|
|
// is never silently dropped while the bus is owned by another port.
|
|
reg [N_PORTS-1:0] pending;
|
|
reg [ADDR_WIDTH*N_PORTS-1:0] pending_addr;
|
|
reg [16*N_PORTS-1:0] pending_wdata;
|
|
reg [N_PORTS-1:0] pending_wr;
|
|
reg [N_PORTS-1:0] pending_lb_n;
|
|
reg [N_PORTS-1:0] pending_ub_n;
|
|
|
|
// Fixed lowest-index-wins priority scan over PENDING requests (not
|
|
// raw s_req -- see file header).
|
|
reg [PIDXW-1:0] grant_idx;
|
|
reg any_pending;
|
|
integer ri;
|
|
always @(*) begin
|
|
grant_idx = {PIDXW{1'b0}};
|
|
any_pending = 1'b0;
|
|
for (ri = N_PORTS-1; ri >= 0; ri = ri - 1) begin
|
|
if (pending[ri]) begin
|
|
grant_idx = ri[PIDXW-1:0];
|
|
any_pending = 1'b1;
|
|
end
|
|
end
|
|
end
|
|
|
|
// grant_idx-selected pending fields, read out via N_PORTS parallel
|
|
// CONSTANT-indexed comparisons (`gi` is the for-loop's own unrolled
|
|
// constant, not a runtime value) instead of a runtime-indexed part-
|
|
// select of a wide packed array -- same fix class already applied
|
|
// in neural_director.v (see that file's own header comment): a
|
|
// variable-indexed read/write of a wide packed array synthesizes as
|
|
// a real multiplier (index * ADDR_WIDTH, ADDR_WIDTH=26 not a power
|
|
// of 2) feeding a wide demux/crossbar, measurably worse as
|
|
// ADDR_WIDTH/N_PORTS grow -- exactly the arbiter<->backend boundary
|
|
// this project's own N=8 congestion diagnosis names. Functionally
|
|
// IDENTICAL to the old `pending_*[grant_idx]` reads (exactly one gi
|
|
// matches grant_idx whenever any_pending is set).
|
|
reg grant_wr_c, grant_lb_n_c, grant_ub_n_c;
|
|
reg [ADDR_WIDTH-1:0] grant_addr_c;
|
|
reg [15:0] grant_wdata_c;
|
|
integer gi;
|
|
always @(*) begin
|
|
grant_wr_c = 1'b0;
|
|
grant_lb_n_c = 1'b1;
|
|
grant_ub_n_c = 1'b1;
|
|
grant_addr_c = {ADDR_WIDTH{1'b0}};
|
|
grant_wdata_c = 16'h0000;
|
|
for (gi = 0; gi < N_PORTS; gi = gi + 1) begin
|
|
if (grant_idx == gi[PIDXW-1:0]) begin
|
|
grant_wr_c = pending_wr[gi];
|
|
grant_lb_n_c = pending_lb_n[gi];
|
|
grant_ub_n_c = pending_ub_n[gi];
|
|
grant_addr_c = pending_addr[gi*ADDR_WIDTH +: ADDR_WIDTH];
|
|
grant_wdata_c = pending_wdata[gi*16 +: 16];
|
|
end
|
|
end
|
|
end
|
|
|
|
integer pi;
|
|
|
|
always @(posedge clk) begin
|
|
if (rst) begin
|
|
owner <= OWNER_NONE;
|
|
pending <= {N_PORTS{1'b0}};
|
|
pending_addr <= {(ADDR_WIDTH*N_PORTS){1'b0}};
|
|
pending_wdata <= {(16*N_PORTS){1'b0}};
|
|
pending_wr <= {N_PORTS{1'b0}};
|
|
pending_lb_n <= {N_PORTS{1'b1}};
|
|
pending_ub_n <= {N_PORTS{1'b1}};
|
|
m_req <= 1'b0;
|
|
m_wr <= 1'b0;
|
|
m_addr <= {ADDR_WIDTH{1'b0}};
|
|
m_wdata <= 16'h0000;
|
|
m_lb_n <= 1'b1;
|
|
m_ub_n <= 1'b1;
|
|
s_rdata <= {(16*N_PORTS){1'b0}};
|
|
s_ready <= {N_PORTS{1'b0}};
|
|
end else begin
|
|
m_req <= 1'b0;
|
|
s_ready <= {N_PORTS{1'b0}};
|
|
|
|
// Latch every incoming request pulse. Safe against a
|
|
// same-cycle collision with the grant-clear write below:
|
|
// a port only ever becomes grant_idx while its OWN pending
|
|
// bit is already 1 (latched on an earlier cycle), and its
|
|
// requester (memory_manager/prefetch_engine) never issues
|
|
// a NEW s_req for that port until THIS transaction's
|
|
// s_ready arrives -- so s_req[grant_idx] is guaranteed low
|
|
// the cycle it is granted.
|
|
for (pi = 0; pi < N_PORTS; pi = pi + 1) begin
|
|
if (s_req[pi]) begin
|
|
pending[pi] <= 1'b1;
|
|
pending_wr[pi] <= s_wr[pi];
|
|
pending_lb_n[pi] <= s_lb_n[pi];
|
|
pending_ub_n[pi] <= s_ub_n[pi];
|
|
pending_addr[pi*ADDR_WIDTH +: ADDR_WIDTH] <= s_addr[pi*ADDR_WIDTH +: ADDR_WIDTH];
|
|
pending_wdata[pi*16 +: 16] <= s_wdata[pi*16 +: 16];
|
|
end
|
|
end
|
|
|
|
if (owner == OWNER_NONE) begin
|
|
if (any_pending) begin
|
|
owner <= grant_idx + 1'b1;
|
|
m_req <= 1'b1;
|
|
m_wr <= grant_wr_c;
|
|
m_lb_n <= grant_lb_n_c;
|
|
m_ub_n <= grant_ub_n_c;
|
|
m_addr <= grant_addr_c;
|
|
m_wdata <= grant_wdata_c;
|
|
for (pi = 0; pi < N_PORTS; pi = pi + 1) begin
|
|
if (grant_idx == pi[PIDXW-1:0]) pending[pi] <= 1'b0;
|
|
end
|
|
end
|
|
end else begin
|
|
if (m_ready) begin
|
|
// owner is (port_index+1); vectorized single-write
|
|
// so exactly one s_rdata/s_ready lane updates (no
|
|
// per-bit loop last-write-wins hazard -- same class
|
|
// of bug already hit/fixed at ERR-0006/M2/M6).
|
|
for (pi = 0; pi < N_PORTS; pi = pi + 1) begin
|
|
if (owner == pi[PIDXW-1:0] + 1'b1) begin
|
|
s_rdata[pi*16 +: 16] <= m_rdata;
|
|
s_ready[pi] <= 1'b1;
|
|
end
|
|
end
|
|
owner <= OWNER_NONE;
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
endmodule
|