mlx-bun 0.0.7 → 0.0.9

package/src/serve/batch-scheduler.ts

@@ -2,7 +2,7 @@
 // loop). Owns ONE running batch and drives it forward one decode step at a
 // time, admitting waiting requests and evicting finished ones between steps —
 // iteration-level (continuous) scheduling, not static batching. See
-// docs/design/parallel-slots.md.
+// docs/design/parallel-slots.md and docs/design/batching-v2-plan.md.
 //
 // The numerically-hard parts are verified primitives:
 //   - the batched FORWARD (per-row RoPE/mask) is bit-parity with mlx-lm B=N
@@ -21,12 +21,35 @@
 // mask). Full layers share one leftPad/offset (all rows advance together); the
 // rotating caches self-track per-row leftPad/offset as the ring wraps. The
 // per-row absolute position stays consistent across both (full: offset-leftPad;
-// rot: offsetArr) — see docs/design/parallel-slots.md.
+// rot: offsetArr) — see docs/design/parallel-slots.md. Models whose caches
+// don't support the dynamic-B ops (e.g. Qwen3.5's SSMCache) never reach this
+// scheduler — GenerationGateway.willBatch gates on cache capability.
+//
+// Engine mechanics (the serial decode loop's hygiene, transplanted —
+// batching-v2-plan step 3):
+//   - PIPELINED decode: each step builds the NEXT step's graph from the
+//     still-unread sampled-token array (asyncEval), then reads the PREVIOUS
+//     step's tokens while the new step computes — mlx-lm GenerationBatch._step.
+//     The pipeline is flushed (read + emit) before a join merges, so admission
+//     never has to reconcile an in-flight token array with a new row.
+//   - clearCache every 256 steps (serial's cadence; mlx-lm batched uses 512),
+//     not every step — per-step clears trashed the buffer pool each token.
+//   - CHUNKED, INTERLEAVED admission: a joiner prefills prefillChunkSize
+//     tokens per loop iteration with one batch decode step run in between, so
+//     running rows stall at most one chunk per joiner (mlx-lm interleaves the
+//     same way), and the prefill transient stays bounded.
+//   - Failure containment: one row's onToken throwing evicts THAT row (its
+//     promise rejects); siblings keep decoding (mlx-lm `remove` semantics). A
+//     forward/sampling error still drops the whole batch (can't be attributed
+//     to a row).
 //
 // Bun-async, NO threads: a single detached driver loop owns the GPU for batched
 // mode (an ExclusiveLock keeps the serial fallback off the GPU concurrently).
+// When `admissionHeld` reports a waiting serial-lane request, the loop stops
+// admitting, finishes the running rows, and releases the lock so the serial
+// request runs (mlx-lm's drain_batch) — resumed via kick().
 // Joins re-merge the whole batch; the keep-the-running-batch `extend`
-// optimization is a later refinement.
+// optimization is a later refinement (batching-v2-plan item a).
 
 import { MlxArray } from "../mlx/array";
 import * as ops from "../mlx/ops";
@@ -36,10 +59,15 @@ import { BatchedDecodeMaskCache, mergeKVRows, filterKVRows } from "../model/batc
 import { BatchedRotatingCache } from "../model/batched-rotating";
 import type { RuntimeModel } from "../model/factory";
 
