mirror of
https://github.com/MobileGL-Dev/MobileGL
synced 2026-11-09 02:53:23 +09:00
swung0x48
aba329cc53
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.
61 lines
3.5 KiB
Markdown
61 lines
3.5 KiB
Markdown
# P5e 设备验证（头 `3cc4e1ec`，Redmi `2f7cbe2e`）
|
||
|
||
**结论：PASS。两条传输臂都能正常跑游戏。** 上一轮设备验证发现的 monolith 启动即崩已修复并回归。
|
||
|
||
## 1. 被测物
|
||
|
||
- MobileGL `feat/disaggregated @ 3cc4e1ec`（= wave2 `44f91c74` + fix1 `66621767` + ID-110）
|
||
- FCL fordebug，`./gradlew :FCL:assembleFordebug -Pmobilegl.buildDisaggregated=ON -Pmobilegl.buildDisaggregatedInproc=ON -Pmobilegl.pipePush=ON`，BUILD SUCCESSFUL
|
||
- Minecraft 26.3-rc-3，世界 `test`，VD12，DirectGLES
|
||
- **版本身份以符号探针确认**，不看游戏内 `GIT@` 戳记（增量构建下它是旧的）：APK 的
|
||
`lib/arm64-v8a/libMobileGL.so` 内含 `texture-handle-arm`、
|
||
`was handed a NULL frontend texture for handle`、`the storage sync needs the frontend`、
|
||
`refusing to attach a renderbuffer with no storage` 四个 fix1 新增字符串。
|
||
|
||
## 2. 三臂结果（进世界后 60 s 采样）
|
||
|
||
| 臂 | 进世界 | fps | draws/帧 | 进程 | Fatal / crash buffer | 截图 |
|
||
|---|---|---|---|---|---|---|
|
||
| monolith | 31 s | **263.5** | 845 | 存活 | 无 | 世界正常（夜间地形、树、热键栏） |
|
||
| inproc | 31 s | **136.1** | 853 | 存活 | 无 | 同一视角同一世界 |
|
||
| inproc 复跑 | 32 s | **140.3** | 852 | 存活 | 无 | 同上 |
|
||
|
||
对照：修复前（`44f91c74`）同一臂 monolith 是 **65 s 后进程消失**，SIGSEGV 于
|
||
`Lightmap.<init>` → `clearColorTexture` → `glClear` → … → `SyncMipmapsToBackend(空 SharedPtr)`。
|
||
|
||
两点说明：
|
||
|
||
- monolith 这一次**未被 120 Hz vsync 封顶**（与 P5d 记录的 205.8 那次同类），所以 263.5 与
|
||
inproc 的 136-140 **不可直接比大小**。本轮问的是"改完还能不能正常跑"，不是配对性能。
|
||
- inproc 的 136-140 与修复前记录的 140.0 / 144.9 同档。fix1 改的那行（臂选择本身）两臂都读，
|
||
split 臂没有被拖慢。
|
||
|
||
## 3. 主机门（WSL `~/w7/p5e-int`，split flavour）
|
||
|
||
| 门 | `44f91c74` | `3cc4e1ec` |
|
||
|---|---|---|
|
||
| build | rc=0 | rc=0 |
|
||
| unit | 2250/2250 | **2250/2250** |
|
||
| `integration-split` | 113/113 | **116/116** |
|
||
| `integration-gpu`（两条运行时臂） | **1157/1294**（137 SEGFAULT / 38 scenario） | **1294/1294** |
|
||
| `integration-split-strict` | 7/116 | 7/116（预期红，逐数相同） |
|
||
| 生成器 / include 闭包 / dirty-surface / doc 引用 | 绿 | 绿（只余 `CONTRACT-P5.md:524` 既有歧义行） |
|
||
|
||
## 4. 两条裁定
|
||
|
||
- **ID-109**：fix1 给 monolith lane 挂 `integration-split` 标签的读法**接受**（该标签指"门禁要跑
|
||
的集合"，不是"跑 inproc"）。并把 `integration-gpu` 升为**集成分支的常设门禁步骤**
|
||
（`p5e_gate.sh gpu`）。漏的不是某个用例，是整条运行时臂。
|
||
- **ID-110**：fix1 报告 §3.5 留的那处"靠链条安全"的座（`texBufferByRecord`）改为自述式传输
|
||
测试。新增 `MGB_TEXTURE_RECORD_ARM_SELECTED()` 把"记录臂被选中"只说一次。有传输时该合取项
|
||
已被 `pushedStorage != nullptr` 蕴含，行为不变。
|
||
|
||
## 5. 阶段状态
|
||
|
||
P5e **未收官**：`kMGPipeP5eRunAheadReady` 与 `kMGPipeP5eClientWaitRuleLanded` 仍为 `false`。
|
||
翻转它们的门是 BRIEF-P5E §3（strict 车道转硬绿，只余 §7 白名单 —— 当前 7/116，是本阶段剩下的
|
||
主要工作）与 §4（设备出口：fps ≥ lockstep、client 线程 CPU ms/帧 < lockstep、SSIM 不变、
|
||
逐 op 等待清单无 `kWaitApplied` 行与逐 draw reply 行）。
|
||
|
||
已推送 `origin/feat/disaggregated @ 7c6f6886`（含本轮文档写回）。
|