mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-07-05 14:56:11 +00:00
Code Activity
22802 commits 95 branches 58 tags 276 MiB
Commit graph

137 commits

Author SHA1 Message Date
Nikolaj Bjorner
4fdfc65b37 tune seq rewriting 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-06-09 13:30:39 -07:00
calebstanford-msr
1fd567d1e9
fix bug in seq rewriter op_cache::find (#4509) 
* remove unneeded reverse case in derivative; placeholder for generalized lifted derivative

* experimental tweaks to RE rewriter to improve performance

* if-then-else lifting
(broken code -- preserving this commit in case this idea is useful later)

* if-then-else derivative optimizations: new approach templates

* implement if-then-else BDD normal form for derivatives
(code compiles but is still buggy)

* remove std::cout debugging for PR

* Revert "remove std::cout debugging for PR"

This reverts commit c7bdc44d31.

* debugging

* fix derivative interaction with reverse; add flags for left/right derivative and lifting over union/intersection

* remove debugging statements for PR

* Revert "remove debugging statements for PR"

This reverts commit 38e85a7288.

* revert some purely cosmetic changes from upstream; fix a bug

* revert unnecessary changes

* remove some redundant rewrites and add a new one for str.in_re(s, comp(r))

* add disabled rewrite for complement

* fix bug in op cache find (result was not saved)

* remove debugging std::cout for PR
 2020-06-09 11:36:31 -07:00
Nikolaj Bjorner
d2a12f6db5 tuning 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-06-07 12:52:13 -07:00
Nikolaj Bjorner
ba1ca33637 normalization of union/intersection 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-06-06 12:54:44 -07:00
Nikolaj Bjorner
1b9fcc7098 integrate ite-normalized derivatives 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-06-05 17:28:48 -07:00
Nikolaj Bjorner
4dbf7b183d inline conditions with derivative computation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-06-05 13:51:31 -07:00
Nikolaj Bjorner
bfb5c95b9a use op-cache for is-nullable 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-06-02 13:30:18 -07:00
Nikolaj Bjorner
e388055a33 connecting op-cache 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-06-02 13:13:32 -07:00
Nikolaj Bjorner
4ef480e2a5 add op cache 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-06-02 12:52:42 -07:00
Nikolaj Bjorner
084cd335eb add (disabled) stubs for decomposing re-membership on regex 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-05-31 12:25:21 -07:00
Nikolaj Bjorner
7f7663a3b4 fix #4478 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-05-31 11:16:21 -07:00
Nikolaj Bjorner
d41ecda03e skip non-overlap simplification in rewriter 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-05-29 17:27:54 -07:00
calebstanford-msr
c939195c10
add regex support for reverse and left/right derivative rewriting (#4477) 
* partial work on adding 'reverse' (broken code)

* new op codes for derivative and reverse + associated rewrite rules

* incorporate reverses and derivatives in rewriter + some fixes

* enable rewriting str.in_re constraints with right derivative
 2020-05-29 13:00:37 -07:00
Nikolaj Bjorner
3d9d52f742 add detection of string equalities 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-05-29 10:40:47 -07:00
Nikolaj Bjorner
e0130f5cf4 remove Kleene naming as it is a misnomer in this context 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-05-28 20:41:03 -07:00
Nikolaj Bjorner
0911a06d81 bounds 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-05-28 20:05:32 -07:00
Nikolaj Bjorner
ea1f50b77e simplify extended contains patterns 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-05-28 19:11:29 -07:00
Nikolaj Bjorner
88e36c6bf3 add general purpose emptiness/non-emptiness check 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-05-26 20:42:21 -07:00
Nikolaj Bjorner
4e01d5b5c1 tune axioms for derivatives 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-05-25 14:11:59 -07:00
Nikolaj Bjorner
eb3f20832e initial pass at using derivatives in regex unfolding 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-05-23 11:53:07 -07:00
Nikolaj Bjorner
9eedd4ecd6 gate mk_bool_app by existence of regex 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-05-22 10:09:16 -07:00
Nikolaj Bjorner
82fb7573d7 more rewrites for emptiness 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-05-22 09:56:21 -07:00
Margus Veanes
5d6be3f17f
adding regex simplification rewriter (#4440) 2020-05-22 09:55:29 -07:00
Nikolaj Bjorner
7756e2c6d5
in progress (#4386) 
* initial work on replacing str in regex check

* finish rewriter for empty string in regex

* remove unnecessary argument in mk_regexp_contains_emptystr; initial template for eval_regexp_derivative

* progress on string in regexp general check using derivatives

* added recursive nullable and derivative funcitons, partially working

* remove tests from z3test

* fix rewriting infinite loop and some failing simplify checks

* several fixes addressing comments for z3 main branch PR #4386

* redo derivative to return an expr_ref, and null on failure

Co-authored-by: calebstanford-msr <t-casta@microsoft.com>
 2020-05-19 15:55:19 -07:00
Nikolaj Bjorner
5bbf05c93c kleene 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-05-18 19:35:31 -07:00
Nikolaj Bjorner
f8d328b1fb add nullable, get-head-tail with Caleb 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-05-18 19:10:00 -07:00
Nikolaj Bjorner
1def58bc9f optional unicode mode 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-05-17 19:06:34 -07:00
Nikolaj Bjorner
34cc60410f additional str/re operators, remove encoding option from zstring 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-05-17 05:08:36 -07:00
Nikolaj Bjorner
4753d93bb7 add some of the SMTLIB2.6 conventions and features to strings 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-05-16 14:00:02 -07:00
Nikolaj Bjorner
b81ab94db7
pipeline with release mode (#4206) 
* pipeline with release mode

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* na

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-05-04 12:30:03 -07:00
Nikolaj Bjorner
6a540e8429
add Julia to pipeline (#4199) 
* add Julia to pipeline

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* na

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* na

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-05-03 17:16:46 -07:00
Nikolaj Bjorner
cc8cd2cc2f na 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-04-23 21:28:19 -07:00
Nikolaj Bjorner
9c3f0190f4 fix #4069 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-04-23 20:53:13 -07:00
Nikolaj Bjorner
95a78b2450
updates to seq and bug fixes (#4056) 
* na

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* fix #4037

* nicer output for skolem functions

* more overhaul of seq, some bug fixes

* na

* added offset_eq file

* na

* fix #4044

* fix #4040

* fix #4045

* updated ignore

* new rewrites for indexof based on #4036

* add shortcuts

* updated ne solver for seq, fix #4025

* use pair vectors for equalities that are reduced by seq_rewriter

* use erase_and_swap

* remove unit-walk

* na

* add check for #3200

* nits

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* name a type

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* remove fp check

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* remove unsound axiom instantiation for non-contains

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* fix rewrites

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* fix #4053

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* fix #4052

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-04-22 13:18:55 -07:00
Nikolaj Bjorner
e1fa04b365 disable breaking change to model generation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-04-19 16:53:20 -07:00
Nikolaj Bjorner
a9c4984a16 more seq overhaul 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-04-18 19:46:30 -07:00
Nikolaj Bjorner
835b57b775 fix #3961 fix #3940 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-04-14 17:33:44 -07:00
Nikolaj Bjorner
9f42338de8 fix #3926 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-04-13 14:43:27 -07:00
Nikolaj Bjorner
ee62f83131 fix #2892 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-01-27 20:59:02 -08:00
Nikolaj Bjorner
cd0cd82eb7 add rewrites for #2575 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-09-20 08:55:53 -07:00
Nikolaj Bjorner
a337a51374 fixes for #2513 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-08-23 23:29:24 +03:00
Nikolaj Bjorner
584eee2cf4 fixing #2448 and #2445 and #2443 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-08-02 15:06:34 -07:00
Nikolaj Bjorner
e593b5b2c8 fix #2415 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-07-20 16:23:01 -07:00
Nikolaj Bjorner
79e4b84507 augment axiomatization for substr to fix #2366 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-07-12 11:12:01 +01:00
Nikolaj Bjorner
85b0722df0 ensure also negative lt are constrained 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-06-30 07:44:06 +03:00
Nikolaj Bjorner
28ce701e17 fixing 2267 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-05-06 15:31:55 +02:00
Nikolaj Bjorner
3c8fd83c97 implementing last-index-of #2089 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-03-22 12:29:50 -07:00
Nikolaj Bjorner
71e239c08e fix #2061 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-06 11:49:47 -08:00
Nikolaj Bjorner
9e5aaf074e perf improvements for #1979 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-12-04 10:13:55 -08:00
Nikolaj Bjorner
2aa7ccc4a9 hide bit-vector dependencies under seq_util 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-12-03 08:45:17 -08:00