From 618ff7af4ac85c63ee2c39acc69bf763ed35b60a Mon Sep 17 00:00:00 2001 From: Nick Petalas Date: Wed, 11 Nov 2026 13:32:59 +0000 Subject: [PATCH 1/2] perf(research): shrink rounded ADD signed-residue control --- research/reverse-horner-residue/PROOF.md | 137 +++++++++++++ research/reverse-horner-residue/README.md | 155 +++++++++++++++ research/reverse-horner-residue/SOURCES.json | 66 +++++++ research/reverse-horner-residue/TASK.json | 91 +++++++++ research/reverse-horner-residue/VERIFY.json | 43 ++++ research/reverse-horner-residue/adapter.py | 194 +++++++++++++++++++ research/reverse-horner-residue/verify.py | 167 ++++++++++++++++ 7 files changed, 853 insertions(+) create mode 100644 research/reverse-horner-residue/PROOF.md create mode 100644 research/reverse-horner-residue/README.md create mode 100644 research/reverse-horner-residue/SOURCES.json create mode 100644 research/reverse-horner-residue/TASK.json create mode 100644 research/reverse-horner-residue/VERIFY.json create mode 100644 research/reverse-horner-residue/adapter.py create mode 100644 research/reverse-horner-residue/verify.py diff --git a/research/reverse-horner-residue/PROOF.md b/research/reverse-horner-residue/PROOF.md new file mode 100644 index 0000000000..bed48652c9 --- /dev/null +++ b/research/reverse-horner-residue/PROOF.md @@ -0,0 +1,137 @@ +# A linear signed-residue phase during numerator rewind + +This contribution was produced by Nick Petalas. Apache-2.0. + +Claim type: scoped constructive proof, corroborated by exact finite execution. +No new kappa or complete multiplication theorem is claimed. + +## Contract and new statement + +Use CubeJerry's compact rounded ADD compiler from [PR6990](https://github.com/CrocSwap/integer-mult-bounds/pull/6990). +For a fixed reduced rational coefficient `a/b`, write `b=2^d o`, with `o` +positive and odd. Let `L=max(bitlength(abs(a)),bitlength(b))`, `K=L+2`. +The inherited numerator construction supplies the signed integer + + N = b*x + a*y + floor(b/2) + +in `M=W+K` two's-complement bits on private port 2. Its local layout is +marker 6, the M bits in least-significant-first order, delimiter 2. At +`offset-done`, the port-2 head is on that delimiter. Public heads and the +other private bank obey the inherited contract. Numerator correctness, +its width bound, subsequent exact division and the lifecycle are credited +premises here, not new theorems or audit deliverables. + +For `o>1`, replace only the outgoing rewind-to-residue edge at each of +the two component parities. The new phase has exactly `8o+2` graph labels +and `14o+4` six-opcode rows, counting both parities. It returns the head +to the first numerator bit and enters the original `drop` state with +carry `-r`, where `r` is the unique element of `[0,o)` congruent to N. +It writes nothing, reads no public field and uses no new bank. + +For every positive M the phase uses exactly `M+1` virtual reads, `M+2` +virtual unit moves and `3M+4` executed rows, including the exit goto and +excluding the first row of `drop`. The old route uses `3M+3` reads, +`3M+4` moves and `7M+10` rows with the same boundary convention. +Thus the replacement saves `2M+2` reads, `2M+2` moves and `4M+6` executed +rows per component. Integral and dyadic coefficients have `o=1`; their +compiled tables remain identical. + +The mathematical graph construction is valid for every finite odd o. +The executable retains `o<=125` and additionally bounds L by 24, matching +the coefficient-size range of the cited current compact ADD application. +No full coefficient catalogue is constructed here. + +## Signed backward Horner recurrence + +Let the bits be `n_0,...,n_(M-1)` and `s=n_(M-1)`. Then + + N = sum_(j=0)^(M-1) n_j 2^j - s 2^M. + +Move once left from the delimiter and read s. Start the finite residue +state at `h=-s mod o`. Process the bits in descending index order, +including this first sign bit, using + + h <- (2h+n_j) mod o. + +After t processed bits, induction gives + + h = -s 2^t + sum_(j=M-t)^(M-1) n_j 2^(j-(M-t)) mod o. + +At t=M this is N modulo o. The final left move encounters marker 6; +one right move returns to the first bit. The marker separates successive +components, so the phase cannot cross into a preceding numerator. Neither +the width nor a power of two needs to be stored. This is classical Horner +evaluation applied to the supplied signed tape boundary. + +The source quotient accepts carry `-r` because `N-r` is divisible by o. +Its original low-bit discard therefore produces + + floor((N-r)/(o*2^d)) = floor(N/(o*2^d)). + +Indeed, writing `N=oQ+r` with `0<=r 1 else {}, + phase_exits={pc: key for key, pc in builder.labels.items() + if key[0] == "drop" and key[1] == twos}) + need(builder.replacement_edges == (2 if odd > 1 else 0), "both component parities") + need(not any(key[0] in ("residue", "res-digit", "res-done") + for key in builder.labels), "old residue phase absent") + return table, receipt + + +def physical_fixture(): + machine = module_from_source(PREFIX + "vendor/machine.py", "residue_machine") + names = ("RowCounter", "Tape", "encode_symbols", "symbols", "decode", "execute") + return definitions(PREFIX + "vendor/physical_fixture.py", "residue_fixture", names, + {"need": need, "M": machine, "SimpleNamespace": SimpleNamespace}) diff --git a/research/reverse-horner-residue/verify.py b/research/reverse-horner-residue/verify.py new file mode 100644 index 0000000000..3ef31646dd --- /dev/null +++ b/research/reverse-horner-residue/verify.py @@ -0,0 +1,167 @@ +"""Exact new-phase and literal lifecycle checks; no files are written.""" +from fractions import Fraction +import hashlib +import json +from pathlib import Path +import platform +import sys + +sys.path.insert(0, str(Path(__file__).resolve().parent)) +from adapter import PACKAGE, compile_add, need, physical_fixture + + +def run_phase(table, receipt, bits, parity): + """Independent bounded interpreter, starting at the numerator delimiter.""" + tape = [6, *bits, 2] + position, reads, moves = len(tape) - 1, 0, 0 + pc = receipt["phase_entries"][parity] + for steps in range(3 * len(bits) + 5): + if pc in receipt["phase_exits"]: + key = receipt["phase_exits"][pc] + need(position == 1, "rewound exactly to first numerator bit") + need(key[3] == parity, "component parity retained") + return -key[2], reads, moves, steps + row = table[pc] + if row[0] == "goto": + pc = row[1] + elif row[0] == "move": + need(row[1] == 2 and row[2] in (-1, 1), "confined unit movement") + position += row[2] + need(0 <= position < len(tape), "marker confinement") + moves += 1 + pc += 1 + elif row[0] == "branch": + need(row[1] == 2, "only numerator read") + reads += 1 + pc = dict(row[2]).get(tape[position], row[3]) + else: + raise ValueError("unexpected phase instruction") + raise ValueError("phase step bound exhausted") + + +def phase_cases(): + words = states = rows = 0 + for odd in range(3, 126, 2): + table, receipt = compile_add(Fraction(1, odd)) + need(receipt["reverse_states"] == 8 * odd + 2, "exact phase-state count") + need(receipt["reverse_rows"] == 14 * odd + 4, "exact phase-row count") + states += receipt["reverse_states"] + rows += receipt["reverse_rows"] + for width in range(1, 9): + for unsigned in range(1 << width): + bits = [(unsigned >> j) & 1 for j in range(width)] + signed = unsigned - (bits[-1] << width) + for parity in (0, 1): + residue, reads, moves, steps = run_phase(table, receipt, bits, parity) + need(residue == signed % odd, "direct signed-integer residue") + need((reads, moves, steps) == (width + 1, width + 2, 3 * width + 4), + "exact local operation counts") + words += 1 + return dict(odd_divisors=62, signed_phase_cases=words, + enumerated_phase_states=states, enumerated_phase_rows=rows) + + +def check_call(fixture, table, coefficient, target, source, width, work=None): + result = fixture.execute(table, "ADD", target, source, width, work, + count_rows=True) + a, b = coefficient.numerator, coefficient.denominator + expected = tuple(x + (a * y + b // 2) // b for x, y in zip(target, source)) + fits = all(-(1 << (width - 1)) <= value < (1 << (width - 1)) for value in expected) + need((result["error"] is None) == fits, "whole-field final-range iff") + if fits: + need(result["output"] == expected, "direct integer nearest-up ADD") + return result + + +def arithmetic_cases(fixture): + cases = successes = 0 + coefficients = (Fraction(0), Fraction(-1), Fraction(1, 2), Fraction(-2, 3), + Fraction(1, 5), Fraction(-5, 6), Fraction(7, 10), Fraction(13, 12)) + for coefficient in coefficients: + table, receipt = compile_add(coefficient) + need(all(row[0] in ("branch", "goto", "move", "write", "halt", "reject") + for row in table), "literal six-opcode table") + for width in range(1, 5): + values = range(-(1 << (width - 1)), 1 << (width - 1)) + for x in values: + for y in values: + result = check_call(fixture, table, coefficient, (x, 0), (y, 0), width) + successes += result["error"] is None + cases += 1 + if receipt["odd_divisor"] == 1: + original, _ = compile_add(coefficient, baseline=True) + need(table == original, "dyadic and integral tables byte-identical") + return dict(coefficients=len(coefficients), complete_calls=cases, + successes=successes, range_rejections=cases - successes) + + +def improvement_cases(fixture): + samples = ((Fraction(-14729531, 163840), 100, 2, 8), + (Fraction(-1379, 250), 7, 2, 4), + (Fraction(1085645, 393216), -7, 3, 4)) + evidence = [] + for coefficient, x, y, width in samples: + table, receipt = compile_add(coefficient) + original, before = compile_add(coefficient, baseline=True) + changed = check_call(fixture, table, coefficient, (x, 0), (y, 0), width) + control = fixture.execute(original, "ADD", (x, 0), (y, 0), width, count_rows=True) + need(changed["error"] is None, "new source-compatible cancellation case") + need(control["output"] == changed["output"], "resource comparator endpoint") + component_width = width + receipt["extra_width"] + need(control["actions"] - changed["actions"] == 56 * (component_width + 1), + "two-component physical-action saving") + need(control["table_rows"] - changed["table_rows"] == 8 * component_width + 12, + "two-component executed-row saving") + need(receipt["rows"] < before["rows"], "strict fixed-table improvement") + evidence.append(dict(coefficient=str(coefficient), width=width, + output=list(changed["output"]), + old_rows=before["rows"], new_rows=receipt["rows"], + saved_rows=before["rows"] - receipt["rows"], + saved_physical_actions=control["actions"] - changed["actions"], + saved_executed_rows=control["table_rows"] - changed["table_rows"])) + return evidence + + +def controls(fixture): + caught = [] + for mutant in ("unsigned", "missing-double"): + table, receipt = compile_add(Fraction(-2, 3), mutant=mutant) + failures = 0 + for unsigned in range(8): + bits = [(unsigned >> j) & 1 for j in range(3)] + residue, _, _, _ = run_phase(table, receipt, bits, 0) + failures += residue != (unsigned - (bits[-1] << 3)) % 3 + need(failures > 0, "mutant changes literal phase") + caught.append(dict(mutant=mutant, enumerated_failures=failures)) + table, _ = compile_add(Fraction(-2, 3)) + work = [fixture.Tape((1, 0) * 400, 101), fixture.Tape((0, 1) * 500, 1201)] + work[0].pos += 799 + work[1].pos += 1000 + for width in (12, 2, 7, 1): + check_call(fixture, table, Fraction(-2, 3), (0, 0), (0, 0), width, work) + late = check_call(fixture, table, Fraction(-2, 3), (0, -8), (0, 7), 4, work) + need(late["error"] is not None, "late overflow keeps the whole target unchanged") + check_call(fixture, table, Fraction(-2, 3), (0, 0), (0, 0), 2, work) + for coefficient in (Fraction(1, 127), Fraction(1, 1 << 24)): + try: + compile_add(coefficient) + except ValueError: + continue + raise ValueError("executable domain guard missing") + return dict(semantic_mutants=caught, dirty_history_calls=6, invalid_coefficients=2) + + +def main(): + fixture = physical_fixture() + result = dict(status="PASS_REVERSE_HORNER_RESIDUE", python=platform.python_version(), + phase=phase_cases(), arithmetic=arithmetic_cases(fixture), + improvement=improvement_cases(fixture), controls=controls(fixture)) + result["package_sha256"] = { + path.name: hashlib.sha256(path.read_bytes()).hexdigest() + for path in sorted(PACKAGE.iterdir()) if path.is_file() + } + print(json.dumps(result, sort_keys=True, indent=2)) + + +if __name__ == "__main__": + main() From 3e2d4bc2c37683f52847f00c2f0658b279ae061e Mon Sep 17 00:00:00 2001 From: Nick Petalas Date: Tue, 17 Nov 2026 22:41:04 +0000 Subject: [PATCH 2/2] fix(ci): sync CI verification doc and historical replay-gap verifier --- docs/ci-verification.md | 19 +++++- .../historical-selected-replay-gap/README.md | 6 +- .../SOURCES.json | 60 +++++++++--------- .../VERIFY.json | 31 +-------- .../historical-selected-replay-gap/verify.py | 63 ++++++++++++++----- 5 files changed, 100 insertions(+), 79 deletions(-) diff --git a/docs/ci-verification.md b/docs/ci-verification.md index 63ba3e9aa8..52b62d0481 100644 --- a/docs/ci-verification.md +++ b/docs/ci-verification.md @@ -1,8 +1,25 @@ # CI verification -## Current selected-family replay: #6030 +## Current selected-family replay: #7000 with #7001 The [selected record](../certificates/selected-result.json) binds conditional +κ = 0.00363005817 to the [application review](research/pr-intake-evidence/pr7000-application/PROOF-REVIEW.md), +[validation receipts](research/pr-intake-evidence/pr7000-application/VALIDATION.json), +and [explicit source closure](../certificates/frontier7000-source.json). +`make frontier7000-verify` follows that exact-source selected replay. The review +reuses eleven authenticated preceding executions and records seven fresh serial +application, scalar and complete native-catalogue executions. The earlier +monolithic timeout is retained separately and is not completed coverage. +Consult the receipts for exact commands, source heads and limits. + +The five inherited framework assumptions remain. No complete uniform word, +literal multiplier execution, independent human proof or formal-kernel proof +is asserted. Routine research submissions do not need to rerun this +selected-family replay. The sections below preserve historical checkpoints. + +## Historical selected-family replay: #6030 + +The [historical checkpoint](../certificates/checkpoints/frontier6030.json) binds conditional κ = 0.003125804 to the [proof review](research/pr-intake-evidence/pr6030-audit/PROOF-REVIEW.md), [validation receipts](research/pr-intake-evidence/pr6030-audit/VALIDATION.json), and [explicit source closure](../certificates/frontier6030-source.json). diff --git a/research/historical-selected-replay-gap/README.md b/research/historical-selected-replay-gap/README.md index 55d8cc3b49..36d9a873ca 100644 --- a/research/historical-selected-replay-gap/README.md +++ b/research/historical-selected-replay-gap/README.md @@ -69,7 +69,11 @@ python3 -B scripts/research_package.py --package research/historical-selected-re The direct command prints `PASS_HISTORICAL_SELECTED_REPLAY_GAP`. A registered replay prints `PASS_REGISTERED_RESEARCH_PACKAGE`. Both require Git history -containing the two inspected commits. +containing the two inspected commits and the source and manifest objects at +`2485805a6d47f36ea83ddde6327d453ac82d44dc`. The verifier uses a temporary +sparse checkout of that commit, checks the declared source digests there, and +uses its planner and manifest inventory. The recorded rejections and selection +therefore remain reproducible after later changes to the live Makefile or CI guide. ## Open next questions diff --git a/research/historical-selected-replay-gap/SOURCES.json b/research/historical-selected-replay-gap/SOURCES.json index c1010eec95..62bb8b3950 100644 --- a/research/historical-selected-replay-gap/SOURCES.json +++ b/research/historical-selected-replay-gap/SOURCES.json @@ -4,13 +4,13 @@ "files": [ { "path": "Makefile", - "usage": "input", + "usage": "provenance", "git_blob": "0d683a06b9e7ee162496108ce9a7c5d2ee94fccf", "sha256": "4f2d4f2dcd15139ec82658a975f85ed300897385f85799218539f4c8d60567da" }, { "path": "certificates/partial-swap-network.json", - "usage": "input", + "usage": "provenance", "git_blob": "eccafa830c16170c36faf93045ddf1f638f7bcd4", "sha256": "4c0b9d37e1034b2076e30a70f8e514416298c462d9ee98bc87fe6556b14df786" }, @@ -22,7 +22,7 @@ }, { "path": "docs/ci-verification.md", - "usage": "input", + "usage": "provenance", "git_blob": "63ba3e9aa8bdc5e942b56e34244b92b16f854085", "sha256": "c7d3027e9ad8bcbff68f07aa9576b30fb2f3c76c44d876d40c7fdbf4a3e2228a" }, @@ -34,163 +34,163 @@ }, { "path": "research/clifford-state-performance/SOURCE.json", - "usage": "input", + "usage": "provenance", "git_blob": "6f98a0061a5104dfab82c9e806f819b41811f684", "sha256": "396d0f08df24952248140d5c65c51b8c902ef1c580892ff7ea182890530f67ee" }, { "path": "research/community-batch1047-audit/CONTENT-COVERAGE.json", - "usage": "input", + "usage": "provenance", "git_blob": "5e0f92af463ec12c5e1dcc3effd44081a88af647", "sha256": "07a9daeaf2bda308a92e9a4684f13d5fc766c7772d74801fceb7f4599fdab226" }, { "path": "research/community-batch1099-audit/CONTENT-COVERAGE.json", - "usage": "input", + "usage": "provenance", "git_blob": "9e13266bf85e627f1b7dc225e9530ea69fd2c7f0", "sha256": "421e1211fb1897c45621dc6801c276e53f2e6f335583c9c9049e535f87c0a3b1" }, { "path": "research/community-batch932-audit/CONTENT-COVERAGE.json", - "usage": "input", + "usage": "provenance", "git_blob": "cc4d03eb59b9ab3f952735f7e88ff18c2d15d7af", "sha256": "184629cac91a5cfaca50330a88596008b824221433867dcf8117539c913c284a" }, { "path": "research/community-batch970-audit/CONTENT-COVERAGE.json", - "usage": "input", + "usage": "provenance", "git_blob": "8b9f4111badf7de5d97684799560b55110e9da79", "sha256": "23188ed920e38a54006cb883e181585620821c63bf7e8b5e05d32719417cc37e" }, { "path": "research/community-frontier741-audit/CONTENT-COVERAGE.json", - "usage": "input", + "usage": "provenance", "git_blob": "a5300d4e7a5381a3f443fc54c768ca6f0f236d68", "sha256": "3c820fb30e1b4d9bcfc6a7ab524375e5b2abd66b940af2c509146104f0bcd79c" }, { "path": "research/community-frontier890-audit/CONTENT-COVERAGE.json", - "usage": "input", + "usage": "provenance", "git_blob": "d7ff6d777b01d69b6ce84caf25d3b7e4a4d2f211", "sha256": "6b185a9902652f893f3ebd8ada92d2f11b6de6533a9a4d11718a8a4496101128" }, { "path": "research/community-hyperplane599-audit/SOURCE.json", - "usage": "input", + "usage": "provenance", "git_blob": "546f37d326d10a99910ae8f908e71ef768524d98", "sha256": "65099d764bfcc39bda5e4d9966783611b094c3522dbdd1435cd498d657a8ef8e" }, { "path": "research/community-k492-audit/SOURCE.json", - "usage": "input", + "usage": "provenance", "git_blob": "e538481e4cb16ed936d3195f2dfb5b5a9ca0a76b", "sha256": "2c0f4fa5bc150d05658af2e7c54c4d2c337dd52b7efd3d69530ae73bcbdf452a" }, { "path": "research/community-reconciliation92-audit/MANIFEST.json", - "usage": "input", + "usage": "provenance", "git_blob": "2a2e93685173d5f13cbb5abe740f5d90352e0228", "sha256": "5f501f3c118131e7d069f30ad77186eb2ad6961f9680a0ef105f4514ed41808a" }, { "path": "research/partial-swap-digest/baseline.py", - "usage": "input", + "usage": "provenance", "git_blob": "a2f0190704db83bd8ef48e46e723c49b925804fe", "sha256": "81e9af92cdf38243a540cdcff2062778e449467848d444da37a9553c12ca4c34" }, { "path": "research/r420-two-sided-basis/SOURCES.json", - "usage": "input", + "usage": "provenance", "git_blob": "5d718e11e62f4bcadecf1e02d6b61f87dbe190b0", "sha256": "d9810b0d139c5a1211fd2c1f0d142187cc1fca30026e1e7bc4f9ecfacf1596d1" }, { "path": "research/skip-clones/SOURCE.json", - "usage": "input", + "usage": "provenance", "git_blob": "8d1bb3b9c8189e35e5d8bfdfa632d7473e8be0d5", "sha256": "0b68e63e35a97ce6b0cdb6e291b88ebaa8f2dd4afb70b2498f10ee89428258dc" }, { "path": "research/split-skip/SOURCE.json", - "usage": "input", + "usage": "provenance", "git_blob": "2ab610b6ea2edd2865fda793ef2168b0c76afb4f", "sha256": "7c2b4646a3ecfef6f881da5c43e4bd0fa9a4d1b00548b8ab458d897e16735134" }, { "path": "scripts/historical-ci-inputs/Makefile", - "usage": "input", + "usage": "provenance", "git_blob": "aff68409021c9d401a6f8013b9dfd7dbcc30f2a8", "sha256": "ea8830dd79da493e2d75baf753d733ff7efbcf2b4794afe41fae0ac8f3055646" }, { "path": "scripts/historical-ci-inputs/ledger-batch932-run_isolated_tests.py", - "usage": "input", + "usage": "provenance", "git_blob": "65db599ab0b1dea0312c4ca048e0bd0f44c3736f", "sha256": "96ea543e6c707424afe247e77bd86c82152f90fc76a0773c4232145da5cdf8d1" }, { "path": "scripts/historical-ci-inputs/ledger-batch932-test_isolated_test_runner.py", - "usage": "input", + "usage": "provenance", "git_blob": "34820a8f24678f918f4d0e7a35380d8013fc3495", "sha256": "628391b6abfbc8674ceec1751867a4392f2cc0b5b66886243e139af86cf355ac" }, { "path": "scripts/historical-ci-inputs/ledger-batch970-verify_selected_result.py", - "usage": "input", + "usage": "provenance", "git_blob": "c755b76e0d44ba4917aa94440ebe54daefce5b2a", "sha256": "d7fd929726b326aeeaf0a3996475adec88eee9aac09ae0bebeeaa0bc1fc8f199" }, { "path": "scripts/historical-ci-inputs/ledger-frontier741-ci-verification.md", - "usage": "input", + "usage": "provenance", "git_blob": "7f3c012504187917a728b9fe87043f0fc8cd006a", "sha256": "a854022e0e1d5d4db4d60e586be3ea56005013ef14a1fc06d02bc06e8529c4b0" }, { "path": "scripts/historical-ci-inputs/partial-swap-context.json", - "usage": "input", + "usage": "provenance", "git_blob": "ad65114886bf34a4fd27e79f3be502389e689faa", "sha256": "833a9642f33aeab2ffea17ec9c6b82e0a953f90192b2c82e10bef21538dccba9" }, { "path": "scripts/historical-ci-inputs/partial-swap-network.json", - "usage": "input", + "usage": "provenance", "git_blob": "52075f2463f60af5e16571347f24274fce73a1ea", "sha256": "f3c4be597b2f2136da4ae2cc80c7454f63c90aa01f84e5b8131cee4dd55de815" }, { "path": "scripts/partial_swap/shared.py", - "usage": "input", + "usage": "provenance", "git_blob": "44a0e454c70f9c4b98e258b8443612e6a119904b", "sha256": "5a0646a50b9f3e8ea55168620a78e8853b0ab810517cefc8cfb8696aedee278a" }, { "path": "scripts/replay_historical_check.py", - "usage": "input", + "usage": "provenance", "git_blob": "1e92fff2782970ef71378f594f2350d245a4db26", "sha256": "5467619c78183d3adc82b0cb55af28e5c1a01fca2b0588677816244b53e2bafd" }, { "path": "scripts/research_package.py", - "usage": "input", + "usage": "provenance", "git_blob": "091b4c8f58bac9a9580d76025b887dc5c873d05f", "sha256": "e1256016e7f51827d04fa2179255989f639ae1d97afaa9c16265f85a0c6abd70" }, { "path": "scripts/run_isolated_tests.py", - "usage": "input", + "usage": "provenance", "git_blob": "a96ab35b315ce492e7fbbfd6c5ae211aa066b541", "sha256": "49eb56dd0fc0d8d8ffdb209970a7adf2176223580646f575d5c22e59543b381c" }, { "path": "scripts/verify_selected_result.py", - "usage": "input", + "usage": "provenance", "git_blob": "6882a4700e410dec569b51ae2eaf1a19cc019195", "sha256": "d6b305eac5b9bdb8172c469ad30a1655a60fa0aceac8b1bf610e1b73f51babd8" }, { "path": "tests/test_isolated_test_runner.py", - "usage": "input", + "usage": "provenance", "git_blob": "343b24abf6719b81805eba5a84c74e57634c8288", "sha256": "3a5470d0b139828b90e19bf9583ddeafcd69f8e34f2824664eb3a2958a52e34d" } diff --git a/research/historical-selected-replay-gap/VERIFY.json b/research/historical-selected-replay-gap/VERIFY.json index 98553e72ed..ab7efa3471 100644 --- a/research/historical-selected-replay-gap/VERIFY.json +++ b/research/historical-selected-replay-gap/VERIFY.json @@ -4,36 +4,7 @@ "python": "3.12", "requirements": [], "inputs": [ - "Makefile", - "certificates/partial-swap-network.json", - "docs/ci-verification.md", - "research/clifford-state-performance/SOURCE.json", - "research/community-batch1047-audit/CONTENT-COVERAGE.json", - "research/community-batch1099-audit/CONTENT-COVERAGE.json", - "research/community-batch932-audit/CONTENT-COVERAGE.json", - "research/community-batch970-audit/CONTENT-COVERAGE.json", - "research/community-frontier741-audit/CONTENT-COVERAGE.json", - "research/community-frontier890-audit/CONTENT-COVERAGE.json", - "research/community-hyperplane599-audit/SOURCE.json", - "research/community-k492-audit/SOURCE.json", - "research/community-reconciliation92-audit/MANIFEST.json", - "research/partial-swap-digest/baseline.py", - "research/r420-two-sided-basis/SOURCES.json", - "research/skip-clones/SOURCE.json", - "research/split-skip/SOURCE.json", - "scripts/historical-ci-inputs/Makefile", - "scripts/historical-ci-inputs/ledger-batch932-run_isolated_tests.py", - "scripts/historical-ci-inputs/ledger-batch932-test_isolated_test_runner.py", - "scripts/historical-ci-inputs/ledger-batch970-verify_selected_result.py", - "scripts/historical-ci-inputs/ledger-frontier741-ci-verification.md", - "scripts/historical-ci-inputs/partial-swap-context.json", - "scripts/historical-ci-inputs/partial-swap-network.json", - "scripts/partial_swap/shared.py", - "scripts/replay_historical_check.py", - "scripts/research_package.py", - "scripts/run_isolated_tests.py", - "scripts/verify_selected_result.py", - "tests/test_isolated_test_runner.py" + "scripts/research_package.py" ], "commands": [ { diff --git a/research/historical-selected-replay-gap/verify.py b/research/historical-selected-replay-gap/verify.py index 83b995941a..9d266c5a4e 100644 --- a/research/historical-selected-replay-gap/verify.py +++ b/research/historical-selected-replay-gap/verify.py @@ -6,8 +6,10 @@ """ import hashlib import importlib.util +import json import subprocess import sys +import tempfile from pathlib import Path ROOT = Path(__file__).resolve().parents[2] @@ -61,31 +63,47 @@ def require(ok, message): raise SystemExit(message) -def load_checker(): - path = ROOT / "scripts/replay_historical_check.py" - spec = importlib.util.spec_from_file_location("historical_selected_replay_gap_checker", path) +def load_module(path): + spec = importlib.util.spec_from_file_location(path.stem, path) module = importlib.util.module_from_spec(spec) spec.loader.exec_module(module) return module +def checkout_snapshot(snapshot, sources, runner, env): + paths = [runner.canonical_relative_path(row["path"]) for row in sources["files"]] + git = ["git", "-c", "maintenance.auto=false", "-c", "gc.auto=0", + "-c", "core.autocrlf=false"] + subprocess.run([*git, "clone", "--quiet", "--shared", "--no-tags", "--no-checkout", + "--", str(ROOT), str(snapshot)], cwd=ROOT, env=env, check=True) + subprocess.run([*git, "update-ref", "--no-deref", "HEAD", INSPECTED], + cwd=snapshot, env=env, check=True) + # The pinned planner reads omitted manifests from the sparse HEAD/index. + patterns = "".join(f"/{path.as_posix()}\n" for path in paths) + subprocess.run([*git, "sparse-checkout", "set", "--no-cone", "--stdin"], + cwd=snapshot, env=env, input=patterns.encode("utf-8"), check=True) + subprocess.run([*git, "read-tree", "-mu", "HEAD"], cwd=snapshot, env=env, check=True) + for path, row in zip(paths, sources["files"], strict=True): + require(hashlib.sha256((snapshot / path).read_bytes()).hexdigest() == row["sha256"], + "historical checkout source digest changed: " + path.as_posix()) + + def entries(checker): for name, config in checker.CONFIG.items(): for entry in [config, *config.get("additional_inputs", [])]: yield name, entry -def reject(checker, entry): +def reject(root, checker, entry): try: - checker.authenticated_input(ROOT, entry) + checker.authenticated_input(root, entry) except ValueError as exc: return str(exc) raise SystemExit("historical input was admitted: " + entry["path"]) -def main(): - require(not sys.flags.optimize, "assertions must stay enabled") - checker = load_checker() +def check_snapshot(root, env): + checker = load_module(root / "scripts/replay_historical_check.py") selected = [entry for name, entry in entries(checker) if name == "tooling-ledger" and entry["path"] == SELECTED_PATH] require(len(selected) == 1, "selected-result checker overlay is not unique") @@ -94,7 +112,7 @@ def main(): require(entry["accepted_live_sha256"] == [SELECTED_ACCEPTED], "accepted selected-checker successors changed") frozen = (checker.INPUTS / entry["input"]).read_bytes() - live = (ROOT / SELECTED_PATH).read_bytes() + live = (root / SELECTED_PATH).read_bytes() require(hashlib.sha256(frozen).hexdigest() == SELECTED_PIN, "frozen selected checker bytes changed") require(hashlib.sha256(live).hexdigest() == SELECTED_LIVE, "live selected checker digest changed") require(SELECTED_LIVE not in (SELECTED_PIN, SELECTED_ACCEPTED), "live checker was already admitted") @@ -102,7 +120,7 @@ def main(): # live successor, not a broken comparison. require(SELECTED_PIN in (SELECTED_PIN, *entry["accepted_live_sha256"]), "pin membership control failed") - require(reject(checker, entry) == REJECTIONS[SELECTED_PATH][1], + require(reject(root, checker, entry) == REJECTIONS[SELECTED_PATH][1], "selected checker rejection text changed") counts = {path: 0 for path in REJECTIONS} @@ -110,7 +128,7 @@ def main(): for _name, item in entries(checker): if item["path"] not in REJECTIONS: continue - message = reject(checker, item) + message = reject(root, checker, item) counts[item["path"]] += 1 messages.setdefault(item["path"], message) for path, (count, message) in REJECTIONS.items(): @@ -118,20 +136,31 @@ def main(): require(messages[path] == message, "rejection text changed for " + path) require(sum(counts.values()) == 19, "rejection total changed") ci = [item for _name, item in entries(checker) if item["path"] == CI_PATH] - require(len(ci) == 1 and hashlib.sha256((ROOT / CI_PATH).read_bytes()).hexdigest() == CI_LIVE, + require(len(ci) == 1 and hashlib.sha256((root / CI_PATH).read_bytes()).hexdigest() == CI_LIVE, "selected CI note digest changed") diff = subprocess.check_output( - ["git", "diff", "--name-only", PARENT, INSPECTED], cwd=ROOT, text=True) + ["git", "diff", "--name-only", PARENT, INSPECTED], cwd=root, env=env, text=True) changed = sorted(name for name in diff.splitlines() if name) require(changed == CHANGED, "inspected commit diff changed") - sys.path.insert(0, str(ROOT / "scripts")) - from research_package import plan_details - details = plan_details(ROOT, set(changed)) + planner = load_module(root / "scripts/research_package.py") + details = planner.plan_details(root, set(changed)) require([row["package"] for row in details] == PLAN_PACKAGES, "helper plan selection changed") matched = {name for row in details for names in row["causes"].values() for name in names} require(sorted(set(changed) - matched) == UNMATCHED, "unmatched plan paths changed") - require(plan_details(ROOT, set()) == [], "empty change set selected a package") + require(planner.plan_details(root, set()) == [], "empty change set selected a package") + + +def main(): + require(not sys.flags.optimize, "assertions must stay enabled") + sources = json.loads(Path(__file__).with_name("SOURCES.json").read_bytes()) + require(sources["base_commit"] == INSPECTED, "historical checkout base changed") + runner = load_module(ROOT / "scripts/research_package.py") + env = runner.git_source_env() + with tempfile.TemporaryDirectory(prefix="historical-selected-replay-") as temporary: + snapshot = Path(temporary) / "snapshot" + checkout_snapshot(snapshot, sources, runner, env) + check_snapshot(snapshot, env) print("PASS_HISTORICAL_SELECTED_REPLAY_GAP") print("selected_checker_live=" + SELECTED_LIVE) print("rejections=19 distinct_paths=7 plan_packages=9")