mirror of
https://github.com/MobileGL-Dev/MobileGL
synced 2026-11-17 23:13:22 +09:00
[CI, android-plugin] (P6): CI starts a second MobileGL process on a device
The Android retrace matrix gains a third lane, spawn-acceptance, beside
monolith-control and inproc-acceptance. Until now nothing in CI had ever
started a second MobileGL process on a device at all.
The apk.yml retrace job already carried a `transport` matrix dimension and
already branched on it, so the lane itself is three edits: a row in
github_transport_matrix, an elif in the retrace step, and a summary to render.
What needed thought was the gate.
THE SPAWN LANE IS APK-ONLY, and that is a statement about where evidence is
missing rather than about what spawn can do. Linux already has
test.yml's `retrace-split`, which is {backend, case, transport} over inproc AND
spawn with the two negative controls that make it mean anything. A spawn row in
the Linux transport matrix would pay for a second full sweep proving nothing -
and test.yml's `retrace` job stages no server image, so the lane would not
merely be redundant, it would be red. self_test_transport_matrices now asserts
the absence in both directions, because an accidental removal of the `if apk`
has to be caught in the self-test rather than in CI.
--require-spawn REQUIRES TWO SENTENCES, and the second is the one that matters.
ConfigLoader's marker proves the VALUE RESOLVED - it exists only in the Spawn
arm, which exists only under MOBILEGL_BUILD_DISAGGREGATED - but that is a
statement about a parser. `spawn ARMED - the server role runs in pid N` is
written only after the launch, the connect and the handshake have all
succeeded, and the pid in it is the SERVER's. It is the only line in the log a
same-process run cannot produce.
Both halves red once, measured:
* a monolith run demanded to prove spawn: REFUSED, transport_resolution_marker
false, server_pid null - while the retrace itself scored ssim=1.000000,
which is exactly the trap. OpenRA matches its golden under monolith too, so
the picture has never been the evidence.
* the same run's real spawn log with the one ARMED line deleted: REFUSED,
transport_resolution_marker TRUE and server_pid null. That is the
"resolved the transport and then never left the process" case, isolated.
THE PROOF USES `any` WHERE THE inproc GATE USES `all`, and the difference is
load-bearing rather than a relaxation. Under spawn two processes append to one
MOBILEGL_LOG_FILE_PATH, and the launcher deliberately scrubs every
MOBILEGL_IPC_* from the child's environment (anti-recursion catch (b)) - so the
server's own `Config: IPC` line reads strict=0 role-split-state=0 BY
CONSTRUCTION. Demanding every line match would red every spawn run for the one
thing the design requires.
--use-pbuffer is not optional on this lane: until P12 a spawned server cannot be
handed a window, because an ANativeWindow* is a pointer into the CLIENT's
process (Rule H). MOBILEGL_IPC_SERVER_PATH is deliberately NOT passed -
nativeLibraryDir carries an install-time hash that nothing off the device can
spell, and the Activity resolves it.
The local runner now passes the same knobs and the same --require-* flag CI
does, so "it works locally" can no longer mean "it ran monolith locally". That
change immediately caught its own omission: the first local run with the gate
armed failed on client_ipc_line_present=false because the runner had been
sending MOBILEGL_TRANSPORT alone.
Verified on device 2f7cbe2e: OpenRA.DirectGLES spawn, ssim=1.000000,
mismatchPixels=0, "real spawn transport, server role in pid 9885, and zero
Fatal records confirmed".
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
@@ -449,6 +449,28 @@ def parse_args():
|
||||
return parser.parse_args()
|
||||
|
||||
|
||||
def transport_proof_args(args):
|
||||
"""The same arm-proof flag CI passes, so a local run cannot be greener than the lane.
|
||||
|
||||
trace-replay-ci.sh's --require-inproc / --require-spawn read the LIBRARY's own log and
|
||||
refuse a run whose transport did not actually resolve - and for spawn, one whose server
|
||||
role never left the process. Passing them here too is what stops "it works locally" from
|
||||
meaning "it ran monolith locally".
|
||||
"""
|
||||
return {"inproc": ["--require-inproc"], "spawn": ["--require-spawn"]}.get(args.transport, [])
|
||||
|
||||
|
||||
# The knobs .github/workflows/apk.yml hands BOTH acceptance lanes. They are kept here verbatim so
|
||||
# a local run is the same run: the arm proof below reads the library's own `Config: IPC` line and
|
||||
# requires strict/role-split-state/run-ahead to be 1, so a local invocation that quietly omitted
|
||||
# them would fail a gate CI passes - or worse, pass a weaker one.
|
||||
SPLIT_ACCEPTANCE_KNOBS = (
|
||||
"MOBILEGL_IPC_ROLE_SPLIT_STATE=1",
|
||||
"MOBILEGL_IPC_STRICT_ERRORS=1",
|
||||
"MOBILEGL_IPC_RUN_AHEAD=1",
|
||||
)
|
||||
|
||||
|
||||
def transport_env(args):
|
||||
"""The transport knob as env overrides, or nothing at all for monolith.
|
||||
|
||||
@@ -456,7 +478,9 @@ def transport_env(args):
|
||||
environment is byte-identical to what it was before this option existed - the control arm has
|
||||
to stay a control.
|
||||
"""
|
||||
return [] if args.transport == "monolith" else [f"MOBILEGL_TRANSPORT={args.transport}"]
|
||||
if args.transport == "monolith":
|
||||
return []
|
||||
return [f"MOBILEGL_TRANSPORT={args.transport}", *SPLIT_ACCEPTANCE_KNOBS]
|
||||
|
||||
|
||||
def main():
|
||||
@@ -482,7 +506,8 @@ def main():
|
||||
failures += run_benchmark_case(case, backend, args)
|
||||
continue
|
||||
print(f"=== Android retrace: {case['name']} / {backend} ===", flush=True)
|
||||
rc = run_case(case, backend, env_overrides=transport_env(args) + list(args.env),
|
||||
rc = run_case(case, backend, extra_args=transport_proof_args(args),
|
||||
env_overrides=transport_env(args) + list(args.env),
|
||||
use_pbuffer=args.use_pbuffer)
|
||||
try:
|
||||
render_summary()
|
||||
|
||||
@@ -246,21 +246,36 @@ def github_apk_matrix(cases):
|
||||
|
||||
|
||||
def github_transport_matrix(cases, *, apk=False):
|
||||
"""Run the entire original matrix as both control and inproc acceptance.
|
||||
"""Run the entire original matrix as control and as acceptance, once per transport.
|
||||
|
||||
The two transports use the same D/P artifact and each case's existing backend
|
||||
The transports use the same D/P artifact and each case's existing backend
|
||||
list. The legacy split:true subset does not limit this main acceptance matrix.
|
||||
Nested APK case/backend metadata is deliberately left untouched.
|
||||
|
||||
THE SPAWN LANE IS APK-ONLY, and that is a statement about where the evidence is missing
|
||||
rather than about what spawn can do. On Linux the spawn arm already has a job of its own -
|
||||
test.yml's `retrace-split`, which is {backend, case, transport} over inproc AND spawn and
|
||||
carries the two negative controls that make it mean anything (the pull library must red it,
|
||||
dropping the draws must red it). Adding spawn to THIS matrix as well would pay for a second
|
||||
full Linux sweep that proves nothing the first one does not, and test.yml's `retrace` job
|
||||
has neither the server image staged nor MOBILEGL_IPC_SERVER_PATH set - so the lane would
|
||||
not merely be redundant, it would be red.
|
||||
|
||||
On Android there is no such job. Until this lane existed, nothing in CI ever started a
|
||||
second MobileGL process on a device.
|
||||
"""
|
||||
build = github_apk_matrix if apk else github_test_matrix
|
||||
if not cases:
|
||||
raise ValueError("transport matrix needs at least one trace case")
|
||||
lanes = [
|
||||
(cases, "monolith-control", "monolith"),
|
||||
(cases, "inproc-acceptance", "inproc"),
|
||||
]
|
||||
if apk:
|
||||
lanes.append((cases, "spawn-acceptance", "spawn"))
|
||||
return {"include": [
|
||||
{**row, "lane": lane, "transport": transport}
|
||||
for selected, lane, transport in (
|
||||
(cases, "monolith-control", "monolith"),
|
||||
(cases, "inproc-acceptance", "inproc"),
|
||||
)
|
||||
for selected, lane, transport in lanes
|
||||
for row in build(selected)["include"]
|
||||
]}
|
||||
|
||||
@@ -275,10 +290,21 @@ def self_test_transport_matrices():
|
||||
acceptance = [row for row in mixed if row["transport"] == "inproc"]
|
||||
strip_lane = lambda rows: [{key: value for key, value in row.items()
|
||||
if key not in ("lane", "transport")} for row in rows]
|
||||
spawned = [row for row in mixed if row["transport"] == "spawn"]
|
||||
assert strip_lane(controls) == original, "control lost original case/backend/parameters"
|
||||
assert strip_lane(acceptance) == original, "acceptance lost original case/backend/parameters"
|
||||
assert all(row["lane"] == "monolith-control" for row in controls)
|
||||
assert all(row["lane"] == "inproc-acceptance" for row in acceptance)
|
||||
# THE SPAWN LANE IS APK-ONLY AND MUST NOT DRIFT INTO THE LINUX MATRIX. test.yml's
|
||||
# `retrace` job exports matrix.transport straight into MOBILEGL_TRANSPORT and stages no
|
||||
# server image, so a spawn row reaching it would be red for a packaging reason and say
|
||||
# nothing about the transport. Asserted in both directions: present for apk, absent
|
||||
# otherwise - an accidental `if apk` removal has to be caught here rather than in CI.
|
||||
if apk:
|
||||
assert strip_lane(spawned) == original, "spawn lane lost original case/backend/parameters"
|
||||
assert all(row["lane"] == "spawn-acceptance" for row in spawned)
|
||||
else:
|
||||
assert not spawned, "the Linux transport matrix must carry no spawn lane"
|
||||
identities = [(row["case"]["name"] if apk else row["case"],
|
||||
row["backend"]["name"] if apk else row["backend"], row["transport"])
|
||||
for row in mixed]
|
||||
@@ -286,7 +312,10 @@ def self_test_transport_matrices():
|
||||
# A restricted case keeps exactly its original backend and golden data.
|
||||
restricted = [{**cases[0], "split": False, "ci_backends": ["DirectGLES"]}]
|
||||
rows = github_transport_matrix(restricted, apk=apk)["include"]
|
||||
assert len(rows) == 2 and strip_lane(rows[:1]) == strip_lane(rows[1:])
|
||||
expected_lanes = 3 if apk else 2
|
||||
assert len(rows) == expected_lanes
|
||||
assert all(strip_lane(rows[:1]) == strip_lane(rows[index:index + 1])
|
||||
for index in range(1, expected_lanes))
|
||||
try:
|
||||
github_transport_matrix([], apk=apk)
|
||||
except ValueError:
|
||||
@@ -294,7 +323,8 @@ def self_test_transport_matrices():
|
||||
else:
|
||||
raise AssertionError("an empty acceptance lane silently passed")
|
||||
print(f"transport matrix {'APK' if apk else 'Linux'}: {len(controls)} unchanged controls, "
|
||||
f"{len(acceptance)} full acceptance entries; exact metadata and negative controls OK")
|
||||
f"{len(acceptance)} inproc acceptance entries, {len(spawned)} spawn acceptance "
|
||||
f"entries; exact metadata and negative controls OK")
|
||||
|
||||
|
||||
def cmake_quote(value):
|
||||
|
||||
Reference in New Issue
Block a user