Two sessions that were never separated in the working tree, so they land as one commit. check.sh ALL GREEN before and after both. SESSION 19 -- the ring rig gets a frame clock (FINDINGS 51). src/player/stream.s had no frame clock: it asked for record i the instant it finished i-1, outran any finite pipe, and never let the ring back up. The 49.1 sweep passing at 48 KB was therefore a wrap-correctness result and nothing else. PACE/PACEON ($18034/$18038) hold the decoder to 12 fps, so FR_HEAD-FR_TAIL finally means what it reads as: whole frames the decoder could still draw with delivery stopped dead. PACEON=0 free-runs and is what the wrap gate still uses, so every figure in 49 is unmoved. Paced, on the gate container: 64 KB holds 2 frames, 256 KB holds 7-8, 512 KB holds 14-15, all pixel-exact. Tolerance is ceiling-1, measured by cutting the pipe: 256 KB buys 500 ms of dead pipe, not 583. SLACK IS ACCUMULATED, NOT OWNED. It is built out of pipe-wire and a seek spends all of it. At 488 KB/s a 256 KB ring needs 4.83 s of play to reach its ceiling from empty; 512 KB needs 8.42 s to reach 14. A bigger ring raises the ceiling AND lengthens the climb, so a branch point does not ask "is the buffer big enough" but "has there been enough play since the last one" -- and Dragon's Lair's decision points are seconds apart. The rig now also says WHICH resource is binding: at 460 KB/s every ring from 192 KB to 512 KB is rate-bound at ceiling 4 and never fills, so larger rings are dead RAM in that scene. 20_seek_slack.py is the same model rewritten in Python from record sizes, sharing no code with the Lua producer: 35/35 ceilings inside its bracket. SESSION 20 -- the DMAC configuration was in the IPL ROM the whole time (FINDINGS 52). ROADMAP's "do this first" was to put the ADPCM stream on the bus. That needs a clocks-per-byte figure for the audio channel, and 11_cpu_budget.py was charging audio the DISK's rate -- 5 clk/B, its own help text calling it "single-address, bus held". Audio was being charged the favourable end of B3, a 242 KB/s open question. It never had to be a guess. The IPL ROM programs all four HD63450 channels itself and MAME boots the rig with it, so 21_iplrom_dmac.py reads the configuration out of the image and decodes the MC68450 fields. Eight (address, expected bytes, meaning) sites; a mismatch or an unknown revision exits non-zero. In check.sh, no emulator, milliseconds. ch3 DCR=$80, OCR=$32: dual address, 8-bit port, cycle steal WITHOUT hold, REQG=10 external request. The DMAC arbitrates once per byte with no burst to amortise the 5..8 + 2 over, so an audio byte is 16..19 clocks, not 5 -- the old debit was 3.2x..3.8x small. And on the bus it is still nothing: 651 B/frame is 1.25%..1.48% of a frame, about 4% of what the decoder leaves. P6's bus risk does not materialise. The unit worry was worth checking and nearly right: 15.6 kHz is 8 MHz/512 = 15,625 samples/s, two 4-bit samples to a byte = 7,812.5 B/s exactly, and AUDIO_KBPS=7.8 is that in decimal kB while the tool multiplied by 1024. THE DISK CHANNEL IS PROGRAMMED IDENTICALLY. ch1 (SASI) is DCR=$80 too, and so is ch0. That is 16..19 clocks per delivered byte, where 42.4 brackets W at 5..12 and 42.5 has W=8 already missing 47/120 frames. The only worked example of a disk DMA configuration on this machine sits above the entire bracket, and at that price nothing fits at any container size. It is not scsiexrom.bin so B3 stays open -- what changed is that a cheap configuration is now the thing that has to be SHOWN. W <= 12 is a requirement on the player's DMAC programming, not a range the hardware hands us, and it is now the largest open number in the project, ahead of the rate. An unforced cross-check fell out: 15_bus_occupancy.py's new W sweep puts W=8 at 105.7% of the frame, agreeing with 42.5's 47/120, from mode histograms and bus clocks respectively, two models sharing no code. Also: ADPCM outranks the disk at the arbiter (CPR 1 against 2), so an audio byte never waits and a video byte does -- relevant to 51's smooth-rate delivery model. README MEDIA. stream.lua gains DLX_SNAP_EVERY=1 (needs DLX_PACE, off by default, on no path check.sh takes) and tools/media/make_readme_media.py turns the PNGs into docs/img/. The stills and both clips are MAME's own screen pixels. Building it turned up something worth recording. 116 of 119 captured frames are pixel-exact against dlx.py; three are TORN -- frame n on top, frame n-1 below the tear line -- because MAME captured the screen while the block loop was partway down it. decode.s writes straight to the displayed page (one display path, 28.1), so a real player tears the same way, and this is the first time that consequence has been visible rather than argued. The script ASSERTS the tear and refuses to build otherwise, rather than trimming three frames and reporting "every frame I kept is exact". Second correction the capture forced: the snapshot fires before frame n is decoded, so the obvious reading is that it holds frame n-1 -- it does not, because MAME renders the screen at the end of the machine frame, by which time the 68000 has finished frame n. 11_cpu_budget.py's "validated to within 1 pt" line is also corrected: the model reads 2..10 pt HIGH and by more as the frame gets harder, which was already true before either session. src/player/decode.s is unchanged; decode.bin is still 1,296 B at the same MD5. Claude-Session: https://claude.ai/code/session_01194oWYW8DQXK1SZ2DnChW6
109 lines
5.3 KiB
Python
109 lines
5.3 KiB
Python
#!/usr/bin/env python3
|
|
"""GATE for the DLX3 span container: does the reference decoder reproduce the
|
|
encoder's own reconstruction, from the emitted bytes?
|
|
|
|
python3 tools/analysis/16_span_roundtrip.py [frames_dir] --kbps <KB/s>
|
|
|
|
Exits non-zero if any frame differs by a single pixel.
|
|
|
|
WHY THIS EXISTS SEPARATELY FROM 09. `09_ratectl_drift.py` replays SKIP
|
|
semantics in Python against the mode maps the encoder returned; it never reads
|
|
a container. A span breaks exactly that shortcut: a spanned block reads SKIP
|
|
in the mode header and is painted by the span section instead, so a replay that
|
|
knows only about mode maps reports drift where there is none, and -- far worse
|
|
-- a container whose span section is malformed would still pass, because 09
|
|
never parses one. This gate closes that: encode, WRITE THE CONTAINER, read it
|
|
back with tools/encoder/dlx.py (the byte-for-byte reference decoder the 68000
|
|
is checked against), and compare to what ratectl recorded.
|
|
|
|
It also has to prove it tested something. A round-trip over a container with
|
|
no spans in it is green by vacuity, which is the failure mode FINDINGS 40.6
|
|
named for the snapshot count: a gate must take its expected work from the
|
|
generated artefact, not from an assumption. So the thresholds below are
|
|
asserted, not printed.
|
|
|
|
The `--kbps` default is the BUS rate, not the `scsi` profile's 280: spans are
|
|
bought with bytes, and 14_dmac_chain.py scores them against the delivery pipe.
|
|
At the profile rate the lam search has already spent the allowance and there is
|
|
nothing left to buy a span with -- which is a real finding about the encoder
|
|
(FINDINGS 41.2), not a reason for the gate to test nothing.
|
|
"""
|
|
import argparse, os, pickle, sys, time
|
|
sys.path.insert(0, "tools/encoder")
|
|
import numpy as np
|
|
import vq_hybrid as H, ratectl as RC, encode as E
|
|
from dlx import DLX
|
|
|
|
ap = argparse.ArgumentParser()
|
|
ap.add_argument("frames_dir", nargs="?", default="tmp/fr_singe")
|
|
ap.add_argument("--kbps", type=float, required=True,
|
|
help="REQUIRED. There is no default: the delivery rate is a property of the medium and this project has never measured it. FINDINGS 42.1 -- the figure this tool used to default to was a user-supplied '4 Mbps' with no provenance, was a tenth of SCSI-1's asynchronous rating, and was never a bus measurement at all. A default let every table in FINDINGS 30-49 be scored against it without anyone restating it. Pass one explicitly.")
|
|
ap.add_argument("--out", default="tmp/s12_roundtrip")
|
|
ap.add_argument("--cache", default=None)
|
|
a = ap.parse_args()
|
|
|
|
cache = a.cache or f"tmp/model_{os.path.basename(a.frames_dir.rstrip('/'))}.pkl"
|
|
if os.path.exists(cache):
|
|
m = pickle.load(open(cache, "rb"))
|
|
print(f"model from {cache}")
|
|
else:
|
|
t = time.time()
|
|
m = H.build(a.frames_dir, k1=256, k4=256, iters=16)
|
|
pickle.dump(m, open(cache, "wb"))
|
|
print(f"built model in {time.time()-t:.0f} s -> {cache}")
|
|
|
|
bad = 0
|
|
for span_mode in ("need", "all"):
|
|
print(f"\n=== spans={span_mode}, {a.kbps:g} KB/s ===")
|
|
m.pop("_sym", None)
|
|
enc = RC.encode_rate_controlled(m, target_kbps=a.kbps, lam_lo=1.0,
|
|
cycle_budget=RC.FRAME_CYCLES,
|
|
span_mode=span_mode)
|
|
recs = E.build_records(m, enc, span_mode)
|
|
path = f"{a.out}_{span_mode}.dlx"
|
|
total, vid, _ = E.write_container(path, m, recs, 12, m["k1"], m["k4"],
|
|
span_mode)
|
|
|
|
nsp = sum(len(x) for x in enc["spans"])
|
|
nfr = sum(1 for x in enc["spans"] if x)
|
|
px = sum(len(p) for x in enc["spans"] for _, _, p in x)
|
|
print(f"{path}: {total:,} B, {len(recs)} frames, "
|
|
f"{nsp:,} spans on {nfr} frames, {px:,} pixels painted by one "
|
|
f"({100*px/(len(recs)*m['H']*m['W']):.1f}% of all pixels)")
|
|
|
|
d = DLX(path)
|
|
if d.version != 3:
|
|
print(f"FAIL: container is DLX{d.version}, not DLX3"); bad += 1; continue
|
|
|
|
# The decoder's own walk of the span section must land exactly where the
|
|
# block payload starts, and blocks() already raises if the payload does not
|
|
# consume the record -- so this reads the spans back through the same code
|
|
# path the 68000 is modelled on rather than trusting the writer.
|
|
got = d.decode_all()
|
|
diff = np.array([(g != r).sum() for g, r in zip(got, enc["recon"])])
|
|
print(f"pixels differing from the encoder's reconstruction: "
|
|
f"{diff.sum()} total, worst frame {diff.max()}, "
|
|
f"frames with any: {int((diff>0).sum())}/{len(diff)}")
|
|
if diff.sum():
|
|
f = int(np.argmax(diff))
|
|
ys, xs = np.where(got[f] != enc["recon"][f])
|
|
print(f"FAIL: frame {f} differs at {diff[f]} px, first (x={xs[0]}, "
|
|
f"y={ys[0]}), block (bx={xs[0]//4}, by={ys[0]//4}), "
|
|
f"mode there = {d.modes(f)[(ys[0]//4)*d.nbx + xs[0]//4]}")
|
|
bad += 1
|
|
|
|
# A green round-trip over a container with no spans in it proves nothing.
|
|
if span_mode == "all":
|
|
if nsp < 1000:
|
|
print(f"FAIL: only {nsp} spans emitted -- this gate did not "
|
|
f"exercise the span path"); bad += 1
|
|
if not (px and max(len(x) for x in enc["spans"]) > 50):
|
|
print(f"FAIL: no frame carries a substantial span table"); bad += 1
|
|
|
|
print()
|
|
if bad:
|
|
print(f"FAILED: {bad} check(s)")
|
|
sys.exit(1)
|
|
print("OK the DLX3 span container round-trips: the reference decoder rebuilds "
|
|
"the\n encoder's reconstruction exactly, from the emitted bytes.")
|