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
|
@@ -7,14 +7,19 @@ import {
|
|
|
7
7
|
FAMILY_ARRAY,
|
|
8
8
|
FAMILY_BV,
|
|
9
9
|
FAMILY_CHAR,
|
|
10
|
+
FAMILY_DATALOG_RELATION,
|
|
10
11
|
FAMILY_DATATYPE,
|
|
12
|
+
FAMILY_FF,
|
|
11
13
|
FAMILY_FINITE_SET,
|
|
12
14
|
FAMILY_FPA,
|
|
13
15
|
FAMILY_POLY,
|
|
14
16
|
FAMILY_RECFUN,
|
|
15
17
|
FAMILY_SEQ,
|
|
18
|
+
FAMILY_SPECIAL_RELATIONS,
|
|
16
19
|
} from "./ast";
|
|
20
|
+
import { SmtDefaultError } from "../../../errors";
|
|
17
21
|
import { collectStaticFeatures, isDense, type StaticFeatures } from "./static-features";
|
|
22
|
+
import { Rational } from "./rational";
|
|
18
23
|
|
|
19
24
|
const AUFLIA_LOGICS = new Set([
|
|
20
25
|
"AUFLIA",
|
|
@@ -101,6 +106,12 @@ export interface SmtConfig {
|
|
|
101
106
|
isNnfCnf: boolean;
|
|
102
107
|
isEq2Ineq: boolean;
|
|
103
108
|
isFindingMacros: boolean;
|
|
109
|
+
isEliminatingTermIte: boolean;
|
|
110
|
+
isLiftingNonGroundIte: boolean;
|
|
111
|
+
isEliminatingBounds: boolean;
|
|
112
|
+
isArithPropagatingEqs: boolean;
|
|
113
|
+
arithPropagationThreshold: number;
|
|
114
|
+
isArithBoundPropagating: boolean;
|
|
104
115
|
}
|
|
105
116
|
|
|
106
117
|
const UNKNOWN_THEORIES = [
|
|
@@ -109,10 +120,13 @@ const UNKNOWN_THEORIES = [
|
|
|
109
120
|
FAMILY_BV,
|
|
110
121
|
FAMILY_DATATYPE,
|
|
111
122
|
FAMILY_RECFUN,
|
|
123
|
+
FAMILY_DATALOG_RELATION,
|
|
112
124
|
FAMILY_SEQ,
|
|
113
125
|
FAMILY_CHAR,
|
|
114
126
|
FAMILY_FPA,
|
|
127
|
+
FAMILY_FF,
|
|
115
128
|
FAMILY_FINITE_SET,
|
|
129
|
+
FAMILY_SPECIAL_RELATIONS,
|
|
116
130
|
FAMILY_POLY,
|
|
117
131
|
];
|
|
118
132
|
|
|
@@ -128,6 +142,12 @@ export const DEFAULT_CONFIG: SmtConfig = {
|
|
|
128
142
|
isNnfCnf: true,
|
|
129
143
|
isEq2Ineq: false,
|
|
130
144
|
isFindingMacros: false,
|
|
145
|
+
isEliminatingTermIte: false,
|
|
146
|
+
isLiftingNonGroundIte: false,
|
|
147
|
+
isEliminatingBounds: false,
|
|
148
|
+
isArithPropagatingEqs: true,
|
|
149
|
+
arithPropagationThreshold: Infinity,
|
|
150
|
+
isArithBoundPropagating: true,
|
|
131
151
|
};
|
|
132
152
|
|
|
133
153
|
// setup_unknown(), which closes with setup_relevancy.
|
|
@@ -144,15 +164,23 @@ const setupQfUf = (config: SmtConfig) => {
|
|
|
144
164
|
config.randomInitialActivity = IA_RANDOM;
|
|
145
165
|
};
|
|
146
166
|
|
|
167
|
+
const setupQfUfByFeatures = (config: SmtConfig, features: StaticFeatures) => {
|
|
168
|
+
if (isArith(features))
|
|
169
|
+
throw new SmtDefaultError(
|
|
170
|
+
"Benchmark constrains arithmetic, but specified logic does not support it.",
|
|
171
|
+
);
|
|
172
|
+
setupQfUf(config);
|
|
173
|
+
};
|
|
174
|
+
|
|
147
175
|
const setupQfDt = (config: SmtConfig) => {
|
|
148
176
|
setupQfUf(config);
|
|
149
177
|
config.theories.push(FAMILY_DATATYPE, FAMILY_RECFUN);
|
|
150
178
|
};
|
|
151
179
|
|
|
152
|
-
// The parameters smt_params::setup_QF_IDL, setup_QF_RDL and setup_QF_LIA share.
|
|
153
180
|
const setupDiffLogicParams = (config: SmtConfig) => {
|
|
154
181
|
config.relevancyLevel = 0;
|
|
155
182
|
config.isEq2Ineq = true;
|
|
183
|
+
config.isArithPropagatingEqs = false;
|
|
156
184
|
config.isNnfCnf = false;
|
|
157
185
|
};
|
|
158
186
|
|
|
@@ -161,27 +189,47 @@ const setupQfLia = (config: SmtConfig) => {
|
|
|
161
189
|
config.theories.push(FAMILY_ARITH);
|
|
162
190
|
};
|
|
163
191
|
|
|
192
|
+
const checkNoUninterpretedFunctions = (features: StaticFeatures) => {
|
|
193
|
+
if (features.numUninterpretedFunctions !== 0)
|
|
194
|
+
throw new SmtDefaultError(
|
|
195
|
+
"Benchmark contains uninterpreted function symbols, but specified logic does not support them.",
|
|
196
|
+
);
|
|
197
|
+
};
|
|
198
|
+
|
|
164
199
|
const setupQfLiaByFeatures = (config: SmtConfig, features: StaticFeatures) => {
|
|
200
|
+
checkNoUninterpretedFunctions(features);
|
|
165
201
|
setupDiffLogicParams(config);
|
|
166
202
|
if (features.maxIteTreeDepth > 50) {
|
|
167
203
|
config.isEq2Ineq = false;
|
|
204
|
+
config.isArithPropagatingEqs = true;
|
|
168
205
|
config.relevancyLevel = 2;
|
|
169
|
-
} else if (features.numClauses === features.numUnits)
|
|
170
|
-
|
|
206
|
+
} else if (features.numClauses === features.numUnits) {
|
|
207
|
+
config.relevancyLevel = 2;
|
|
208
|
+
config.isEliminatingTermIte = true;
|
|
209
|
+
} else {
|
|
210
|
+
config.isEliminatingTermIte = true;
|
|
171
211
|
config.isRestartAdaptive = false;
|
|
172
212
|
config.restartStrategy = RS_GEOMETRIC;
|
|
173
213
|
config.restartFactor = 1.5;
|
|
174
214
|
}
|
|
215
|
+
if (
|
|
216
|
+
features.numBinClauses + features.numUnits === features.numClauses &&
|
|
217
|
+
features.isCnf &&
|
|
218
|
+
features.arithKSum.compare(Rational.of(100000n)) > 0
|
|
219
|
+
)
|
|
220
|
+
config.isArithBoundPropagating = false;
|
|
175
221
|
config.theories.push(FAMILY_ARITH);
|
|
176
222
|
};
|
|
177
223
|
|
|
178
224
|
const setupQfLra = (config: SmtConfig) => {
|
|
179
225
|
setupDiffLogicParams(config);
|
|
226
|
+
config.isEliminatingTermIte = true;
|
|
180
227
|
config.phaseSelection = PS_THEORY;
|
|
181
228
|
config.theories.push(FAMILY_ARITH);
|
|
182
229
|
};
|
|
183
230
|
|
|
184
231
|
const setupQfLraByFeatures = (config: SmtConfig, features: StaticFeatures) => {
|
|
232
|
+
checkNoUninterpretedFunctions(features);
|
|
185
233
|
setupQfLra(config);
|
|
186
234
|
if (features.arithKSum.num > 2000000n && features.arithKSum.den > 500n) config.relevancyLevel = 2;
|
|
187
235
|
if (features.isCnf) return;
|
|
@@ -190,6 +238,13 @@ const setupQfLraByFeatures = (config: SmtConfig, features: StaticFeatures) => {
|
|
|
190
238
|
};
|
|
191
239
|
|
|
192
240
|
const setupQfRdlByFeatures = (config: SmtConfig, features: StaticFeatures) => {
|
|
241
|
+
if (!isInDiffLogic(features))
|
|
242
|
+
throw new SmtDefaultError("Benchmark is not in QF_RDL (real difference logic).");
|
|
243
|
+
if (features.hasInt)
|
|
244
|
+
throw new SmtDefaultError(
|
|
245
|
+
"Benchmark has integer variables but it is marked as QF_RDL (real difference logic).",
|
|
246
|
+
);
|
|
247
|
+
checkNoUninterpretedFunctions(features);
|
|
193
248
|
setupDiffLogicParams(config);
|
|
194
249
|
if (isDense(features)) {
|
|
195
250
|
config.restartStrategy = RS_GEOMETRIC;
|
|
@@ -200,6 +255,13 @@ const setupQfRdlByFeatures = (config: SmtConfig, features: StaticFeatures) => {
|
|
|
200
255
|
};
|
|
201
256
|
|
|
202
257
|
const setupQfIdlByFeatures = (config: SmtConfig, features: StaticFeatures, setup: SmtSetup) => {
|
|
258
|
+
if (!isInDiffLogic(features))
|
|
259
|
+
throw new SmtDefaultError("Benchmark is not in QF_IDL (integer difference logic).");
|
|
260
|
+
if (features.hasReal)
|
|
261
|
+
throw new SmtDefaultError(
|
|
262
|
+
"Benchmark has real variables but it is marked as QF_IDL (integer difference logic).",
|
|
263
|
+
);
|
|
264
|
+
checkNoUninterpretedFunctions(features);
|
|
203
265
|
setupDiffLogicParams(config);
|
|
204
266
|
if (features.numUninterpretedConstants > 5000) config.relevancyLevel = 2;
|
|
205
267
|
else if (features.isCnf && !isDense(features)) config.phaseSelection = PS_CACHING_CONSERVATIVE2;
|
|
@@ -216,7 +278,9 @@ const setupQfIdlByFeatures = (config: SmtConfig, features: StaticFeatures, setup
|
|
|
216
278
|
};
|
|
217
279
|
|
|
218
280
|
const setupQfUfIdl = (config: SmtConfig) => {
|
|
219
|
-
|
|
281
|
+
config.relevancyLevel = 0;
|
|
282
|
+
config.isNnfCnf = false;
|
|
283
|
+
config.isEq2Ineq = true;
|
|
220
284
|
config.restartStrategy = RS_GEOMETRIC;
|
|
221
285
|
config.restartFactor = 1.5;
|
|
222
286
|
config.isRestartAdaptive = false;
|
|
@@ -224,10 +288,15 @@ const setupQfUfIdl = (config: SmtConfig) => {
|
|
|
224
288
|
};
|
|
225
289
|
|
|
226
290
|
const setupQfUfIdlByFeatures = (config: SmtConfig, features: StaticFeatures) => {
|
|
291
|
+
if (features.hasReal)
|
|
292
|
+
throw new SmtDefaultError(
|
|
293
|
+
"Benchmark has real variables but it is marked as QF_UFIDL (uninterpreted functions and difference logic).",
|
|
294
|
+
);
|
|
227
295
|
config.relevancyLevel = 0;
|
|
228
296
|
config.isNnfCnf = false;
|
|
229
297
|
if (features.numUninterpretedFunctions === 0) {
|
|
230
298
|
config.isEq2Ineq = true;
|
|
299
|
+
config.isArithPropagatingEqs = false;
|
|
231
300
|
if (isDense(features)) {
|
|
232
301
|
config.restartStrategy = RS_GEOMETRIC;
|
|
233
302
|
config.theories.push(FAMILY_ARITH);
|
|
@@ -240,12 +309,17 @@ const setupQfUfIdlByFeatures = (config: SmtConfig, features: StaticFeatures) =>
|
|
|
240
309
|
config.theories.push(FAMILY_ARITH);
|
|
241
310
|
};
|
|
242
311
|
|
|
243
|
-
const
|
|
312
|
+
const setupQfUfLra = (config: SmtConfig) => {
|
|
244
313
|
config.theories.push(FAMILY_ARITH);
|
|
245
314
|
config.relevancyLevel = 0;
|
|
246
315
|
config.isNnfCnf = false;
|
|
247
316
|
};
|
|
248
317
|
|
|
318
|
+
const setupQfUfLia = (config: SmtConfig) => {
|
|
319
|
+
setupQfUfLra(config);
|
|
320
|
+
config.arithPropagationThreshold = 1000;
|
|
321
|
+
};
|
|
322
|
+
|
|
249
323
|
const setupQfBv = (config: SmtConfig) => {
|
|
250
324
|
config.relevancyLevel = 0;
|
|
251
325
|
config.isNnfCnf = false;
|
|
@@ -253,6 +327,10 @@ const setupQfBv = (config: SmtConfig) => {
|
|
|
253
327
|
};
|
|
254
328
|
|
|
255
329
|
const setupQfUfLiaByFeatures = (config: SmtConfig, features: StaticFeatures) => {
|
|
330
|
+
if (features.hasReal)
|
|
331
|
+
throw new SmtDefaultError(
|
|
332
|
+
"Benchmark has real variables but it is marked as QF_UFLIA (uninterpreted functions and linear integer arithmetic).",
|
|
333
|
+
);
|
|
256
334
|
setupQfUfLia(config);
|
|
257
335
|
if (features.hasBv) setupQfBv(config);
|
|
258
336
|
};
|
|
@@ -308,23 +386,36 @@ const setupAufLia = (config: SmtConfig) => {
|
|
|
308
386
|
config.phaseSelection = PS_ALWAYS_FALSE;
|
|
309
387
|
config.restartStrategy = RS_GEOMETRIC;
|
|
310
388
|
config.restartFactor = 1.5;
|
|
389
|
+
config.isEliminatingBounds = true;
|
|
390
|
+
config.isLiftingNonGroundIte = true;
|
|
311
391
|
config.theories.push(FAMILY_ARITH, FAMILY_ARRAY);
|
|
312
392
|
};
|
|
313
393
|
|
|
394
|
+
const setupAufLiaByFeatures = (config: SmtConfig, features: StaticFeatures) => {
|
|
395
|
+
if (features.hasReal)
|
|
396
|
+
throw new SmtDefaultError(
|
|
397
|
+
"Benchmark has real variables but it is marked as AUFLIA (arrays, uninterpreted functions and linear integer arithmetic).",
|
|
398
|
+
);
|
|
399
|
+
setupAufLia(config);
|
|
400
|
+
};
|
|
401
|
+
|
|
314
402
|
const setupAufLira = (config: SmtConfig) => {
|
|
315
403
|
config.phaseSelection = PS_ALWAYS_FALSE;
|
|
404
|
+
config.isEliminatingBounds = true;
|
|
316
405
|
config.isFindingMacros = true;
|
|
406
|
+
config.isLiftingNonGroundIte = true;
|
|
317
407
|
config.theories.push(FAMILY_ARITH, FAMILY_ARRAY);
|
|
318
408
|
};
|
|
319
409
|
|
|
320
410
|
const setupLra = (config: SmtConfig) => {
|
|
321
411
|
config.relevancyLevel = 0;
|
|
412
|
+
config.isArithPropagatingEqs = false;
|
|
413
|
+
config.isEliminatingTermIte = true;
|
|
322
414
|
config.theories.push(FAMILY_ARITH);
|
|
323
415
|
};
|
|
324
416
|
|
|
325
|
-
// setup_ff, without the finite field theory the port does not have.
|
|
326
417
|
const setupFf = (config: SmtConfig) => {
|
|
327
|
-
config.theories.push(FAMILY_BV);
|
|
418
|
+
config.theories.push(FAMILY_BV, FAMILY_FF);
|
|
328
419
|
};
|
|
329
420
|
|
|
330
421
|
const setupQfBvre = (config: SmtConfig) => {
|
|
@@ -341,7 +432,7 @@ const DEFAULT_SETUPS = new Map<string, (config: SmtConfig) => void>([
|
|
|
341
432
|
["QF_LRA", setupQfLra],
|
|
342
433
|
["QF_LIA", setupQfLia],
|
|
343
434
|
["QF_UFLIA", setupQfUfLia],
|
|
344
|
-
["QF_UFLRA",
|
|
435
|
+
["QF_UFLRA", setupQfUfLra],
|
|
345
436
|
["QF_AX", setupQfAx],
|
|
346
437
|
["QF_AUFLIA", setupQfAufLia],
|
|
347
438
|
["QF_BV", setupQfBv],
|
|
@@ -387,16 +478,18 @@ const setupQuantified = (config: SmtConfig, features: StaticFeatures) => {
|
|
|
387
478
|
config.theories.push(
|
|
388
479
|
FAMILY_DATATYPE,
|
|
389
480
|
FAMILY_BV,
|
|
481
|
+
FAMILY_DATALOG_RELATION,
|
|
390
482
|
FAMILY_SEQ,
|
|
391
483
|
FAMILY_CHAR,
|
|
392
484
|
FAMILY_FINITE_SET,
|
|
393
485
|
FAMILY_FPA,
|
|
486
|
+
FAMILY_FF,
|
|
394
487
|
FAMILY_RECFUN,
|
|
488
|
+
FAMILY_SPECIAL_RELATIONS,
|
|
395
489
|
FAMILY_POLY,
|
|
396
490
|
);
|
|
397
491
|
};
|
|
398
492
|
|
|
399
|
-
// setup_unknown(static_features&), without the finite fields the port does not have.
|
|
400
493
|
const setupUnknownByFeatures = (config: SmtConfig, features: StaticFeatures, setup: SmtSetup) => {
|
|
401
494
|
const hasUf = features.numUninterpretedFunctions > 0;
|
|
402
495
|
const numTheories = features.numTheories + (hasUf ? 1 : 0);
|
|
@@ -417,7 +510,7 @@ const setupUnknownByFeatures = (config: SmtConfig, features: StaticFeatures, set
|
|
|
417
510
|
else setupQfLiaByFeatures(config, features);
|
|
418
511
|
} else if (isTwoWithUf && isArith(features)) {
|
|
419
512
|
if (!features.hasReal && isLinear) setupQfUfLiaByFeatures(config, features);
|
|
420
|
-
else if (!features.hasInt && isLinear)
|
|
513
|
+
else if (!features.hasInt && isLinear) setupQfUfLra(config);
|
|
421
514
|
else setupUnknown(config, features);
|
|
422
515
|
} else if (numTheories === 1 && features.hasBv) setupQfBv(config);
|
|
423
516
|
else if (numTheories === 1 && features.hasFpa) setupQfFp(config);
|
|
@@ -434,20 +527,20 @@ const AUTO_SETUPS = new Map<
|
|
|
434
527
|
string,
|
|
435
528
|
(config: SmtConfig, features: StaticFeatures, setup: SmtSetup) => void
|
|
436
529
|
>([
|
|
437
|
-
["QF_UF",
|
|
530
|
+
["QF_UF", setupQfUfByFeatures],
|
|
438
531
|
["QF_RDL", setupQfRdlByFeatures],
|
|
439
532
|
["QF_IDL", setupQfIdlByFeatures],
|
|
440
533
|
["QF_UFIDL", setupQfUfIdlByFeatures],
|
|
441
534
|
["QF_LRA", setupQfLraByFeatures],
|
|
442
535
|
["QF_LIA", setupQfLiaByFeatures],
|
|
443
536
|
["QF_UFLIA", setupQfUfLiaByFeatures],
|
|
444
|
-
["QF_UFLRA",
|
|
537
|
+
["QF_UFLRA", setupQfUfLra],
|
|
445
538
|
["QF_AX", setupQfAxByFeatures],
|
|
446
539
|
["QF_BVRE", setupQfBvre],
|
|
447
540
|
["QF_AUFLIA", setupQfAufLiaByFeatures],
|
|
448
541
|
["QF_S", setupUnknown],
|
|
449
542
|
["QF_SLIA", setupUnknown],
|
|
450
|
-
["AUFLIA",
|
|
543
|
+
["AUFLIA", setupAufLiaByFeatures],
|
|
451
544
|
["AUFLIRA", setupAufLira],
|
|
452
545
|
["AUFNIRA", setupAufLira],
|
|
453
546
|
["AUFLIA+", setupAufLia],
|