mirror of
https://github.com/Druthulu/BFM-decomp
synced 2026-10-01 15:43:06 -04:00
feat(phase-28 T7): make audit-binaries — the R36 citizenship gate (R32 enforcement)
R36: a newly-discovered binary is not real until every consumer knows it. Onboarding produces a
byte-CLEAN binary (check-all green) that is not yet a CITIZEN — the tools that enumerate binaries
can each be silently unaware of it, and the byte-gate is structurally blind to that (R34).
Not hypothetical: P27 onboarded 4 SC07 overlays byte-clean; P28 found FOUR consumers silently
ignoring them (family_remap.img_path, .run/family_hseq.json, config/dedup.us.yaml, and the overlays'
own .c), hiding ~6,400 already-matched bodies. Every failure was silent.
- tools/audit_binaries.py asserts, coverage-checked BOTH directions (R32), against the config the
BUILD reads (R33 — onboarded = main + resident + every config/splat.ov_*.yaml):
1. dup_report.BINARIES (what corpus/family_hseq/progress all derive from) EXACTLY equals the
onboarded set — a missing binary is invisible to every derived tool; a phantom is invented.
2. every onboarded binary has a byte-derived sig.
3. THE LOAD-BEARING SC07 CHECK: every onboarded OVERLAY's .c includes ../shared/engine_core.h,
or no shared body can ever reach it (main/resident have their own bodies, exempt).
4. every onboarded overlay is represented in the family map (warn — regenerable/may post-date).
INFO: dedup-group membership (0 = onboarded-but-un-harvested, a dedup_extend candidate).
- NEGATIVE CONTROL: stripping the shared include from ov_SC07_006.c makes the gate FAIL loudly and
exit 1 — it catches the exact bug that hid 6,400 bodies for a month. Restored clean.
- Wired into `make tools-health` (the pre-matching ritual) — cheap (config + text scans, no build),
so it sits in the fast lane. Passes today: 140 onboarded, all full citizens.
- Reads config/dedup.us.yaml as TEXT (never a YAML round-trip — the H5 lesson from T4).
This commit is contained in:
@@ -132,7 +132,7 @@ CC1_SMOKE_FLAGS := -quiet -O2 -G0 -mips1 -mcpu=3000 -mgas -msoft-float -fgnu-lin
|
||||
BINUTILS_WARN_MAJOR := 2
|
||||
BINUTILS_WARN_MINOR := 38
|
||||
|
||||
.PHONY: help check-env extract build check expected clean report sig-refresh sig-overlays sig-resident build-all check-all audit-corpus audit-cdecl tools-health
|
||||
.PHONY: help check-env extract build check expected clean report sig-refresh sig-overlays sig-resident build-all check-all audit-corpus audit-cdecl audit-binaries tools-health
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
help:
|
||||
@@ -175,6 +175,16 @@ audit-corpus:
|
||||
audit-cdecl:
|
||||
$(VENV_PY) tools/cdecl.py --audit --gcc
|
||||
|
||||
# Binary-citizenship gate (Phase-28 T7, R36 via R32). Asserts every onboarded binary
|
||||
# (main + resident + every config/splat.ov_*.yaml) is a full citizen of every consumer that
|
||||
# enumerates binaries: present in dup_report.BINARIES, has a sig, and (overlays) includes the shared
|
||||
# engine-core header so shared bodies can reach it. The 4 SC07 overlays were byte-clean yet invisible
|
||||
# to four consumers for a month; this is the loud assertion that makes the NEXT onboarding wire the
|
||||
# binary in or fail here, before matching is built on a binary half the tools cannot see. Cheap
|
||||
# (config + text scans; no build), so unlike audit-cdecl it CAN sit in the fast lane.
|
||||
audit-binaries:
|
||||
$(VENV_PY) tools/audit_binaries.py
|
||||
|
||||
# The tool-health ritual (Phase-27 T2). Before the 26-A audit the two oracles above had NO dependent
|
||||
# — nothing invoked them, so "run the audits" was a manual habit, and a habit nobody automates is a
|
||||
# gate nobody counts (R32). This is that dependent: `make tools-health` runs both derived oracles and
|
||||
@@ -191,8 +201,9 @@ tools-health:
|
||||
$(MAKE) --no-print-directory sig-resident
|
||||
$(MAKE) --no-print-directory audit-corpus
|
||||
$(MAKE) --no-print-directory audit-cdecl
|
||||
$(MAKE) --no-print-directory audit-binaries
|
||||
$(MAKE) --no-print-directory report BINARY=main
|
||||
echo "tools-health: OK — sigs fresh; corpus(+resident) + cdecl + report(lint+dedup) all green."
|
||||
echo "tools-health: OK — sigs fresh; corpus(+resident) + cdecl + binaries + report(lint+dedup) all green."
|
||||
|
||||
report:
|
||||
$(VENV_PY) tools/progress.py --binary $(BINARY) --audit
|
||||
|
||||
@@ -0,0 +1,146 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Phase-28 T7: the BINARY-CITIZENSHIP gate (R36 enforcement, via R32 coverage assertions).
|
||||
|
||||
R36 — a newly-discovered binary is not real until every consumer knows it. Onboarding a
|
||||
code-bearing payload produces a byte-CLEAN binary (it builds; `check-all` is green) that is not yet
|
||||
a CITIZEN: the tools that enumerate binaries can each be silently unaware of it, and the whole-binary
|
||||
byte-gate is structurally blind to that (R34 — it verifies the binaries it is TOLD about).
|
||||
|
||||
This is not hypothetical. Phase 27 onboarded 4 SC07 overlays byte-clean; Phase 28 then found FOUR
|
||||
separate consumers silently ignoring them, hiding ~6,400 already-matched function bodies:
|
||||
* family_remap.img_path — hardcoded 0.4.dec -> None -> every member classified "LEN" (T0)
|
||||
* .run/family_hseq.json — 134 overlays, never regenerated after onboarding (T0)
|
||||
* config/dedup.us.yaml — ZERO group memberships; 1,689 groups read "134 binaries" (T4)
|
||||
* src/<ov>/<ov>.c — no `../shared/engine_core.h` include, so no shared body reaches it (T4)
|
||||
Every failure was SILENT. This gate makes each a loud, asserted invariant (R32): the next onboarding
|
||||
either wires the binary into every consumer or fails here, before matching work is built on top of a
|
||||
binary half the tools cannot see.
|
||||
|
||||
GROUND TRUTH = the config the BUILD reads (R33): the onboarded set is `main` + `resident` + every
|
||||
`config/splat.ov_*.yaml`. Nothing here is hand-listed; drift from that set is the primary defect.
|
||||
|
||||
make audit-binaries (fail-closed; wired into tools-health)
|
||||
tools/audit_binaries.py [--verbose]
|
||||
"""
|
||||
import glob
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
import sys
|
||||
|
||||
sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
|
||||
import dup_report
|
||||
import corpus
|
||||
|
||||
REPO = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||
SHARED_INCLUDE = "shared/engine_core.h"
|
||||
|
||||
|
||||
def onboarded():
|
||||
"""The authoritative onboarded set, DERIVED from the splat configs the build consumes (R33)."""
|
||||
ovs = {os.path.basename(p)[len("splat."):-len(".yaml")]
|
||||
for p in glob.glob(os.path.join(REPO, "config/splat.ov_*.yaml"))}
|
||||
return {"main", "resident"} | ovs
|
||||
|
||||
|
||||
def dedup_membership():
|
||||
"""{binary: n_groups} from config/dedup.us.yaml — INFO, not a hard check (0 is legitimate for a
|
||||
freshly-onboarded overlay no one has propagated into yet). Read as text so this never rewrites
|
||||
the registry (the H5 lesson from T4: never round-trip that file through a YAML dumper)."""
|
||||
counts = {}
|
||||
txt = open(os.path.join(REPO, "config/dedup.us.yaml")).read()
|
||||
for b in onboarded():
|
||||
counts[b] = len(re.findall(rf"\b{re.escape(b)}\b", txt))
|
||||
return counts
|
||||
|
||||
|
||||
def main():
|
||||
verbose = "--verbose" in sys.argv
|
||||
os.chdir(REPO)
|
||||
onb = onboarded()
|
||||
fails = []
|
||||
warns = []
|
||||
|
||||
# --- CHECK 1: the enumeration all derived tools read (dup_report.BINARIES) EXACTLY equals the
|
||||
# onboarded config set. Both directions (R32): a binary in config but not here is invisible to
|
||||
# corpus/family_hseq/progress; a binary here but not in config is a phantom the reports invent.
|
||||
binaries = set(dup_report.BINARIES)
|
||||
missing = onb - binaries
|
||||
phantom = binaries - onb
|
||||
if missing:
|
||||
fails.append(f"dup_report.BINARIES is MISSING {len(missing)} onboarded binary(ies) — "
|
||||
f"invisible to every derived tool (corpus/family_hseq/progress): {sorted(missing)}")
|
||||
if phantom:
|
||||
fails.append(f"dup_report.BINARIES has {len(phantom)} PHANTOM binary(ies) not onboarded "
|
||||
f"in config: {sorted(phantom)}")
|
||||
|
||||
# --- CHECK 2: every onboarded binary has a sig (the byte-derived fingerprint the whole matching
|
||||
# frontier is measured against). No sig -> the binary contributes to no report and no family.
|
||||
for b in sorted(onb):
|
||||
cfg = dup_report.BINARIES.get(b)
|
||||
if not cfg:
|
||||
continue # already flagged by CHECK 1
|
||||
if not os.path.exists(os.path.join(REPO, cfg["sig"])):
|
||||
fails.append(f"{b}: no sig at {cfg['sig']} (run `make sig-overlays` / `make sig-resident`)")
|
||||
|
||||
# --- CHECK 3 (the load-bearing SC07 check): every onboarded OVERLAY's .c includes the shared
|
||||
# engine-core header. Without it NO shared body can be instantiated in that overlay, so it can
|
||||
# never receive the ~1,600 already-matched engine functions its siblings carry — the exact bug
|
||||
# that left the 4 SC07 overlays at ~80 matched / ~2,400 stubs. (main + resident have their own
|
||||
# bodies and legitimately do not include it.)
|
||||
for b in sorted(onb):
|
||||
if not b.startswith("ov_"):
|
||||
continue
|
||||
c = os.path.join(REPO, f"src/{b}/{b}.c")
|
||||
if not os.path.exists(c):
|
||||
fails.append(f"{b}: no src file at src/{b}/{b}.c")
|
||||
continue
|
||||
if SHARED_INCLUDE not in open(c).read():
|
||||
fails.append(f"{b}: src/{b}/{b}.c does NOT include ../{SHARED_INCLUDE} — shared engine "
|
||||
f"bodies cannot reach it (the SC07 propagation-blindness; run tools/dedup_extend.py)")
|
||||
|
||||
# --- CHECK 4: every onboarded overlay is represented in the family map (the templating frontier).
|
||||
# A missing overlay there means every member it holds is invisible to the family engine.
|
||||
fam_path = os.path.join(REPO, ".run/family_hseq.json")
|
||||
if os.path.exists(fam_path):
|
||||
fam = json.load(open(fam_path))
|
||||
fam_ovs = set()
|
||||
for g in fam.get("families", []):
|
||||
for o, _ in g.get("members", []) + g.get("matched_members", []):
|
||||
fam_ovs.add(o)
|
||||
map_missing = {b for b in onb if b.startswith("ov_")} - fam_ovs
|
||||
# An overlay can be legitimately absent only if it shares NO function with any other (never,
|
||||
# in practice — every overlay shares the engine core). Flag, do not hard-fail, since the map
|
||||
# is regenerable and may legitimately post-date a brand-new onboarding.
|
||||
if map_missing:
|
||||
warns.append(f".run/family_hseq.json is missing {len(map_missing)} onboarded overlay(s) "
|
||||
f"(regenerate: tools/family_hseq.py): {sorted(map_missing)}")
|
||||
else:
|
||||
warns.append(".run/family_hseq.json absent — cannot check family-map coverage")
|
||||
|
||||
# --- INFO: dedup-group membership. 0 is legitimate for a freshly-onboarded overlay, but an
|
||||
# onboarded overlay WITH the shared include yet 0 groups is a not-yet-harvested one worth naming.
|
||||
memb = dedup_membership()
|
||||
zero = sorted(b for b in onb if b.startswith("ov_") and memb.get(b, 0) == 0)
|
||||
if zero:
|
||||
warns.append(f"{len(zero)} overlay(s) in 0 dedup groups (onboarded but un-harvested — "
|
||||
f"candidate for tools/dedup_extend.py): {zero if verbose else zero[:6]}")
|
||||
|
||||
# --- report
|
||||
print(f"audit-binaries: {len(onb)} onboarded (main + resident + "
|
||||
f"{len([b for b in onb if b.startswith('ov_')])} overlays)")
|
||||
if verbose:
|
||||
print(f" dup_report.BINARIES: {len(binaries)} | family-map overlays: "
|
||||
f"{len(fam_ovs) if os.path.exists(fam_path) else 'n/a'}")
|
||||
for w in warns:
|
||||
print(f" [warn] {w}")
|
||||
for f in fails:
|
||||
print(f" [FAIL] {f}")
|
||||
if fails:
|
||||
sys.exit(f"\naudit-binaries: {len(fails)} citizenship FAILURE(s) — a binary the tools cannot "
|
||||
f"fully see is invisible work (R36/R34). Fix before matching on top of it.")
|
||||
print("audit-binaries: OK — every onboarded binary is a full citizen of every enumerating consumer.")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
Reference in New Issue
Block a user