From 060749f4000e71dba9b1cfcc12a6b91c887e2cb3 Mon Sep 17 00:00:00 2001 From: Nick Petalas Date: Thu, 12 Nov 2026 18:22:55 +0000 Subject: [PATCH 1/2] perf(research): remove two selected left-map CNOTs --- .../PROOF.md | 88 +++++++++++++++ .../README.md | 89 +++++++++++++++ .../SOURCES.json | 18 +++ .../TASK.json | 101 +++++++++++++++++ .../VERIFY.json | 34 ++++++ .../verify.py | 106 ++++++++++++++++++ 6 files changed, 436 insertions(+) create mode 100644 research/selected-linear-cnot-cancellation/PROOF.md create mode 100644 research/selected-linear-cnot-cancellation/README.md create mode 100644 research/selected-linear-cnot-cancellation/SOURCES.json create mode 100644 research/selected-linear-cnot-cancellation/TASK.json create mode 100644 research/selected-linear-cnot-cancellation/VERIFY.json create mode 100644 research/selected-linear-cnot-cancellation/verify.py diff --git a/research/selected-linear-cnot-cancellation/PROOF.md b/research/selected-linear-cnot-cancellation/PROOF.md new file mode 100644 index 0000000000..12f18c6db0 --- /dev/null +++ b/research/selected-linear-cnot-cancellation/PROOF.md @@ -0,0 +1,88 @@ +# Twenty-five CNOTs for the selected left binary map + +Claim type: an exact finite word certificate and a scoped all-column proof. +This contribution was produced by Nick Petalas. Apache-2.0. + +## Source and new step + +Jerry Chen / CubeJerry's [PR #7430](https://github.com/CrocSwap/integer-mult-bounds/pull/7430), +head `39b40c465f7636a4bb6d70af28595fe8f70f4f3f`, binds the left binary +factor of selected MOVE24472 to the matrix with row masks + +```text +G = (3, 5, 9, 17, 32, 65, 129, 1, 256). +``` + +Bit i in a row mask is the coefficient of input coordinate i. Thus + +```text +Gx = (x0+x1, x0+x2, x0+x3, x0+x4, x5, + x0+x6, x0+x7, x0, x8), +``` + +where every addition is in F2. That source's +[MATRICES.json](https://github.com/CubeJerry/integer-mult-bounds/blob/39b40c465f7636a4bb6d70af28595fe8f70f4f3f/research/literal-selected-linear-maps/MATRICES.json) +records a 27-gate left word. Gate pairs are `(target, control)` in temporal +order, with action `x[target] ^= x[control]`. + +The new step removes its adjacent gates at zero-based positions 5 and 6. +Both are `(1,0)`. For `E=I+e1 e0^T`, the scalar product `e0^T e1` is zero, +so `E^2=I` over F2. The full product is therefore unchanged after removing +this adjacent pair. This elementary involution identity is classical; the +contribution is its application to this specified word and the shorter +explicit certificate. + +The resulting 25-gate temporal word is + +```text +(7,0) (6,0) (4,0) (3,0) (2,0) +(0,1) (1,0) (2,1) (1,2) (2,1) +(3,2) (2,3) (3,2) (4,3) (3,4) +(4,3) (5,4) (4,5) (5,4) (6,5) +(5,6) (6,5) (7,6) (6,7) (7,6). +``` + +The verifier establishes this new word's matrix identity directly by row +addition from I, rather than relying on correctness of the predecessor's +word. A separate explicit-coordinate oracle checks its entire address +action. No predecessor executable is imported or replayed. + +## Every positive column multiplicity + +For any positive integer f, let each xi be an arbitrary vector in F2^f. +Apply every gate by componentwise XOR. A gate acts independently on each +bit column, so the new word is the direct sum of f copies of G under the +coordinate/column regrouping. The same cancellation holds at every column. +Consequently the map on all nine f-bit coordinates is exactly G, coordinate +8 is fixed, and reversing the word is its inverse. Any additional untouched +coordinates or payload indices remain fixed as well. + +Executing one coordinate CNOT at each column uses 25f elementary column +CNOTs, compared with the cited 27f. This saves exactly 2f such calls. This +is a gate-count statement, not an exact local tape instruction count. + +The endpoint equality also holds as a permutation of an arbitrary payload +array indexed by these addresses: every source address has the same image. +It does not supply a new physical staging, erasure or owner-return program. + +## Verification and limits + +The checker evaluates the new word on all 512 addresses at f=1 and all +262,144 addresses at f=2, including the inverse and the spectator at every +address. It also checks the exact nine-row matrix identity. Three controls +reject an extra deletion, reversed control directions, and a purported f=2 +implementation that only updates the first bit column. + +The all-f statement follows from the direct-sum proof above; the finite +censuses are corroboration. No minimum CNOT count is claimed. The right +factor, phase recipes, offset, central native operator and the selected +frontier are not improved here. Integrating the word into the literal tape +compiler, executing its new graph, and measuring complete instructions and +historical storage remain open. No physical speedup, supplier admission, +complete multiplication theorem, or new kappa is claimed. + +The selected five framework assumptions remain. Independent human and +formal proof-kernel review are unclaimed. The source's matrix/source binding, +27-gate comparison point, and literal implementation belong to Jerry Chen / +CubeJerry. Credit also its #3834, #5188, #6992 and retained native/compiler +lineage. Their results are cited premises, not validation deliverables here. diff --git a/research/selected-linear-cnot-cancellation/README.md b/research/selected-linear-cnot-cancellation/README.md new file mode 100644 index 0000000000..cdd0fc2def --- /dev/null +++ b/research/selected-linear-cnot-cancellation/README.md @@ -0,0 +1,89 @@ +# Remove two CNOTs from the selected left binary map + +**Exact finite certificate and scoped all-column proof; no new kappa.** +This contribution was produced by Nick Petalas. Apache-2.0. + +The left binary map of MOVE24472 has an explicit **25-CNOT word**, improving +the 27-CNOT word recorded by Jerry Chen / CubeJerry in +[PR #7430](https://github.com/CrocSwap/integer-mult-bounds/pull/7430) at +`39b40c465f7636a4bb6d70af28595fe8f70f4f3f`. Its adjacent gates 5 and 6 are +both `x1 ^= x0`; their composition is the identity. The shorter word is +printed and proved in [PROOF.md](PROOF.md). + +Its exact matrix has rows `(3,5,9,17,32,65,129,1,256)`. The identity holds +for every positive number f of binary columns and arbitrary payloads, +saving exactly 2f elementary column CNOT calls. Coordinate 8 and untouched +spectators remain fixed. This is the first strict word improvement found; +no shortest-word or additional synthesis claim is made. + +## Reproduce + +From the repository root, with CPython 3.12 and its standard library: + +```sh +/Users/nick/git/integer-mult-bounds/.venv/bin/python3.12 -I -W error -B research/selected-linear-cnot-cancellation/verify.py +/Users/nick/git/integer-mult-bounds/.venv/bin/python3.12 -I -O -W error -B research/selected-linear-cnot-cancellation/verify.py +/Users/nick/git/integer-mult-bounds/.venv/bin/python3.12 -B scripts/research_package.py --package research/selected-linear-cnot-cancellation +/Users/nick/git/integer-mult-bounds/.venv/bin/python3.12 -B scripts/check_research_commit.py --package research/selected-linear-cnot-cancellation --check-source-history +``` + +Another CPython 3.12 path can replace the local interpreter. Direct replay +prints `PASS_SELECTED_LINEAR_CNOT_CANCELLATION` in a generated JSON receipt +bound to all six package source hashes. It writes nothing. It checks the +new matrix by row addition and the complete new forward/inverse maps by a +separate explicit-coordinate oracle: 512 addresses at f=1 and 262,144 at +f=2. Three malformed implementations are distinguished. No predecessor +executable or scientific suite is run. + +## Scope, provenance and overlap + +The selected baseline metadata check passed against main +`e54523517d0f03e58352e647c403a5af3e525a57`, priority revision 8, selected +#7000. [SOURCES.json](SOURCES.json) pins that orientation context. The new +word and target matrix are explicit package constants; replay does not +depend on the pending predecessor commit being present in Git history. +The cited source file fixes the comparison and target, rather than acting +as an undeclared executable input. + +The [advance CLAIM](https://github.com/CrocSwap/integer-mult-bounds/discussions/1166#discussioncomment-19571878) +asks for the first shorter word. Live claims, open PRs, account history, +merged CNOT/24472 work and main README searches were checked. No overlapping +shorter word for this matrix was found. These bounded searches do not prove +literature novelty. Classical CNOT cancellation is not a new theorem. + +No literal tape graph is changed or executed here. Exact instruction counts, +whole-call staging, owner return, precision and complete MOVE composition +remain separate obligations. No selected frontier, recursive invoice or +five-framework-assumption claim changes. Credit Jerry Chen / CubeJerry's +#7430 and its #3834/#5188/#6992 native/compiler lineage. Independent human +and formal proof-kernel review are unclaimed. + +## Code bounds + +The checker has no recursion, network, subprocess or filesystem writes. +There are at most 27 gates and nine coordinates; the largest streamed +address domain has 262,144 elements. Only one nine-coordinate input/output +pair is live per iteration. Every function is under 60 physical lines. +Exception-based checks remain enabled under optimization. The source-hash +reader admits six fixed package files of at most 128 KiB each and assumes +the package stays stable during replay. Normal and optimized warning-strict +execution and AST inspection are the local diagnostics. + +Power-of-ten rule 3 deviation: CPython allocates integers, tuples and lists +during this offline finite checker. Fixed gate/address/file bounds and a +120-second registered timeout bound its work and live data. A fixed-storage +port is required before use in a steady service. No compiler configuration +or shared verifier code is changed. Build the Lever led to the rerunnable +word certificate; Prove It Works led to the separate complete-address oracle. + +## Open next questions + +1. Integrate the 25-gate word into #7430's literal compiler and obtain fresh + graph, full-array and history receipts. First replace only its frozen left + word and regenerate that graph. The complete literal replay and source + binder remain the blockers to claiming an instruction-count improvement. +2. Is 25 optimal for this exact matrix? First derive a gate-count lower bound + or run a separately budgeted bounded synthesis. This package stops at its + first strict improvement and supplies neither a search nor an optimum. + +[TASK.json](TASK.json) records the changed card and structured next questions. diff --git a/research/selected-linear-cnot-cancellation/SOURCES.json b/research/selected-linear-cnot-cancellation/SOURCES.json new file mode 100644 index 0000000000..5335fa97d9 --- /dev/null +++ b/research/selected-linear-cnot-cancellation/SOURCES.json @@ -0,0 +1,18 @@ +{ + "schema_version": 1, + "base_commit": "e54523517d0f03e58352e647c403a5af3e525a57", + "files": [ + { + "path": "certificates/selected-result.json", + "usage": "provenance", + "git_blob": "75d77b328ea02ded535e7f23aee5b1e55d0bb1a8", + "sha256": "154c3d30455d778fd3343b6b4851f0fa4665f0f7625b0adb3675e2bafbbf6bf1" + }, + { + "path": "docs/research/agent-task-catalog.json", + "usage": "provenance", + "git_blob": "3404fbdd5e7529a0674eef26114b5071e4586cec", + "sha256": "ead6cdc9d0af6d58e8a49744d8ec8c7c15e13d2ba93c276c434bcf9b51b93a81" + } + ] +} diff --git a/research/selected-linear-cnot-cancellation/TASK.json b/research/selected-linear-cnot-cancellation/TASK.json new file mode 100644 index 0000000000..8deb96dc01 --- /dev/null +++ b/research/selected-linear-cnot-cancellation/TASK.json @@ -0,0 +1,101 @@ +{ + "schema_version": 1, + "task_id": "formal-interface-lemma", + "priority_revision": 8, + "base_commit": "e54523517d0f03e58352e647c403a5af3e525a57", + "original_card": { + "id": "formal-interface-lemma", + "question": "Can one uncovered interface implication be formalized with exact caller and certificate bindings?", + "starting_points": [ + "docs/research/research-family-status.md", + "certificates/selected-result.json", + "research/gate-operand-parity-lean/README.md", + "research/staged544-certified-endpoint/README.md", + "research/unconditional-batched-crt/README.md" + ], + "methods": [ + "Formalize a missing boundary lemma identified by the selected review.", + "Audit a formal theorem-to-certificate binding independently." + ], + "acceptance_gate": "State the exact formalized proposition and remaining assumptions; avoid duplicate arithmetic formalizations already present.", + "first_step": { + "command": [ + "python3", + "-B", + "scripts/research_selected_baseline.py" + ], + "expected": "PASS_RESEARCH_BASELINE_BINDINGS_ONLY", + "inspect": "Resolve the current selected review, separate complex/ordinary BIT/admitted BIT/outer budgets, and compare the card against live handoffs before starting. Historical ceilings require exact source/model equivalence.", + "scope": "Source-binding orientation only; not a scientific replay or all-size proof. Materialize selected inputs if this checkout is sparse." + }, + "first_experiment": "Write one missing statement with quantified hypotheses, actual caller and existing coverage. A compact-switch lemma is a candidate only after its mathematical contract is reviewed. Establish a bounded proof plan before a separately budgeted proof-assistant build; do not rerun large Lean jobs as orientation.", + "bottleneck_link": "A missing interface proof can reduce the conditional gap even if it does not change kappa.", + "allowed_variations": [ + "Narrow to one formal lemma or one theorem-to-certificate binding." + ], + "scope_change_triggers": [ + "Formalizing already-covered arithmetic and claiming the full multiplication theorem." + ], + "overlap_terms": [ + "hyperplane end", + "formal interface", + "Lean binding", + "3807", + "3857", + "4100", + "gate-operand-parity-lean", + "staged544-certified-endpoint", + "unconditional-batched-crt" + ], + "existing_checks": [ + { + "scope": "PR #3807: scoped gate-operand parity formalization.", + "evidence": "research/gate-operand-parity-lean/README.md", + "remaining": "Exact theorem-to-caller binding and genuinely uncovered interface lemmas.", + "status": "author-checked", + "source_commit": "4c3530f42a6abcc48e7a6bcffd6c901911dc8269", + "selected_record_sha256": "bb2eaa58647b353f88d0aec2eafb9d30df1be53589231b23e12ceef3e4bad129" + }, + { + "scope": "PR #3857: certified real-power moment/endpoint arithmetic.", + "evidence": "research/staged544-certified-endpoint/README.md", + "remaining": "Uniform algorithmic implications, not another endpoint digit.", + "status": "author-checked", + "source_commit": "ef4315b8caa605e47a2515004845eb2d2ed71a86", + "selected_record_sha256": "bb2eaa58647b353f88d0aec2eafb9d30df1be53589231b23e12ceef3e4bad129" + }, + { + "scope": "PR #4100: compact-switch formalization proposed as future validation.", + "evidence": "research/unconditional-batched-crt/README.md", + "remaining": "Audit the statement and assumptions before a formal proof campaign.", + "status": "author-checked", + "source_commit": "337d04939571a637aeab54a0f58f54fde811663a", + "selected_record_sha256": "bb2eaa58647b353f88d0aec2eafb9d30df1be53589231b23e12ceef3e4bad129" + } + ] + }, + "scope_status": "changed", + "actual_scope": "An explicit 25-CNOT word for the selected MOVE24472 left binary map, improving the cited 27-gate word, with a scoped all-positive-column proof.", + "scope_change_reason": "The formal-interface card is narrowed to a constructive finite binary-map side result. No proof assistant or all-size physical caller binding is claimed.", + "bottleneck_link": "The selected native monomial needs this exact binary permutation. Two adjacent identical CNOTs can be removed, reducing its elementary gate passes before physical compiler integration.", + "budget_minutes": 60, + "stop_rule": "Ship the first strict verified gate-count improvement; do not extend synthesis.", + "outcome": "completed", + "evidence": "PROOF.md and verify.py: exact matrix identity, complete forward/inverse f=1 and f=2 address censuses, three controls.", + "author": "Nick Petalas", + "ai_assistance": "Independent human and formal proof-kernel review are unclaimed.", + "open_questions": [ + { + "question": "What exact literal tape instructions and history does the shorter word save?", + "why_it_matters": "Gate counts alone do not supply the complete physical bill.", + "first_step": "Replace the left frozen word in PR7430 and regenerate its literal graph and full-array receipts.", + "blocked_by": "No updated literal compiler graph or full tape execution is supplied." + }, + { + "question": "Is the 25-CNOT word optimal for this exact matrix?", + "why_it_matters": "A lower bound would distinguish a strict improvement from a shortest word.", + "first_step": "Derive a source-specific lower bound or budget a bounded synthesis.", + "blocked_by": "This package stops at the first improvement and runs no optimal synthesis." + } + ] +} diff --git a/research/selected-linear-cnot-cancellation/VERIFY.json b/research/selected-linear-cnot-cancellation/VERIFY.json new file mode 100644 index 0000000000..896a3a1a6d --- /dev/null +++ b/research/selected-linear-cnot-cancellation/VERIFY.json @@ -0,0 +1,34 @@ +{ + "schema_version": 1, + "status": "ready", + "python": "3.12", + "requirements": [], + "inputs": [], + "commands": [ + { + "argv": [ + "{python}", + "-I", + "-W", + "error", + "-B", + "{package}/verify.py" + ], + "timeout_seconds": 120, + "checks": "Exact new matrix identity; complete f=1 and f=2 address and inverse maps; spectator preservation; three rejection controls; generated source-hash receipt." + }, + { + "argv": [ + "{python}", + "-I", + "-O", + "-W", + "error", + "-B", + "{package}/verify.py" + ], + "timeout_seconds": 120, + "checks": "Exact new matrix identity; complete f=1 and f=2 address and inverse maps; spectator preservation; three rejection controls; generated source-hash receipt." + } + ] +} diff --git a/research/selected-linear-cnot-cancellation/verify.py b/research/selected-linear-cnot-cancellation/verify.py new file mode 100644 index 0000000000..52141a67f5 --- /dev/null +++ b/research/selected-linear-cnot-cancellation/verify.py @@ -0,0 +1,106 @@ +#!/usr/bin/env python3 +"""Certify the shorter selected left-map word; standard library, no writes.""" + +import hashlib +import json +from pathlib import Path + + +TARGET = (3, 5, 9, 17, 32, 65, 129, 1, 256) +# Temporal order; each pair means row[target] ^= row[control]. +WORD = ( + (7, 0), (6, 0), (4, 0), (3, 0), (2, 0), + (0, 1), (1, 0), (2, 1), (1, 2), (2, 1), + (3, 2), (2, 3), (3, 2), (4, 3), (3, 4), + (4, 3), (5, 4), (4, 5), (5, 4), (6, 5), + (5, 6), (6, 5), (7, 6), (6, 7), (7, 6), +) +FILES = ("README.md", "PROOF.md", "TASK.json", "SOURCES.json", + "VERIFY.json", "verify.py") + + +def require(condition, message): + if not condition: + raise ValueError(message) + + +def word_matrix(word): + require(len(word) <= 27, "word exceeds the fixed certificate domain") + rows = [1 << i for i in range(9)] + for target, control in word: + require(0 <= target < 9 and 0 <= control < 9, "invalid coordinate") + require(target != control, "a CNOT needs two coordinates") + rows[target] ^= rows[control] + return tuple(rows) + + +def apply_word(coordinates, word): + require(len(coordinates) == 9, "nine coordinates required") + result = list(coordinates) + for target, control in word: + result[target] ^= result[control] + return tuple(result) + + +def direct_map(x): + """Separate, explicit coordinate oracle, without interpreting WORD.""" + return (x[0] ^ x[1], x[0] ^ x[2], x[0] ^ x[3], x[0] ^ x[4], + x[5], x[0] ^ x[6], x[0] ^ x[7], x[0], x[8]) + + +def check_complete_addresses(f): + require(f in (1, 2), "finite census is registered only for f=1,2") + mask = (1 << f) - 1 + count = 1 << (9 * f) + inverse = tuple(reversed(WORD)) + for address in range(count): + coordinates = tuple((address >> (f * i)) & mask for i in range(9)) + actual = apply_word(coordinates, WORD) + require(actual == direct_map(coordinates), "complete address mismatch") + require(actual[8] == coordinates[8], "spectator changed") + require(apply_word(actual, inverse) == coordinates, "inverse mismatch") + return count + + +def check_controls(): + require(word_matrix(WORD[1:]) != TARGET, "extra deletion escaped") + swapped = tuple((control, target) for target, control in WORD) + require(word_matrix(swapped) != TARGET, "control-direction mutant escaped") + x = (2, 0, 0, 0, 0, 0, 0, 0, 0) + low = apply_word(tuple(value & 1 for value in x), WORD) + first_column_only = tuple((x[i] & 2) | low[i] for i in range(9)) + require(first_column_only != direct_map(x), "one-column mutant escaped") + return 3 + + +def package_hashes(): + root = Path(__file__).resolve().parent + result = {} + for name in FILES: + require((root / name).stat().st_size <= 131072, "source exceeds cap") + data = (root / name).read_bytes() + require(len(data) <= 131072, "package source exceeds hash bound") + result[name] = hashlib.sha256(data).hexdigest() + return result + + +def main(): + require(len(WORD) == 25, "new gate count changed") + require(word_matrix(WORD) == TARGET, "matrix identity failed") + counts = {str(f): check_complete_addresses(f) for f in (1, 2)} + controls = check_controls() + print(json.dumps({ + "status": "PASS_SELECTED_LINEAR_CNOT_CANCELLATION", + "claim_type": "finite certificate and scoped all-column proof", + "new_left_gate_count": len(WORD), + "cited_predecessor_left_gate_count": 27, + "matrix_rows": TARGET, + "complete_addresses_and_inverse_checks": counts, + "rejected_mutants": controls, + "package_sha256": package_hashes(), + "no_new_kappa": True, + }, indent=2, sort_keys=True)) + + +if __name__ == "__main__": + main() From d28f673520db7acb7d15ac9a76c9f78dd5ce2507 Mon Sep 17 00:00:00 2001 From: Nick Petalas Date: Tue, 17 Nov 2026 22:43:30 +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")