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
234 lines
12 KiB
Python
234 lines
12 KiB
Python
#!/usr/bin/env python3
|
|
"""Would letting the HD63450 paint the spans beat letting the 68000 do it?
|
|
|
|
python3 tools/analysis/14_dmac_chain.py [container.dlx] --bus <KB/s>
|
|
[--dma-px-bus 2] [--disk-bus-byte 1]
|
|
|
|
FINDINGS 29.6 called this the one lever that could move the CPU budget without
|
|
spending a byte, and left it uncosted. FINDINGS 30 measured the alternative --
|
|
the 68000 painting spans itself, 43.7 cycles per span + 9.152 per pixel. This
|
|
prices the two against each other, and the answer turns on a resource neither
|
|
section costed: the 68000's own LOCAL BUS.
|
|
|
|
FINDINGS 29's "the bus has 4x the headroom the CPU has" is about the SCSI pipe,
|
|
110 KB/s of the delivery pipe. That is a different bus. The 68000's memory bus runs one 4-clock
|
|
cycle at a time and carries instruction prefetch as well as data, and
|
|
tools/analysis/15_bus_occupancy.py measures the decoder using 86.7% of it.
|
|
|
|
THE TWO DESIGNS ARE THE SAME CONTAINER. v6's record is {u32 absolute GVRAM
|
|
address, u16 jump displacement} = 6 bytes; an MC68450/HD63450 array-chaining
|
|
entry is {u32 memory address, u16 transfer count} = 6 bytes. Set the channel to
|
|
dual-address, direction device->memory, Sequence Control counting both addresses
|
|
up: MAR reloads per entry (the GVRAM destination), DAR walks the stream buffer,
|
|
MTC is the span's word count. The chain array IS the span table.
|
|
|
|
THE DMAC CONSTANTS ARE NOW SOURCED, and they killed the first answer. From the
|
|
MC68450 manual (Motorola, Jul 1989, bitsavers), Fig 4-25 sheet 4: a dual-address
|
|
WORD operand between two 16-bit ports is **9 clocks**, because note 2 gives the
|
|
DMAC 4-clock reads and **5-clock writes**. The 68000 writes in 4. So:
|
|
|
|
DMAC 9.000 clocks/pixel (datasheet)
|
|
v6 9.152 clocks/pixel (measured, FINDINGS 30)
|
|
|
|
A 1.7% difference. Session 10's first pass guessed 2 bus cycles = 8 clocks from
|
|
bus arithmetic and was 12% optimistic; the extra clock on every DMAC write is
|
|
the whole story. Per span, sequential array chaining costs 36 clocks (Fig 4-25
|
|
sheet 1) against v6's measured 43.7 -- the DMAC's one real edge, and it is small.
|
|
|
|
AND DMA DOES NOT OVERLAP. The 68000 has no cache and a two-word prefetch queue,
|
|
so it stalls as soon as another master takes the bus. Frame time is therefore
|
|
CPU + DMA, additive. Session 10's first pass used max(CPU, bus) and got 53/120
|
|
where the additive model gives 84/120; FINDINGS 35's flat debit was right.
|
|
|
|
So the only material difference left is v6's 24-pixel padding quantum -- and
|
|
that is a property of v6's unrolled chain, not of the CPU. The `v7 fine tail`
|
|
column prices fixing it in software instead, and as of session 11 that column
|
|
is MEASURED on the 68000 (blit.s v7, tools/bench/span.sh, FINDINGS 40) rather
|
|
than derived: 66.0 clocks per span + 9.143 per coarse pixel + 9.978 per fine
|
|
pixel, with a 2-pixel quantum that a run of 4x4 blocks pads to exactly.
|
|
"""
|
|
import sys, os, argparse
|
|
sys.path.insert(0, "tools/encoder")
|
|
sys.path.insert(0, "tools/analysis")
|
|
import numpy as np
|
|
from dlx import DLX
|
|
import buscost as B
|
|
|
|
FRAME_CYC = 833333.0
|
|
AUDIO_KBPS = 7.8
|
|
import vq_hybrid as _H
|
|
C_V1, C_V4, C_RAW = _H.C_V1, _H.C_V4, _H.C_RAW # FINDINGS 28.2 (MEASURED)
|
|
# 45.0 until session 12 measured it at 55.0 (FINDINGS 41.5) -- imported now, so
|
|
# the correction cannot be undone by a stale copy.
|
|
C_SKIP_CLUSTERED, C_SKIP_MIXED = _H.C_SKIP_CLUSTERED, _H.C_SKIP_MIXED
|
|
SPAN_BYTES_PX, SPAN_HDR = 2, 6
|
|
|
|
ap = argparse.ArgumentParser()
|
|
ap.add_argument("container", nargs="?", default="tmp/rc_fr_singe_scsi_cpufit.dlx")
|
|
ap.add_argument("--bus", 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("--fps", type=float, default=12.0)
|
|
ap.add_argument("--dma-px-clk", type=float, default=B.DMA_PX_CLK,
|
|
help="clocks the DMAC spends per pixel, dual-address word "
|
|
"between two 16-bit ports. 9 is the DATASHEET figure "
|
|
"(MC68450 Fig 4-25 sheet 4).")
|
|
ap.add_argument("--disk-clk-byte", type=float, default=5.0,
|
|
help="clocks the SCSI DMA steals per BYTE delivered. The SPC is "
|
|
"an 8-bit port, so the DMAC pays per byte, not per word "
|
|
"(FINDINGS 43). 5, the default, is the OPTIMISTIC end and "
|
|
"what ratectl encodes against: single-address, bus held, no "
|
|
"drive wait (Fig 4-25 sheet 2). 9 is dual-address, which is "
|
|
"what MAME models and what applies if the board does not "
|
|
"drive DACK. Score both.")
|
|
ap.add_argument("--disk-clk-word", type=float, default=None,
|
|
help="DEPRECATED denominator of FINDINGS 39.7/42, kept so the "
|
|
"old tables reproduce: sets --disk-clk-byte to half this")
|
|
a = ap.parse_args()
|
|
if a.disk_clk_word is not None:
|
|
a.disk_clk_byte = a.disk_clk_word / 2.0
|
|
|
|
if not os.path.exists(a.container):
|
|
sys.exit(f"missing {a.container}")
|
|
|
|
BYTE_BUD = (a.bus - AUDIO_KBPS) * 1024 / a.fps
|
|
BUS_SLOTS = FRAME_CYC / B.BUS_CLK
|
|
d = DLX(a.container)
|
|
BLK_C = {1: C_V1, 2: C_V4, 3: C_RAW}
|
|
BLK_B = {1: 1, 2: 4, 3: 16}
|
|
|
|
|
|
def runs(m, by):
|
|
dirty = m[by] != 0
|
|
i = 0
|
|
while i < d.nbx:
|
|
if not dirty[i]:
|
|
i += 1; continue
|
|
j = i
|
|
while j < d.nbx and dirty[j]:
|
|
j += 1
|
|
yield i, j
|
|
i = j
|
|
|
|
|
|
def span_cost(design, L):
|
|
"""(pixels carried, clocks charged to the frame) for a run of L blocks,
|
|
as 4 rows of 4L pixels. Every design is charged additively: the 68000
|
|
cannot execute while the DMAC owns the bus."""
|
|
if design == "v6":
|
|
px = B.pad24(4 * L)
|
|
return 4 * px, 4 * (B.V6_SPAN_CYC + px * B.V6_PX_CYC)
|
|
if design == "v7":
|
|
px, c = B.v7_span(4 * L)
|
|
return 4 * px, 4 * c
|
|
px = 4 * L
|
|
return 4 * px, 4 * (B.DMA_CHAIN_CLK + px * a.dma_px_clk)
|
|
|
|
|
|
def score(design):
|
|
"""Greedy, as 12_span_tradeoff.py: buy the best clocks-saved per byte spent
|
|
until the frame's byte budget is gone. Unlike 12, a spanned block still pays
|
|
its mode-map dispatch, which FINDINGS 30.7 flagged as uncounted."""
|
|
out = []
|
|
for f in range(d.nframes):
|
|
m = d.modes(f).reshape(d.nby, d.nbx)
|
|
byt = d.mode_bytes + sum(BLK_B.get(int(x), 0) for x in m.ravel())
|
|
spanned = np.zeros_like(m, bool)
|
|
span_clk = 0.0
|
|
|
|
cand = []
|
|
if design != "none":
|
|
for by in range(d.nby):
|
|
for i, j in runs(m, by):
|
|
L = j - i
|
|
cur_c = sum(BLK_C[int(b)] for b in m[by][i:j])
|
|
cur_b = sum(BLK_B[int(b)] for b in m[by][i:j])
|
|
px, sc = span_cost(design, L)
|
|
sc += L * C_SKIP_MIXED # the dispatch still happens
|
|
# v7 carries a second u16 (the fine displacement) per span.
|
|
hdr = B.V7_SPAN_HDR if design == "v7" else SPAN_HDR
|
|
span_b = 4 * hdr + px * SPAN_BYTES_PX
|
|
if sc < cur_c:
|
|
cand.append((cur_c - sc, span_b - cur_b, by, i, j, sc, L))
|
|
cand.sort(key=lambda s: -(s[0] / max(s[1], 1)))
|
|
for dc, db, by, i, j, sc, L in cand:
|
|
if byt + db <= BYTE_BUD:
|
|
byt += db
|
|
spanned[by][i:j] = True
|
|
span_clk += sc - L * C_SKIP_MIXED
|
|
g = m.copy()
|
|
g[spanned] = 0
|
|
gg = g.reshape(-1, 4)
|
|
allskip = (gg == 0).all(1)
|
|
cpu = allskip.sum() * 4 * C_SKIP_CLUSTERED
|
|
mm = gg[~allskip]
|
|
cpu += (mm == 0).sum() * C_SKIP_MIXED
|
|
for k, c in BLK_C.items():
|
|
cpu += (mm == k).sum() * c
|
|
pref, data = B.block_bus(m, spanned)
|
|
disk = byt * a.disk_clk_byte
|
|
# additive: CPU work, then span painting, then the disk stealing the bus
|
|
out.append((cpu + span_clk + disk, (pref + data) * B.BUS_CLK, byt,
|
|
spanned.sum()))
|
|
return np.array(out).T
|
|
|
|
|
|
DESIGNS = [("today", "none"), ("v6 span", "v6"),
|
|
("v7 fine tail", "v7"), ("DMAC chain", "dmac")]
|
|
res = {n: score(k) for n, k in DESIGNS}
|
|
|
|
print(f"{a.container}: {d.nframes} frames, {d.nb} blocks, {a.fps:g} fps")
|
|
print(f"SCSI pipe {a.bus:.0f} KB/s -> {BYTE_BUD:,.0f} B/frame; "
|
|
f"68000 bus {BUS_SLOTS:,.0f} cycles/frame; CPU {FRAME_CYC:,.0f} clocks\n")
|
|
|
|
print("PER PIXEL AND PER SPAN -- datasheet against measurement")
|
|
print(f" DMAC dual-address word, two 16-bit ports {B.DMA_PX_CLK:.3f} clocks "
|
|
f"MC68450 Fig 4-25 sheet 4")
|
|
print(f" v6 movem chain {B.V6_PX_CYC:.3f} clocks "
|
|
f"MEASURED, FINDINGS 30")
|
|
print(f" -> the DMAC is {100*(B.V6_PX_CYC-B.DMA_PX_CLK)/B.V6_PX_CYC:+.1f}% per pixel. "
|
|
f"The 68000 writes in 4 clocks; the DMAC takes 5.")
|
|
print(f" per span: DMAC array chaining {B.DMA_CHAIN_CLK} clocks against v6's "
|
|
f"{B.V6_SPAN_CYC:.1f}\n")
|
|
|
|
w = 15
|
|
print(f"{'':<26}" + "".join(f"{n:>{w}}" for n, _ in DESIGNS))
|
|
def row(label, fmt, get):
|
|
print(f" {label:<24}" + "".join(f"{fmt(get(res[n])):>{w}}" for n, _ in DESIGNS))
|
|
|
|
row("bitrate KB/s", lambda v: f"{v:.1f}", lambda r: r[2].mean() * a.fps / 1024)
|
|
row("frame, median", lambda v: f"{v:.1f}%", lambda r: 100*np.median(r[0])/FRAME_CYC)
|
|
row("frame, worst", lambda v: f"{v:.1f}%", lambda r: 100*r[0].max()/FRAME_CYC)
|
|
row("frames missing", lambda v: f"{v}/{d.nframes}",
|
|
lambda r: int((r[0] > FRAME_CYC).sum()))
|
|
row("blocks spanned/frame", lambda v: f"{v:,.0f}", lambda r: r[3].mean())
|
|
print(f"\n ADDITIVE: frame = CPU + span painting + disk DMA. The 68000 has no"
|
|
f"\n cache and a two-word prefetch queue, so it stalls the moment another"
|
|
f"\n master takes the bus. Disk debited at {a.disk_clk_byte:g} clocks/byte.")
|
|
|
|
# What is left of the case, isolated.
|
|
v6m = int((res["v6 span"][0] > FRAME_CYC).sum())
|
|
finem = int((res["v7 fine tail"][0] > FRAME_CYC).sum())
|
|
dmam = int((res["DMAC chain"][0] > FRAME_CYC).sum())
|
|
print(f"\nWHAT THE DMAC ACTUALLY BUYS, decomposed")
|
|
print(f" v6 as built {v6m}/{d.nframes} frames over")
|
|
print(f" v7, a finer chain tail (MEASURED) {finem}/{d.nframes}")
|
|
print(f" DMAC chain {dmam}/{d.nframes}")
|
|
print(f" -> of the gap between v6 and the DMAC, "
|
|
f"{100*(v6m-finem)/max(v6m-dmam,1):.0f}% is the 24-pixel padding")
|
|
print(f" quantum, which is a property of v6's unrolled chain and fixable")
|
|
print(f" in software. The rest is 1.7% a pixel and 7.7 clocks a span.")
|
|
|
|
# The additive model here IS FINDINGS 35's flat debit, and reproduces its
|
|
# 84/120 exactly in the "today" column. Session 10's first pass replaced it with
|
|
# max(CPU, bus) and got 53/120; that was wrong, because a 68000 cannot execute
|
|
# while the DMAC holds the bus.
|
|
|
|
print(f"\nbreak-even against all-V1 ({C_V1:.1f} cycles/block), clocks per block")
|
|
print(f" {'L':<16}" + "".join(f"{L:>8}" for L in (1, 2, 3, 4, 8, 16, 64)))
|
|
for nm, dz in (("v6 as built", "v6"), ("v7 fine tail", "v7"), ("DMAC chain", "dmac")):
|
|
print(f" {nm:<16}" + "".join(f"{span_cost(dz, L)[1]/L:>8.0f}"
|
|
for L in (1, 2, 3, 4, 8, 16, 64)))
|
|
for nm, dz in (("v6 as built", "v6"), ("v7 fine tail", "v7"), ("DMAC chain", "dmac")):
|
|
brk = next((L for L in range(1, 65) if span_cost(dz, L)[1] < L * C_V1), None)
|
|
print(f" {nm:<16} beats all-V1 from L={brk} blocks up")
|