Files
MobileGL/docs/Disaggregated/notes/p5/p5-results/x2m-v1.md
T
swung0x48 aba329cc53 [Docs] (Disaggregated): P6's plan and contract draft; the working notes move from a local directory into the repository
Two things land together: the plan and contract draft P6 needs before it starts, and the
working notes that until now existed on exactly one machine.

1. P6's plan and contract draft (neither started; not one line of code)

     docs/Disaggregated/P6-SPAWN-PLAN.md      the package plan
     docs/Disaggregated/P6-CONTRACT-DRAFT.md  the contract draft (moves to
                                              MG_Remote/CONTRACT-P6.md when c6 lands)

   The three findings that mattered, all written into the documents:

   a. P6 is SMALLER than its roadmap cell suggests. The transport primitives are already in
      the tree and already tested: SocketDoorbell including hangup detection and the two
      lost-wakeup fences (Doorbell.cpp:211-360, four cases in FdPassingTest), SCM_RIGHTS fd
      passing, ShmSegment::Adopt, and the SurfaceOp / WindowKind schema already defined in
      protocol.fbs. inproc uses a real second shm mapping rather than an alias, and
      SessionRings.h:22-28 says that was done so today is not the first time it runs. P6 is
      assembly plus a control plane plus a process, not "write a socket transport".

   b. The evidence for "P6 is only a transport swap" has EXPIRED. It was bought by P5c, whose
      audit found 59 direct memory accesses in a tree that already looked clean. P5e changed
      the tree again. So the first package, a6, is a read-only audit that writes no code, and
      every contract row that depends on it is marked PENDING a6 rather than decided in
      advance.

   c. P6 does not get a game running on the phone. ANativeWindow* is meaningless in the child,
      and protocol.fbs:186-196's own comment says Android transfers the window out of band -
      that band is P12. P6 lands pbuffer / surfaceless / offscreen, which is what HeadlessGL,
      the split-equivalent lane and trace replay need, and which is exactly what P6's own exit
      gate measures. A real window reaching the server is a named refusal. This gets its own
      section because "P6 is done" would otherwise read as "the game runs now".

   The contract adds rule G: a role may not name a process-local handle. It extends P5c's
   rule E (a role may not name the other role's memory) from memory to identity - EGLDisplay /
   EGLSurface / EGLContext / ANativeWindow* / fd number / pid / mapped address either cross as
   a token this contract defines or they do not cross, and a descriptor crosses only through
   SCM_RIGHTS, where the kernel renumbers it.

   What P5e left for P6 gets its own section. The latch semantics are already designed
   (ARCHITECTURE.md:504) and are copied unchanged. What is new is that after run-ahead the
   client no longer waits while the peer process can DIE: the client holds records that were
   published and will never be applied, and Android's freezer suspends the child without
   closing anything. So slow and dead must be distinguishable WITHOUT a timeout threshold.
   That is P6's only new design; everything else is carriage. It shares a predicate with E1's
   outstanding re-specification (ID-122), and the two should be designed together.

   Two gates carried over from P5e's lessons: G2 requires integration-spawn's test-name set to
   match integration-split's name for name, because a differing set means the lane is quietly
   running less; and the arm-proof gate requires every entry to record the child pid and
   transport=spawn in its OWN private log - ID-124 established that this kind of false green
   really happens, and a spawn lane that actually ran monolith would pass every other gate.
   S2's shape must be settled before it is written, and the document says why: E1 is the
   cautionary case.

2. The working notes move into the repository (docs/Disaggregated/notes/, 415 .md files)

   ROADMAP / CURRENT_STAGE_PROGRESS / MEASUREMENTS cite ruling numbers, audit line numbers and
   the provenance of gate figures from ~/w7/notes/, a directory that exists on one machine and
   is under no version control. A record cited hundreds of times that lives only locally is not
   a record, so it moves in whole, with its directory structure intact.

   Only .md moves. Scripts, run logs, census and gate result JSON, patches, APKs and nm dumps
   stay where they are: they are evidence DATA rather than documents - large, regenerated per
   run, and mostly carrying absolute paths and device serials that mean something only on the
   machine that produced them. The mapping and this split are written in
   docs/Disaggregated/notes/README.md.

   Two exceptions are recorded there too: P6's BRIEF has been promoted to a first-class
   document and keeps no copy under notes/, so the two cannot drift apart; and recovered/ holds
   material salvaged from failed workflow runs, which may duplicate the like-named phase
   directories and is kept because a few of those were the only complete version at the time.

   CI's citation lint takes docs/Disaggregated/*.md only (non-recursive), and notes/ is
   deliberately outside it: those notes' file:line citations were written against their own
   code heads, and resolving them against today's HEAD would fail wholesale - which is not an
   error, it is their correct state as a historical record. To check one, use the revision it
   declares (--rev).

3. Inconsistencies fixed in passing

   - README.md's status line still said P5e was in progress while the stage table already said
     closed.
   - CURRENT_STAGE_PROGRESS's next-step item 1 still listed the exit gate as pending, though
     (a) and (b) were run in the previous commit; rewritten to closed plus the one item that
     actually remains (E1).
   - ROADMAP's P6 row still had the pre-phase plan in three of its cells; it now carries the
     package order, the scope boundary and the two new gates.

Checked with check_doc_citations.py: 125 citations across docs/Disaggregated/*.md, 0 problems.
2026-09-18 23:31:39 -04:00

4.2 KiB
Raw Blame History

x2m — merge x2 against j0 rounds 2–3

Branch p5/x2m, merge commit bd11ab18, based on feat/disaggregated@f5614995 and merging p5/x2@579118a1. Identity immediately before commit was Swung0x48 <swung0x48@outlook.com>. The commit message is one line with no attribution trailer. No LFS fetch and no adb access occurred.

Conflict resolutions

MobileGL/MG_IntegrationTest/Harness/split_log_paths.py — one hunk

Kept j0 round 3's result/JUnit classification unchanged: skipped, missing, duplicate, not-run, or non-failing selected entries cannot satisfy a control. In evidence, retained j0's stronger E1 contract that every selected private log must contain the expected Fatal, and added x2's optional control label plus its named E3(a) diagnostic. Successful evidence is printed for every selected entry; labeled failures name E3(a), while unlabeled E1 failures retain j0's exact established text.

scripts/ci/redcheck_control_smoke_test.sh — two conflict regions

The setup/trap backs up and restores all four mutated files: j0's helper, split control and pull retrace control, plus x2's draw-drop control. mktemp failure remains fatal.

The mutation combines x2's seven evidence-check perturbations across split/pull/drop-draw with j0's separate ID-62 skipped-selection perturbation. The runner requires the named unrelated split, unrelated pull-retrace, high-SSIM, missing-arm-line, zero-drop and missing-private-Fatal failures, then restores all three control scripts before mutating only the helper's skip check. j0's generalized line rewrite already preserves both if and elif; that subsumes x2's narrower elif ! matcher fix, so the j0 repair is the retained implementation.

scripts/ci/testdata/split_private_log_smoke.sh — two hunks

Kept both suites as distinct modes: x2's e3-no-private case and j0's skipped/notrun/missing selection, partial-Fatal and wrong-Fatal cases. The message dispatch retains x2's named E3(a) private-log failure and j0's exact full-line matching for selection-classification failures.

scripts/ci/testdata/stub_ctest.sh — two hunks

Kept the union of mode documentation and behavior. E1 emits the correct private Fatal for x2's e3-no-private and j0's selection/partial cases, while wrong-fatal remains deliberately wrong. The command-result switch keeps j0's skip/not-run shapes and x2's distinct E3(a) pixel-only failure whose private library diagnostic is absent.

Verification

Both Release Clang/Ninja builds completed with CCACHE_BASEDIR=/home/swung/w7 and GLIBC_TUNABLES=glibc.malloc.tcache_count=0.

Gate Result
control_smoke_test.sh 16 core + 11 private-log cases, 0 failed
redcheck_control_smoke_test.sh P5_T1_CONTROL_SMOKE_REDCHECK_OK; all named evidence mutations and ID-62 skip mutation caught
split_log_paths.py check ctest build-split 21 entries, 21 distinct private paths
split ctest -L unit, REQUIRE_GPU=1 2073/2073, 0 failed
split inproc ctest -L integration-split -j 4, REQUIRE_GPU=1 22 selected, 0 failed; 20 passed and 2 expected skips
SmallRing ledger maxrec=784, cap=524288, cmdbytes=1314880, ringwraps=1, ringpads=0, ringwaits=1, emitseq=24323
push ctest -L integration-gpu -j 4 1128/1128, 0 failed
OpenRA DirectGLES baseline, inproc 1/1 pass; ssim=1.000000, mismatchPixels=0
OpenRA with MOBILEGL_IPC_E2_DROP_DRAW=1 expected red, 0/1; ssim=0.000036, mismatchPixels=295296; 758 DrawVbo records dropped

OpenRA evidence is retained in ~/w7/p5-x2m-e2-baseline{,.out} and ~/w7/p5-x2m-e2-dropdraw{,.out}. Test transcripts are retained as ~/w7/p5-x2m-{unit,split,gpu,redcheck}.log; ~/w7/p5-x2m-submodlinks.sh is the retained worktree link toggle.

G1

This worktree has no build-linux, so no new symbol-report run is claimed. The merged x2 report's measured G1 was 0 added / 0 removed / 0 resized / 0 renamed and .text +0. The merge diff was checked: every addition in the only pull-built touched files, PipeStats.{h,cpp}, is inside #if MOBILEGL_PIPE_PUSH; all remaining implementation changes are under MG_Remote/, MG_IntegrationTest/, MG_Test/Wire/, or CI scripts and therefore push/split guarded.

The worktree was left clean with submodule links off.