Memory upgrade, at the user's own explicit request: Alliance Memory AS4C4M16SA-6TIN (64Mbit/8MB) -> AS4C32M16SB-7BIN (512Mbit/64MB, 54-ball TFBGA), the largest same-family SDR SDRAM Alliance Memory offers. Real-datasheet-driven (whole AS4C4M16SA/AS4C8M16SA/AS4C16M16SA/ AS4C32M16SA family investigated): 13 row bits (was 12, one new FPGA pin sdram_a[12]/ball F1), 10 column bits (was 8), real -7-grade AC timing (tRCD/tRP improved to 15ns, tREFI halved to 7.8us for the doubled row count). sdram_controller.v and sdram_model.v gained real ROW_BITS/COL_BITS/BANK_BITS parameters (was hardcoded 12/8/2). ADDR_WIDTH widened 23->26 bits across the live instantiation tree. This required a real SPI protocol change (spi_host_bridge.v): a 26-bit byte address no longer fits in 3 bytes -- every address field widened 3->4 bytes (WRITE_JOB 15->18 payload bytes, WRITE_MEM/READ_MEM header 5->6 bytes). Found and fixed two real timing regressions via nextpnr-ecp5 P&R (not assumed): neural_director.v's own runtime-indexed demux write (ERR-0027, was silently synthesizing an extra MULT18X18D) and nms_activation_fill_ctrl_v3.v's own linear N_SLOTS-wide max-scan (ERR-0028, became dominant at N_SLOTS=8) -- both replaced with constant-indexed/tree-based equivalents, bit-exact same behavior, confirmed via full D-Stress N=2/4/8 regression (identical cycle counts). N_SLOTS=4 now fully closes timing at 64MHz (8/8 seeds); N_SLOTS=8 significantly improved but not yet fully reliable (5/8 seeds) -- honestly disclosed, not claimed complete. Full regression re-verified: sdram_controller (461/461, 18 configs), tb_sdram_boundary (21/21), D-Stress N=2/4/8 (bit-exact), spi_host_bridge (18/18), board-level SPI smoke test (11/11), unified backend (40/40). See hardware/v2/docs/MEMORY_UPGRADE_64MB_N8.md for the full investigation, and errors.log/decisions.log (ERR-0027, ERR-0028, DEC-0039) for the complete root-cause writeups. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013xXuuRUWZScuo1DeYJxs3v
185 lines
8.2 KiB
Verilog
185 lines
8.2 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
|
|
|
|
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 <= pending_wr[grant_idx];
|
|
m_lb_n <= pending_lb_n[grant_idx];
|
|
m_ub_n <= pending_ub_n[grant_idx];
|
|
m_addr <= pending_addr[grant_idx*ADDR_WIDTH +: ADDR_WIDTH];
|
|
m_wdata <= pending_wdata[grant_idx*16 +: 16];
|
|
pending[grant_idx] <= 1'b0;
|
|
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
|