Port DoE trial-summary persistence (doe_region.c) onto the reshuffled branch
Local master had 9 unpushed commits building block-backed DoE persistence on Artemis's own disk (FABRIC-3.md SXXXV.3/.4/.12, designed and built 2026-09-17, never pushed) that this branch never inherited after the Tripod/kernel reshuffle diverged history. Ports the mechanism cleanly onto the current Hera/Artemis/Hestia shape: - doe_region.h/.c: growable, CRC-protected trial-summary ring in Artemis's top-of-device metadata fence, immediately past log_region.c's own ceiling (devblock_from_top 98-102). Same accessor/CRC discipline as log_region.c. - log_words.c: DOE-PERSIST-TRIAL and DOE-RESUME-COUNT kernel-only FORTH words. - multiuser-doe.4th: per-ISA tagging (MU-ISA-TAG!) and campaign resume support (MU-EXEC-CAMPAIGN now takes a start-idx). - per-isa-doe.4th (new): RUN-AMD64-CAMPAIGN/RUN-AARCH64-CAMPAIGN/ RUN-RISCV64-CAMPAIGN entry points, resuming from DOE-RESUME-COUNT. - extract_doe_region.py (new): host-side reader, CRC-verified, no filesystem assumptions -- reads the ring directly off a raw disk image. Deliberately not ported: the R/LaTeX report-generation pipeline (analyse_multiuser_doe.R, multiuser_doe_report.tex, build_multiuser_doe_report.sh) -- not needed to prove persistence works, and unscoped for this pass. Verified live on all three architectures: clean boot, word_count 530->532, zero UNKNOWN WORD. amd64 and riscv64 both live-exercised end-to-end (write via DOE-PERSIST-TRIAL, count via DOE-RESUME-COUNT, clean QEMU exit, then read back correctly with extract_doe_region.py against the raw disk image -- no host serial dependency, matching the real bare-metal requirement this campaign is rehearsing for). riscv64 finding (not a defect in this port, no fix applied): DOE-PERSIST-TRIAL failed 3/3 on a first attempt against a fresh disk image with "virtio_blk: vblk_io timed out". Root cause: disk/artemis.img is a sparse file (180KB allocated of a 1GB apparent size); the new DOE region (devblock_from_top 98-102) is genuinely virgin territory on a fresh image, and riscv64's slower TCG emulation missed the existing virtio_blk spin-bound budget (already documented as fragile, FABRIC-3.md 2026-09-09) on that first cold touch. Confirmed by isolation: a plain BLOCK/UPDATE at an already-warm LBN succeeded instantly, the pre-existing LOG-ERROR" (same meta-zone mechanism, an already-warmed offset range) also succeeded, and a reboot reusing the now-partially-warmed disk let DOE-PERSIST-TRIAL succeed immediately and verify correctly on read-back. Pre-existing environmental fragility, not a logic bug in the ported address computation. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Sonnet 5
parent
6302dcb50e
commit
2d773ca923
+22
-19
@@ -1,5 +1,5 @@
|
||||
# Capsule Block Manifest — Auto-generated
|
||||
<!-- Generated by mkcapsule --manifest 2026-09-22T22:29:26Z -->
|
||||
<!-- Generated by mkcapsule --manifest 2026-09-23T14:57:37Z -->
|
||||
<!-- DO NOT EDIT — re-run mkcapsule --manifest to refresh. -->
|
||||
<!-- Hand-written justifications and immutability notes live -->
|
||||
<!-- in MANIFEST.md alongside this auto-generated index. -->
|
||||
@@ -25,7 +25,8 @@
|
||||
| `init-l8-volatile.4th` | 4810, 4811, 4812, 4813 | `0x98caabbbd92abac4` | yes |
|
||||
| `init.4th` | 2049, 2050, 2057 | `0xea038ba684c53443` | yes |
|
||||
| `lib.4th` | 4050 | `0x4b216635c359ef73` | yes |
|
||||
| `multiuser-doe.4th` | 5044, 5045, 5046, 5047, 5048, 5049, 5050, 5051, 5052, 5053, 5054, 5055 | `0x22140588ee7c39e6` | yes |
|
||||
| `multiuser-doe.4th` | 5044, 5045, 5046, 5047, 5048, 5049, 5050, 5051, 5052, 5053, 5054, 5055 | `0xb4f6f0c2c582a4d4` | yes |
|
||||
| `per-isa-doe.4th` | 5117, 5119 | `0x73f21c35b683e295` | yes |
|
||||
| `sdk.4th` | 5109, 5110, 5111, 5112, 5113, 5114, 5115 | `0x008fdbbb62c94a3a` | yes |
|
||||
| `turtle.4th` | 5100, 5101, 5102, 5103, 5104, 5105, 5106, 5107, 5108 | `0x4d470418ca543365` | yes |
|
||||
| `user-font-demo.4th` | 4200, 4201, 4202 | `0xce1fd7d1b581a56d` | yes |
|
||||
@@ -43,7 +44,7 @@
|
||||
| `workload-9.4th` | 4706, 4715, 4725, 4735, 4745 | `0x3f2bec73142aa424` | yes |
|
||||
| `workload-calib1.4th` | 5043 | `0x3b9f2d17b554fabc` | yes |
|
||||
| `zuse-eligibility.4th` | 4021, 4022 | `0x7b28f4776a32e0b7` | yes |
|
||||
| `zuse.4th` | 4016, 4017, 4018 | `0x490ded9be257a90b` | yes |
|
||||
| `zuse.4th` | 4016, 4017, 4018 | `0xa14d5a7a88791cf6` | yes |
|
||||
|
||||
## Block Map (sorted by LBN)
|
||||
|
||||
@@ -109,9 +110,9 @@
|
||||
| 4007 | `ACL.4th` | `0xf8890c05c0d8f921` | ok |
|
||||
| 4008 | `ACL.4th` | `0xf8890c05c0d8f921` | ok |
|
||||
| 4015 | `ACL.4th` | `0xf8890c05c0d8f921` | ok |
|
||||
| 4016 | `zuse.4th` | `0x490ded9be257a90b` | ok |
|
||||
| 4017 | `zuse.4th` | `0x490ded9be257a90b` | ok |
|
||||
| 4018 | `zuse.4th` | `0x490ded9be257a90b` | ok |
|
||||
| 4016 | `zuse.4th` | `0xa14d5a7a88791cf6` | ok |
|
||||
| 4017 | `zuse.4th` | `0xa14d5a7a88791cf6` | ok |
|
||||
| 4018 | `zuse.4th` | `0xa14d5a7a88791cf6` | ok |
|
||||
| 4019 | `block-acl.4th` | `0xf6cc2a59e3a6734e` | ok |
|
||||
| 4020 | `block-acl.4th` | `0xf6cc2a59e3a6734e` | ok |
|
||||
| 4021 | `zuse-eligibility.4th` | `0x7b28f4776a32e0b7` | ok |
|
||||
@@ -332,18 +333,18 @@
|
||||
| 5001 | `fabric.4th` | `0x9d9489cbeca4099b` | ok |
|
||||
| 5002 | `fabric.4th` | `0x9d9489cbeca4099b` | ok |
|
||||
| 5043 | `workload-calib1.4th` | `0x3b9f2d17b554fabc` | ok |
|
||||
| 5044 | `multiuser-doe.4th` | `0x22140588ee7c39e6` | ok |
|
||||
| 5045 | `multiuser-doe.4th` | `0x22140588ee7c39e6` | ok |
|
||||
| 5046 | `multiuser-doe.4th` | `0x22140588ee7c39e6` | ok |
|
||||
| 5047 | `multiuser-doe.4th` | `0x22140588ee7c39e6` | ok |
|
||||
| 5048 | `multiuser-doe.4th` | `0x22140588ee7c39e6` | ok |
|
||||
| 5049 | `multiuser-doe.4th` | `0x22140588ee7c39e6` | ok |
|
||||
| 5050 | `multiuser-doe.4th` | `0x22140588ee7c39e6` | ok |
|
||||
| 5051 | `multiuser-doe.4th` | `0x22140588ee7c39e6` | ok |
|
||||
| 5052 | `multiuser-doe.4th` | `0x22140588ee7c39e6` | ok |
|
||||
| 5053 | `multiuser-doe.4th` | `0x22140588ee7c39e6` | ok |
|
||||
| 5054 | `multiuser-doe.4th` | `0x22140588ee7c39e6` | ok |
|
||||
| 5055 | `multiuser-doe.4th` | `0x22140588ee7c39e6` | ok |
|
||||
| 5044 | `multiuser-doe.4th` | `0xb4f6f0c2c582a4d4` | ok |
|
||||
| 5045 | `multiuser-doe.4th` | `0xb4f6f0c2c582a4d4` | ok |
|
||||
| 5046 | `multiuser-doe.4th` | `0xb4f6f0c2c582a4d4` | ok |
|
||||
| 5047 | `multiuser-doe.4th` | `0xb4f6f0c2c582a4d4` | ok |
|
||||
| 5048 | `multiuser-doe.4th` | `0xb4f6f0c2c582a4d4` | ok |
|
||||
| 5049 | `multiuser-doe.4th` | `0xb4f6f0c2c582a4d4` | ok |
|
||||
| 5050 | `multiuser-doe.4th` | `0xb4f6f0c2c582a4d4` | ok |
|
||||
| 5051 | `multiuser-doe.4th` | `0xb4f6f0c2c582a4d4` | ok |
|
||||
| 5052 | `multiuser-doe.4th` | `0xb4f6f0c2c582a4d4` | ok |
|
||||
| 5053 | `multiuser-doe.4th` | `0xb4f6f0c2c582a4d4` | ok |
|
||||
| 5054 | `multiuser-doe.4th` | `0xb4f6f0c2c582a4d4` | ok |
|
||||
| 5055 | `multiuser-doe.4th` | `0xb4f6f0c2c582a4d4` | ok |
|
||||
| 5056 | `workload-5-lite.4th` | `0xea0303f38824f254` | ok |
|
||||
| 5057 | `workload-5-lite.4th` | `0xea0303f38824f254` | ok |
|
||||
| 5058 | `workload-1-lite.4th` | `0x44a7a7e3176dcc8d` | ok |
|
||||
@@ -364,10 +365,12 @@
|
||||
| 5113 | `sdk.4th` | `0x008fdbbb62c94a3a` | ok |
|
||||
| 5114 | `sdk.4th` | `0x008fdbbb62c94a3a` | ok |
|
||||
| 5115 | `sdk.4th` | `0x008fdbbb62c94a3a` | ok |
|
||||
| 5117 | `per-isa-doe.4th` | `0x73f21c35b683e295` | ok |
|
||||
| 5119 | `per-isa-doe.4th` | `0x73f21c35b683e295` | ok |
|
||||
|
||||
## Conflicts
|
||||
|
||||
None.
|
||||
|
||||
---
|
||||
*36 capsule(s) scanned. Re-run `mkcapsule --manifest <dir>` to refresh.*
|
||||
*37 capsule(s) scanned. Re-run `mkcapsule --manifest <dir>` to refresh.*
|
||||
|
||||
@@ -84,6 +84,10 @@ CREATE MU-RUN-MATRIX MU-MAX-RUNS CELLS ALLOT
|
||||
: MU-MATRIX@ ( idx -- val ) CELLS MU-RUN-MATRIX + @ ;
|
||||
VARIABLE MU-N-RUNS
|
||||
: MU-INIT-MATRIX ( -- ) MU-N-RUNS @ 0 DO I I MU-MATRIX! LOOP ;
|
||||
CREATE MU-ISA-TAG-BUF 16 ALLOT VARIABLE MU-ISA-TAG-LEN
|
||||
: MU-ISA-TAG! ( c-addr u -- )
|
||||
16 MIN DUP MU-ISA-TAG-LEN !
|
||||
MU-ISA-TAG-BUF SWAP CMOVE ;
|
||||
|
||||
Block 5050
|
||||
VARIABLE MU-SW-I VARIABLE MU-SW-J
|
||||
@@ -105,12 +109,16 @@ VARIABLE MU-RUN-ID VARIABLE MU-CFG
|
||||
VARIABLE MU-REP VARIABLE MU-NW
|
||||
VARIABLE MU-MODE VARIABLE MU-NREPS
|
||||
: MU-EMIT-TRIAL-MARKER ( -- )
|
||||
." MU-TRIAL run=" MU-RUN-ID @ .
|
||||
." MU-TRIAL isa=" MU-ISA-TAG-BUF MU-ISA-TAG-LEN @ TYPE
|
||||
." run=" MU-RUN-ID @ .
|
||||
." cfg=" MU-CFG @ .
|
||||
." rep=" MU-REP @ .
|
||||
." nw=" MU-NW @ .
|
||||
." mode=" MU-MODE @ .
|
||||
." fail=" MU-FAIL-COUNT @ . CR ;
|
||||
." fail=" MU-FAIL-COUNT @ . CR
|
||||
MU-RUN-ID @ MU-CFG @ MU-REP @ MU-NW @
|
||||
MU-MODE @ MU-FAIL-COUNT @
|
||||
MU-ISA-TAG-BUF MU-ISA-TAG-LEN @ DOE-PERSIST-TRIAL ;
|
||||
|
||||
Block 5052
|
||||
: MU-BIRTH-ALL ( -- )
|
||||
@@ -153,14 +161,15 @@ Block 5054
|
||||
MU-RUN-ID @ 1+ MU-RUN-ID ! ;
|
||||
|
||||
Block 5055
|
||||
: MU-EXEC-CAMPAIGN ( seed n-reps -- )
|
||||
: MU-EXEC-CAMPAIGN ( seed n-reps start-idx -- )
|
||||
>R
|
||||
DUP MU-NREPS !
|
||||
MU-N-CFG * MU-N-RUNS !
|
||||
SEED
|
||||
MU-INIT-MATRIX MU-SHUFFLE
|
||||
HB-ON
|
||||
0 MU-RUN-ID !
|
||||
MU-N-RUNS @ 0 DO
|
||||
R@ MU-RUN-ID !
|
||||
MU-N-RUNS @ R> DO
|
||||
I MU-CAMPAIGN-STEP
|
||||
LOOP
|
||||
HB-OFF
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
Block 5117
|
||||
( per-isa-doe.4th - per-ISA DoE driver. FABRIC-3 SXXXIV.4/ )
|
||||
( SXXXV.5/.7: 6-cell factorial from multiuser-doe.4th's own )
|
||||
( MU-EXEC-CAMPAIGN, unchanged. Adds: one fixed seed per ISA, )
|
||||
( N=3 reps/cell=18 trials/ISA (ratified 2026-09-17, not the )
|
||||
( N=2 SXXXV.5 recommended). Load multiuser-doe.4th FIRST. )
|
||||
20260917 CONSTANT AMD64-SEED
|
||||
20260918 CONSTANT AARCH64-SEED
|
||||
20260919 CONSTANT RISCV64-SEED
|
||||
18 CONSTANT PER-ISA-NREPS
|
||||
|
||||
Block 5119
|
||||
( Per-ISA entry points, single word, no args -- run ONE per )
|
||||
( boot (one-QEMU-at-a-time). Uses MU-ISA-TAG! (multiuser-doe. )
|
||||
( 4th) -- redefining MU-EMIT-TRIAL-MARKER here never worked, )
|
||||
( see FABRIC-3.md SXXXV.12 for why. )
|
||||
: RUN-AMD64-CAMPAIGN ( -- )
|
||||
S" amd64" MU-ISA-TAG!
|
||||
AMD64-SEED PER-ISA-NREPS
|
||||
S" amd64" DOE-RESUME-COUNT MU-EXEC-CAMPAIGN ;
|
||||
: RUN-AARCH64-CAMPAIGN ( -- )
|
||||
S" aarch64" MU-ISA-TAG!
|
||||
AARCH64-SEED PER-ISA-NREPS
|
||||
S" aarch64" DOE-RESUME-COUNT MU-EXEC-CAMPAIGN ;
|
||||
: RUN-RISCV64-CAMPAIGN ( -- )
|
||||
S" riscv64" MU-ISA-TAG!
|
||||
RISCV64-SEED PER-ISA-NREPS
|
||||
S" riscv64" DOE-RESUME-COUNT MU-EXEC-CAMPAIGN ;
|
||||
Reference in New Issue
Block a user