tla-ts 0.0.10-dev.8aec06f77 → 0.0.10-dev.94c3dd828
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/deciders.cjs +37 -36
- package/dist/deciders.js +55 -54
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +3 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +146 -58
- package/dist/prove.js +142 -54
- package/dist/run.cjs +45 -43
- package/dist/run.js +47 -45
- package/dist/transfer.cjs +39 -36
- package/dist/transfer.js +23 -20
- package/dist/worker.cjs +1 -1
- package/dist/worker.js +1 -1
- package/package.json +1 -1
- package/src/ast.ts +3 -3
- package/src/check.ts +203 -33
- package/src/cli/tlapm.ts +261 -68
- package/src/dependencies.ts +23 -2
- package/src/errors.ts +1 -1
- package/src/exit-codes.ts +1 -0
- package/src/liveness-checker.ts +530 -201
- package/src/liveness.ts +47 -32
- package/src/obligations/anonymize.ts +2 -4
- package/src/obligations/index.ts +5 -3
- package/src/obligations/pragma.ts +2 -2
- package/src/parallel.ts +2 -2
- package/src/parser.ts +151 -42
- package/src/prover/deciders.ts +1 -8
- package/src/prover/isabelle/isar/attrib.ts +86 -45
- package/src/prover/isabelle/isar/context.ts +25 -22
- package/src/prover/isabelle/isar/induct.ts +2 -5
- package/src/prover/isabelle/isar/method.ts +5 -7
- package/src/prover/isabelle/isar/proof.ts +33 -16
- package/src/prover/isabelle/isar/rule-cases.ts +6 -14
- package/src/prover/isabelle/isar/theory.ts +16 -17
- package/src/prover/isabelle/isar/toplevel.ts +46 -52
- package/src/prover/isabelle/provers/classical.ts +1 -1
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +1 -0
- package/src/prover/prep/methods.ts +50 -3
- package/src/prover/prep/normalize.ts +4 -1
- package/src/prover/prove.ts +58 -32
- package/src/prover/ptl/decide.ts +43 -63
- package/src/prover/smt/data.ts +51 -45
- package/src/prover/smt/encode.ts +1 -2
- package/src/prover/smt/rewrite.ts +1 -0
- package/src/prover/smt/solver/aig-tactic.ts +25 -15
- package/src/prover/smt/solver/arith-rewriter.ts +3 -5
- package/src/prover/smt/solver/asserted-formulas.ts +1 -1
- package/src/prover/smt/solver/ast-util.ts +3 -1
- package/src/prover/smt/solver/ast.ts +110 -152
- package/src/prover/smt/solver/bound-manager.ts +39 -28
- package/src/prover/smt/solver/bv-bound-chk.ts +2 -8
- package/src/prover/smt/solver/bv-rewriter.ts +14 -16
- package/src/prover/smt/solver/bv1-blast.ts +1 -9
- package/src/prover/smt/solver/cg-table.ts +19 -14
- package/src/prover/smt/solver/check-logic.ts +6 -1
- package/src/prover/smt/solver/context.ts +20 -10
- package/src/prover/smt/solver/demodulator.ts +2 -2
- package/src/prover/smt/solver/dependent-expr-state.ts +16 -0
- package/src/prover/smt/solver/distribute-forall.ts +1 -10
- package/src/prover/smt/solver/dom-simplify.ts +1 -1
- package/src/prover/smt/solver/dt2bv-tactic.ts +2 -7
- package/src/prover/smt/solver/e-matching.ts +6 -6
- package/src/prover/smt/solver/elim-uncnstr.ts +3 -14
- package/src/prover/smt/solver/enode.ts +15 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +19 -8
- package/src/prover/smt/solver/euf/dt-solver.ts +19 -19
- package/src/prover/smt/solver/euf/egraph.ts +65 -32
- package/src/prover/smt/solver/euf/euf-solver.ts +35 -18
- package/src/prover/smt/solver/euf/fpa-solver.ts +37 -51
- package/src/prover/smt/solver/euf/mam.ts +6 -48
- package/src/prover/smt/solver/euf/q-ematch.ts +21 -94
- package/src/prover/smt/solver/euf/q-mbi.ts +4 -2
- package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -1
- package/src/prover/smt/solver/euf/q-solver.ts +2 -0
- package/src/prover/smt/solver/euf/th-solver.ts +1 -1
- package/src/prover/smt/solver/factor.ts +1 -11
- package/src/prover/smt/solver/fd-solver.ts +1 -2
- package/src/prover/smt/solver/fm-tactic.ts +19 -13
- package/src/prover/smt/solver/fpa-rewriter.ts +3 -1
- package/src/prover/smt/solver/fpa2bv-converter.ts +10 -6
- package/src/prover/smt/solver/internalizer.ts +41 -2
- package/src/prover/smt/solver/lia2pb.ts +18 -4
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +144 -107
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +50 -17
- package/src/prover/smt/solver/macro-finder.ts +1 -1
- package/src/prover/smt/solver/mam-compiler.ts +13 -13
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +1 -11
- package/src/prover/smt/solver/maxcore.ts +4 -12
- package/src/prover/smt/solver/maxlex.ts +0 -7
- package/src/prover/smt/solver/maxsmt-base.ts +7 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -11
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +9 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -9
- package/src/prover/smt/solver/model-evaluator.ts +9 -5
- package/src/prover/smt/solver/model-macro-solver.ts +3 -3
- package/src/prover/smt/solver/muz/dl-context.ts +57 -3
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -20
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -1
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -10
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +76 -13
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -2
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -2
- package/src/prover/smt/solver/muz/dl-rule.ts +93 -29
- package/src/prover/smt/solver/muz/hnf.ts +6 -5
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +178 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +14 -3
- package/src/prover/smt/solver/muz/rule-properties.ts +194 -36
- package/src/prover/smt/solver/muz/spacer-context.ts +102 -84
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -2
- package/src/prover/smt/solver/muz/spacer-pdr.ts +3 -3
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +2 -7
- package/src/prover/smt/solver/muz/spacer-util.ts +2 -2
- package/src/prover/smt/solver/muz/substitution.ts +88 -37
- package/src/prover/smt/solver/nlqsat.ts +2 -2
- package/src/prover/smt/solver/nlsat/algebraic.ts +1 -2
- package/src/prover/smt/solver/nlsat/explain.ts +5 -0
- package/src/prover/smt/solver/nlsat/solver.ts +36 -25
- package/src/prover/smt/solver/opt-context.ts +9 -8
- package/src/prover/smt/solver/opt-nlsat.ts +68 -58
- package/src/prover/smt/solver/opt-solver.ts +16 -7
- package/src/prover/smt/solver/optsmt.ts +12 -9
- package/src/prover/smt/solver/pattern-inference.ts +2 -2
- package/src/prover/smt/solver/pb-rewriter.ts +13 -13
- package/src/prover/smt/solver/poly-rewriter.ts +2 -2
- package/src/prover/smt/solver/probes.ts +1 -1
- package/src/prover/smt/solver/propagate-values.ts +4 -0
- package/src/prover/smt/solver/proto-model.ts +5 -5
- package/src/prover/smt/solver/purify-arith.ts +50 -15
- package/src/prover/smt/solver/qe-arith-plugin.ts +2 -1
- package/src/prover/smt/solver/qe-mbp.ts +13 -23
- package/src/prover/smt/solver/qe.ts +45 -53
- package/src/prover/smt/solver/qsat.ts +70 -90
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -9
- package/src/prover/smt/solver/quasi-macros.ts +9 -18
- package/src/prover/smt/solver/rational.ts +17 -0
- package/src/prover/smt/solver/recfun-decl-plugin.ts +33 -19
- package/src/prover/smt/solver/recfun-rewriter.ts +1 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +6 -2
- package/src/prover/smt/solver/rewriter.ts +1 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +59 -46
- package/src/prover/smt/solver/sat/clause-use-list.ts +0 -6
- package/src/prover/smt/solver/sat/clause.ts +1 -3
- package/src/prover/smt/solver/sat/config.ts +3 -3
- package/src/prover/smt/solver/sat/consequences.ts +1 -1
- package/src/prover/smt/solver/sat/goal2sat.ts +1 -1
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +4 -12
- package/src/prover/smt/solver/sat/model-converter.ts +1 -15
- package/src/prover/smt/solver/sat/pb-solver.ts +49 -23
- package/src/prover/smt/solver/sat/probing.ts +22 -19
- package/src/prover/smt/solver/sat/sat2goal.ts +9 -10
- package/src/prover/smt/solver/sat/simplifier.ts +15 -56
- package/src/prover/smt/solver/sat/solver.ts +20 -19
- package/src/prover/smt/solver/sat/watch-list.ts +7 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +7 -7
- package/src/prover/smt/solver/seq-derive.ts +6 -7
- package/src/prover/smt/solver/seq-eq-solver.ts +7 -7
- package/src/prover/smt/solver/seq-range-predicate.ts +14 -1
- package/src/prover/smt/solver/seq-re-rewriter.ts +1 -10
- package/src/prover/smt/solver/seq-re-util.ts +1 -2
- package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
- package/src/prover/smt/solver/seq-regex-live.ts +4 -4
- package/src/prover/smt/solver/seq-rewriter.ts +1 -4
- package/src/prover/smt/solver/smt-setup.ts +15 -9
- package/src/prover/smt/solver/smtlib-parser.ts +1174 -579
- package/src/prover/smt/solver/smtlib-script.ts +866 -728
- package/src/prover/smt/solver/tactic.ts +66 -14
- package/src/prover/smt/solver/theory-array.ts +25 -58
- package/src/prover/smt/solver/theory-bv.ts +13 -50
- package/src/prover/smt/solver/theory-fpa.ts +46 -78
- package/src/prover/smt/solver/theory-pb.ts +10 -6
- package/src/prover/smt/solver/theory-recfun.ts +2 -2
- package/src/prover/smt/solver/theory-seq-regex.ts +3 -6
- package/src/prover/smt/solver/theory-seq-solve.ts +5 -5
- package/src/prover/smt/solver/theory-seq-state.ts +6 -3
- package/src/prover/smt/solver/theory-seq.ts +32 -54
- package/src/prover/smt/solver/theory.ts +16 -1
- package/src/prover/smt/solver/tseitin-cnf.ts +3 -3
- package/src/prover/smt/solver/var-subst.ts +2 -2
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/zenon/decide.ts +9 -11
- package/src/prover/zenon/node.ts +12 -11
- package/src/prover/zenon/tla/sets.ts +1 -1
- package/src/search.ts +131 -16
- package/src/successors.ts +1 -1
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/summary.ts +29 -14
- package/src/typed-tier.ts +6535 -0
- package/src/prover/smt/solver/seq-regex-witness.ts +0 -100
|
@@ -1,9 +1,13 @@
|
|
|
1
1
|
// Ported from Z3 (src/muz/spacer/spacer_context.cpp), MIT license, see z3-license.txt.
|
|
2
2
|
import { SmtTacticError, SmtUnsupportedError } from "../../../../errors";
|
|
3
3
|
import { type AstManager, getSymbolName, KIND_VAR, OP_AND, OP_IMPLIES, SORT_BOOL } from "../ast";
|
|
4
|
-
import { pushNotOwned } from "../ast-util";
|
|
4
|
+
import { flattenOrVector, pushNotOwned } from "../ast-util";
|
|
5
|
+
import { ObjHashtable, ObjMap } from "../hashtable";
|
|
5
6
|
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
6
|
-
import
|
|
7
|
+
import { ExprSafeReplace } from "../expr-safe-replace";
|
|
8
|
+
import { FuncInterp, ProtoModel } from "../proto-model";
|
|
9
|
+
import { RefVector } from "../ref-vector";
|
|
10
|
+
import { Rewriter, TACTIC_REWRITER_OPTIONS } from "../rewriter";
|
|
7
11
|
import { getFreeVarSorts, VarSubst } from "../var-subst";
|
|
8
12
|
import type { DatalogContext, FpParams } from "./dl-context";
|
|
9
13
|
import { blastTermIte } from "./dl-mk-elim-term-ite";
|
|
@@ -35,10 +39,8 @@ export const L_GAVE_UP = 2;
|
|
|
35
39
|
|
|
36
40
|
class ReachFact {
|
|
37
41
|
tag = -1;
|
|
38
|
-
readonly justifications: ReachFact[] = [];
|
|
39
42
|
|
|
40
43
|
constructor(
|
|
41
|
-
readonly rule: Rule,
|
|
42
44
|
readonly fact: number,
|
|
43
45
|
readonly auxVars: readonly number[],
|
|
44
46
|
readonly isInit = false,
|
|
@@ -53,9 +55,7 @@ export class Lemma {
|
|
|
53
55
|
level: number;
|
|
54
56
|
bumped = 0;
|
|
55
57
|
weakness: number;
|
|
56
|
-
isExternal = false;
|
|
57
58
|
isBlocked = false;
|
|
58
|
-
isBackground = false;
|
|
59
59
|
|
|
60
60
|
constructor(
|
|
61
61
|
private context: SpacerContext,
|
|
@@ -116,7 +116,6 @@ export class Lemma {
|
|
|
116
116
|
}
|
|
117
117
|
|
|
118
118
|
setLevel(level: number) {
|
|
119
|
-
this.pob?.blockedAt(level);
|
|
120
119
|
this.level = level;
|
|
121
120
|
}
|
|
122
121
|
|
|
@@ -132,8 +131,7 @@ export class Lemma {
|
|
|
132
131
|
const isLemmaLess = (manager: AstManager, first: Lemma, second: Lemma) =>
|
|
133
132
|
first.level !== second.level
|
|
134
133
|
? first.level < second.level
|
|
135
|
-
:
|
|
136
|
-
first.getExpr() !== second.getExpr();
|
|
134
|
+
: manager.ids[first.getExpr()] < manager.ids[second.getExpr()];
|
|
137
135
|
|
|
138
136
|
export class Pob {
|
|
139
137
|
readonly id: number;
|
|
@@ -141,7 +139,6 @@ export class Pob {
|
|
|
141
139
|
binding: number[] = [];
|
|
142
140
|
level: number;
|
|
143
141
|
depth: number;
|
|
144
|
-
desiredLevel = 0;
|
|
145
142
|
isOpen = true;
|
|
146
143
|
isUsingFarkas = true;
|
|
147
144
|
isInQueue = false;
|
|
@@ -149,8 +146,6 @@ export class Pob {
|
|
|
149
146
|
derivation: Derivation | undefined;
|
|
150
147
|
readonly kids: Pob[] = [];
|
|
151
148
|
readonly lemmas: Lemma[] = [];
|
|
152
|
-
blockedLevel = 0;
|
|
153
|
-
gas = 0;
|
|
154
149
|
|
|
155
150
|
constructor(
|
|
156
151
|
readonly parent: Pob | undefined,
|
|
@@ -163,7 +158,6 @@ export class Pob {
|
|
|
163
158
|
this.level = level;
|
|
164
159
|
this.depth = depth;
|
|
165
160
|
if (isAddingToParent && parent !== undefined) parent.kids.push(this);
|
|
166
|
-
if (parent !== undefined) this.gas = parent.gas;
|
|
167
161
|
}
|
|
168
162
|
|
|
169
163
|
setPost(post: number, binding: readonly number[] = []) {
|
|
@@ -175,7 +169,6 @@ export class Pob {
|
|
|
175
169
|
this.binding = [...other.binding];
|
|
176
170
|
this.level = other.level;
|
|
177
171
|
this.depth = other.depth;
|
|
178
|
-
this.desiredLevel = Math.max(this.desiredLevel, other.desiredLevel);
|
|
179
172
|
this.isOpen = other.isOpen;
|
|
180
173
|
this.isUsingFarkas = other.isUsingFarkas;
|
|
181
174
|
this.weakness = other.weakness;
|
|
@@ -198,17 +191,11 @@ export class Pob {
|
|
|
198
191
|
this.depth++;
|
|
199
192
|
this.weakness = 0;
|
|
200
193
|
}
|
|
201
|
-
|
|
202
|
-
blockedAt(level = 0) {
|
|
203
|
-
this.blockedLevel = Math.max(level, this.blockedLevel);
|
|
204
|
-
return this.blockedLevel;
|
|
205
|
-
}
|
|
206
194
|
}
|
|
207
195
|
|
|
208
196
|
const isPobLess = (manager: AstManager, first: Pob, second: Pob) => {
|
|
209
197
|
if (first.level !== second.level) return first.level < second.level;
|
|
210
198
|
if (first.depth !== second.depth) return first.depth < second.depth;
|
|
211
|
-
if (first.gas !== second.gas) return first.gas > second.gas;
|
|
212
199
|
const getSize = (post: number) => (manager.getOp(post) === OP_AND ? manager.getNumArgs(post) : 1);
|
|
213
200
|
if (getSize(first.post) !== getSize(second.post))
|
|
214
201
|
return getSize(first.post) < getSize(second.post);
|
|
@@ -218,6 +205,8 @@ const isPobLess = (manager: AstManager, first: Pob, second: Pob) => {
|
|
|
218
205
|
return firstHead !== secondHead ? firstHead < secondHead : first.id < second.id;
|
|
219
206
|
};
|
|
220
207
|
|
|
208
|
+
// A binary heap by isPobLess, which orders the proof obligations totally and reads nothing that
|
|
209
|
+
// changes while they are queued.
|
|
221
210
|
class PobQueue {
|
|
222
211
|
root: Pob | undefined;
|
|
223
212
|
maxLevel = 0;
|
|
@@ -226,25 +215,31 @@ class PobQueue {
|
|
|
226
215
|
|
|
227
216
|
constructor(private manager: AstManager) {}
|
|
228
217
|
|
|
229
|
-
private getMinIndex() {
|
|
230
|
-
let best = 0;
|
|
231
|
-
for (let index = 1; index < this.data.length; index++)
|
|
232
|
-
if (isPobLess(this.manager, this.data[index], this.data[best])) best = index;
|
|
233
|
-
return best;
|
|
234
|
-
}
|
|
235
|
-
|
|
236
218
|
top() {
|
|
237
219
|
if (this.data.length === 0) return undefined;
|
|
238
|
-
const top = this.data[
|
|
220
|
+
const top = this.data[0];
|
|
239
221
|
if (top.level > this.maxLevel) return undefined;
|
|
240
222
|
if (top.level === this.maxLevel && top.depth > this.minDepth) return undefined;
|
|
241
223
|
return top;
|
|
242
224
|
}
|
|
243
225
|
|
|
244
226
|
pop() {
|
|
245
|
-
const
|
|
246
|
-
|
|
247
|
-
|
|
227
|
+
const data = this.data;
|
|
228
|
+
data[0].isInQueue = false;
|
|
229
|
+
const moved = data[data.length - 1];
|
|
230
|
+
data.pop();
|
|
231
|
+
if (data.length === 0) return;
|
|
232
|
+
let index = 0;
|
|
233
|
+
for (let left = 1; left < data.length; left = 2 * index + 1) {
|
|
234
|
+
const child =
|
|
235
|
+
left + 1 < data.length && isPobLess(this.manager, data[left + 1], data[left])
|
|
236
|
+
? left + 1
|
|
237
|
+
: left;
|
|
238
|
+
if (!isPobLess(this.manager, data[child], moved)) break;
|
|
239
|
+
data[index] = data[child];
|
|
240
|
+
index = child;
|
|
241
|
+
}
|
|
242
|
+
data[index] = moved;
|
|
248
243
|
}
|
|
249
244
|
|
|
250
245
|
setRoot(root: Pob) {
|
|
@@ -265,7 +260,16 @@ class PobQueue {
|
|
|
265
260
|
push(pob: Pob) {
|
|
266
261
|
if (pob.isInQueue) return;
|
|
267
262
|
pob.isInQueue = true;
|
|
268
|
-
this.data
|
|
263
|
+
const data = this.data;
|
|
264
|
+
let index = data.length;
|
|
265
|
+
data.push(pob);
|
|
266
|
+
while (index > 0) {
|
|
267
|
+
const parent = (index - 1) >> 1;
|
|
268
|
+
if (!isPobLess(this.manager, pob, data[parent])) break;
|
|
269
|
+
data[index] = data[parent];
|
|
270
|
+
index = parent;
|
|
271
|
+
}
|
|
272
|
+
data[index] = pob;
|
|
269
273
|
}
|
|
270
274
|
|
|
271
275
|
incLevel() {
|
|
@@ -391,7 +395,7 @@ class Derivation {
|
|
|
391
395
|
summaries.push(activeTrans);
|
|
392
396
|
const model = pt.isMustReachable(mkAndOf(manager, summaries));
|
|
393
397
|
if (model === undefined) return undefined;
|
|
394
|
-
const reachFact = pt.getUsedRf(model
|
|
398
|
+
const reachFact = pt.getUsedRf(model);
|
|
395
399
|
const summary = mkAndOf(manager, computeImplicantLiterals(model, [reachFact.fact]));
|
|
396
400
|
premise.isMust = true;
|
|
397
401
|
premise.summary = spacer.formulaN2o(summary, premise.oIndex);
|
|
@@ -428,11 +432,9 @@ class PredTransformer {
|
|
|
428
432
|
private pobs = new Map<number, Pob[]>();
|
|
429
433
|
nextPobId = 0;
|
|
430
434
|
readonly lemmas: Lemma[] = [];
|
|
431
|
-
private bgInvs: Lemma[] = [];
|
|
432
435
|
private frameSize = 0;
|
|
433
436
|
private isSorted = true;
|
|
434
437
|
readonly reachFacts: ReachFact[] = [];
|
|
435
|
-
private rfInitSize = 0;
|
|
436
438
|
private transitionClause: number[] = [];
|
|
437
439
|
private transition = -1;
|
|
438
440
|
private init = -1;
|
|
@@ -504,11 +506,8 @@ class PredTransformer {
|
|
|
504
506
|
return model;
|
|
505
507
|
}
|
|
506
508
|
|
|
507
|
-
getUsedRf(model: ProtoModel
|
|
508
|
-
for (const reachFact of this.reachFacts)
|
|
509
|
-
if (!isAll && reachFact.isInit) continue;
|
|
510
|
-
if (isFalseIn(model, reachFact.tag)) return reachFact;
|
|
511
|
-
}
|
|
509
|
+
getUsedRf(model: ProtoModel) {
|
|
510
|
+
for (const reachFact of this.reachFacts) if (isFalseIn(model, reachFact.tag)) return reachFact;
|
|
512
511
|
throw new SmtTacticError("spacer found no used reach fact");
|
|
513
512
|
}
|
|
514
513
|
|
|
@@ -583,11 +582,6 @@ class PredTransformer {
|
|
|
583
582
|
|
|
584
583
|
addLemma(lemma: Lemma) {
|
|
585
584
|
const manager = this.manager;
|
|
586
|
-
if (lemma.isBackground) {
|
|
587
|
-
if (this.bgInvs.some((other) => other.getExpr() === lemma.getExpr())) return false;
|
|
588
|
-
this.bgInvs.push(lemma);
|
|
589
|
-
return true;
|
|
590
|
-
}
|
|
591
585
|
for (let index = 0; index < this.lemmas.length; index++) {
|
|
592
586
|
const old = this.lemmas[index];
|
|
593
587
|
if (old.getExpr() !== lemma.getExpr()) continue;
|
|
@@ -686,7 +680,6 @@ class PredTransformer {
|
|
|
686
680
|
? this.mkFreshRfTag()
|
|
687
681
|
: manager.getArg(this.extendInitial(reachFact.fact), 0);
|
|
688
682
|
this.reachFacts.push(reachFact);
|
|
689
|
-
if (reachFact.isInit) this.rfInitSize++;
|
|
690
683
|
const fml = mkOrOf(
|
|
691
684
|
manager,
|
|
692
685
|
lastTag === -1
|
|
@@ -717,17 +710,6 @@ class PredTransformer {
|
|
|
717
710
|
return { summary: mkAndOf(manager, computeImplicantLiterals(model, conjs)), auxVars };
|
|
718
711
|
}
|
|
719
712
|
|
|
720
|
-
isBlocked(pob: Pob) {
|
|
721
|
-
this.ensureLevel(pob.level);
|
|
722
|
-
const solver = this.solver;
|
|
723
|
-
return solver.withLevel(pob.level, () => {
|
|
724
|
-
solver.core = undefined;
|
|
725
|
-
solver.model = undefined;
|
|
726
|
-
const result = solver.checkAssumptions([pob.post], [], [], []);
|
|
727
|
-
return result === L_FALSE ? solver.usesLevel : undefined;
|
|
728
|
-
});
|
|
729
|
-
}
|
|
730
|
-
|
|
731
713
|
mbp(vars: number[], fml: number, model: ProtoModel, isForcing: boolean) {
|
|
732
714
|
return qeProject(this.manager, vars, fml, model, !isForcing);
|
|
733
715
|
}
|
|
@@ -875,8 +857,7 @@ class PredTransformer {
|
|
|
875
857
|
|
|
876
858
|
initRfs() {
|
|
877
859
|
for (const ptRule of this.ptRules.values())
|
|
878
|
-
if (isInitRule(ptRule))
|
|
879
|
-
this.addRf(new ReachFact(ptRule.rule, ptRule.trans, ptRule.auxs, true));
|
|
860
|
+
if (isInitRule(ptRule)) this.addRf(new ReachFact(ptRule.trans, ptRule.auxs, true));
|
|
880
861
|
}
|
|
881
862
|
|
|
882
863
|
private initRules(pts: Map<number, PredTransformer>) {
|
|
@@ -936,7 +917,7 @@ class PredTransformer {
|
|
|
936
917
|
trans = context.simplify(mkAndOf(manager, side));
|
|
937
918
|
const inflation = context.params.getUint("spacer.blast_term_ite_inflation", 3);
|
|
938
919
|
if (inflation > 0) trans = context.simplify(blastTermIte(manager, trans, inflation));
|
|
939
|
-
if (rule.uninterpretedSize > 0 && !manager.
|
|
920
|
+
if (rule.uninterpretedSize > 0 && !manager.isGroundApp(trans))
|
|
940
921
|
throw new SmtTacticError("spacer: quantifier in a recursive rule");
|
|
941
922
|
if (manager.isFalse(trans)) return;
|
|
942
923
|
if (!this.ptRules.has(rule)) this.ptRules.set(rule, { rule, trans, auxs: auxVars, tag: -1 });
|
|
@@ -982,13 +963,11 @@ class PredTransformer {
|
|
|
982
963
|
const manager = this.manager;
|
|
983
964
|
const context = this.context;
|
|
984
965
|
const spacer = this.spacer;
|
|
985
|
-
const children: ReachFact[] = [];
|
|
986
966
|
const pathCons = [this.getTransition(rule)];
|
|
987
967
|
const vars: number[] = [];
|
|
988
968
|
this.getPredecessors(rule).forEach((predicate, index) => {
|
|
989
969
|
const pt = context.getPredTransformer(predicate);
|
|
990
970
|
const kid = pt.getUsedOriginRf(model, index);
|
|
991
|
-
children.push(kid);
|
|
992
971
|
pathCons.push(spacer.formulaN2o(kid.fact, index));
|
|
993
972
|
for (const decl of pt.sig) vars.push(spacer.constOf(spacer.o2o(decl, index)));
|
|
994
973
|
for (const variable of kid.auxVars)
|
|
@@ -1001,9 +980,7 @@ class PredTransformer {
|
|
|
1001
980
|
if (context.params.getBool("spacer.reach_dnf", true))
|
|
1002
981
|
result = mkAndOf(manager, computeImplicantLiterals(model, [result]));
|
|
1003
982
|
result = this.mbp(vars, result, model, true);
|
|
1004
|
-
|
|
1005
|
-
reachFact.justifications.push(...children);
|
|
1006
|
-
return reachFact;
|
|
983
|
+
return new ReachFact(result, isElimAux ? [] : auxVars);
|
|
1007
984
|
}
|
|
1008
985
|
|
|
1009
986
|
isMdlRfConsistent(rule: Rule, model: ProtoModel) {
|
|
@@ -1060,9 +1037,8 @@ export class SpacerContext {
|
|
|
1060
1037
|
queryPred = -1;
|
|
1061
1038
|
query: PredTransformer | undefined;
|
|
1062
1039
|
readonly pobQueue: PobQueue;
|
|
1063
|
-
lastResult = L_UNDEF;
|
|
1064
|
-
inductiveLevel = 0;
|
|
1065
1040
|
expandedLevel = 0;
|
|
1041
|
+
private inductiveLevel = 0;
|
|
1066
1042
|
private generalizers: LemmaGeneralizer[] = [];
|
|
1067
1043
|
readonly isUsingCtp: boolean;
|
|
1068
1044
|
readonly isUsingGroundPob: boolean;
|
|
@@ -1073,11 +1049,14 @@ export class SpacerContext {
|
|
|
1073
1049
|
readonly maxLevel: number;
|
|
1074
1050
|
readonly isPdrBfs: boolean;
|
|
1075
1051
|
|
|
1076
|
-
|
|
1077
|
-
|
|
1078
|
-
|
|
1079
|
-
|
|
1080
|
-
|
|
1052
|
+
readonly params: FpParams;
|
|
1053
|
+
readonly manager: AstManager;
|
|
1054
|
+
|
|
1055
|
+
constructor(readonly datalogContext: DatalogContext) {
|
|
1056
|
+
const params = datalogContext.params;
|
|
1057
|
+
const manager = datalogContext.manager;
|
|
1058
|
+
this.params = params;
|
|
1059
|
+
this.manager = manager;
|
|
1081
1060
|
this.spacerManager = new SpacerManager(manager);
|
|
1082
1061
|
this.normalizer = new SpacerNormalizer(manager);
|
|
1083
1062
|
this.zkConsts = new ZkConsts(manager);
|
|
@@ -1114,18 +1093,23 @@ export class SpacerContext {
|
|
|
1114
1093
|
}
|
|
1115
1094
|
|
|
1116
1095
|
updateRules(rules: RuleSet) {
|
|
1117
|
-
const rels = new Map<number, PredTransformer>();
|
|
1118
1096
|
const manager = this.manager;
|
|
1119
|
-
|
|
1097
|
+
// decl2rel and the grouped rules are tables that Z3 walks in slot order.
|
|
1098
|
+
const getHash = (decl: number) => manager.getDeclHash(decl);
|
|
1099
|
+
const heads = new ObjHashtable(getHash);
|
|
1100
|
+
for (const predicate of rules.getHeadPredicates()) heads.add(predicate);
|
|
1101
|
+
const table = new ObjMap<PredTransformer>(getHash);
|
|
1102
|
+
for (const predicate of heads) {
|
|
1120
1103
|
const pt = new PredTransformer(this, predicate);
|
|
1121
|
-
|
|
1104
|
+
table.set(predicate, pt);
|
|
1122
1105
|
pt.rules.push(...rules.getPredicateRules(predicate));
|
|
1123
1106
|
}
|
|
1124
1107
|
for (const rule of rules.rules)
|
|
1125
1108
|
for (let index = 0; index < rule.uninterpretedSize; index++) {
|
|
1126
1109
|
const predicate = rule.getTailDecl(manager, index);
|
|
1127
|
-
if (!
|
|
1110
|
+
if (!table.has(predicate)) table.set(predicate, new PredTransformer(this, predicate));
|
|
1128
1111
|
}
|
|
1112
|
+
const rels = new Map(table);
|
|
1129
1113
|
for (const [predicate, pt] of rels)
|
|
1130
1114
|
for (const dependency of rules.deps.getDeps(predicate)) {
|
|
1131
1115
|
const user = rels.get(dependency) as PredTransformer;
|
|
@@ -1135,14 +1119,11 @@ export class SpacerContext {
|
|
|
1135
1119
|
for (const pt of rels.values()) pt.initRfs();
|
|
1136
1120
|
this.rels = rels;
|
|
1137
1121
|
this.query = undefined;
|
|
1138
|
-
this.lastResult = L_UNDEF;
|
|
1139
|
-
this.inductiveLevel = 0;
|
|
1140
1122
|
this.generalizers = mkLemmaGeneralizers(this);
|
|
1141
1123
|
}
|
|
1142
1124
|
|
|
1143
1125
|
solve(fromLevel: number) {
|
|
1144
|
-
|
|
1145
|
-
return this.lastResult;
|
|
1126
|
+
return this.isUsingGpdr ? gpdrSolveCore(this) : this.solveCore(fromLevel);
|
|
1146
1127
|
}
|
|
1147
1128
|
|
|
1148
1129
|
private solveCore(fromLevel: number) {
|
|
@@ -1329,12 +1310,49 @@ export class SpacerContext {
|
|
|
1329
1310
|
isAllPropagated = pt.propagateToNextLevel(level) && isAllPropagated;
|
|
1330
1311
|
if (!isAllPropagated) continue;
|
|
1331
1312
|
for (const pt of this.rels.values()) pt.propagateToInfinity(level);
|
|
1332
|
-
if (level
|
|
1333
|
-
|
|
1334
|
-
|
|
1313
|
+
if (level > maxLevel) return false;
|
|
1314
|
+
this.inductiveLevel = level;
|
|
1315
|
+
return true;
|
|
1316
|
+
}
|
|
1317
|
+
}
|
|
1318
|
+
|
|
1319
|
+
// context::get_model with get_level_property and inductive_property::to_model, before the
|
|
1320
|
+
// model converter.
|
|
1321
|
+
getModel() {
|
|
1322
|
+
const manager = this.manager;
|
|
1323
|
+
const model = new ProtoModel(manager);
|
|
1324
|
+
const rewriter = new Rewriter(manager, TACTIC_REWRITER_OPTIONS);
|
|
1325
|
+
for (const pt of this.rels.values()) {
|
|
1326
|
+
if (pt.head === this.queryPred) continue;
|
|
1327
|
+
const clauses = flattenAnd(manager, [
|
|
1328
|
+
this.spacerManager.formulaN2o(pt.getFormulas(this.inductiveLevel), 0),
|
|
1329
|
+
]).map((clause) => {
|
|
1330
|
+
const disjuncts = new RefVector(manager);
|
|
1331
|
+
disjuncts.push(clause);
|
|
1332
|
+
flattenOrVector(manager, disjuncts);
|
|
1333
|
+
const fixed = pin(manager, rewriter.mkOr([...disjuncts.items]));
|
|
1334
|
+
disjuncts.reset();
|
|
1335
|
+
return fixed;
|
|
1336
|
+
});
|
|
1337
|
+
const replace = new ExprSafeReplace(manager);
|
|
1338
|
+
pt.sig.forEach((decl, index) =>
|
|
1339
|
+
replace.insert(
|
|
1340
|
+
this.spacerManager.constOf(decl),
|
|
1341
|
+
pin(manager, manager.mkVar(index, manager.funcDecls[decl].range)),
|
|
1342
|
+
),
|
|
1343
|
+
);
|
|
1344
|
+
const property = replace.apply(pin(manager, rewriter.mkAnd(clauses)));
|
|
1345
|
+
replace.release();
|
|
1346
|
+
if (pt.sig.length === 0) model.registerConst(pt.head, property);
|
|
1347
|
+
else {
|
|
1348
|
+
const interp = new FuncInterp(manager, pt.sig.length);
|
|
1349
|
+
interp.setElse(property);
|
|
1350
|
+
model.registerFunc(pt.head, interp);
|
|
1335
1351
|
}
|
|
1336
|
-
|
|
1352
|
+
manager.decRef(property);
|
|
1337
1353
|
}
|
|
1354
|
+
rewriter.release();
|
|
1355
|
+
return model;
|
|
1338
1356
|
}
|
|
1339
1357
|
|
|
1340
1358
|
createChildren(
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
// Ported from Z3 (src/muz/spacer/spacer_dl_interface.cpp), MIT license, see z3-license.txt.
|
|
2
2
|
import { SmtUnsupportedError } from "../../../../errors";
|
|
3
3
|
import { L_FALSE } from "../lbool";
|
|
4
|
-
import
|
|
4
|
+
import { ProtoModel } from "../proto-model";
|
|
5
|
+
import type { DatalogContext, Engine, ModelConverter } from "./dl-context";
|
|
5
6
|
import { MkSlice } from "./dl-mk-slice";
|
|
6
7
|
import { RuleSet } from "./dl-rule-set";
|
|
7
8
|
import { applyDefaultTransformation, transformRules } from "./dl-rule-transformer";
|
|
@@ -10,6 +11,9 @@ import { SpacerContext } from "./spacer-context";
|
|
|
10
11
|
// Each query gets a fresh spacer context, where Z3 keeps the lemmas of a previous query whose
|
|
11
12
|
// rules subsume the new ones.
|
|
12
13
|
export class SpacerDlInterface implements Engine {
|
|
14
|
+
private spacer: SpacerContext | undefined;
|
|
15
|
+
private modelConverters: readonly ModelConverter[] = [];
|
|
16
|
+
|
|
13
17
|
constructor(private context: DatalogContext) {}
|
|
14
18
|
|
|
15
19
|
query(query: number) {
|
|
@@ -31,10 +35,19 @@ export class SpacerDlInterface implements Engine {
|
|
|
31
35
|
context.reopen();
|
|
32
36
|
context.replaceRules(oldRules);
|
|
33
37
|
context.manager.limit.checkpoint();
|
|
34
|
-
const spacer = new SpacerContext(context
|
|
38
|
+
const spacer = new SpacerContext(context);
|
|
39
|
+
this.spacer = spacer;
|
|
40
|
+
this.modelConverters = context.modelConverters ?? [];
|
|
35
41
|
spacer.setQuery(queryPred);
|
|
36
42
|
spacer.updateRules(spacerRules);
|
|
37
43
|
if (spacerRules.rules.length === 0) return L_FALSE;
|
|
38
44
|
return spacer.solve(params.getUint("spacer.min_level", 0));
|
|
39
45
|
}
|
|
46
|
+
|
|
47
|
+
getModel() {
|
|
48
|
+
return this.modelConverters.reduceRight(
|
|
49
|
+
(model, convert) => convert(model),
|
|
50
|
+
this.spacer?.getModel() ?? new ProtoModel(this.context.manager),
|
|
51
|
+
);
|
|
52
|
+
}
|
|
40
53
|
}
|
|
@@ -158,9 +158,9 @@ class ModelSearch {
|
|
|
158
158
|
}
|
|
159
159
|
}
|
|
160
160
|
|
|
161
|
-
// Z3 closes
|
|
162
|
-
// root of a reachable query stays open and
|
|
163
|
-
// children close are closed here, up to the root.
|
|
161
|
+
// Deviation from Z3: gpdr_check_reachability closes only the node that reaches its premises
|
|
162
|
+
// (set_closed), so the root of a reachable query stays open and Z3 answers unreachable
|
|
163
|
+
// (spacer_pdr.cpp). The parents that all their children close are closed here, up to the root.
|
|
164
164
|
const closeNode = (node: ModelNode, root: ModelNode) => {
|
|
165
165
|
node.isClosed = true;
|
|
166
166
|
for (let parent = node.parent; parent?.isOneClosed(); parent = parent.parent)
|
|
@@ -186,9 +186,7 @@ export class PropSolver {
|
|
|
186
186
|
private random: RandomGen;
|
|
187
187
|
core: number[] | undefined;
|
|
188
188
|
model: { value: ProtoModel | undefined } | undefined;
|
|
189
|
-
isSubsetBasedCore = false;
|
|
190
189
|
usesLevel = INFTY_LEVEL;
|
|
191
|
-
isDeltaLevel = false;
|
|
192
190
|
isInLevel = false;
|
|
193
191
|
currentLevel = 0;
|
|
194
192
|
|
|
@@ -225,10 +223,8 @@ export class PropSolver {
|
|
|
225
223
|
}
|
|
226
224
|
|
|
227
225
|
private assertLevelAtoms(level: number) {
|
|
228
|
-
for (let index = 0; index < this.levelPreds.length; index++)
|
|
229
|
-
|
|
230
|
-
this.context.pushBg(isActive ? this.negLevelAtoms[index] : this.posLevelAtoms[index]);
|
|
231
|
-
}
|
|
226
|
+
for (let index = 0; index < this.levelPreds.length; index++)
|
|
227
|
+
this.context.pushBg(index >= level ? this.negLevelAtoms[index] : this.posLevelAtoms[index]);
|
|
232
228
|
}
|
|
233
229
|
|
|
234
230
|
assertExpr(form: number, level = INFTY_LEVEL) {
|
|
@@ -324,7 +320,6 @@ export class PropSolver {
|
|
|
324
320
|
if (context.getNumBg() > numBg) context.popBg(context.getNumBg() - numBg);
|
|
325
321
|
this.core = undefined;
|
|
326
322
|
this.model = undefined;
|
|
327
|
-
this.isSubsetBasedCore = false;
|
|
328
323
|
return result;
|
|
329
324
|
}
|
|
330
325
|
|
|
@@ -16,7 +16,6 @@ import {
|
|
|
16
16
|
FAMILY_BASIC,
|
|
17
17
|
SORT_BOOL,
|
|
18
18
|
} from "../ast";
|
|
19
|
-
import { compareAsts } from "../ast-lt";
|
|
20
19
|
import { flattenAndVector } from "../ast-util";
|
|
21
20
|
import { pickEquality, MbpContext } from "../mbp/mbp-plugin";
|
|
22
21
|
import type { ProtoModel } from "../proto-model";
|
|
@@ -54,8 +53,9 @@ export const flattenAnd = (manager: AstManager, exprs: readonly number[]) => {
|
|
|
54
53
|
return result;
|
|
55
54
|
};
|
|
56
55
|
|
|
56
|
+
// std::sort under ast_lt_proc, which orders by id.
|
|
57
57
|
export const sortByAstLt = (manager: AstManager, exprs: number[]) =>
|
|
58
|
-
exprs.sort((first, second) =>
|
|
58
|
+
exprs.sort((first, second) => manager.ids[first] - manager.ids[second]);
|
|
59
59
|
|
|
60
60
|
export const isTrueIn = (model: ProtoModel, expr: number) =>
|
|
61
61
|
model.manager.isTrue(model.eval(pin(model.manager, expr), false));
|