Nikolaj Bjorner
7656adc483
Merge branch 'master' of https://github.com/Z3Prover/z3
2016-02-28 17:05:52 -08:00
Nikolaj Bjorner
df2d7e7628
add intersection using symbolic automata facility
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-28 17:05:12 -08:00
Nuno Lopes
c1eb1cc3f2
bv_bounds: improve perf of push/pop
2016-02-28 20:07:39 +00:00
Nuno Lopes
e7a360ca08
ctx_simplify: remove virtual push() method
2016-02-28 17:57:40 +00:00
Nuno Lopes
51687b2be7
bv_bounds: ensure (bvule x maxuint) is simplified to true
2016-02-28 10:56:48 +00:00
Nikolaj Bjorner
e659845bc0
tune handling of contains, avoid redundant equalities, merge use of indexof.left/right with contains.left/right adding only least-ness constraints in the context of index
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-27 09:56:11 -08:00
Nikolaj Bjorner
1c630ccc9a
Merge branch 'master' of https://github.com/Z3Prover/z3 into HEAD
2016-02-26 18:15:57 -08:00
Nikolaj Bjorner
ce8862d415
fix bug in conflict clause generation in seq-branch-variable
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-26 18:15:45 -08:00
Nuno Lopes
97d6098d00
bv_bounds: make may_simplify() more aggressive for the common case of a single comparison
...
fix expr_has_bounds to handle cases like (bvadd (ite c t e) ...)
2016-02-25 19:41:01 +00:00
Nuno Lopes
6563e458f0
Merge branch 'master' of https://github.com/Z3Prover/z3
2016-02-25 16:53:45 +00:00
Nuno Lopes
c693c990df
bv_bounds: speedup up to 10x in larger formulas
...
introduce a may_simplify() function to short-circuit evaluation of expression trees that are guaranteed to not be simplifiable
2016-02-25 16:53:35 +00:00
Nuno Lopes
d642d5fe4c
API: add smt.logic parameter to enable setting the logic through the API
...
currently only Z3_solver_set_params() is supported
logic has to be set before solver first usage or before solver reset
2016-02-25 09:47:51 +00:00
Nuno Lopes
c1aa33339d
bv_bounds: early exit in is_bound in case the expr is not boolean
...
~2% speedup
2016-02-25 09:32:10 +00:00
Nikolaj Bjorner
4c408165ab
Merge branch 'master' of https://github.com/Z3Prover/z3 into HEAD
2016-02-24 08:55:28 -08:00
Nikolaj Bjorner
5679fb5d6b
experimenting with alternative prefix encodings
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-24 08:55:22 -08:00
Nikolaj Bjorner
4e7a867cd9
Merge branch 'master' of https://github.com/Z3Prover/z3
2016-02-23 18:42:01 -08:00
Nikolaj Bjorner
d5383e2387
fix bug in definition of rewrite rule for replace, tighten constraints for tightest-prefix
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-23 18:41:56 -08:00
Nikolaj Bjorner
8c68aed69e
Merge branch 'master' of https://github.com/Z3Prover/z3 into HEAD
2016-02-23 08:11:09 -08:00
Nuno Lopes
64888b6b19
ctx_simplify: fix bug in simplification of or exprs
...
this triggered when the or covers the whole space -> true
2016-02-23 10:37:01 +00:00
Nuno Lopes
12458b1a84
remove dead code in qfufbv
2016-02-22 10:22:56 +00:00
Nikolaj Bjorner
63c138c08e
add option to enable equality propagation
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-21 11:16:13 -08:00
Nikolaj Bjorner
8c538fd3f0
setting partial equivalence priority lower so that it doesn't intefere with inlining (partial fix to the fact that inlining will remove such implicit relations). Using short-circuit negation in qe to avoid redundant double negations in intermediary results
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-21 10:31:13 -08:00
Nikolaj Bjorner
d4f41c0420
add goal context for simplifier, disable equality creation
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-20 10:13:24 -08:00
Nikolaj Bjorner
c7abc11ce0
Merge branch 'master' of https://github.com/Z3Prover/z3 into HEAD
2016-02-19 08:23:32 -08:00
Nikolaj Bjorner
bff10527d1
merge
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-19 08:23:27 -08:00
Nuno Lopes
7d3af70a63
ctx-simplify: fix mem leak of simplifier
2016-02-19 11:08:01 +00:00
Nuno Lopes
c618838ed9
bv_bounds: fix crash in push() when realloc happened
2016-02-19 11:06:22 +00:00
Nuno Lopes
121b3b60f3
bv_bounds/ctx_simplify: improve handling of (ite x a b) where (not x) is proved to be false
2016-02-19 09:42:42 +00:00
Nikolaj Bjorner
73f93dbadb
Merge branch 'master' of https://github.com/Z3Prover/z3
2016-02-18 18:10:30 -08:00
Nikolaj Bjorner
a073b37ce3
fix bugs in seq solver: add relevancy and axiom
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-18 18:10:16 -08:00
Nikolaj Bjorner
5962ca2a62
seq
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-18 12:08:35 -08:00
Nuno Lopes
73da4dda07
add a bv rewrite pattern:
...
(bvsle (- x (srem x c1)) c2) -> (bvsle x (+ c1 c2 - 1))
2016-02-18 17:45:55 +00:00
Nuno Lopes
d32b4c71d1
[bv_bounds] introduce a tight bit in intervals to denote they are tight (over and under approx)
...
use this to ensure certain transformations remain sound
2016-02-18 15:53:11 +00:00
Nikolaj Bjorner
67958efed2
add fixed length heuristic
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-17 21:20:39 -08:00
Nuno Lopes
8718c1c99f
bv_bounds: simplify negated expressions as well
2016-02-17 19:14:02 +00:00
Nikolaj Bjorner
16ced7cda5
Merge pull request #453 from delcypher/fix_clause_allocator_bound_check
...
Fix incorrect (off by one) bound check in clause_allocator
2016-02-17 08:50:51 -08:00
Nuno Lopes
a4cfcd4550
bv_bounds: fix bug in interval intersection for non-wrapping disjoint values
2016-02-17 16:32:43 +00:00
Nuno Lopes
ac20d8bc11
bv_bounds: fix intersection of wrapped intervals
...
e.g., [117, 115] /\ [115, 113] -> [115, 113]
2016-02-17 15:41:12 +00:00
Nuno Lopes
98a92b9255
bv_bounds tactic: change representation to intervals
...
Code by myself and Nikolaj Bjorner
2016-02-17 10:02:40 +00:00
Dan Liew
6c966bba59
Fix incorrect (off by one) bound check. Also assert that we don't
...
increment ``m_num_segments`` beyond the maximum value
(``c_max_segments``).
This is related to #436 .
When doing an AddressSanitized build and running the ``c_example``
it looks like Z3 tries to create too many segments and index out of
bounds. Fixing the checks here causes them to fail which should help
us narrow down the problem.
2016-02-16 14:04:21 +00:00
Nuno Lopes
c05a0dfa61
revert my previous attempt to simplify the destructor of ctx-simplify
...
there can be assertions at level 0
2016-02-16 13:10:17 +00:00
Nuno Lopes
293566d464
ctx-simplify: simplify destructor
2016-02-16 09:53:04 +00:00
Nuno Lopes
98c5a5c86c
move ctx_propagate_assertions class to .cpp file
2016-02-16 09:34:45 +00:00
Nikolaj Bjorner
07953342ac
Merge branch 'master' of https://github.com/Z3Prover/z3
2016-02-15 17:29:54 -08:00
Nikolaj Bjorner
d3805bbdf6
fix location of level retrieval
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-15 17:29:46 -08:00
Nuno Lopes
96f6bf7028
ctx_simplify: simplify ite if then/else values become equal
2016-02-15 12:06:20 +00:00
Nikolaj Bjorner
8fc58e1ace
propagate bounds implementation
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-13 02:07:41 +00:00
Nikolaj Bjorner
d7186eede8
bv bounds tactic for Nuno
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-13 00:13:16 +00:00
Nikolaj Bjorner
e484fc365d
add outline of bv bounds tactic
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-12 22:57:47 +00:00
Nikolaj Bjorner
94be6fc776
remove passing suffixes into pdr_sym_mux, trying to isolate cause of issue #420
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-12 19:25:52 +00:00
Nikolaj Bjorner
660eff0b9e
Merge branch 'master' of https://github.com/Z3Prover/z3
2016-02-12 18:59:05 +00:00
Nikolaj Bjorner
45999b254c
hoist simplifier functionality out of context loop to allow plugging in other contextual simplification methods
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-12 18:58:37 +00:00
Christoph M. Wintersteiger
6319861e26
Merge branch 'master' of https://github.com/Z3Prover/z3
2016-02-12 18:32:46 +00:00
Christoph M. Wintersteiger
f399fe5e1d
resolved conflicts
2016-02-12 18:29:46 +00:00
Christoph M. Wintersteiger
3356f36b8f
Merge pull request #446 from msullivan/arm-build
...
Fix gcc build failure on ARM caused by including <emmintrin.h>
2016-02-12 18:27:14 +00:00
Nikolaj Bjorner
e2dc7c6f64
add note that current re.complement is non-standard
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-12 17:12:43 +00:00
Nikolaj Bjorner
94453033b6
add partial support for complementation of regular expressions. Handles case of complementing character ranges
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-12 15:59:33 +00:00
Christoph M. Wintersteiger
9dbb8057ca
Merge pull request #449 from kenmcmil/issue243
...
fixed logging on return of Z3_compute_interpolant...
2016-02-12 12:40:01 +00:00
Nikolaj Bjorner
8d61d36c3f
add documentation methods to param_descrs, add C++ API and example for param_descrs. Issue #443
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-12 11:45:00 +00:00
Ken McMillan
8b90bc9e91
fixed logginf on return of Z3_compute_interpolant and added interpolation example to test_capi.c
2016-02-11 16:09:54 -08:00
Michael Sullivan
fa598edf43
Fix gcc build failure on ARM caused by including <emmintrin.h>
...
src/util/hwf.cpp tries to use <emmintrin.h> to directly use SSE
intrinsics. Make sure to only use those when actually on x86 or
x86_64.
2016-02-10 20:47:08 +00:00
Nikolaj Bjorner
9ed7dadc02
Merge branch 'master' of https://github.com/Z3Prover/z3
2016-02-10 15:02:28 +00:00
Nikolaj Bjorner
a6e1c70eab
fix documentation/default bug. #445
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-10 15:02:22 +00:00
Christoph M. Wintersteiger
fa68b00563
Cleanliness
2016-02-10 14:39:33 +00:00
Christoph M. Wintersteiger
c01f0323c3
Merge branch 'lackr' of https://github.com/MikolasJanota/z3 into MikolasJanota-lackr
2016-02-10 14:26:04 +00:00
Nikolaj Bjorner
84cf208d5f
Merge branch 'master' of https://github.com/Z3Prover/z3
2016-02-10 12:02:51 +00:00
Nikolaj Bjorner
535fb39313
add documentation comments as raised in #443
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-10 12:02:40 +00:00
Nikolaj Bjorner
56f15e98b5
Merge pull request #444 from delcypher/explicit_solver_timeout_units
...
Explicitly state what the units of the timeout parameter for the "smt" module are.
2016-02-10 11:43:31 +00:00
Dan Liew
ea900db337
Explicitly state what the units of the timeout parameter for the "smt"
...
module are.
2016-02-10 11:35:15 +00:00
Nikolaj Bjorner
5285a795ac
handle configuration passed in as null, deal with crash in logs attached to issue #243
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-10 01:20:16 +00:00
Nikolaj Bjorner
cacfa0cb98
fix build, likely addressing issue #420
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-09 22:58:08 +00:00
Nikolaj Bjorner
a0503ba6a1
Merge branch 'master' of https://github.com/Z3Prover/z3
2016-02-09 22:24:48 +00:00
Nikolaj Bjorner
5ce85aba40
removing const qualifiers, perhaps this helps for #420 and adding assert to enable Clang analysis earlier for issue #440
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-09 22:23:37 +00:00
Mikolas Janota
73ef125171
Merge remote-tracking branch 'upstream/master' into lackr
2016-02-09 17:28:24 +00:00
Christoph M. Wintersteiger
4ba744987d
Merge branch 'master' of https://github.com/Z3Prover/z3
2016-02-09 16:38:42 +00:00
Christoph M. Wintersteiger
3df9fea54c
removed unused variables
2016-02-09 16:38:35 +00:00
Nuno Lopes
564343c39c
remove unused methods in ast.cpp
2016-02-09 15:30:05 +00:00
Nikolaj Bjorner
60c0e73b2f
Merge branch 'master' of https://github.com/Z3Prover/z3
2016-02-09 11:08:52 +00:00
Nikolaj Bjorner
133e3693de
fix bug in replace built-in and move length-equality propagation to branch final check
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-09 11:08:33 +00:00
Christoph M. Wintersteiger
a2f376f9d6
Fixed memory leak in theory_fpa. Relates to #436
2016-02-08 17:17:49 +00:00
Christoph M. Wintersteiger
7e2783c6a2
Fixed javadoc links in comments.
...
Relates to #401 .
2016-02-08 15:25:53 +00:00
Mikolas Janota
b614e7732b
Merge remote-tracking branch 'upstream/master' into lackr
2016-02-08 12:54:22 +00:00
Christoph M. Wintersteiger
92b6a3e134
Fixed exponent cap for fp.add in fpa2bv_converter (was unsound for combinations of many sbits but few ebits).
...
Fixes #439 .
2016-02-07 17:33:33 +00:00
Christoph M. Wintersteiger
e9d94e53f6
Improved FPA simplifier plugin
2016-02-07 15:01:22 +00:00
Christoph M. Wintersteiger
37b11cdc74
Comments, whitespace.
2016-02-07 15:01:09 +00:00
Nikolaj Bjorner
3ef6d91038
fix #434 : repeat documentation remarks about reference counting for disambiguation
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-07 14:46:53 +00:00
Nikolaj Bjorner
677b4bf4fe
fix #436 , adding more length-based propagation
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-07 14:43:53 +00:00
Nikolaj Bjorner
fc1f37efc9
Merge branch 'master' of https://github.com/Z3Prover/z3
2016-02-06 16:14:07 +00:00
Nikolaj Bjorner
5b50d98b89
ensure that seq rewriter gets invoked during pre-processing
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-06 16:13:31 +00:00
Christoph M. Wintersteiger
b61376e8c2
Merge branch 'master' of https://github.com/Z3Prover/z3
2016-02-05 15:22:42 +00:00
Christoph M. Wintersteiger
7ddd2856c8
Added is_considered_uninterpreted() to decl_plugins.
2016-02-05 15:22:37 +00:00
Christoph M. Wintersteiger
3d37c25bcc
whitespace
2016-02-05 15:16:54 +00:00
Christoph M. Wintersteiger
c11b6d90ce
whitespace
2016-02-05 15:16:19 +00:00
Christoph M. Wintersteiger
757585d96f
Merge pull request #427 from jwakely/patch-1
...
Convert stream to bool explicitly
2016-02-05 15:08:33 +00:00
Christoph M. Wintersteiger
ac19bfb032
Merge branch 'master' of https://github.com/Z3Prover/z3
2016-02-05 13:53:41 +00:00
Christoph M. Wintersteiger
bb5118acbb
Bugfix for bv*div0 model construction.
2016-02-05 13:53:35 +00:00
Christoph M. Wintersteiger
88f007e9da
whitespace
2016-02-05 13:48:47 +00:00
Christoph M. Wintersteiger
b87f4ca677
whitespace
2016-02-05 13:48:05 +00:00
Christoph M. Wintersteiger
21b85c27e1
whitespace
2016-02-05 13:47:14 +00:00
Nikolaj Bjorner
eae17a43a2
Fix #430 : disable rewriting of concatentations with constants because it breaks equality propagation
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-05 11:00:17 +00:00