+/** Decode-pipeline kill switch (read once at load, like the serial loop's
+ *  MLX_BUN_COMPILED_DECODE): 1 ⇒ read each step's tokens synchronously. */
+const NO_PIPELINE = process.env.MLX_BUN_BATCH_NO_PIPELINE === "1";
+
 /** A token sampler for one row: (logits [1,V], step) → token array [1] on
  *  device. Greedy is `(l) => ops.argmaxAxis(l, -1)`; richer closures fold in
  *  temperature / top-p / logits processors + history (built per request from
- *  its sampler options, exactly like generate()'s sampleStep). */
+ *  its sampler options, exactly like generate()'s sampleStep). Called once per
+ *  step 0..maxTokens-1 for this row (never beyond maxTokens). */
 export type RowSampler = (logits1V: MlxArray, step: number) => MlxArray;
 
 export interface BatchRequest {
@@ -49,8 +77,9 @@ export interface BatchRequest {
   sample: RowSampler;
   /** Called per emitted (non-EOS) token, in order. Returning `false` halts this
    *  row (a decoded-text stop sequence fired) — matches generate()'s onToken
-   *  contract. EOS terminates the row WITHOUT an onToken call. May be async;
-   *  keep it cheap — it runs inline in the step loop. */
+   *  contract. EOS terminates the row WITHOUT an onToken call. Throwing evicts
+   *  THIS row only (its submit promise rejects; siblings continue). May be
+   *  async; keep it cheap — it runs inline in the step loop. */
   onToken: (token: number) => void | boolean | Promise<void | boolean>;
 }
 
@@ -67,11 +96,20 @@ interface Row {
   req: BatchRequest;
   resolve: (s: BatchStats) => void;
   reject: (e: unknown) => void;
-  current: number; // last emitted token, fed at the next step
+  current: number; // last emitted token, fed at the next step (pipeline cold)
   generated: number; // tokens emitted so far (incl. a terminating EOS)
+  sampled: number; // sample() calls so far (leads `generated` by 1 in-pipeline)
   promptTokens: number;
 }
 
+/** A joiner mid-prefill: `pos` prompt tokens are already in `solo`. Advanced
+ *  one chunk per loop iteration, interleaved with batch decode steps. */
+interface PrefillState {
+  row: Row;
+  solo: Cache[];
+  pos: number;
+}
+
 /** Held while the batch is active; the serial fallback acquires the same lock. */
 export interface ExclusiveLock {
   acquire(): Promise<() => void>;
@@ -81,6 +119,12 @@ export interface BatchSchedulerOptions {
   /** Max rows in the running batch (mlx-lm `--decode-concurrency`). */
   maxBatch: number;
   lock?: ExclusiveLock;
+  /** Drain signal: while true, no NEW rows are admitted (running rows finish,
+   *  the lock is released) so a waiting serial-lane request can run — mlx-lm's
+   *  drain_batch. Pair with kick() when it flips back to false. */
+  admissionHeld?: () => boolean;
+  /** Joiner prefill chunk length (default 2048, the serial loop's constant). */
+  prefillChunkSize?: number;
 }
 
 type LayerInner = KVCache | BatchedRotatingCache;
@@ -91,19 +135,29 @@ export class BatchScheduler {
   #inners: LayerInner[] | null = null; // per-layer batched KV; null when empty
   #fullLeftPad: number[] = []; // per-row padding for FULL layers (rot self-tracks)
   #pending: Row[] = [];
+  #prefill: PrefillState | null = null; // the (single) joiner mid-prefill
+  /** Sampled-but-unread token array [B], aligned with #running — the decode
+   *  pipeline register. Filtered/disposed alongside the batched KV. */
+  #pendingToks: MlxArray | null = null;
+  #steps = 0; // decode-step counter (clearCache cadence)
   #looping = false;
   #wake: (() => void) | null = null;
   readonly #maxBatch: number;
   readonly #lock: ExclusiveLock | undefined;
+  readonly #admissionHeld: (() => boolean) | undefined;
+  readonly #prefillChunkSize: number;
   readonly #kinds: ("full" | "rot")[]; // per-layer attention type
   readonly #rotMaxSize: number[]; // per-layer sliding window (rot layers only)
 
   constructor(private readonly model: RuntimeModel, opts: BatchSchedulerOptions) {
     this.#maxBatch = Math.max(1, Math.floor(opts.maxBatch));
     this.#lock = opts.lock;
+    this.#admissionHeld = opts.admissionHeld;
+    this.#prefillChunkSize = Math.max(1, Math.floor(opts.prefillChunkSize ?? 2048));
     const proto = model.makeCache(); // fresh caches hold no buffers
     this.#kinds = proto.map((c) => (c instanceof RotatingKVCache ? "rot" : "full"));
     this.#rotMaxSize = proto.map((c) => (c instanceof RotatingKVCache ? c.maxSize : 0));
+    for (const c of proto) c.dispose();
   }
 
   get activeRows(): number {
@@ -115,12 +169,17 @@ export class BatchScheduler {
     return new Promise<BatchStats>((resolve, reject) => {
       this.#pending.push({
         req, resolve, reject,
-        current: 0, generated: 0, promptTokens: req.promptIds.length,
+        current: 0, generated: 0, sampled: 0, promptTokens: req.promptIds.length,
       });
       this.#ensureLoop();
     });
   }
 
+  /** Wake the driver loop (e.g. after admissionHeld flips back to false). */
+  kick(): void {
+    this.#ensureLoop();
+  }
+
   #ensureLoop(): void {
     if (this.#wake) { this.#wake(); return; }
     if (this.#looping) return;
@@ -132,29 +191,58 @@ export class BatchScheduler {
     let release: (() => void) | null = null;
     try {
       while (true) {
-        if (!release && this.#lock && (this.#pending.length > 0 || this.#running.length > 0))
-          release = await this.#lock.acquire();
+        const held = this.#admissionHeld?.() === true;
+        // Work = running rows, an in-flight prefill (finish it even under
+        // drain — the row is already half-admitted), or admissible pending.
+        const hasWork =
+          this.#running.length > 0 ||
+          this.#prefill !== null ||
+          (!held && this.#pending.length > 0);
+        if (!hasWork) {
+          if (release) { release(); release = null; } // let the serial lane in
+          await new Promise<void>((r) => { this.#wake = r; });
+          this.#wake = null;
+          continue;
+        }
+        if (!release && this.#lock) release = await this.#lock.acquire();
+
+        // Start at most one joiner prefill (drain-aware); it advances one
+        // chunk per iteration, interleaved with the decode step below.
+        if (!this.#prefill && !held &&
+            this.#pending.length > 0 && this.#running.length < this.#maxBatch)
+          this.#prefill = { row: this.#pending.shift()!, solo: this.model.makeCache(), pos: 0 };
 
-        while (this.#pending.length > 0 && this.#running.length < this.#maxBatch) {
-          const row = this.#pending.shift()!;
+        if (this.#prefill) {
+          const p = this.#prefill;
           try {
-            await this.#admit(row);
+            if (await this.#prefillChunk(p)) this.#prefill = null;
           } catch (e) {
-            row.reject(e);
+            // Prefill/admission failure is per-row: reject the joiner, keep
+            // the running batch.
+            this.#prefill = null;
+            for (const c of p.solo) c.dispose();
+            p.row.reject(e);
           }
         }
-        if (this.#running.length === 0) {
-          if (this.#pending.length > 0) continue;
-          if (release) { release(); release = null; }
-          await new Promise<void>((r) => { this.#wake = r; });
-          this.#wake = null;
+
+        // Burst admission: when a joiner just COMPLETED and more batchable
+        // requests are queued, admit them before the next decode step (the
+        // admit-all-then-step grouping the mlx-lm goldens gate). Long prompts
+        // still interleave: a mid-prefill joiner leaves #prefill non-null, so
+        // the loop falls through to run a decode step between chunks.
+        if (this.#prefill === null && !held &&
+            this.#pending.length > 0 && this.#running.length < this.#maxBatch)
           continue;
-        }
-        try {
-          await this.#step();
-        } catch (e) {
-          for (const row of this.#running) row.reject(e);
-          this.#applyFilter([]);
+
+        if (this.#running.length > 0) {
+          try {
+            await this.#step();
+          } catch (e) {
+            // A forward/sampling error can't be attributed to one row — drop
+            // the batch. (A row's onToken error is contained in #emitRows.)
+            for (const row of this.#running) row.reject(e);
+            this.#applyFilter([]);
+          }
         }
         await new Promise<void>((r) => setImmediate(r));
       }
@@ -164,40 +252,69 @@ export class BatchScheduler {
     }
   }
 
-  /** Solo-prefill a joining request, emit its first token, and (if it survives)
-   *  re-merge it with the running batch (per-layer, by attention type). */
-  async #admit(row: Row): Promise<void> {
-    const solo = this.model.makeCache();
-    const ids = ops.fromInt32(row.req.promptIds, [1, row.req.promptIds.length]);
-    const h = this.model.forwardHidden(ids, solo);
+  /** Advance a joiner's solo prefill by one chunk. Non-final chunks forward +
+   *  eval the cache and return false (the caller interleaves a decode step).
+   *  The final chunk samples token 0, emits it, and — if the row survives —
+   *  merges it into the running batch; returns true (admission complete). */
+  async #prefillChunk(p: PrefillState): Promise<boolean> {
+    const prompt = p.row.req.promptIds;
+    if (prompt.length - p.pos > this.#prefillChunkSize) {
+      const chunk = prompt.slice(p.pos, p.pos + this.#prefillChunkSize);
+      const ids = ops.fromInt32(chunk, [1, chunk.length]);
+      const h = this.model.forwardHidden(ids, p.solo);
+      ids.dispose();
+      h.dispose(); // logits never computed for non-final chunks
+      ops.evalAll(p.solo.flatMap((c) => c.state()));
+      clearCache(); // serial prefill's per-chunk clear (generate.ts)
+      p.pos += this.#prefillChunkSize;
+      return false;
+    }
+
+    // Final chunk: slice the LAST hidden position BEFORE the lm_head — running
+    // logitsFromHidden on the whole [1,Lp,H] hidden materializes a [1,Lp,V]
+    // transient (~4.3 GB bf16 at Gemma V=262k, 8k prompt). Same reorder as the
+    // serial path (generate.ts prefill).
+    const chunk = prompt.slice(p.pos);
+    const ids = ops.fromInt32(chunk, [1, chunk.length]);
+    const h = this.model.forwardHidden(ids, p.solo);
     ids.dispose();
-    const lg = this.model.logitsFromHidden(h);
+    const [, Lc, H] = h.shape as [number, number, number];
+    const hLast = h.slice([0, Lc - 1, 0], [1, Lc, H]);
     h.dispose();
-    const [, Lp, V] = lg.shape as [number, number, number];
-    const last = lg.slice([0, Lp - 1, 0], [1, Lp, V]);
+    const lg = this.model.logitsFromHidden(hLast); // [1,1,V]
+    hLast.dispose();
+    const V = lg.shape[2]!;
+    const last2 = ops.reshape(lg, [1, V]);
     lg.dispose();
-    const last2 = ops.reshape(last, [1, V]);
-    last.dispose();
-    const tok = this.#readToken(row.req.sample(last2, 0));
+    const tok = this.#readToken(p.row.req.sample(last2, 0));
     last2.dispose();
-    row.generated = 1;
-    clearCache();
+    p.row.sampled = 1;
+    p.row.generated = 1;
+    clearCache(); // drop the prefill transients (serial's token-0 clear)
 
-    const stop = await this.#emit(row, tok);
+    const stop = await this.#emit(p.row, tok);
     if (stop !== "continue") {
-      for (const c of solo) c.dispose();
-      this.#finish(row, stop);
-      return;
+      for (const c of p.solo) c.dispose();
+      this.#finish(p.row, stop);
+      return true;
     }
+    await this.#mergeJoiner(p);
+    return true;
+  }
+
+  /** Merge a fully-prefilled joiner with the running batch, layer by layer
+   *  (re-merge; `extend` is the later refinement). Flushes the decode pipeline
+   *  first so the row set is settled and the next step starts cold. */
+  async #mergeJoiner(p: PrefillState): Promise<void> {
+    await this.#flushPipeline();
 
-    // Re-merge the running batch + the new row, layer by layer.
     const prev = this.#inners;
     const prevPad = this.#fullLeftPad;
     const B = this.#running.length;
     const newInners: LayerInner[] = [];
     let newFullPad = this.#fullLeftPad;
     for (let layer = 0; layer < this.#kinds.length; layer++) {
-      const soloC = solo[layer] as KVCache | RotatingKVCache;
+      const soloC = p.solo[layer] as KVCache | RotatingKVCache;
       const [sk, sv] = soloC.temporalView();
       const newRow: Row1 = { keys: sk, values: sv };
       if (this.#kinds[layer] === "rot") {
@@ -248,55 +365,120 @@ export class BatchScheduler {
       }
     }
     if (prev) for (const c of prev) c.dispose();
-    for (const c of solo) c.dispose();
+    for (const c of p.solo) c.dispose();
     this.#inners = newInners;
     this.#fullLeftPad = newFullPad;
-    this.#running.push(row);
+    this.#running.push(p.row);
   }
 
-  /** One batched decode step: forward all rows, sample per row, emit, evict. */
+  /** One PIPELINED batched decode step (mlx-lm GenerationBatch._step):
+   *  1. forward all rows from the UNREAD pending token array (or, pipeline
+   *     cold, from the rows' last emitted tokens), sample each live row's next
+   *     token on its [1,V] slice, asyncEval the new [B] token array;
+   *  2. THEN sync-read the previous step's tokens (overlapping the readback
+   *     with this step's compute), emit them, and evict finished rows.
+   *  Rows that finish get one extra harmless KV write from the already-built
+   *  step; filter drops the row (mlx-lm behaves identically). Length-finished
+   *  rows are known in advance and are NOT sampled (placeholder slot). */
   async #step(): Promise<void> {
     const rows = this.#running;
     const B = rows.length;
     const inners = this.#inners!;
-    // Per-layer forward cache: rot layers use the persistent BatchedRotatingCache
-    // directly; full layers get a fresh BatchedDecodeMaskCache wrapper.
-    const fwd: Cache[] = inners.map((c) =>
-      c instanceof BatchedRotatingCache ? c : new BatchedDecodeMaskCache(c, B, this.#fullLeftPad, null),
-    );
-    let toks: number[];
-    try {
-      const ids = ops.fromInt32(rows.map((r) => r.current), [B, 1]);
-      const h = this.model.forwardHidden(ids, fwd);
-      ids.dispose();
-      const lg = this.model.logitsFromHidden(h); // [B,1,V]
-      h.dispose();
-      const V = lg.shape[2]!;
-      const sampled: MlxArray[] = [];
-      for (let b = 0; b < B; b++) {
-        const rl = lg.slice([b, 0, 0], [b + 1, 1, V]);
-        const rl2 = ops.reshape(rl, [1, V]);
-        rl.dispose();
-        sampled.push(rows[b]!.req.sample(rl2, rows[b]!.generated));
-        rl2.dispose();
+
+    // A row is live if it still needs tokens sampled; a row whose pending
+    // unread token is its last (sampled == maxTokens) only awaits emission.
+    const anyLive = rows.some((r) => r.sampled < r.req.maxTokens);
+    let nextToks: MlxArray | null = null;
+    if (anyLive) {
+      // Per-layer forward cache: rot layers use the persistent
+      // BatchedRotatingCache directly; full layers get a fresh
+      // BatchedDecodeMaskCache wrapper.
+      const fwd: Cache[] = inners.map((c) =>
+        c instanceof BatchedRotatingCache ? c : new BatchedDecodeMaskCache(c, B, this.#fullLeftPad, null),
+      );
+      try {
+        const ids = this.#pendingToks
+          ? ops.reshape(this.#pendingToks, [B, 1]) // feed the unread tokens
+          : ops.fromInt32(rows.map((r) => r.current), [B, 1]); // pipeline cold
+        const h = this.model.forwardHidden(ids, fwd);
+        ids.dispose();
+        const lg = this.model.logitsFromHidden(h); // [B,1,V]
+        h.dispose();
+        const V = lg.shape[2]!;
+        const sampled: MlxArray[] = [];
+        for (let b = 0; b < B; b++) {
+          const row = rows[b]!;
+          if (row.sampled >= row.req.maxTokens) {
+            // Length-doomed row: evicted right after the emission below ever
+            // uses this slot as input — placeholder keeps the [B] alignment.
+            sampled.push(ops.fromInt32([0], [1]));
+            continue;
+          }
+          const rl = lg.slice([b, 0, 0], [b + 1, 1, V]);
+          const rl2 = ops.reshape(rl, [1, V]);
+          rl.dispose();
+          sampled.push(row.req.sample(rl2, row.sampled));
+          row.sampled++;
+          rl2.dispose();
+        }
+        lg.dispose();
+        nextToks = ops.concatAxis(sampled, 0); // [B]
+        for (const t of sampled) t.dispose();
+        ops.asyncEvalAll([nextToks]); // dispatch; read NEXT iteration
+      } finally {
+        // Free the step's RoPE arrays; do NOT dispose (full wrappers would free
+        // their persistent inner; rot caches persist across steps).
+        for (const c of fwd) (c as { releaseRopeArr?: () => void }).releaseRopeArr?.();
       }
-      lg.dispose();
-      const tokArr = ops.concatAxis(sampled, 0); // [B]
-      for (const t of sampled) t.dispose();
-      toks = [...tokArr.toFloat32()].map((x) => Math.round(x));
-      tokArr.dispose();
-    } finally {
-      // Free the step's RoPE arrays; do NOT dispose (full wrappers would free
-      // their persistent inner; rot caches persist across steps).
-      for (const c of fwd) (c as { releaseRopeArr?: () => void }).releaseRopeArr?.();
     }
-    clearCache();
+    this.#steps++;
+    if (this.#steps % 256 === 0) clearCache(); // serial's cadence, not per-step
 
+    // Read + emit the PREVIOUS step's tokens while the new step computes.
+    const prev = this.#pendingToks;
+    this.#pendingToks = nextToks;
+    // Kill switch / A-B lever (house style, cf. MLX_BUN_COMPILED_DECODE=0):
+    // MLX_BUN_BATCH_NO_PIPELINE=1 reads THIS step's tokens synchronously —
+    // set from process start `prev` is always null, so the flush below IS the
+    // whole phase 2. Same math either way (pipelining is scheduling).
+    if (NO_PIPELINE) {
+      await this.#flushPipeline();
+      return;
+    }
+    if (prev) {
+      const toks = [...prev.toFloat32()].map((x) => Math.round(x));
+      prev.dispose();
+      await this.#emitRows(toks); // also filters #pendingToks on eviction
+    }
+  }
+
+  /** Read out the pipeline register (if any): emit its tokens and evict
+   *  finished rows, leaving the pipeline cold. Called before a join merges. */
+  async #flushPipeline(): Promise<void> {
+    const prev = this.#pendingToks;
+    if (!prev) return;
+    this.#pendingToks = null;
+    const toks = [...prev.toFloat32()].map((x) => Math.round(x));
+    prev.dispose();
+    await this.#emitRows(toks);
+  }
+
+  /** Emit one read-back token per running row; evict finished rows. A row's
+   *  onToken throwing rejects THAT row and evicts it — siblings continue. */
+  async #emitRows(toks: number[]): Promise<void> {
+    const rows = this.#running;
+    const B = rows.length;
     const keep: number[] = [];
     for (let b = 0; b < B; b++) {
       const row = rows[b]!;
       row.generated++;
-      const disp = await this.#emit(row, toks[b]!);
+      let disp: "continue" | "stop" | "length";
+      try {
+        disp = await this.#emit(row, toks[b]!);
+      } catch (e) {
+        row.reject(e); // containment: this row only (mlx-lm `remove`)
+        continue; // not kept → evicted by the filter below
+      }
       if (disp === "continue") keep.push(b);
       else this.#finish(row, disp);
     }
@@ -324,7 +506,8 @@ export class BatchScheduler {
     });
   }
 
-  /** Evict rows not in `keep` (sorted ascending) from the batched KV. */
+  /** Evict rows not in `keep` (sorted ascending) from the batched KV and the
+   *  pipeline register. */
   #applyFilter(keep: number[]): void {
     const inners = this.#inners!;
     if (keep.length === 0) {
@@ -332,6 +515,8 @@ export class BatchScheduler {
       this.#inners = null;
       this.#fullLeftPad = [];
       this.#running = [];
+      this.#pendingToks?.dispose();
+      this.#pendingToks = null;
       return;
     }
     const out: LayerInner[] = [];
@@ -352,6 +537,13 @@ export class BatchScheduler {
     this.#inners = out;
     this.#fullLeftPad = keep.map((i) => this.#fullLeftPad[i]!);
     this.#running = keep.map((i) => this.#running[i]!);
+    if (this.#pendingToks) {
+      const idx = ops.fromInt32(keep, [keep.length]);
+      const next = ops.takeAxis(this.#pendingToks, idx, 0);
+      idx.dispose();
+      this.#pendingToks.dispose();
+      this.#pendingToks = next;
+    }
   }
 
   #readToken(t: MlxArray): number {