summaryrefslogtreecommitdiff
path: root/test/regress/regress2
diff options
context:
space:
mode:
authorAndres Noetzli <andres.noetzli@gmail.com>2019-08-29 21:15:33 -0700
committerGitHub <noreply@github.com>2019-08-29 21:15:33 -0700
commitd45b5e1ae2b0d4812e41673bba16de0114070fc1 (patch)
treeba111f037eaf2164d2903762072dfde434099fd0 /test/regress/regress2
parent974fc1d23c2b6091c26cf316964c4c16c5e2733f (diff)
Better heuristic for str.code/re.range (#3220)
To make sure that our `str.code` function is injectve (except for -1 in the codomain), we send the inference that `str.code(x) == -1 v str.code(x) != str.code(y) v x == y` for each pair of `str.code` terms. Because of the order of disjuncts, `str.code(x) != str.code(y)` was usually assigned true. This in turn lead to a difficult problem for the arithmetic engine if there were more `str.code` applications than the size of the domain. E.g. if we had `0 <= str.code(xi) < 10` for 0 <= i <= 10, then the arithmetic engine had a difficult time finding a conflict. This PR improves the heuristic by setting the phase of `str.code(x) != str.code(y)` to false, so we prefer to keep the `str.code` values equal instead of trying to make them different. This change is also reflected in the models produced for inputs involving `str.code`: Previously, we were producing models with different values for the `str.code` whereas now the models are much more uniform. The PR adds two regressions, one testing `str.code` performance directly and one testing it for `str.code` terms generated by `re.range`. Signed-off-by: Andres Noetzli <anoetzli@amazon.com>
Diffstat (limited to 'test/regress/regress2')
-rw-r--r--test/regress/regress2/strings/range-perf.smt27
1 files changed, 7 insertions, 0 deletions
diff --git a/test/regress/regress2/strings/range-perf.smt2 b/test/regress/regress2/strings/range-perf.smt2
new file mode 100644
index 000000000..62ec10711
--- /dev/null
+++ b/test/regress/regress2/strings/range-perf.smt2
@@ -0,0 +1,7 @@
+; COMMAND-LINE: --strings-exp
+; EXPECT: sat
+(set-logic QF_SLIA)
+(declare-const x String)
+(assert (str.in.re x (re.loop (re.range "0" "9") 12 12)))
+(assert (str.in.re x (re.++ (re.* re.allchar) (str.to.re "01") (re.* re.allchar))))
+(check-sat)
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback