[Docs] (P15): S0 handoff, parity audit corrections and the bsl workload in matrix_p14.

This commit is contained in:
2026-10-08 06:59:56 -04:00
parent 748ffc31c5
commit 4a8ecf9aaf
4 changed files with 246 additions and 4 deletions
@@ -0,0 +1,128 @@
# P15 handoff (living document)
The plan and its measurements are in [PLAN-P15.md](PLAN-P15.md); the audit is in
[PARITY-AUDIT.md](PARITY-AUDIT.md).
**Target** (PLAN §0.1):
- CPU scenes: FCL presenting-thread CPU on both backends within ~5 % of the MobileGlues plugin.
- GPU scene (Iris + BSL): fps within ~5 % of the better of MobileGlues and dev.
## Status (2026-10-08)
**Branch:** `p15impl` (worktree `.claude/worktrees/p15`, short path `W:/p15`), pushed to
`feat/disaggregated`.
**S0.1 parity audit:** written.
**S0.2, Magma wire non-draw ports:**
- **M1a, clears become part of the draw pass** (`ClearWireFramebufferInPass`; `PrepareWireDrawPass`
split out of `SetupWireDraw`):
- A whole-area clear that begins the pass begins it with a LOAD_OP_CLEAR variant of the pass's
render pass (`RenderPassEntry::clearVariants`, compatible with the framebuffer).
- Any other clear (into the open pass, or scissored) is `vkCmdClearAttachments` in the pass. A
forced pass restart for depth clears (an LRZ hypothesis) was tried and reverted: it cost CPU
and fixed nothing.
- Kill switches: `MOBILEGL_MAGMA_INPASS_CLEAR=0`; `MOBILEGL_MAGMA_INPASS_CLEAR_DEFAULT=1` puts
default-framebuffer clears in the pass too (off by default, see the open item).
- **Open item: default-framebuffer clears stay standalone.** With them in the pass, the openra
retrace on Adreno 750 loses its palette-sampled sprites (SSIM 0.956378, deterministic). What was
measured:
- Both `vkCmdClearAttachments` and LOAD_OP_CLEAR fail; so does splitting the clear calls.
- Colour-only or depth-only in the pass, with the other part standalone, passes.
- Event traces: the first draw flushes the recording (the palette `glTexImage2D`'s upload flush,
`FlushPendingCommands`) right after the clear. Command order otherwise matches the standalone
path.
- Not explained yet. Lavapipe and the InPassClear scenarios on FBOs are clean.
- Ruled out by reading: a missing ordering edge. Default-framebuffer images get the same
pass-begin barrier as FBO images (a full ALL_COMMANDS memory barrier, or their transition),
with their layout tracked per swapchain index through the swapchain object.
- Still open: the in-pass path commits the freshly acquired swapchain image
(`DefaultFramebufferWriteIndex(true)` in `PrepareWireDrawPass`) at the clear; check whether
the standalone path's clear and the in-pass clear address the same index on the trace route.
- Cost of leaving it: small for FCL (MC renders into its own FBO and blits to the default one).
- **M2, draw-pass cache across frames:** one cache, entries pruned when their image epochs move,
destroyed after their last submit. Kill switch: `MOBILEGL_MAGMA_PASS_CACHE=0`.
- **M3, blit descriptor sets:** one pool per frame slot.
- **M9, converted vertex streams** (wrongly marked "have" in the first audit). The wire arm
re-converted the whole remaining stream on every draw: Sodium's multi-draws over one arena cost
49 ms/frame of CPU on BSL (19.5 fps against dev's 64.7).
- Now one conversion per (store content serial, layout), kept across frames in
`VkBufferManager` (`LookupConvertedStream` / `StoreConvertedStream`).
- Each entry owns a vertex buffer. Bounded at 192 MB (least recently used first); entries idle
for 256 frames go. A replaced buffer is released when its frame slot comes round.
- The content serial is process-wide monotonic and moves on every host write, respecify,
GPU-write mark, shader-writable bind and donation.
- Kill switch: `MOBILEGL_MAGMA_VERTEX_CONVERSION_CACHE=0`.
- **M4, write renaming.** A busy `glBufferSubData` used to take a staged copy, which ended the
render pass with two full barriers (FCL: ~5.6 per frame, all on one 288-byte store). Now:
- A store of 64 KB or less keeps a host shadow (64 MB budget), from respecify on.
- A busy write into a shadowed store gives it a fresh VkBuffer filled from the shadow and
releases the old one like a glBufferData orphan. No copy is recorded and the pass stays open.
- GPU-written marks, shader-writable binds, donation and import drop the shadow.
- `ReadWireBuffer` serves shadowed stores from the shadow, so no host wait.
- Kill switch: `MOBILEGL_MAGMA_WRITE_RENAME=0`.
- **Tests:**
- `InPassClearScenario`: 4 cases, monolith and split, both backends.
- `ConvertedVertexStreamScenario`: 3 cases (reuse, same-frame sub-data, cross-frame sub-data).
Red-once: a lookup that ignores the content serial turns both sub-data cases red.
- `WriteRenameScenario`: 4 cases (order and carry, one-byte writes, uniform and index buffers,
multi-frame). Red-once: a rename that skips the shadow fill turns all 4 red, which also
proves the rename engages.
- Red-once checks: the colour index and the scissor (2 cases red); the depth clear-load bit
(depth/stencil case red).
- Syncval gates green (cache 7/7, run-ahead 14/14), plus the InPassClear cases under syncval.
- **Gates:**
- SSIM 24/24 (openra, rd12, bsl × 4 arms × 2 backends) on `p15e`.
- Host unit and integration-gpu green, apart from the known environmental `ServerSpawn` /
`FuzzArm2` / `PeerLatch` / spawn ColdStart failures.
- `CompositorRecovery` flakes under -j16 and passes alone 3/3.
**S0 milestone (one device session, FCL, interval 0, 2 reps; `runs/ms-s0i`):**
| scene | build | Magma CPU ms/frame | Magma fps | Espryt CPU ms/frame | Espryt fps | GPU busy |
|---|---|---|---|---|---|---|
| vanilla 1.21.5 (CPU) | fin | 3.27 | 170 | 2.81 | 190 | 12-15 % |
| | p15h (S0 without M4) | 2.59 | 191 | - | - | 15 % |
| | p15i (S0) | 2.56 | 190 | 2.77 | 193 | 13-15 % |
| | dev | 1.79 (n=1) | 234 | 2.14 | 218 | 14 % |
| | MobileGlues | 1.59 | 256 | | | 15 % |
| BSL (GPU) | p15i | 7.26 | 77.2 | 7.61 | 70.6 | 99 % |
| | dev | 13.85 | 66.1 | 7.17 | 70.5 | 85-100 % |
| | MobileGlues | 6.25 | 78.2 | | | 98-100 % |
(BSL before the converted-stream cache: Magma 19.5 fps at 26 % GPU busy, 49 ms CPU/frame.)
- Espryt's `base` lib (p15plan, unchanged) read 2.84 in the same session: the earlier "p15e
Espryt regression" was session variance. S0 does not touch Espryt.
- **Target status.** Magma BSL is met (within 1.3 % of MobileGlues, GPU-bound). Espryt BSL is
GPU-bound at 99 % and 10 % below MobileGlues, same as dev: a GPU-side gap still to explain (the
load/store and clear audit of PLAN §0.1). CPU scene: Magma 2.56 vs MobileGlues 1.59, Espryt 2.77.
- **Where Magma's CPU goes now** (p15i profile, `runs/prof-hi`, ms/frame inclusive):
`VerbChannel::Port` 0.85, `OnDrawVbo` 0.62, `SetupWireDraw` 0.46, `Present` 0.32,
`MGPipeValidateForVerb` 0.27, in-pass clears 0.18. The draw path is S1-S3's; S0's non-draw ports
are done. Proof that M4 engages: `StagedWireRangeCopy` 0.067 is gone and `RenameBusyWireStore`
costs 0.048 (a VMA allocation per rename; a recycle pool could take most of it).
**Stage P:** dropped for the target.
## Harness
| purpose | where |
|---|---|
| FCL probes and reducers | `tools/device_bench/disagg/` (README "P15 FCL probes") |
| FCL milestone (CPU + BSL scenes, fin / new / dev / MobileGlues) | scratchpad `p15/fcl_milestone.sh`, `fcl_scene.sh`, `fclab.sh`, `fclsum.py` |
| SSIM gate (openra, rd12, bsl × 4 arms × 2 backends) | scratchpad `p15/ssim_gate.sh`; `matrix_p14.sh` now takes `PREP_WLS` and a `bsl` workload |
| host CI-shaped build (WSL archlinux) | `~/mgl-p15-ci31`, scratchpad `p15/wsl_ci.sh`, `w_suite.sh`, `w_syncval.sh`, `w_sv_one.sh`, `w_one.sh` |
| trace APK builds | scratchpad `build_trace.sh W:/p15 .<tag>` (rerun once on the `IncrementalSplitterRunnable` failure) |
**Host-build trap:** editing a header while ninja is compiling leaves objects newer than the header
but built from its old text. This happened once and gave a `bad_alloc` in every scenario. Never
edit sources during a build; `touch` the edited headers if in doubt.
**Device facts:**
- Clocks are pinned.
- FCL's original lib md5 is `00c09f0a…`.
- MC 1.21.5 options md5 is `93b3f708…`; it is backed up at `/data/local/tmp/p15-options.txt`.
- Iris properties are backed up at `/data/local/tmp/p15-iris.properties`.
- `fcl_scene.sh restore` restores Iris; `fcl_p14.sh restore` restores the lib and `config.json`.
- The anland desktop is stopped during runs and restarted afterwards.