tla-ts 0.0.10-dev.37a75eb5b → 0.0.10-dev.45c0eaef5
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/dist/compile.cjs +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +33 -33
- package/dist/deciders.js +53 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +17 -3
- package/dist/index.d.ts +17 -3
- 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 +55 -55
- package/dist/prove.js +78 -78
- package/dist/run.cjs +40 -42
- package/dist/run.js +42 -44
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +96 -91
- package/dist/transfer.js +95 -90
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +31 -3
- package/src/bags.ts +12 -10
- package/src/builtins.ts +4 -3
- package/src/check-failure.ts +13 -11
- package/src/check-trace.ts +146 -93
- package/src/check.ts +418 -246
- package/src/cli/tlc-output.ts +17 -2
- package/src/cli/tlc.ts +5 -4
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +23 -10
- package/src/coverage.ts +255 -18
- package/src/dependencies.ts +68 -15
- package/src/dfid.ts +93 -35
- package/src/environment.ts +106 -39
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +415 -132
- package/src/exit-codes.ts +28 -15
- package/src/instances.ts +135 -11
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +674 -236
- package/src/lexer.ts +12 -2
- package/src/liveness-checker.ts +161 -60
- package/src/liveness.ts +55 -10
- package/src/obligations/index.ts +1 -1
- package/src/obligations/normalize.ts +1 -4
- package/src/obligations/printer.ts +5 -5
- package/src/obligations/source.ts +2 -0
- package/src/parser.ts +110 -111
- package/src/prover/isabelle/isar/attrib.ts +4 -4
- package/src/prover/isabelle/isar/rule-cases.ts +8 -6
- package/src/prover/isabelle/provers/clasimp.ts +1 -1
- package/src/prover/isabelle/provers/hypsubst.ts +2 -2
- package/src/prover/isabelle/pure/rewriter.ts +3 -3
- package/src/prover/isabelle/pure/term.ts +3 -3
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/smt/rewrite.ts +2 -7
- package/src/prover/smt/simplify.ts +1 -1
- package/src/prover/smt/solver/arith-rewriter.ts +11 -3
- package/src/prover/smt/solver/array-rewriter.ts +12 -2
- package/src/prover/smt/solver/asserted-formulas.ts +164 -58
- package/src/prover/smt/solver/ast-lt.ts +1 -1
- package/src/prover/smt/solver/ast.ts +65 -13
- package/src/prover/smt/solver/auf-solver.ts +23 -12
- package/src/prover/smt/solver/bit-blast-tactic.ts +27 -1
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-simplifier.ts +11 -13
- package/src/prover/smt/solver/bv-decl-plugin.ts +13 -10
- package/src/prover/smt/solver/bv-rewriter.ts +1 -1
- package/src/prover/smt/solver/card2bv.ts +35 -18
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
- package/src/prover/smt/solver/context.ts +65 -14
- package/src/prover/smt/solver/ctx-simplify.ts +1 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -7
- package/src/prover/smt/solver/dependent-expr-state.ts +28 -16
- package/src/prover/smt/solver/diff-neq.ts +1 -2
- package/src/prover/smt/solver/dt2bv-tactic.ts +57 -21
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +5 -8
- package/src/prover/smt/solver/euf/arith-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/bv-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/egraph.ts +3 -9
- package/src/prover/smt/solver/euf/euf-solver.ts +1 -2
- package/src/prover/smt/solver/euf/mam.ts +1 -5
- package/src/prover/smt/solver/euf/q-ematch.ts +1 -2
- package/src/prover/smt/solver/euf/th-solver.ts +0 -7
- package/src/prover/smt/solver/fd-solver.ts +608 -141
- package/src/prover/smt/solver/fix-dl-var.ts +1 -2
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
- package/src/prover/smt/solver/goal.ts +4 -3
- package/src/prover/smt/solver/hashtable.ts +4 -0
- package/src/prover/smt/solver/internalizer.ts +1 -1
- package/src/prover/smt/solver/logic-tactics.ts +15 -5
- package/src/prover/smt/solver/lp/core-solver.ts +12 -8
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -2
- package/src/prover/smt/solver/lp/nla-grobner.ts +2 -2
- package/src/prover/smt/solver/lp/pdd.ts +2 -3
- package/src/prover/smt/solver/lp/union-find.ts +1 -1
- package/src/prover/smt/solver/mam-compiler.ts +1 -1
- package/src/prover/smt/solver/maxcore.ts +2 -1
- package/src/prover/smt/solver/maxsmt-base.ts +1 -0
- package/src/prover/smt/solver/model-based-opt.ts +1 -1
- package/src/prover/smt/solver/model-checker.ts +1 -1
- package/src/prover/smt/solver/model-evaluator.ts +2 -0
- package/src/prover/smt/solver/model-generator.ts +85 -43
- package/src/prover/smt/solver/mpf.ts +2 -4
- package/src/prover/smt/solver/mus.ts +2 -3
- package/src/prover/smt/solver/muz/dl-context.ts +14 -42
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +1 -1
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
- package/src/prover/smt/solver/muz/dl-rule.ts +8 -9
- package/src/prover/smt/solver/muz/hnf.ts +2 -2
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +1 -1
- package/src/prover/smt/solver/muz/horn-tactic.ts +15 -2
- package/src/prover/smt/solver/muz/rule-properties.ts +22 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1 -4
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +1 -1
- package/src/prover/smt/solver/nlqsat.ts +1 -1
- package/src/prover/smt/solver/nlsat/algebraic.ts +4 -5
- package/src/prover/smt/solver/nlsat/levelwise.ts +0 -4
- package/src/prover/smt/solver/nlsat/polynomial.ts +1 -36
- package/src/prover/smt/solver/nlsat/upolynomial.ts +1 -1
- package/src/prover/smt/solver/nlsat-tactic.ts +1 -1
- package/src/prover/smt/solver/nnf.ts +6 -2
- package/src/prover/smt/solver/opt-context.ts +16 -7
- package/src/prover/smt/solver/opt-pareto.ts +19 -0
- package/src/prover/smt/solver/opt-preprocess.ts +1 -1
- package/src/prover/smt/solver/opt-solver.ts +4 -3
- package/src/prover/smt/solver/optsmt.ts +1 -1
- package/src/prover/smt/solver/parallel-tactic.ts +1 -1
- package/src/prover/smt/solver/pb-rewriter.ts +1 -4
- package/src/prover/smt/solver/poly-rewriter.ts +75 -18
- package/src/prover/smt/solver/probes.ts +88 -23
- package/src/prover/smt/solver/proto-model.ts +8 -8
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +2 -4
- package/src/prover/smt/solver/qe-lite.ts +2 -2
- package/src/prover/smt/solver/qe.ts +3 -2
- package/src/prover/smt/solver/qsat.ts +23 -8
- package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +7 -6
- package/src/prover/smt/solver/rewriter.ts +31 -25
- package/src/prover/smt/solver/rlimit.ts +7 -3
- package/src/prover/smt/solver/sat/config.ts +1 -1
- package/src/prover/smt/solver/sat/goal2sat.ts +65 -12
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +129 -43
- package/src/prover/smt/solver/sat/model-converter.ts +1 -1
- package/src/prover/smt/solver/sat/pb-constraint.ts +7 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +26 -7
- package/src/prover/smt/solver/sat/sat-tactic.ts +15 -6
- package/src/prover/smt/solver/sat/sat2goal.ts +72 -48
- package/src/prover/smt/solver/sat/simplifier.ts +1 -1
- package/src/prover/smt/solver/sat/solver.ts +27 -47
- package/src/prover/smt/solver/seq-axioms.ts +20 -35
- package/src/prover/smt/solver/seq-decl-plugin.ts +1 -1
- package/src/prover/smt/solver/seq-derive.ts +1 -1
- package/src/prover/smt/solver/seq-eq-solver.ts +2 -2
- package/src/prover/smt/solver/seq-monadic.ts +7 -5
- package/src/prover/smt/solver/seq-re-rewriter.ts +2 -1
- package/src/prover/smt/solver/seq-re-util.ts +1 -1
- package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
- package/src/prover/smt/solver/seq-regex-live.ts +2 -2
- package/src/prover/smt/solver/seq-rewriter.ts +31 -29
- package/src/prover/smt/solver/seq-skolem.ts +0 -23
- package/src/prover/smt/solver/seq-view-witness.ts +4 -4
- package/src/prover/smt/solver/smt-consequences.ts +1 -1
- package/src/prover/smt/solver/smt-kernel.ts +40 -6
- package/src/prover/smt/solver/smt-setup.ts +106 -13
- package/src/prover/smt/solver/smtlib-parser.ts +579 -214
- package/src/prover/smt/solver/smtlib-script.ts +600 -170
- package/src/prover/smt/solver/solve-eqs.ts +36 -37
- package/src/prover/smt/solver/solver.ts +18 -3
- package/src/prover/smt/solver/tactic.ts +342 -196
- package/src/prover/smt/solver/theory-bv.ts +13 -3
- package/src/prover/smt/solver/theory-fpa.ts +1 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +1 -0
- package/src/prover/smt/solver/theory-lra-internalize.ts +2 -0
- package/src/prover/smt/solver/theory-lra-propagate.ts +11 -3
- package/src/prover/smt/solver/theory-lra-state.ts +1 -1
- package/src/prover/smt/solver/theory-lra.ts +1 -1
- package/src/prover/smt/solver/theory-pb.ts +24 -7
- package/src/prover/smt/solver/theory-seq-solve.ts +1 -1
- package/src/prover/smt/solver/theory-seq-state.ts +2 -21
- package/src/prover/smt/solver/theory-without-terms.ts +24 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +1 -0
- package/src/prover/tlapm/cache.ts +8 -8
- package/src/prover/zenon/index-table.ts +5 -2
- package/src/prover/zenon/isar-case.ts +1 -1
- package/src/prover/zenon/isar.ts +2 -2
- package/src/prover/zenon/phrase.ts +1 -1
- package/src/resolve.ts +1226 -246
- package/src/runtime.ts +19 -2
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +4 -2
- package/src/sany/generator-def-entries.ts +123 -36
- package/src/sany/generator-definitions.ts +4 -2
- package/src/sany/generator-expressions.ts +51 -20
- package/src/sany/generator-proofs.ts +17 -11
- package/src/sany/generator.ts +11 -5
- package/src/sany/lexer.ts +15 -7
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +283 -126
- package/src/simulate.ts +247 -185
- package/src/spec-description.ts +15 -7
- package/src/standard-definitions.ts +1 -0
- package/src/standard-modules.ts +56 -22
- package/src/subexpressions.ts +563 -139
- package/src/successors.ts +50 -20
- package/src/symmetry.ts +2 -1
- package/src/tlc/jar-data.ts +1 -3
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/random.ts +2 -1
- package/src/tlc/replay.ts +147 -46
- package/src/tlc/tlc-operators.ts +10 -8
- package/src/tlc/tlcext-operators.ts +26 -10
- package/src/tlc/trace-spec.ts +9 -22
- package/src/trace-liveness.ts +529 -0
- package/src/typed-tier.ts +52 -31
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +150 -79
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { SmtInvariantError } from "../../../errors";
|
|
2
|
-
import { OP_ITE, OP_LT, SORT_BOOL, SORT_INT, isArithSort, type AstManager } from "./ast";
|
|
2
|
+
import { KIND_APP, OP_ITE, OP_LT, SORT_BOOL, SORT_INT, isArithSort, type AstManager } from "./ast";
|
|
3
3
|
import { combineHash } from "./hash";
|
|
4
4
|
import { ObjHashtable, ObjMap } from "./hashtable";
|
|
5
5
|
import { FuncInterp, type ProtoModel } from "./proto-model";
|
|
@@ -245,14 +245,30 @@ export class AufSolver {
|
|
|
245
245
|
|
|
246
246
|
private cleanupInstantiationSets() {
|
|
247
247
|
const manager = this.manager;
|
|
248
|
+
const containsArray = (expr: number) => {
|
|
249
|
+
const visited = new Set<number>();
|
|
250
|
+
const todo = [expr];
|
|
251
|
+
for (let term = todo.pop(); term !== undefined; term = todo.pop()) {
|
|
252
|
+
if (visited.has(term)) continue;
|
|
253
|
+
visited.add(term);
|
|
254
|
+
if (manager.isArraySort(manager.sorts[term])) return true;
|
|
255
|
+
manager.pushArgs(term, todo);
|
|
256
|
+
}
|
|
257
|
+
return false;
|
|
258
|
+
};
|
|
259
|
+
const shouldCleanup = (value: number | null) =>
|
|
260
|
+
value === null ||
|
|
261
|
+
(!manager.isValue(value) &&
|
|
262
|
+
!manager.isArraySort(manager.sorts[value]) &&
|
|
263
|
+
(manager.kinds[value] !== KIND_APP ||
|
|
264
|
+
manager.getNumArgs(value) === 0 ||
|
|
265
|
+
!containsArray(value)));
|
|
248
266
|
for (const node of this.nodes) {
|
|
249
267
|
if (!node.isRoot()) continue;
|
|
250
268
|
const set = node.getInstantiationSet();
|
|
251
269
|
const toDelete: number[] = [];
|
|
252
|
-
for (const term of set.elems.keys())
|
|
253
|
-
|
|
254
|
-
if (value === null || !manager.isUniqueValue(value)) toDelete.push(term);
|
|
255
|
-
}
|
|
270
|
+
for (const term of set.elems.keys())
|
|
271
|
+
if (shouldCleanup(this.eval(term, true))) toDelete.push(term);
|
|
256
272
|
for (const term of toDelete) set.remove(term);
|
|
257
273
|
this.resetEvalCache();
|
|
258
274
|
}
|
|
@@ -285,18 +301,13 @@ export class AufSolver {
|
|
|
285
301
|
return result;
|
|
286
302
|
}
|
|
287
303
|
|
|
288
|
-
private areDistinct(first: number, second: number) {
|
|
289
|
-
const manager = this.manager;
|
|
290
|
-
return first !== second && manager.isUniqueValue(first) && manager.isUniqueValue(second);
|
|
291
|
-
}
|
|
292
|
-
|
|
293
304
|
private pickInstanceDiffExceptions(node: Node, exceptionValues: number[]) {
|
|
294
305
|
let result: number | null = null;
|
|
295
306
|
let resultGeneration = Number.POSITIVE_INFINITY;
|
|
296
307
|
for (const entry of node.getInstantiationSet().elems) {
|
|
297
308
|
const value = this.eval(entry[0], true);
|
|
298
309
|
if (value === null) return result;
|
|
299
|
-
const isFound = exceptionValues.some((other) => !this.areDistinct(value, other));
|
|
310
|
+
const isFound = exceptionValues.some((other) => !this.manager.areDistinct(value, other));
|
|
300
311
|
if (!isFound && (result === null || entry[1] < resultGeneration)) {
|
|
301
312
|
result = entry[0];
|
|
302
313
|
resultGeneration = entry[1];
|
|
@@ -331,7 +342,7 @@ export class AufSolver {
|
|
|
331
342
|
if (kValue === null) return false;
|
|
332
343
|
for (const exception of exceptions) {
|
|
333
344
|
const value = this.eval(exception, true);
|
|
334
|
-
if (value !== null && !this.areDistinct(kValue, value))
|
|
345
|
+
if (value !== null && !this.manager.areDistinct(kValue, value))
|
|
335
346
|
this.newConstraints.push(this.manager.mkNot(this.manager.mkEq(k, exception)));
|
|
336
347
|
}
|
|
337
348
|
return true;
|
|
@@ -88,6 +88,8 @@ export class BitBlasterRewriter extends RewriterTpl {
|
|
|
88
88
|
readonly keys: number[] = [];
|
|
89
89
|
readonly values: RefVector;
|
|
90
90
|
readonly newbits: number[] = [];
|
|
91
|
+
private keyLimits: number[] = [];
|
|
92
|
+
private newbitLimits: number[] = [];
|
|
91
93
|
|
|
92
94
|
constructor(
|
|
93
95
|
manager: AstManager,
|
|
@@ -123,6 +125,30 @@ export class BitBlasterRewriter extends RewriterTpl {
|
|
|
123
125
|
return this.const2bits.get(decl);
|
|
124
126
|
}
|
|
125
127
|
|
|
128
|
+
getNumScopes() {
|
|
129
|
+
return this.keyLimits.length;
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
push() {
|
|
133
|
+
this.keyLimits.push(this.keys.length);
|
|
134
|
+
this.newbitLimits.push(this.newbits.length);
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
pop(numScopes: number) {
|
|
138
|
+
if (numScopes === 0) return;
|
|
139
|
+
const manager = this.manager;
|
|
140
|
+
const size = this.keyLimits.length - numScopes;
|
|
141
|
+
const keyLimit = this.keyLimits[size];
|
|
142
|
+
for (const decl of this.keys.splice(keyLimit)) {
|
|
143
|
+
this.const2bits.delete(decl);
|
|
144
|
+
manager.decDeclRef(decl);
|
|
145
|
+
}
|
|
146
|
+
this.values.shrink(keyLimit);
|
|
147
|
+
this.keyLimits.length = size;
|
|
148
|
+
for (const decl of this.newbits.splice(this.newbitLimits[size])) manager.decDeclRef(decl);
|
|
149
|
+
this.newbitLimits.length = size;
|
|
150
|
+
}
|
|
151
|
+
|
|
126
152
|
private mkConst(decl: number) {
|
|
127
153
|
const manager = this.manager;
|
|
128
154
|
const existing = this.const2bits.get(decl);
|
|
@@ -557,7 +583,7 @@ export const runBitBlast =
|
|
|
557
583
|
rewritten = next;
|
|
558
584
|
if (form === rewritten) continue;
|
|
559
585
|
isChanged = true;
|
|
560
|
-
goal.update(index, rewritten);
|
|
586
|
+
goal.update(index, rewritten, goal.getDependency(index));
|
|
561
587
|
}
|
|
562
588
|
if (isChanged && rewriter.keys.length > keyPos) {
|
|
563
589
|
const const2bits = new ObjMap<number>((decl) => manager.getDeclHash(decl));
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
import { type AstManager, OP_ITE, SORT_BOOL } from "./ast";
|
|
2
|
+
import { runSimplifier } from "./dependent-expr-state";
|
|
3
|
+
import type { Goal } from "./goal";
|
|
4
|
+
import { RewriterTpl } from "./rewriter-tpl";
|
|
5
|
+
|
|
6
|
+
class BlastTermIteRewriter extends RewriterTpl {
|
|
7
|
+
isRewritingPatterns() {
|
|
8
|
+
return false;
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
reduceApp(decl: number, args: number[], sort: number) {
|
|
12
|
+
const manager = this.manager;
|
|
13
|
+
if (decl === OP_ITE) return -1;
|
|
14
|
+
for (let index = 0; index < args.length; index++) {
|
|
15
|
+
const arg = args[index];
|
|
16
|
+
if (manager.sorts[arg] === SORT_BOOL || manager.getOp(arg) !== OP_ITE) continue;
|
|
17
|
+
const thenBranch = manager.getArg(arg, 1);
|
|
18
|
+
const elseBranch = manager.getArg(arg, 2);
|
|
19
|
+
const newArgs = [...args];
|
|
20
|
+
newArgs[index] = thenBranch;
|
|
21
|
+
const thenApp = manager.mkApp(decl, newArgs, sort);
|
|
22
|
+
if (thenBranch === elseBranch) {
|
|
23
|
+
manager.incRef(thenApp);
|
|
24
|
+
return { expr: thenApp, depth: 1 };
|
|
25
|
+
}
|
|
26
|
+
newArgs[index] = elseBranch;
|
|
27
|
+
const elseApp = manager.mkApp(decl, newArgs, sort);
|
|
28
|
+
const result = manager.mkApp(
|
|
29
|
+
OP_ITE,
|
|
30
|
+
[manager.getArg(arg, 0), thenApp, elseApp],
|
|
31
|
+
manager.sorts[thenApp],
|
|
32
|
+
);
|
|
33
|
+
manager.incRef(result);
|
|
34
|
+
return { expr: result, depth: 3 };
|
|
35
|
+
}
|
|
36
|
+
return -1;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
export const blastTermIte = (manager: AstManager, goal: Goal) =>
|
|
41
|
+
runSimplifier(goal, false, (state) => {
|
|
42
|
+
const rewriter = new BlastTermIteRewriter(manager);
|
|
43
|
+
return {
|
|
44
|
+
reduce: () => state.rewriteEach((form) => rewriter.rewrite(form)),
|
|
45
|
+
release: () => rewriter.release(),
|
|
46
|
+
};
|
|
47
|
+
});
|
|
@@ -29,6 +29,7 @@ import { Rational } from "./rational";
|
|
|
29
29
|
import { RefVector } from "./ref-vector";
|
|
30
30
|
import { Rewriter, TACTIC_REWRITER_OPTIONS } from "./rewriter";
|
|
31
31
|
import { RewriterTpl } from "./rewriter-tpl";
|
|
32
|
+
import { DependentExprState, finishSimplifier } from "./dependent-expr-state";
|
|
32
33
|
|
|
33
34
|
interface Bound {
|
|
34
35
|
value: Rational;
|
|
@@ -373,22 +374,21 @@ class BoundSimplifier {
|
|
|
373
374
|
|
|
374
375
|
reduce() {
|
|
375
376
|
const goal = this.goal;
|
|
377
|
+
const state = new DependentExprState(this.manager, goal);
|
|
376
378
|
let isUpdated = true;
|
|
377
379
|
for (let round = 0; round < 5 && isUpdated; round++) {
|
|
378
380
|
isUpdated = false;
|
|
379
381
|
let isBoundFound = false;
|
|
380
382
|
this.reset();
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
}
|
|
383
|
+
state.forEachIndex((index) => {
|
|
384
|
+
if (!this.insertBound(goal.forms.items[index])) return;
|
|
385
|
+
goal.update(index, this.manager.trueExpr);
|
|
386
|
+
isBoundFound = true;
|
|
387
|
+
});
|
|
387
388
|
if (!isBoundFound) break;
|
|
388
|
-
|
|
389
|
-
this.tightenBound(goal.forms.items[index]);
|
|
389
|
+
state.forEachIndex((index) => this.tightenBound(goal.forms.items[index]));
|
|
390
390
|
const rewriter = new BoundRewriter(this.manager, this);
|
|
391
|
-
|
|
391
|
+
state.forEachIndex((index) => {
|
|
392
392
|
const form = goal.forms.items[index];
|
|
393
393
|
const result = rewriter.rewrite(form);
|
|
394
394
|
if (result !== form) {
|
|
@@ -396,7 +396,7 @@ class BoundSimplifier {
|
|
|
396
396
|
isUpdated = true;
|
|
397
397
|
}
|
|
398
398
|
this.manager.decRef(result);
|
|
399
|
-
}
|
|
399
|
+
});
|
|
400
400
|
rewriter.release();
|
|
401
401
|
this.restoreBounds();
|
|
402
402
|
}
|
|
@@ -594,7 +594,5 @@ export const propagateIneqs = (manager: AstManager, goal: Goal) => {
|
|
|
594
594
|
simplifier.reduce();
|
|
595
595
|
simplifier.release();
|
|
596
596
|
}
|
|
597
|
-
goal
|
|
598
|
-
goal.elimRedundancies();
|
|
599
|
-
goal.depth++;
|
|
597
|
+
finishSimplifier(goal);
|
|
600
598
|
};
|
|
@@ -254,13 +254,12 @@ export const getBvSignature = (
|
|
|
254
254
|
: op === OP_BCOMP
|
|
255
255
|
? { name: "bvcomp", domain: [sort, sort], range: manager.mkBvSort(1) }
|
|
256
256
|
: undefined;
|
|
257
|
-
if (fixed !== undefined) {
|
|
258
|
-
if (
|
|
259
|
-
return "declared arity mismatches supplied arity";
|
|
257
|
+
if (fixed !== undefined && argSorts.length !== fixed.domain.length) {
|
|
258
|
+
if (binary?.[1] !== true) return "declared arity mismatches supplied arity";
|
|
260
259
|
if (argSorts.some((argSort) => argSort !== sort))
|
|
261
260
|
return "declared sorts do not match supplied sorts";
|
|
262
|
-
return fixed;
|
|
263
261
|
}
|
|
262
|
+
if (fixed !== undefined) return fixed;
|
|
264
263
|
const isUnaryWithInt = argSorts.length === 1 && parameters.length === 1;
|
|
265
264
|
switch (op) {
|
|
266
265
|
case OP_BIT2BOOL:
|
|
@@ -320,19 +319,23 @@ export const getBvSignature = (
|
|
|
320
319
|
}
|
|
321
320
|
};
|
|
322
321
|
|
|
322
|
+
// mk_func_decl checks each argument against the declaration whose size the first one gives.
|
|
323
|
+
export const getMismatchedArgument = (signature: BvSignature, argSorts: number[]) =>
|
|
324
|
+
argSorts.length === signature.domain.length
|
|
325
|
+
? argSorts.findIndex((sort, index) => sort !== signature.domain[index])
|
|
326
|
+
: -1;
|
|
327
|
+
|
|
323
328
|
export const mkBvApp = (
|
|
324
329
|
manager: AstManager,
|
|
325
330
|
op: number,
|
|
326
331
|
args: number[],
|
|
327
332
|
parameters: number[] = [],
|
|
328
333
|
) => {
|
|
329
|
-
const
|
|
330
|
-
|
|
331
|
-
op,
|
|
332
|
-
args.map((arg) => manager.sorts[arg]),
|
|
333
|
-
parameters,
|
|
334
|
-
);
|
|
334
|
+
const argSorts = args.map((arg) => manager.sorts[arg]);
|
|
335
|
+
const signature = getBvSignature(manager, op, argSorts, parameters);
|
|
335
336
|
if (typeof signature === "string") throw new SmtInvariantError(signature);
|
|
337
|
+
if (getMismatchedArgument(signature, argSorts) !== -1)
|
|
338
|
+
throw new SmtInvariantError("an argument does not match the declaration");
|
|
336
339
|
const decl = manager.mkBvDecl(op, signature.name, parameters, signature.domain, signature.range);
|
|
337
340
|
return manager.mkApp(decl, args, signature.range);
|
|
338
341
|
};
|
|
@@ -100,7 +100,7 @@ export const DEFAULT_BV_OPTIONS: Omit<BvRewriterOptions, "isHiDiv0"> = {
|
|
|
100
100
|
isSplitConcatEq: false,
|
|
101
101
|
};
|
|
102
102
|
|
|
103
|
-
|
|
103
|
+
interface BoolRewrites {
|
|
104
104
|
mkEq: (left: number, right: number) => number;
|
|
105
105
|
mkIte: (condition: number, thenExpr: number, elseExpr: number) => number;
|
|
106
106
|
}
|
|
@@ -17,6 +17,8 @@ import {
|
|
|
17
17
|
import type { Goal } from "./goal";
|
|
18
18
|
import { Rational } from "./rational";
|
|
19
19
|
import { Rewriter, type RewriterOptions } from "./rewriter";
|
|
20
|
+
import { type DependentExprState, runSimplifier } from "./dependent-expr-state";
|
|
21
|
+
import { RewriterTpl } from "./rewriter-tpl";
|
|
20
22
|
|
|
21
23
|
interface Bound {
|
|
22
24
|
value: Rational;
|
|
@@ -69,8 +71,7 @@ const isPb = (manager: AstManager, first: number, second: number) => {
|
|
|
69
71
|
export const checkPbFree = (manager: AstManager, form: number) => {
|
|
70
72
|
const visited = new Set<number>();
|
|
71
73
|
const todo = [form];
|
|
72
|
-
|
|
73
|
-
const expr = todo.pop() as number;
|
|
74
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
74
75
|
if (visited.has(expr)) continue;
|
|
75
76
|
visited.add(expr);
|
|
76
77
|
if (manager.kinds[expr] === KIND_QUANTIFIER) {
|
|
@@ -91,20 +92,36 @@ export const checkPbFree = (manager: AstManager, form: number) => {
|
|
|
91
92
|
}
|
|
92
93
|
};
|
|
93
94
|
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
for (let index = 0; index < size && !goal.isInconsistent; index++) {
|
|
99
|
-
const form = goal.forms.items[index];
|
|
100
|
-
const rewritten = rewriter.rewrite(form);
|
|
101
|
-
checkPbFree(manager, rewritten);
|
|
102
|
-
if (rewritten !== form) goal.update(index, rewritten);
|
|
103
|
-
manager.decRef(rewritten);
|
|
104
|
-
}
|
|
105
|
-
rewriter.release();
|
|
95
|
+
// The port has no encoding to rewrite to, but the walk still counts its steps of the limit.
|
|
96
|
+
class CardPbRewriter extends RewriterTpl {
|
|
97
|
+
isRewritingPatterns() {
|
|
98
|
+
return false;
|
|
106
99
|
}
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
export const createCard2Bv =
|
|
103
|
+
(manager: AstManager, options: RewriterOptions) => (state: DependentExprState) => {
|
|
104
|
+
const rewriter = new Rewriter(manager, options);
|
|
105
|
+
const pbRewriter = new CardPbRewriter(manager);
|
|
106
|
+
let simplified = -1;
|
|
107
|
+
return {
|
|
108
|
+
reduce: () => {
|
|
109
|
+
state.rewriteEach((form) => {
|
|
110
|
+
const next = rewriter.rewrite(form);
|
|
111
|
+
if (simplified !== -1) manager.decRef(simplified);
|
|
112
|
+
simplified = next;
|
|
113
|
+
const rewritten = pbRewriter.rewrite(simplified);
|
|
114
|
+
checkPbFree(manager, rewritten);
|
|
115
|
+
return rewritten;
|
|
116
|
+
});
|
|
117
|
+
if (simplified !== -1) manager.decRef(simplified);
|
|
118
|
+
},
|
|
119
|
+
release: () => {
|
|
120
|
+
rewriter.release();
|
|
121
|
+
pbRewriter.release();
|
|
122
|
+
},
|
|
123
|
+
};
|
|
124
|
+
};
|
|
125
|
+
|
|
126
|
+
export const card2bv = (manager: AstManager, goal: Goal, options: RewriterOptions) =>
|
|
127
|
+
runSimplifier(goal, false, createCard2Bv(manager, options));
|
|
@@ -18,6 +18,7 @@ import { ObjMap } from "./hashtable";
|
|
|
18
18
|
import { RefVector } from "./ref-vector";
|
|
19
19
|
import { Rewriter, type RewriterOptions } from "./rewriter";
|
|
20
20
|
import { RewriterTpl } from "./rewriter-tpl";
|
|
21
|
+
import { runSimplifier } from "./dependent-expr-state";
|
|
21
22
|
|
|
22
23
|
const SIMPLIFIED_FAMILIES = [
|
|
23
24
|
FAMILY_BASIC,
|
|
@@ -48,6 +49,10 @@ class CofactorRewriter extends RewriterTpl {
|
|
|
48
49
|
return false;
|
|
49
50
|
}
|
|
50
51
|
|
|
52
|
+
checkMaxSteps() {
|
|
53
|
+
this.manager.limit.checkpoint();
|
|
54
|
+
}
|
|
55
|
+
|
|
51
56
|
setCofactorAtom(expr: number) {
|
|
52
57
|
const manager = this.manager;
|
|
53
58
|
this.term = -1;
|
|
@@ -121,16 +126,30 @@ class CofactorElimTermIte {
|
|
|
121
126
|
const manager = this.manager;
|
|
122
127
|
const occs = new ObjMap<number>((key) => manager.hashes[key]);
|
|
123
128
|
const visited = new Set<number>();
|
|
124
|
-
const
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
129
|
+
const frames = [expr];
|
|
130
|
+
const childIndexes = [0];
|
|
131
|
+
while (frames.length > 0) {
|
|
132
|
+
manager.limit.checkpoint();
|
|
133
|
+
const top = frames.length - 1;
|
|
134
|
+
const curr = frames[top];
|
|
135
|
+
const numArgs = manager.kinds[curr] === KIND_APP ? manager.getNumArgs(curr) : 0;
|
|
136
|
+
const isTermIte = this.isTermIte(curr);
|
|
137
|
+
let isPushed = false;
|
|
138
|
+
while (!isPushed && childIndexes[top] < numArgs) {
|
|
139
|
+
const arg = manager.getArg(curr, childIndexes[top]);
|
|
140
|
+
if (childIndexes[top] === 0 && isTermIte) occs.set(arg, (occs.get(arg) ?? 0) + 1);
|
|
141
|
+
childIndexes[top]++;
|
|
131
142
|
if (visited.has(arg)) continue;
|
|
132
143
|
visited.add(arg);
|
|
133
|
-
if (manager.kinds[arg] === KIND_APP && manager.getNumArgs(arg) > 0)
|
|
144
|
+
if (manager.kinds[arg] === KIND_APP && manager.getNumArgs(arg) > 0) {
|
|
145
|
+
frames.push(arg);
|
|
146
|
+
childIndexes.push(0);
|
|
147
|
+
isPushed = true;
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
if (!isPushed) {
|
|
151
|
+
frames.pop();
|
|
152
|
+
childIndexes.pop();
|
|
134
153
|
}
|
|
135
154
|
}
|
|
136
155
|
let best = -1;
|
|
@@ -200,6 +219,7 @@ class CofactorElimTermIte {
|
|
|
200
219
|
const manager = this.manager;
|
|
201
220
|
const frames = [{ expr: root, isFirst: true }];
|
|
202
221
|
while (frames.length > 0) {
|
|
222
|
+
manager.limit.checkpoint();
|
|
203
223
|
const frame = frames[frames.length - 1];
|
|
204
224
|
const expr = frame.expr;
|
|
205
225
|
if (manager.kinds[expr] !== KIND_APP) {
|
|
@@ -260,19 +280,14 @@ export const cofactorTermIte = (
|
|
|
260
280
|
goal: Goal,
|
|
261
281
|
options: RewriterOptions,
|
|
262
282
|
isCofactoringEqualities: boolean,
|
|
263
|
-
) =>
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
}
|
|
275
|
-
goal.elimTrue();
|
|
276
|
-
goal.elimRedundancies();
|
|
277
|
-
goal.depth++;
|
|
278
|
-
};
|
|
283
|
+
) =>
|
|
284
|
+
runSimplifier(goal, false, (state) => ({
|
|
285
|
+
reduce: () =>
|
|
286
|
+
state.rewriteEach((form) => {
|
|
287
|
+
const eliminator = new CofactorElimTermIte(manager, options, isCofactoringEqualities);
|
|
288
|
+
const result = eliminator.apply(form);
|
|
289
|
+
eliminator.release();
|
|
290
|
+
return result;
|
|
291
|
+
}),
|
|
292
|
+
release: () => {},
|
|
293
|
+
}));
|