diff options
| author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2017-09-29 14:28:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-29 14:28:52 -0500 |
| commit | b48120e1c224208eaef28f86e77830f211852f9b (patch) | |
| tree | 28d9329c1cc13d5e99e8ac38212efb88c20c7ffa /test | |
| parent | 8011f2715fa6ba312fd766cab5249648598310d4 (diff) | |
Simplify representation of inversion Skolems for bv cegqi (#1164)
* Simplify intermediate representation of inversion skolems for cegqi bit-vectors. Cache bv inversion status globally in QuantifierEngine. Generalize virtual term policy for marking eligible instantiation terms. Enable regression.
* Enable other regression
Diffstat (limited to 'test')
| -rw-r--r-- | test/regress/regress0/quantifiers/Makefile.am | 8 | ||||
| -rw-r--r-- | test/regress/regress0/quantifiers/qbv-simple-2vars-vo.smt2 | 3 | ||||
| -rw-r--r-- | test/regress/regress0/quantifiers/qbv-test-invert-mul.smt2 | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/test/regress/regress0/quantifiers/Makefile.am b/test/regress/regress0/quantifiers/Makefile.am index cb6ed687e..a4bd40df5 100644 --- a/test/regress/regress0/quantifiers/Makefile.am +++ b/test/regress/regress0/quantifiers/Makefile.am @@ -89,11 +89,9 @@ TESTS = \ cbqi-sdlx-fixpoint-3-dd.smt2 \ qbv-simp.smt2 \ psyco-001-bv.smt2 \ - bug822.smt2 - -# FIXME: solvable with --cbqi-bv -#qbv-test-invert-mul.smt2 -#qbv-simple-2vars-vo.smt2 + bug822.smt2 \ + qbv-test-invert-mul.smt2 \ + qbv-simple-2vars-vo.smt2 # regression can be solved with --finite-model-find --fmf-inst-engine # set3.smt2 diff --git a/test/regress/regress0/quantifiers/qbv-simple-2vars-vo.smt2 b/test/regress/regress0/quantifiers/qbv-simple-2vars-vo.smt2 index f38625fd8..b6ae95fec 100644 --- a/test/regress/regress0/quantifiers/qbv-simple-2vars-vo.smt2 +++ b/test/regress/regress0/quantifiers/qbv-simple-2vars-vo.smt2 @@ -1,3 +1,5 @@ +; COMMAND-LINE: --cbqi-bv +; EXPECT: sat (set-logic BV) (set-info :status sat) (declare-fun a () (_ BitVec 32)) @@ -6,7 +8,6 @@ (assert (not (= a #x00000000))) -; this is sensitive to variable ordering (try changing x and y) (assert (forall ((x (_ BitVec 32)) (y (_ BitVec 32))) (or (not (= (bvmul x y) #x0000000A)) (not (= (bvadd y a) #x00000010)) diff --git a/test/regress/regress0/quantifiers/qbv-test-invert-mul.smt2 b/test/regress/regress0/quantifiers/qbv-test-invert-mul.smt2 index bea19a054..235d353ef 100644 --- a/test/regress/regress0/quantifiers/qbv-test-invert-mul.smt2 +++ b/test/regress/regress0/quantifiers/qbv-test-invert-mul.smt2 @@ -1,3 +1,5 @@ +; COMMAND-LINE: --cbqi-bv +; EXPECT: sat (set-logic BV) (set-info :status sat) (declare-fun a () (_ BitVec 32)) |