tla-ts 0.0.4-dev.702eb98 → 0.0.4-dev.7714e32
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +32 -6
- package/dist/cli.cjs +1 -1
- package/dist/cli.js +1 -1
- package/dist/deciders.cjs +27 -27
- package/dist/deciders.js +34 -34
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +12 -14
- package/dist/index.d.ts +12 -14
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +516 -25
- package/dist/prove.js +518 -27
- package/dist/run.cjs +45 -0
- package/dist/run.js +45 -0
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +76 -86
- package/dist/transfer.js +73 -83
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +1 -1
- package/src/ast.ts +2 -2
- package/src/bags.ts +22 -23
- package/src/builtins.ts +16 -8
- package/src/check.ts +131 -1154
- package/src/{cli-options.ts → cli/options.ts} +54 -9
- package/src/cli/run.ts +63 -0
- package/src/cli/shared.ts +106 -0
- package/src/cli/tlapm.ts +374 -0
- package/src/{run-cli.ts → cli/tlc.ts} +112 -761
- package/src/cli/xml-exporter.ts +221 -0
- package/src/cli.ts +1 -1
- package/src/codegen.ts +17 -15
- package/src/config.ts +5 -5
- package/src/dependencies.ts +4 -6
- package/src/environment.ts +55 -60
- package/src/errors.ts +12 -36
- package/src/evaluate.ts +81 -101
- package/src/exit-codes.ts +1 -1
- package/src/fingerprints.ts +3 -3
- package/src/index.ts +2 -2
- package/src/instances.ts +56 -46
- package/src/java-overrides.ts +79 -41
- package/src/json.ts +31 -36
- package/src/levels.ts +10 -13
- package/src/{live-check.ts → liveness-checker.ts} +169 -142
- package/src/liveness.ts +38 -34
- package/src/obligations/action.ts +58 -105
- package/src/obligations/{anon.ts → anonymize.ts} +44 -52
- package/src/obligations/equality.ts +260 -0
- package/src/obligations/expression.ts +42 -530
- package/src/obligations/format.ts +7 -8
- package/src/obligations/generate.ts +93 -783
- package/src/obligations/index.ts +23 -23
- package/src/obligations/levels.ts +38 -44
- package/src/obligations/module.ts +106 -729
- package/src/obligations/normalize.ts +554 -0
- package/src/obligations/operators.ts +176 -0
- package/src/obligations/pragma.ts +35 -29
- package/src/obligations/printer.ts +98 -209
- package/src/obligations/proof.ts +0 -1
- package/src/obligations/regroup.ts +100 -0
- package/src/obligations/simplify.ts +668 -0
- package/src/obligations/source.ts +92 -192
- package/src/obligations/{deref.ts → subexpression.ts} +82 -113
- package/src/obligations/substitution.ts +261 -0
- package/src/obligations/temporal.ts +32 -30
- package/src/obligations/tuples.ts +37 -53
- package/src/parallel-worker.ts +37 -33
- package/src/parallel.ts +30 -24
- package/src/parser.ts +67 -74
- package/src/{pcal-ast.ts → pcal/ast.ts} +2 -17
- package/src/{pcal-parse.ts → pcal/parse.ts} +28 -64
- package/src/{pcal-tokenize.ts → pcal/tokenize.ts} +10 -39
- package/src/{pcal-translate.ts → pcal/translate.ts} +30 -109
- package/src/{pcal-validate.ts → pcal/validate.ts} +10 -20
- package/src/{prove → prover}/decide-pool.ts +14 -19
- package/src/{prove → prover}/deciders.ts +7 -1
- package/src/{obligations/pickle.ts → prover/first-order.ts} +79 -4
- package/src/{prove → prover}/isabelle/decide.ts +3 -6
- package/src/{prove → prover}/isabelle/encode.ts +106 -138
- package/src/{prove → prover}/isabelle/isar/inner-syntax.ts +1 -1
- package/src/{prove → prover}/isabelle/isar/method.ts +3 -3
- package/src/{prove → prover}/isabelle/isar/type-check.ts +1 -1
- package/src/{prove → prover}/isabelle/provers/blast/blast.ts +1 -1
- package/src/{prove → prover}/isabelle/provers/blast/branch.ts +1 -1
- package/src/{prove → prover}/isabelle/provers/blast/term.ts +3 -4
- package/src/{prove → prover}/isabelle/provers/clasimp.ts +1 -1
- package/src/{prove → prover}/isabelle/provers/classical.ts +3 -3
- package/src/{prove → prover}/isabelle/provers/hypsubst.ts +1 -9
- package/src/{prove → prover}/isabelle/pure/conv.ts +1 -1
- package/src/{prove → prover}/isabelle/pure/drule.ts +2 -2
- package/src/{prove → prover}/isabelle/pure/envir.ts +3 -35
- package/src/{prove → prover}/isabelle/pure/logic.ts +4 -76
- package/src/{prove → prover}/isabelle/pure/name.ts +1 -13
- package/src/{prove → prover}/isabelle/pure/net.ts +2 -49
- package/src/{prove → prover}/isabelle/pure/pattern.ts +3 -22
- package/src/{prove → prover}/isabelle/pure/raw-simplifier.ts +3 -18
- package/src/{prove → prover}/isabelle/pure/seq.ts +0 -23
- package/src/{prove → prover}/isabelle/pure/simplifier.ts +2 -8
- package/src/{prove → prover}/isabelle/pure/table.ts +1 -8
- package/src/{prove → prover}/isabelle/pure/tactic.ts +5 -113
- package/src/{prove → prover}/isabelle/pure/tactical.ts +1 -84
- package/src/{prove → prover}/isabelle/pure/term-ord.ts +1 -55
- package/src/{prove → prover}/isabelle/pure/term.ts +8 -128
- package/src/{prove → prover}/isabelle/pure/thm.ts +4 -27
- package/src/{prove → prover}/isabelle/pure/type.ts +0 -12
- package/src/{prove → prover}/isabelle/pure/unify.ts +1 -1
- package/src/{prove → prover}/isabelle/tla/classical-setup.ts +1 -1
- package/src/{prove → prover}/ocaml.ts +1 -1
- package/src/{prove → prover}/prep/action.ts +54 -66
- package/src/{prove → prover}/prep/enabled-axioms.ts +2 -2
- package/src/{prove → prover}/prep/fingerprint.ts +3 -3
- package/src/{prove → prover}/prep/level-comparison.ts +15 -38
- package/src/{prove → prover}/prep/md5.ts +2 -9
- package/src/{prove/prep/pragma.ts → prover/prep/methods.ts} +4 -4
- package/src/prover/prep/normalize.ts +309 -0
- package/src/{prove → prover}/prove-worker.ts +4 -11
- package/src/prover/prove.ts +492 -0
- package/src/{prove → prover}/ptl/encode.ts +19 -31
- package/src/{prove → prover}/smt/axioms.ts +78 -79
- package/src/{prove → prover}/smt/data.ts +16 -45
- package/src/{prove → prover}/smt/encode.ts +134 -28
- package/src/{prove → prover}/smt/extensionality.ts +14 -12
- package/src/{prove → prover}/smt/flatten.ts +3 -18
- package/src/{prove → prover}/smt/format.ts +14 -3
- package/src/{prove → prover}/smt/instances.ts +4 -5
- package/src/{prove → prover}/smt/rewrite.ts +41 -59
- package/src/{prove → prover}/smt/solver/ast-util.ts +0 -56
- package/src/{prove → prover}/smt/solver/case-split-queue.ts +1 -1
- package/src/{prove → prover}/smt/solver/enode.ts +1 -1
- package/src/{prove → prover}/smt/solver/lp/dep-intervals.ts +0 -14
- package/src/{prove → prover}/smt/solver/model-macro-solver.ts +1 -1
- package/src/{prove → prover}/smt/solver/nlsat/algebraic.ts +3 -3
- package/src/{prove → prover}/smt/solver/nlsat/atoms.ts +1 -1
- package/src/{prove → prover}/smt/solver/nlsat/explain.ts +1 -1
- package/src/{prove → prover}/smt/solver/nlsat/interval-set.ts +1 -1
- package/src/{prove → prover}/smt/solver/nlsat/levelwise.ts +4 -7
- package/src/{prove → prover}/smt/solver/nlsat/polynomial.ts +4 -4
- package/src/{prove → prover}/smt/solver/nlsat/upolynomial.ts +2 -2
- package/src/{prove → prover}/smt/solver/pattern-inference.ts +1 -1
- package/src/{prove → prover}/smt/solver/relevancy.ts +2 -2
- package/src/{prove → prover}/smt/solver/rewriter.ts +1 -1
- package/src/{prove → prover}/smt/solver/solver.ts +2 -2
- package/src/prover/tlapm/cache.ts +236 -0
- package/src/prover/tlapm/ocaml-marshal.ts +166 -0
- package/src/{prove → prover}/tlapm/tlapm.ts +1 -2
- package/src/prover/verdict.ts +13 -0
- package/src/{prove → prover}/zenon/decide.ts +5 -11
- package/src/{prove → prover}/zenon/encode.ts +40 -106
- package/src/{prove → prover}/zenon/eqrel.ts +1 -1
- package/src/{prove → prover}/zenon/equality-rules.ts +1 -1
- package/src/{prove → prover}/zenon/expr.ts +2 -2
- package/src/{prove → prover}/zenon/index-table.ts +1 -1
- package/src/{prove → prover}/zenon/isar.ts +1 -1
- package/src/{prove → prover}/zenon/llproof.ts +1 -1
- package/src/{prove → prover}/zenon/mltoll.ts +1 -1
- package/src/{prove → prover}/zenon/node.ts +1 -1
- package/src/{prove → prover}/zenon/search.ts +1 -1
- package/src/{prove → prover}/zenon/tla/terms.ts +1 -20
- package/src/{prove → prover}/zenon/tla/tla.ts +1 -1
- package/src/randomization.ts +19 -24
- package/src/resolve.ts +15 -22
- package/src/runtime.ts +8 -8
- package/src/{sany-builtins.ts → sany/builtins.ts} +1 -1
- package/src/{sany-generator.ts → sany/generator.ts} +38 -55
- package/src/{sany-levels.ts → sany/levels.ts} +45 -48
- package/src/{sany-lexer.ts → sany/lexer.ts} +2 -3
- package/src/{sany-linter.ts → sany/linter.ts} +1 -1
- package/src/{sany-modules.ts → sany/modules.ts} +2 -2
- package/src/{sany-nodes.ts → sany/nodes.ts} +2 -2
- package/src/{sany-parse-error.ts → sany/parse-error.ts} +2 -2
- package/src/{sany-report.ts → sany/report.ts} +16 -17
- package/src/{sany-selectors.ts → sany/selectors.ts} +3 -5
- package/src/{sany-source.ts → sany/source.ts} +6 -7
- package/src/{sany-xml.ts → sany/xml.ts} +5 -6
- package/src/search.ts +969 -0
- package/src/spec-description.ts +26 -20
- package/src/{standard-levels.ts → standard-definitions.ts} +118 -2
- package/src/standard-modules.ts +16 -20
- package/src/state-graph.ts +9 -8
- package/src/substitution-levels.ts +2 -2
- package/src/successors.ts +16 -19
- package/src/symmetry.ts +1 -1
- package/src/tableau.ts +6 -7
- package/src/tlc/fingerprint.ts +214 -0
- package/src/{tlc-messages.ts → tlc/messages.ts} +119 -7
- package/src/{tlc-order.ts → tlc/order.ts} +7 -7
- package/src/{tlc-random.ts → tlc/random.ts} +3 -213
- package/src/{tlc-replay.ts → tlc/replay.ts} +40 -36
- package/src/{tlc-module.ts → tlc/tlc-operators.ts} +9 -9
- package/src/{tlc-ext.ts → tlc/tlcext-operators.ts} +30 -25
- package/src/transfer.ts +32 -32
- package/src/values.ts +72 -67
- package/src/worker.ts +1 -4
- package/dist/run-cli.cjs +0 -38
- package/dist/run-cli.js +0 -38
- package/src/canonical.ts +0 -40
- package/src/obligations/ctx.ts +0 -64
- package/src/prove/prep/defs.ts +0 -27
- package/src/prove/prep/elab.ts +0 -156
- package/src/prove/prep/enabled.ts +0 -43
- package/src/prove/prep/flatten.ts +0 -70
- package/src/prove/prep/trivial.ts +0 -22
- package/src/prove/prove.ts +0 -417
- package/src/prove/smt/axiomatize.ts +0 -69
- package/src/prove/smt/simplify.ts +0 -57
- package/src/prove/verdict.ts +0 -13
- package/src/standard-ranges.ts +0 -116
- package/src/value-sources.ts +0 -29
- /package/src/{prove → prover}/isabelle/LICENSE +0 -0
- /package/src/{prove → prover}/isabelle/LICENSE-tlapm +0 -0
- /package/src/{prove → prover}/isabelle/isar/proof.ts +0 -0
- /package/src/{prove → prover}/isabelle/isar/statement.ts +0 -0
- /package/src/{prove → prover}/isabelle/isar/theory.ts +0 -0
- /package/src/{prove → prover}/isabelle/provers/blast/prove.ts +0 -0
- /package/src/{prove → prover}/isabelle/provers/blast/rules.ts +0 -0
- /package/src/{prove → prover}/isabelle/provers/blast/state.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/bicompose.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/consts.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/goal.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/interrupt.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/list.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/object-logic.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/rewriter.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/search.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/variable.ts +0 -0
- /package/src/{prove → prover}/isabelle/tla/context.ts +0 -0
- /package/src/{prove → prover}/isabelle/tla/logic-data.ts +0 -0
- /package/src/{prove → prover}/isabelle/tla/logic.ts +0 -0
- /package/src/{prove → prover}/isabelle/tla/simpdata.ts +0 -0
- /package/src/{prove → prover}/isabelle/tools/intuitionistic.ts +0 -0
- /package/src/{prove → prover}/ptl/decide.ts +0 -0
- /package/src/{prove → prover}/ptl/sat.ts +0 -0
- /package/src/{prove → prover}/ptl/tableau.ts +0 -0
- /package/src/{prove → prover}/smt/context.ts +0 -0
- /package/src/{prove → prover}/smt/solver/act-cache.ts +0 -0
- /package/src/{prove → prover}/smt/solver/arith-rewriter.ts +0 -0
- /package/src/{prove → prover}/smt/solver/array.ts +0 -0
- /package/src/{prove → prover}/smt/solver/asserted-formulas.ts +0 -0
- /package/src/{prove → prover}/smt/solver/ast-lt.ts +0 -0
- /package/src/{prove → prover}/smt/solver/ast.ts +0 -0
- /package/src/{prove → prover}/smt/solver/auf-solver.ts +0 -0
- /package/src/{prove → prover}/smt/solver/cg-table.ts +0 -0
- /package/src/{prove → prover}/smt/solver/clause.ts +0 -0
- /package/src/{prove → prover}/smt/solver/conflict-resolution.ts +0 -0
- /package/src/{prove → prover}/smt/solver/context.ts +0 -0
- /package/src/{prove → prover}/smt/solver/ctx-simplify.ts +0 -0
- /package/src/{prove → prover}/smt/solver/der.ts +0 -0
- /package/src/{prove → prover}/smt/solver/dyn-ack.ts +0 -0
- /package/src/{prove → prover}/smt/solver/e-matching.ts +0 -0
- /package/src/{prove → prover}/smt/solver/expr-ref.ts +0 -0
- /package/src/{prove → prover}/smt/solver/expr-safe-replace.ts +0 -0
- /package/src/{prove → prover}/smt/solver/fingerprints.ts +0 -0
- /package/src/{prove → prover}/smt/solver/flat-literals.ts +0 -0
- /package/src/{prove → prover}/smt/solver/goal.ts +0 -0
- /package/src/{prove → prover}/smt/solver/hash.ts +0 -0
- /package/src/{prove → prover}/smt/solver/hashtable.ts +0 -0
- /package/src/{prove → prover}/smt/solver/internalizer.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lbool.ts +0 -0
- /package/src/{prove → prover}/smt/solver/literal.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/bound-propagator.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/constraints.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/containers.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/core-solver.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/cross-nested.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/dependency.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/dioph-eq.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/explanation.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/gomory.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/hnf-cutter.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/hnf.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/int-cube.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/int-solver.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/lar-solver.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/lar-term.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/lp-settings.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/maximize-term.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nex-creator.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nex.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-backoff.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-basics.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-core.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-divisions.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-emonics.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-factorization.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-grobner.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-horner.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-intervals.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-monomial-bounds.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-monotone.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-order.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-patcher.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-tangents.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-throttle.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-types.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-var-eqs.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nra-solver.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/numeric-pair.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/pdd-interval.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/pdd-simplifier.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/pdd-solver.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/pdd.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/random-updater.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/static-matrix.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/union-find.ts +0 -0
- /package/src/{prove → prover}/smt/solver/mam-compiler.ts +0 -0
- /package/src/{prove → prover}/smt/solver/mam-interpreter.ts +0 -0
- /package/src/{prove → prover}/smt/solver/maximize-ac-sharing.ts +0 -0
- /package/src/{prove → prover}/smt/solver/model-checker.ts +0 -0
- /package/src/{prove → prover}/smt/solver/model-evaluator.ts +0 -0
- /package/src/{prove → prover}/smt/solver/model-finder.ts +0 -0
- /package/src/{prove → prover}/smt/solver/model-generator.ts +0 -0
- /package/src/{prove → prover}/smt/solver/nlsat/evaluator.ts +0 -0
- /package/src/{prove → prover}/smt/solver/nlsat/mpbq.ts +0 -0
- /package/src/{prove → prover}/smt/solver/nlsat/solver.ts +0 -0
- /package/src/{prove → prover}/smt/solver/nlsat/types.ts +0 -0
- /package/src/{prove → prover}/smt/solver/nlsat/upolynomial-factorization.ts +0 -0
- /package/src/{prove → prover}/smt/solver/nnf.ts +0 -0
- /package/src/{prove → prover}/smt/solver/poly-rewriter.ts +0 -0
- /package/src/{prove → prover}/smt/solver/propagate-values.ts +0 -0
- /package/src/{prove → prover}/smt/solver/proto-model.ts +0 -0
- /package/src/{prove → prover}/smt/solver/pull-quant.ts +0 -0
- /package/src/{prove → prover}/smt/solver/qe-lite-der.ts +0 -0
- /package/src/{prove → prover}/smt/solver/qe-lite-fm.ts +0 -0
- /package/src/{prove → prover}/smt/solver/qe-lite.ts +0 -0
- /package/src/{prove → prover}/smt/solver/qi-queue.ts +0 -0
- /package/src/{prove → prover}/smt/solver/quant-tactics.ts +0 -0
- /package/src/{prove → prover}/smt/solver/quantifier-analyzer.ts +0 -0
- /package/src/{prove → prover}/smt/solver/quantifier-manager.ts +0 -0
- /package/src/{prove → prover}/smt/solver/random-gen.ts +0 -0
- /package/src/{prove → prover}/smt/solver/rational.ts +0 -0
- /package/src/{prove → prover}/smt/solver/ref-vector.ts +0 -0
- /package/src/{prove → prover}/smt/solver/rewriter-tpl.ts +0 -0
- /package/src/{prove → prover}/smt/solver/rlimit.ts +0 -0
- /package/src/{prove → prover}/smt/solver/smtlib-parser.ts +0 -0
- /package/src/{prove → prover}/smt/solver/sort.ts +0 -0
- /package/src/{prove → prover}/smt/solver/sticky-generations.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra-axioms.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra-bounds.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra-final-check.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra-internalize.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra-model.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra-propagate.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra-state.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra.ts +0 -0
- /package/src/{prove → prover}/smt/solver/var-subst.ts +0 -0
- /package/src/{prove → prover}/smt/solver/z3-license.txt +0 -0
- /package/src/{prove → prover}/smt/table.ts +0 -0
- /package/src/{prove → prover}/tlaps-module.ts +0 -0
- /package/src/{prove → prover}/zenon/LICENSE +0 -0
- /package/src/{prove → prover}/zenon/check/check.ts +0 -0
- /package/src/{prove → prover}/zenon/check/definitions.ts +0 -0
- /package/src/{prove → prover}/zenon/check/equality.ts +0 -0
- /package/src/{prove → prover}/zenon/check/functions.ts +0 -0
- /package/src/{prove → prover}/zenon/check/keys.ts +0 -0
- /package/src/{prove → prover}/zenon/check/propositional.ts +0 -0
- /package/src/{prove → prover}/zenon/check/records.ts +0 -0
- /package/src/{prove → prover}/zenon/check/relations.ts +0 -0
- /package/src/{prove → prover}/zenon/check/rewrites.ts +0 -0
- /package/src/{prove → prover}/zenon/check/sets.ts +0 -0
- /package/src/{prove → prover}/zenon/check/terms.ts +0 -0
- /package/src/{prove → prover}/zenon/check/tla.ts +0 -0
- /package/src/{prove → prover}/zenon/isar-case.ts +0 -0
- /package/src/{prove → prover}/zenon/limits.ts +0 -0
- /package/src/{prove → prover}/zenon/ocaml.ts +0 -0
- /package/src/{prove → prover}/zenon/parse.ts +0 -0
- /package/src/{prove → prover}/zenon/phrase.ts +0 -0
- /package/src/{prove → prover}/zenon/proof.ts +0 -0
- /package/src/{prove → prover}/zenon/propositional-rules.ts +0 -0
- /package/src/{prove → prover}/zenon/rules.ts +0 -0
- /package/src/{prove → prover}/zenon/tla/functions.ts +0 -0
- /package/src/{prove → prover}/zenon/tla/llproof.ts +0 -0
- /package/src/{prove → prover}/zenon/tla/records.ts +0 -0
- /package/src/{prove → prover}/zenon/tla/rewrites.ts +0 -0
- /package/src/{prove → prover}/zenon/tla/sets.ts +0 -0
- /package/src/{tlc-modules.ts → tlc/jar-data.ts} +0 -0
- /package/src/{tlc-summary.ts → tlc/summary.ts} +0 -0
- /package/src/{tlc-version.ts → tlc/version.ts} +0 -0
|
@@ -3,9 +3,11 @@
|
|
|
3
3
|
|
|
4
4
|
import {
|
|
5
5
|
adjoin,
|
|
6
|
+
adjoinAll,
|
|
6
7
|
applyBuiltin,
|
|
7
8
|
at,
|
|
8
9
|
getFresh,
|
|
10
|
+
getLocalDefn,
|
|
9
11
|
getScopeAt,
|
|
10
12
|
mapChildren,
|
|
11
13
|
type Builtin,
|
|
@@ -20,7 +22,20 @@ const isApplied = (expression: Expr, builtins: Builtin[]) =>
|
|
|
20
22
|
expression.operator.kind === "Internal" &&
|
|
21
23
|
builtins.includes(expression.operator.builtin);
|
|
22
24
|
|
|
23
|
-
const
|
|
25
|
+
const applyUnchanged = (expression: Expr) => applyBuiltin("UNCHANGED", [expression], expression);
|
|
26
|
+
|
|
27
|
+
const getEquality = (expression: Expr) =>
|
|
28
|
+
applyBuiltin("Eq", [applyBuiltin("Prime", [expression], expression), expression], expression);
|
|
29
|
+
|
|
30
|
+
// E_tla_norm.rewrite_unch: UNCHANGED <<x, <<y>>>> as x' = x /\ y' = y.
|
|
31
|
+
export const rewriteUnchanged = (expression: Expr): Expr => {
|
|
32
|
+
const flatten = (inner: Expr): Expr[] =>
|
|
33
|
+
inner.kind === "Tuple" ? inner.elements.flatMap(flatten) : [inner];
|
|
34
|
+
const items = flatten(expression);
|
|
35
|
+
if (items.length === 0) return at({ kind: "Internal", builtin: "TRUE" }, expression);
|
|
36
|
+
if (items.length === 1) return getEquality(items[0]);
|
|
37
|
+
return at({ kind: "List", bullet: "And", items: items.map(getEquality) }, expression);
|
|
38
|
+
};
|
|
24
39
|
|
|
25
40
|
// Each visitor rewrites the outermost match and leaves the rest of the tree as it is.
|
|
26
41
|
const rewrite =
|
|
@@ -80,28 +95,22 @@ export const expandAction = rewrite((expression, recurse) => {
|
|
|
80
95
|
const subscript = recurse(expression.subscript);
|
|
81
96
|
const step =
|
|
82
97
|
expression.modal === "Box"
|
|
83
|
-
? applyBuiltin("Disj", [action,
|
|
98
|
+
? applyBuiltin("Disj", [action, applyUnchanged(subscript)], expression)
|
|
84
99
|
: applyBuiltin(
|
|
85
100
|
"Conj",
|
|
86
|
-
[action, applyBuiltin("Neg", [
|
|
101
|
+
[action, applyBuiltin("Neg", [applyUnchanged(subscript)], expression)],
|
|
87
102
|
expression,
|
|
88
103
|
);
|
|
89
104
|
if (expression.kind === "Sub") return step;
|
|
90
105
|
return applyBuiltin(expression.modal === "Box" ? "BoxTrue" : "Diamond", [step], expression);
|
|
91
106
|
});
|
|
92
107
|
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
applyBuiltin("Eq", [applyBuiltin("Prime", [element], element), element], element),
|
|
100
|
-
);
|
|
101
|
-
if (equalities.length === 0) return at({ kind: "Internal", builtin: "TRUE" }, expression);
|
|
102
|
-
if (equalities.length === 1) return equalities[0];
|
|
103
|
-
return at({ kind: "List", bullet: "And", items: equalities }, expression);
|
|
104
|
-
});
|
|
108
|
+
// Only getTime uses this, so the locations rewriteUnchanged gives do not matter.
|
|
109
|
+
const expandUnchanged = rewrite((expression) =>
|
|
110
|
+
expression.kind === "Apply" && isApplied(expression, ["UNCHANGED"])
|
|
111
|
+
? rewriteUnchanged(expression.args[0])
|
|
112
|
+
: undefined,
|
|
113
|
+
);
|
|
105
114
|
|
|
106
115
|
const TEMPORAL_BUILTINS: Builtin[] = [
|
|
107
116
|
"Prime",
|
|
@@ -131,10 +140,10 @@ const isConstantHyp = (scope: Scope | undefined, hyp: Hyp) => {
|
|
|
131
140
|
}
|
|
132
141
|
};
|
|
133
142
|
|
|
134
|
-
const
|
|
135
|
-
|
|
136
|
-
(inner, name) => adjoin(inner, getFresh(name, "Constant")),
|
|
143
|
+
const bindConstants = (scope: Scope | undefined, names: string[]) =>
|
|
144
|
+
adjoinAll(
|
|
137
145
|
scope,
|
|
146
|
+
names.map((name) => getFresh(name, "Constant")),
|
|
138
147
|
);
|
|
139
148
|
|
|
140
149
|
export const isConstant = (scope: Scope | undefined, expression: Expr): boolean => {
|
|
@@ -167,7 +176,7 @@ export const isConstant = (scope: Scope | undefined, expression: Expr): boolean
|
|
|
167
176
|
return false;
|
|
168
177
|
case "Lambda":
|
|
169
178
|
return isConstant(
|
|
170
|
-
|
|
179
|
+
bindConstants(
|
|
171
180
|
scope,
|
|
172
181
|
expression.params.map((param) => param.name),
|
|
173
182
|
),
|
|
@@ -196,13 +205,7 @@ export const isConstant = (scope: Scope | undefined, expression: Expr): boolean
|
|
|
196
205
|
case "Let": {
|
|
197
206
|
const inner = expression.definitions.reduce<{ scope: Scope | undefined; isGood: boolean }>(
|
|
198
207
|
(state, definition) => ({
|
|
199
|
-
scope: adjoin(state.scope,
|
|
200
|
-
kind: "Defn",
|
|
201
|
-
definition,
|
|
202
|
-
whereDefined: "User",
|
|
203
|
-
visibility: "Visible",
|
|
204
|
-
isLocal: true,
|
|
205
|
-
}),
|
|
208
|
+
scope: adjoin(state.scope, getLocalDefn(definition)),
|
|
206
209
|
isGood:
|
|
207
210
|
state.isGood &&
|
|
208
211
|
definition.kind === "Operator" &&
|
|
@@ -221,7 +224,7 @@ export const isConstant = (scope: Scope | undefined, expression: Expr): boolean
|
|
|
221
224
|
(bound) => bound.domain.kind !== "Domain" || recurse(bound.domain.expression),
|
|
222
225
|
) &&
|
|
223
226
|
isConstant(
|
|
224
|
-
|
|
227
|
+
bindConstants(
|
|
225
228
|
scope,
|
|
226
229
|
expression.bounds.map((bound) => bound.name),
|
|
227
230
|
),
|
|
@@ -233,7 +236,7 @@ export const isConstant = (scope: Scope | undefined, expression: Expr): boolean
|
|
|
233
236
|
case "SetSt":
|
|
234
237
|
return (
|
|
235
238
|
(expression.domain === undefined || recurse(expression.domain)) &&
|
|
236
|
-
isConstant(
|
|
239
|
+
isConstant(bindConstants(scope, [expression.name]), expression.body)
|
|
237
240
|
);
|
|
238
241
|
case "If":
|
|
239
242
|
return (
|
|
@@ -281,8 +284,7 @@ const isClosed = (scope: Scope | undefined, expression: Expr, isBox: boolean): b
|
|
|
281
284
|
if (expression.kind === "List")
|
|
282
285
|
return expression.items.every((item) => isClosed(scope, item, isBox));
|
|
283
286
|
if (expression.kind === "Sequent") {
|
|
284
|
-
|
|
285
|
-
return isClosed(inner, expression.sequent.active, isBox);
|
|
287
|
+
return isClosed(adjoinAll(scope, expression.sequent.context), expression.sequent.active, isBox);
|
|
286
288
|
}
|
|
287
289
|
if (expression.kind !== "Apply") return false;
|
|
288
290
|
const args = expression.args;
|
|
@@ -63,74 +63,58 @@ export const expandQuant = (
|
|
|
63
63
|
else groups.push([bound]);
|
|
64
64
|
});
|
|
65
65
|
return groups.reduceRight((inner: Expr, group): Expr => {
|
|
66
|
+
const quantify = (quantified: Bound[], quantifiedBody = inner): Expr => ({
|
|
67
|
+
kind: "Quant",
|
|
68
|
+
quantifier,
|
|
69
|
+
bounds: quantified,
|
|
70
|
+
body: quantifiedBody,
|
|
71
|
+
location: inner.location,
|
|
72
|
+
});
|
|
66
73
|
const first = group[0];
|
|
67
74
|
if (first.kind === "Name") {
|
|
68
|
-
return
|
|
69
|
-
kind
|
|
70
|
-
|
|
71
|
-
bounds: group.flatMap((bound) => (bound.kind === "Name" ? [getNamedBound(bound)] : [])),
|
|
72
|
-
body: inner,
|
|
73
|
-
location: inner.location,
|
|
74
|
-
};
|
|
75
|
+
return quantify(
|
|
76
|
+
group.flatMap((bound) => (bound.kind === "Name" ? [getNamedBound(bound)] : [])),
|
|
77
|
+
);
|
|
75
78
|
}
|
|
76
79
|
const factors = getFactors(first.domain, first.names);
|
|
77
|
-
if (factors)
|
|
78
|
-
return {
|
|
79
|
-
kind: "Quant",
|
|
80
|
-
quantifier,
|
|
81
|
-
bounds: getFactorBounds(first.names, factors),
|
|
82
|
-
body: inner,
|
|
83
|
-
location: inner.location,
|
|
84
|
-
};
|
|
85
|
-
}
|
|
80
|
+
if (factors) return quantify(getFactorBounds(first.names, factors));
|
|
86
81
|
const membership: Expr = {
|
|
87
82
|
kind: "Apply",
|
|
88
83
|
operator: { kind: "Internal", builtin: quantifier === "Exists" ? "Mem" : "Notmem" },
|
|
89
84
|
args: [getNamesTuple(first.names), first.domain],
|
|
90
85
|
};
|
|
91
|
-
return {
|
|
92
|
-
kind: "
|
|
93
|
-
quantifier,
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
kind: "List",
|
|
97
|
-
bullet: quantifier === "Exists" ? "And" : "Or",
|
|
98
|
-
items: [membership, inner],
|
|
99
|
-
},
|
|
100
|
-
location: inner.location,
|
|
101
|
-
};
|
|
86
|
+
return quantify(getUnbounded(first.names), {
|
|
87
|
+
kind: "List",
|
|
88
|
+
bullet: quantifier === "Exists" ? "And" : "Or",
|
|
89
|
+
items: [membership, inner],
|
|
90
|
+
});
|
|
102
91
|
}, body);
|
|
103
92
|
};
|
|
104
93
|
|
|
105
94
|
// CHOOSE <<x, y>> \in A \X B: P binds t \in A \X B with x == t[1], y == t[2], and any other
|
|
106
|
-
// domain binds t with \E x, y: t = <<x, y>> /\ P.
|
|
107
|
-
const
|
|
108
|
-
|
|
95
|
+
// domain binds t with \E x, y: t = <<x, y>> /\ P. {<<x, y>> \in S: P} binds t the same way.
|
|
96
|
+
export const expandChoose = (
|
|
97
|
+
binder: { kind: "Choose"; domain: Expr | undefined } | { kind: "SetSt"; domain: Expr },
|
|
109
98
|
names: string[],
|
|
110
|
-
domain: Expr | undefined,
|
|
111
99
|
body: Expr,
|
|
112
|
-
): Expr =>
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
kind: "
|
|
121
|
-
|
|
122
|
-
|
|
100
|
+
): Expr => {
|
|
101
|
+
const name = `${binder.kind.toLowerCase()}#${names[0]}`;
|
|
102
|
+
return {
|
|
103
|
+
...binder,
|
|
104
|
+
name,
|
|
105
|
+
body: getFactors(binder.domain, names)
|
|
106
|
+
? { kind: "Let", definitions: getItemDefinitions(name, names), body }
|
|
107
|
+
: {
|
|
108
|
+
kind: "Quant",
|
|
109
|
+
quantifier: "Exists",
|
|
110
|
+
bounds: getUnbounded(names),
|
|
111
|
+
body: {
|
|
112
|
+
kind: "List",
|
|
113
|
+
bullet: "And",
|
|
114
|
+
items: [getEquality(getOpaque(name), getNamesTuple(names)), body],
|
|
115
|
+
},
|
|
123
116
|
},
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
export const expandChoose = (names: string[], domain: Expr | undefined, body: Expr): Expr => {
|
|
127
|
-
const name = `choose#${names[0]}`;
|
|
128
|
-
return { kind: "Choose", name, domain, body: getChooseBody(name, names, domain, body) };
|
|
129
|
-
};
|
|
130
|
-
|
|
131
|
-
export const expandSetSt = (names: string[], domain: Expr, body: Expr): Expr => {
|
|
132
|
-
const name = `setst#${names[0]}`;
|
|
133
|
-
return { kind: "SetSt", name, domain, body: getChooseBody(name, names, domain, body) };
|
|
117
|
+
};
|
|
134
118
|
};
|
|
135
119
|
|
|
136
120
|
// A set or function constructor binds each tuple as fcn#x, with its names defined in a LET around
|
|
@@ -157,8 +141,8 @@ const expandConstructorBounds = (bounds: TuplyBound[], value: Expr, isSetOf: boo
|
|
|
157
141
|
kind: "Operator",
|
|
158
142
|
name: choice,
|
|
159
143
|
body: expandChoose(
|
|
144
|
+
{ kind: "Choose", domain: undefined },
|
|
160
145
|
bound.names,
|
|
161
|
-
undefined,
|
|
162
146
|
getEquality(getOpaque(name), getNamesTuple(bound.names)),
|
|
163
147
|
),
|
|
164
148
|
},
|
package/src/parallel-worker.ts
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import { createCanonicalizer } from "./canonical";
|
|
2
|
-
import { createSearch } from "./check";
|
|
3
1
|
import { createEnvironment } from "./environment";
|
|
4
2
|
import {
|
|
5
3
|
createFingerprintTable,
|
|
@@ -8,11 +6,18 @@ import {
|
|
|
8
6
|
writeStateFingerprint,
|
|
9
7
|
} from "./fingerprints";
|
|
10
8
|
import type { CoordinatorMessage, LevelMessage, StartMessage, WorkerMessage } from "./parallel";
|
|
9
|
+
import { createSearch } from "./search";
|
|
11
10
|
import { getSuccessors, type Successor } from "./successors";
|
|
12
|
-
import { getTlcStringOrder,
|
|
13
|
-
import { OUT_DEGREE_BUCKETS } from "./tlc
|
|
11
|
+
import { getTlcStringOrder, getTlcVariableOrder } from "./tlc/order";
|
|
12
|
+
import { OUT_DEGREE_BUCKETS } from "./tlc/summary";
|
|
14
13
|
import { createStateDecoder, createStateEncoder, type EncodedStates } from "./transfer";
|
|
15
|
-
import {
|
|
14
|
+
import {
|
|
15
|
+
createCanonicalizer,
|
|
16
|
+
getRankedStringCount,
|
|
17
|
+
setStringOrder,
|
|
18
|
+
setValueVersion,
|
|
19
|
+
type Value,
|
|
20
|
+
} from "./values";
|
|
16
21
|
import { getParentPort, type Port } from "./worker";
|
|
17
22
|
|
|
18
23
|
const LOCKED = -1;
|
|
@@ -30,7 +35,7 @@ interface Expansion {
|
|
|
30
35
|
fingerprintStates: Value[][];
|
|
31
36
|
}
|
|
32
37
|
|
|
33
|
-
const
|
|
38
|
+
const runWorker = (start: StartMessage, parent: Port) => {
|
|
34
39
|
const modules = new Map(start.modules);
|
|
35
40
|
const loadModule = (name: string) => modules.get(name);
|
|
36
41
|
const classes = new Map(start.classes);
|
|
@@ -50,12 +55,12 @@ const run = (start: StartMessage, parent: Port) => {
|
|
|
50
55
|
});
|
|
51
56
|
const environment = specification.environment;
|
|
52
57
|
const search = createSearch(start.config, environment, () =>
|
|
53
|
-
|
|
58
|
+
getTlcVariableOrder(start.source, loadModule),
|
|
54
59
|
);
|
|
55
60
|
const nextAction = search?.spec.next;
|
|
56
61
|
if (!search || nextAction === undefined)
|
|
57
62
|
return parent.postMessage({ type: "abort" } satisfies WorkerMessage);
|
|
58
|
-
const
|
|
63
|
+
const workerIndex = start.index;
|
|
59
64
|
const canonicalize = createCanonicalizer();
|
|
60
65
|
const decode = createStateDecoder(environment.variables.length);
|
|
61
66
|
const shared = { fingerprints: start.fingerprints };
|
|
@@ -75,8 +80,8 @@ const run = (start: StartMessage, parent: Port) => {
|
|
|
75
80
|
// A worker that runs out of states asks a peer for some by writing its index + 1 to the peer's
|
|
76
81
|
// request word. The peer sends half of the states it hasn't started, keeps expanding, and wakes
|
|
77
82
|
// the workers waiting to ask it next.
|
|
78
|
-
const
|
|
79
|
-
const thief = Atomics.load(requests,
|
|
83
|
+
const answerRequest = (expansion: Expansion, request: number) => {
|
|
84
|
+
const thief = Atomics.load(requests, workerIndex) - 1;
|
|
80
85
|
const given = Math.floor((expansion.end - expansion.origin - 1) / 2);
|
|
81
86
|
const encoder = createStateEncoder();
|
|
82
87
|
const states = expansion.states.slice(expansion.end - given, expansion.end);
|
|
@@ -84,21 +89,21 @@ const run = (start: StartMessage, parent: Port) => {
|
|
|
84
89
|
if (isEncoded) expansion.end -= given;
|
|
85
90
|
const loot = isEncoded ? encoder.finish() : createStateEncoder().finish();
|
|
86
91
|
start.ports[thief]?.postMessage(loot, [loot.words.buffer]);
|
|
87
|
-
Atomics.store(requests,
|
|
88
|
-
Atomics.notify(requests,
|
|
92
|
+
Atomics.store(requests, workerIndex, request);
|
|
93
|
+
Atomics.notify(requests, workerIndex);
|
|
89
94
|
};
|
|
90
95
|
|
|
91
96
|
// A worker answers any request before it pauses or runs out of states, and takes no more until
|
|
92
97
|
// it resumes.
|
|
93
|
-
const
|
|
94
|
-
Atomics.store(remaining,
|
|
95
|
-
if (Atomics.compareExchange(requests,
|
|
96
|
-
|
|
98
|
+
const lockRequests = (expansion: Expansion) => {
|
|
99
|
+
Atomics.store(remaining, workerIndex, 0);
|
|
100
|
+
if (Atomics.compareExchange(requests, workerIndex, 0, LOCKED) === 0) return;
|
|
101
|
+
answerRequest(expansion, LOCKED);
|
|
97
102
|
};
|
|
98
103
|
|
|
99
|
-
const
|
|
100
|
-
Atomics.store(remaining,
|
|
101
|
-
Atomics.store(requests,
|
|
104
|
+
const unlockRequests = (expansion: Expansion) => {
|
|
105
|
+
Atomics.store(remaining, workerIndex, expansion.end - expansion.origin);
|
|
106
|
+
Atomics.store(requests, workerIndex, 0);
|
|
102
107
|
};
|
|
103
108
|
|
|
104
109
|
// The worker pauses before a successor when the shared table needs to grow, and resumes there.
|
|
@@ -106,8 +111,8 @@ const run = (start: StartMessage, parent: Port) => {
|
|
|
106
111
|
for (; expansion.origin < expansion.end; expansion.origin++) {
|
|
107
112
|
const state = expansion.states[expansion.origin];
|
|
108
113
|
if (!expansion.successors) {
|
|
109
|
-
if (Atomics.load(requests,
|
|
110
|
-
Atomics.store(remaining,
|
|
114
|
+
if (Atomics.load(requests, workerIndex) > 0) answerRequest(expansion, 0);
|
|
115
|
+
Atomics.store(remaining, workerIndex, expansion.end - expansion.origin - 1);
|
|
111
116
|
expansion.successors = getSuccessors(nextAction, state, environment, search.spec.scope);
|
|
112
117
|
expansion.generated += expansion.successors.length;
|
|
113
118
|
if (expansion.successors.length === 0 && start.config.checkDeadlock) return undefined;
|
|
@@ -157,7 +162,7 @@ const run = (start: StartMessage, parent: Port) => {
|
|
|
157
162
|
: best;
|
|
158
163
|
}, undefined);
|
|
159
164
|
if (victim === undefined) return false;
|
|
160
|
-
const request = Atomics.compareExchange(requests, victim, 0,
|
|
165
|
+
const request = Atomics.compareExchange(requests, victim, 0, workerIndex + 1);
|
|
161
166
|
if (request === LOCKED) skipped.add(victim);
|
|
162
167
|
if (request > 0) Atomics.wait(requests, victim, request);
|
|
163
168
|
if (request !== 0) continue;
|
|
@@ -169,7 +174,7 @@ const run = (start: StartMessage, parent: Port) => {
|
|
|
169
174
|
expansion.states = decode(loot).map(canonicalize);
|
|
170
175
|
expansion.origin = 0;
|
|
171
176
|
expansion.end = expansion.states.length;
|
|
172
|
-
|
|
177
|
+
unlockRequests(expansion);
|
|
173
178
|
return true;
|
|
174
179
|
}
|
|
175
180
|
};
|
|
@@ -177,7 +182,7 @@ const run = (start: StartMessage, parent: Port) => {
|
|
|
177
182
|
const report = (message: WorkerMessage) =>
|
|
178
183
|
parent.postMessage(message, message.type === "level" ? [message.fingerprints.buffer] : []);
|
|
179
184
|
|
|
180
|
-
const runLevel = async (
|
|
185
|
+
const runLevel = async (): Promise<LevelMessage | undefined> => {
|
|
181
186
|
const expansion: Expansion = {
|
|
182
187
|
states: frontier.states,
|
|
183
188
|
origin: 0,
|
|
@@ -193,22 +198,21 @@ const run = (start: StartMessage, parent: Port) => {
|
|
|
193
198
|
for (;;) {
|
|
194
199
|
const status = expand(expansion);
|
|
195
200
|
if (status === undefined) return undefined;
|
|
196
|
-
|
|
201
|
+
lockRequests(expansion);
|
|
197
202
|
if (status === "paused") {
|
|
198
203
|
const resumed = new Promise<void>((resolve) => (waiters.resume = resolve));
|
|
199
204
|
report({ type: "paused" });
|
|
200
205
|
await resumed;
|
|
201
|
-
|
|
206
|
+
unlockRequests(expansion);
|
|
202
207
|
continue;
|
|
203
208
|
}
|
|
204
209
|
if (!(await steal(expansion))) break;
|
|
205
210
|
}
|
|
206
211
|
if (getRankedStringCount() !== startupStrings) return undefined;
|
|
207
212
|
frontier.states = expansion.next;
|
|
208
|
-
Atomics.store(remaining,
|
|
213
|
+
Atomics.store(remaining, workerIndex, frontier.states.length);
|
|
209
214
|
return {
|
|
210
215
|
type: "level",
|
|
211
|
-
level,
|
|
212
216
|
generated: expansion.generated,
|
|
213
217
|
added: expansion.next.length,
|
|
214
218
|
outDegrees: expansion.outDegrees,
|
|
@@ -216,21 +220,21 @@ const run = (start: StartMessage, parent: Port) => {
|
|
|
216
220
|
};
|
|
217
221
|
};
|
|
218
222
|
|
|
219
|
-
const
|
|
220
|
-
runLevel(
|
|
223
|
+
const startLevel = () => {
|
|
224
|
+
runLevel().then(
|
|
221
225
|
(message) => report(message ?? { type: "abort" }),
|
|
222
226
|
() => report({ type: "abort" }),
|
|
223
227
|
);
|
|
224
228
|
};
|
|
225
229
|
parent.addEventListener("message", (event) => {
|
|
226
230
|
const message = event.data as CoordinatorMessage;
|
|
227
|
-
if (message.type === "level")
|
|
231
|
+
if (message.type === "level") startLevel();
|
|
228
232
|
if (message.type === "resize") {
|
|
229
233
|
shared.fingerprints = message.fingerprints;
|
|
230
234
|
waiters.resume();
|
|
231
235
|
}
|
|
232
236
|
});
|
|
233
|
-
Atomics.store(remaining,
|
|
237
|
+
Atomics.store(remaining, workerIndex, frontier.states.length);
|
|
234
238
|
report({ type: "ready" });
|
|
235
239
|
};
|
|
236
240
|
|
|
@@ -240,7 +244,7 @@ void getParentPort().then((parent) => {
|
|
|
240
244
|
if (message.type !== "start") return;
|
|
241
245
|
parent.removeEventListener?.("message", onStart);
|
|
242
246
|
try {
|
|
243
|
-
|
|
247
|
+
runWorker(message, parent);
|
|
244
248
|
} catch {
|
|
245
249
|
parent.postMessage({ type: "abort" } satisfies WorkerMessage);
|
|
246
250
|
}
|
package/src/parallel.ts
CHANGED
|
@@ -1,11 +1,6 @@
|
|
|
1
1
|
import type { Expression } from "./ast";
|
|
2
|
-
import { createCanonicalizer } from "./canonical";
|
|
3
2
|
import {
|
|
4
3
|
checkSequentially,
|
|
5
|
-
createSearch,
|
|
6
|
-
findAssumptionViolation,
|
|
7
|
-
reportInitialStatesProgress,
|
|
8
|
-
reportStartup,
|
|
9
4
|
type CheckOptions,
|
|
10
5
|
type CheckProgress,
|
|
11
6
|
type CheckResult,
|
|
@@ -23,12 +18,24 @@ import {
|
|
|
23
18
|
writeStateFingerprint,
|
|
24
19
|
type SharedFingerprints,
|
|
25
20
|
} from "./fingerprints";
|
|
21
|
+
import {
|
|
22
|
+
createSearch,
|
|
23
|
+
findAssumptionViolation,
|
|
24
|
+
reportInitialStatesProgress,
|
|
25
|
+
reportStartup,
|
|
26
|
+
} from "./search";
|
|
26
27
|
import { getInitialStates } from "./successors";
|
|
27
|
-
import { getTlcStringOrder, getTlcVariableOrder } from "./tlc
|
|
28
|
-
import { getFingerprintDistance, OUT_DEGREE_BUCKETS } from "./tlc
|
|
28
|
+
import { getTlcStringOrder, getTlcVariableOrder } from "./tlc/order";
|
|
29
|
+
import { getFingerprintDistance, OUT_DEGREE_BUCKETS } from "./tlc/summary";
|
|
29
30
|
import { createStateEncoder, type EncodedStates } from "./transfer";
|
|
30
|
-
import type { TlcVersion } from "./tlc
|
|
31
|
-
import {
|
|
31
|
+
import type { TlcVersion } from "./tlc/version";
|
|
32
|
+
import {
|
|
33
|
+
createCanonicalizer,
|
|
34
|
+
getRankedStringCount,
|
|
35
|
+
setStringOrder,
|
|
36
|
+
setValueVersion,
|
|
37
|
+
type Value,
|
|
38
|
+
} from "./values";
|
|
32
39
|
import { spawnWorker, type Port } from "./worker";
|
|
33
40
|
|
|
34
41
|
export interface StartMessage {
|
|
@@ -51,7 +58,6 @@ export interface StartMessage {
|
|
|
51
58
|
|
|
52
59
|
export interface LevelMessage {
|
|
53
60
|
type: "level";
|
|
54
|
-
level: number;
|
|
55
61
|
generated: number;
|
|
56
62
|
added: number;
|
|
57
63
|
outDegrees: number[];
|
|
@@ -65,7 +71,7 @@ export type WorkerMessage =
|
|
|
65
71
|
| LevelMessage;
|
|
66
72
|
|
|
67
73
|
export type CoordinatorMessage =
|
|
68
|
-
| { type: "level"
|
|
74
|
+
| { type: "level" }
|
|
69
75
|
| { type: "resize"; fingerprints: SharedFingerprints };
|
|
70
76
|
|
|
71
77
|
export const check = async (options: CheckOptions): Promise<CheckResult> => {
|
|
@@ -101,11 +107,11 @@ export const check = async (options: CheckOptions): Promise<CheckResult> => {
|
|
|
101
107
|
},
|
|
102
108
|
});
|
|
103
109
|
};
|
|
104
|
-
const
|
|
110
|
+
const workerCount = options.workers ?? 1;
|
|
105
111
|
// TLC's workers write the -dump state graph in whichever order they find it, so one worker
|
|
106
112
|
// writes the graph a single TLC worker does.
|
|
107
113
|
const isSequential =
|
|
108
|
-
|
|
114
|
+
workerCount < 2 ||
|
|
109
115
|
typeof SharedArrayBuffer !== "function" ||
|
|
110
116
|
options.dump !== undefined ||
|
|
111
117
|
config.view !== undefined ||
|
|
@@ -164,7 +170,7 @@ export const check = async (options: CheckOptions): Promise<CheckResult> => {
|
|
|
164
170
|
const canonicalize = createCanonicalizer();
|
|
165
171
|
const shared = { fingerprints: createSharedFingerprints() };
|
|
166
172
|
const fingerprint = new Int32Array(2);
|
|
167
|
-
const seeds = Array.from({ length:
|
|
173
|
+
const seeds = Array.from({ length: workerCount }, createStateEncoder);
|
|
168
174
|
const statistics = {
|
|
169
175
|
generatedStates: 0,
|
|
170
176
|
distinctStates: 0,
|
|
@@ -207,7 +213,7 @@ export const check = async (options: CheckOptions): Promise<CheckResult> => {
|
|
|
207
213
|
return false;
|
|
208
214
|
}
|
|
209
215
|
if (!search.satisfiesConstraints(state)) continue;
|
|
210
|
-
if (!seeds[seeded.length %
|
|
216
|
+
if (!seeds[seeded.length % workerCount].encode(state)) return false;
|
|
211
217
|
seeded.push(state);
|
|
212
218
|
statistics.distinctStates++;
|
|
213
219
|
}
|
|
@@ -234,7 +240,7 @@ export const check = async (options: CheckOptions): Promise<CheckResult> => {
|
|
|
234
240
|
if (statistics.distinctStates === 0) return createSuccess();
|
|
235
241
|
|
|
236
242
|
const reports: WorkerMessage[] = [];
|
|
237
|
-
const pending = { count, resolve: (_reports: WorkerMessage[]) => {} };
|
|
243
|
+
const pending = { count: workerCount, resolve: (_reports: WorkerMessage[]) => {} };
|
|
238
244
|
const onMessage = (message: WorkerMessage) => {
|
|
239
245
|
reports.push(message);
|
|
240
246
|
if (message.type === "abort" || reports.length === pending.count) {
|
|
@@ -246,11 +252,11 @@ export const check = async (options: CheckOptions): Promise<CheckResult> => {
|
|
|
246
252
|
pending.count = expected;
|
|
247
253
|
pending.resolve = resolve;
|
|
248
254
|
});
|
|
249
|
-
const ready = waitForReports(
|
|
250
|
-
const requests = new Int32Array(new SharedArrayBuffer(
|
|
251
|
-
const remaining = new Int32Array(new SharedArrayBuffer(
|
|
255
|
+
const ready = waitForReports(workerCount);
|
|
256
|
+
const requests = new Int32Array(new SharedArrayBuffer(workerCount * 4));
|
|
257
|
+
const remaining = new Int32Array(new SharedArrayBuffer(workerCount * 4));
|
|
252
258
|
const workers = await Promise.all(
|
|
253
|
-
Array.from({ length:
|
|
259
|
+
Array.from({ length: workerCount }, () =>
|
|
254
260
|
spawnWorker(
|
|
255
261
|
new URL("./parallel-worker.js", import.meta.url),
|
|
256
262
|
(message) => onMessage(message as WorkerMessage),
|
|
@@ -267,7 +273,7 @@ export const check = async (options: CheckOptions): Promise<CheckResult> => {
|
|
|
267
273
|
return (from < to ? channel.port1 : channel.port2) as unknown as Port;
|
|
268
274
|
};
|
|
269
275
|
workers.forEach((worker, index) => {
|
|
270
|
-
const ports = Array.from({ length:
|
|
276
|
+
const ports = Array.from({ length: workerCount }, (_, peer) =>
|
|
271
277
|
peer === index ? undefined : getPort(index, peer),
|
|
272
278
|
);
|
|
273
279
|
const seed = seeds[index].finish();
|
|
@@ -308,11 +314,11 @@ export const check = async (options: CheckOptions): Promise<CheckResult> => {
|
|
|
308
314
|
terminate();
|
|
309
315
|
return fallBack();
|
|
310
316
|
}
|
|
311
|
-
for (
|
|
312
|
-
const reported = waitForReports(
|
|
317
|
+
for (;;) {
|
|
318
|
+
const reported = waitForReports(workerCount);
|
|
313
319
|
// Every worker is idle, so peers can ask any of them for states once the level starts.
|
|
314
320
|
requests.forEach((_, index) => Atomics.store(requests, index, 0));
|
|
315
|
-
send({ type: "level"
|
|
321
|
+
send({ type: "level" });
|
|
316
322
|
const messages = await collectLevels(await reported);
|
|
317
323
|
if (isAborted(messages)) {
|
|
318
324
|
terminate();
|