diff options
| author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2021-06-10 16:53:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-10 21:53:38 +0000 |
| commit | 5fb5d6030aa031d5f63676ec29ffa8e158fa5c6a (patch) | |
| tree | 5d03b8923d08bcdf9c84151c7fab1a4ee4e52fba /test/regress/regress0/bv | |
| parent | 6394bf6ffa2486587d1726271769117f7dc227a8 (diff) | |
Ensure bv2nat and int2bv are not rewritten when using solve-bv-as-int (#6725)
This PR ensures we do not eagerly rewrite bv2nat and int2bv when using solve-bv-as-int. Instead they are rewritten during expandDefinitions (at the end of preprocessing).
It also updates regressions that relied on lazy extended function reductions in the lazy solver to use solve-bv-as-int, and adds a missing case (INT_TO_BITVECTOR) in the solve-int-as-bv preprocessing pass.
A followup PR will remove support for lazy extended function reductions for bv2nat / int2bv altogether.
Diffstat (limited to 'test/regress/regress0/bv')
| -rw-r--r-- | test/regress/regress0/bv/bv-int-collapse1.smt2 | 2 | ||||
| -rw-r--r-- | test/regress/regress0/bv/bv-int-collapse2.smt2 | 2 | ||||
| -rw-r--r-- | test/regress/regress0/bv/bv2nat-simp-range.smt2 | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/test/regress/regress0/bv/bv-int-collapse1.smt2 b/test/regress/regress0/bv/bv-int-collapse1.smt2 index 1f5015d14..60826da85 100644 --- a/test/regress/regress0/bv/bv-int-collapse1.smt2 +++ b/test/regress/regress0/bv/bv-int-collapse1.smt2 @@ -1,4 +1,4 @@ -; COMMAND-LINE: --bv-solver=lazy +; COMMAND-LINE: --solve-bv-as-int=sum ; EXPECT: unsat (set-logic ALL) (set-info :status unsat) diff --git a/test/regress/regress0/bv/bv-int-collapse2.smt2 b/test/regress/regress0/bv/bv-int-collapse2.smt2 index d56188dad..130b045d9 100644 --- a/test/regress/regress0/bv/bv-int-collapse2.smt2 +++ b/test/regress/regress0/bv/bv-int-collapse2.smt2 @@ -1,4 +1,4 @@ -; COMMAND-LINE: --bv-solver=lazy +; COMMAND-LINE: --solve-bv-as-int=sum ; EXPECT: unsat (set-logic ALL) (set-info :status unsat) diff --git a/test/regress/regress0/bv/bv2nat-simp-range.smt2 b/test/regress/regress0/bv/bv2nat-simp-range.smt2 index 31e2b7bd1..daae6a1c3 100644 --- a/test/regress/regress0/bv/bv2nat-simp-range.smt2 +++ b/test/regress/regress0/bv/bv2nat-simp-range.smt2 @@ -1,3 +1,4 @@ +; COMMAND-LINE: --solve-bv-as-int=sum ; EXPECT: unsat (set-logic ALL) (set-info :status unsat) |