Fix tests of unsat cores (#6593)

This updates all regressions that pass check-unsat-cores to enable check-unsat-cores. This includes any incremental benchmark, which was disabled in run_regression.py previously.

It adds --no-check-unsat-cores to a few corner benchmarks that were previously disabled based on --incremental.

It also reverts a change to when proofs are disabled: options like sygus-inference should not permit proofs (or unsat cores).

diff --git a/src/smt/set_defaults.cpp b/src/smt/set_defaults.cpp
index e7870e4d706a6aceeddcac74e99ffe9ab77a3547..849d775c3ae126aa52cf44c454987a705fe89291 100644 (file)
--- a/src/smt/set_defaults.cpp
+++ b/src/smt/set_defaults.cpp
@@ -350,6 +350,7 @@ void setDefaults(LogicInfo& logic, bool isInternalSubsolver)
         || options::sygusInference() || options::sygusRewSynthInput())
     {
       // since we are trying to recast as sygus, we assume the input is sygus
+      isSygus = true;
       usesSygus = true;
     }
     else if (options::sygusInst())

diff --git a/test/regress/regress0/arith/ackermann.real.smt2 b/test/regress/regress0/arith/ackermann.real.smt2
index e0f3b85f949e9a92304efcb1cec1a4fca06a652d..fa7bec40900a42f44f84880cb3523d72dafb7e34 100644 (file)
--- a/test/regress/regress0/arith/ackermann.real.smt2
+++ b/test/regress/regress0/arith/ackermann.real.smt2
@@ -1,4 +1,4 @@
-; COMMAND-LINE: --ackermann  --no-check-unsat-cores
+; COMMAND-LINE: --ackermann 
 ; EXPECT: unsat
 (set-logic QF_UFNRA)
 

diff --git a/test/regress/regress0/arith/arith-eq.smt2 b/test/regress/regress0/arith/arith-eq.smt2
index 38de29734eb80eee03d22d49fdbebde13476ee7d..b68ccdd7d547e165cb97ceb63bdf0d24b4e79ef1 100644 (file)
--- a/test/regress/regress0/arith/arith-eq.smt2
+++ b/test/regress/regress0/arith/arith-eq.smt2
@@ -1,4 +1,4 @@
-; COMMAND-LINE: --no-check-unsat-cores
+; COMMAND-LINE:
 ; EXPECT: unsat
 (set-logic QF_LRA)
 

diff --git a/test/regress/regress0/arith/arith-mixed-types-no-tighten.smt2 b/test/regress/regress0/arith/arith-mixed-types-no-tighten.smt2
index 2f02c9d1eb15f885364108b9f5906f2b25ae5dcc..0281805fbaee8da127c64b387dad029203a72045 100644 (file)
--- a/test/regress/regress0/arith/arith-mixed-types-no-tighten.smt2
+++ b/test/regress/regress0/arith/arith-mixed-types-no-tighten.smt2
@@ -1,4 +1,4 @@
-; COMMAND-LINE: --no-check-unsat-cores
+; COMMAND-LINE:
 ; EXPECT: unsat
 (set-logic QF_LIRA)
 

diff --git a/test/regress/regress0/arith/arith-mixed-types-tighten.smt2 b/test/regress/regress0/arith/arith-mixed-types-tighten.smt2
index 627118777093f06669688372347aa9353d5af5cc..a2e170c533f3b1b082c17ef164a27306c2650d23 100644 (file)
--- a/test/regress/regress0/arith/arith-mixed-types-tighten.smt2
+++ b/test/regress/regress0/arith/arith-mixed-types-tighten.smt2
@@ -1,4 +1,4 @@
-; COMMAND-LINE: --no-check-unsat-cores
+; COMMAND-LINE:
 ; EXPECT: unsat
 (set-logic QF_LIRA)
 

diff --git a/test/regress/regress0/arith/arith-strict-relaxed.smt2 b/test/regress/regress0/arith/arith-strict-relaxed.smt2
index fe17aa536056f30cd88f8ad0e0b7c43f6839c61b..b1906423f74edb8ce640862824e90a435db007ea 100644 (file)
--- a/test/regress/regress0/arith/arith-strict-relaxed.smt2
+++ b/test/regress/regress0/arith/arith-strict-relaxed.smt2
@@ -1,4 +1,4 @@
-; COMMAND-LINE: --no-check-unsat-cores
+; COMMAND-LINE:
 ; EXPECT: unsat
 (set-logic QF_LRA)
 

diff --git a/test/regress/regress0/arith/arith-strict.smt2 b/test/regress/regress0/arith/arith-strict.smt2
index b1477732c0f7cb3afc5eaeb32246cf72ef609bf3..720ae533713dffc1cc018ef18a3e672debce4ec3 100644 (file)
--- a/test/regress/regress0/arith/arith-strict.smt2
+++ b/test/regress/regress0/arith/arith-strict.smt2
@@ -1,4 +1,4 @@
-; COMMAND-LINE: --no-check-unsat-cores
+; COMMAND-LINE:
 ; EXPECT: unsat
 (set-logic QF_LRA)
 

diff --git a/test/regress/regress0/arith/arith-tighten-1.smt2 b/test/regress/regress0/arith/arith-tighten-1.smt2
index a8a5234a0b4d509b3e76028a82c2a217a6a0c14b..8023ea0a42b6ed52c52d4a04c9a63b85623be48d 100644 (file)
--- a/test/regress/regress0/arith/arith-tighten-1.smt2
+++ b/test/regress/regress0/arith/arith-tighten-1.smt2
@@ -1,4 +1,4 @@
-; COMMAND-LINE: --no-check-unsat-cores
+; COMMAND-LINE:
 ; EXPECT: unsat
 (set-logic QF_LIRA)
 

diff --git a/test/regress/regress0/arith/arith-tighten-2.smt2 b/test/regress/regress0/arith/arith-tighten-2.smt2
index 24eec2977c0fd111ce9e4066d4a188690127d4c1..cb879bb0c4286665989ec0e6431f018750181eac 100644 (file)
--- a/test/regress/regress0/arith/arith-tighten-2.smt2
+++ b/test/regress/regress0/arith/arith-tighten-2.smt2
@@ -1,4 +1,4 @@
-; COMMAND-LINE: --no-check-unsat-cores
+; COMMAND-LINE:
 ; EXPECT: unsat
 (set-logic QF_LIA)
 

diff --git a/test/regress/regress0/arith/integers/ackermann1.smt2 b/test/regress/regress0/arith/integers/ackermann1.smt2
index 677ba24ff8c401212a837bf7178910eb3ba1df4b..81fb1727520440b3a1551a12dee491df55fe1032 100644 (file)
--- a/test/regress/regress0/arith/integers/ackermann1.smt2
+++ b/test/regress/regress0/arith/integers/ackermann1.smt2
@@ -1,4 +1,4 @@
-; COMMAND-LINE: --ackermann  --no-check-unsat-cores
+; COMMAND-LINE: --ackermann 
 ; EXPECT: unsat
 (set-logic QF_UFLIA)
 

diff --git a/test/regress/regress0/arith/integers/ackermann2.smt2 b/test/regress/regress0/arith/integers/ackermann2.smt2
index 3013071f9aefcfd3d6cdab4e8f9cc6af3f39f989..9c02c830b82e00141d8a901b59a834afa01d6fdd 100644 (file)
--- a/test/regress/regress0/arith/integers/ackermann2.smt2
+++ b/test/regress/regress0/arith/integers/ackermann2.smt2
@@ -1,4 +1,4 @@
-; COMMAND-LINE: --ackermann  --no-check-unsat-cores
+; COMMAND-LINE: --ackermann 
 ; EXPECT: unsat
 (set-logic QF_UFLIA)
 

diff --git a/test/regress/regress0/arith/integers/ackermann3.smt2 b/test/regress/regress0/arith/integers/ackermann3.smt2
index cf35267689793d3f210d4ee3276d97d3a1410618..707b39c3e1a7a0ff0804adedb99d83c02b75518e 100644 (file)
--- a/test/regress/regress0/arith/integers/ackermann3.smt2
+++ b/test/regress/regress0/arith/integers/ackermann3.smt2
@@ -1,4 +1,4 @@
-; COMMAND-LINE: --ackermann  --no-check-unsat-cores
+; COMMAND-LINE: --ackermann 
 ; EXPECT: sat
 (set-logic QF_UFLIA)
 

diff --git a/test/regress/regress0/arith/integers/ackermann6.smt2 b/test/regress/regress0/arith/integers/ackermann6.smt2
index cae429f938801e3ccf7c352d7257f59bf0cfc112..b1d17768623719052ea5f33ebb54530763ecf041 100644 (file)
--- a/test/regress/regress0/arith/integers/ackermann6.smt2
+++ b/test/regress/regress0/arith/integers/ackermann6.smt2
@@ -1,4 +1,4 @@
-; COMMAND-LINE: --ackermann --no-check-unsat-cores
+; COMMAND-LINE: --ackermann
 ; EXPECT: unsat
 (set-logic QF_UFLIA)
 (set-info :smt-lib-version 2.6)

diff --git a/test/regress/regress0/arrays/bug4957.smt2 b/test/regress/regress0/arrays/bug4957.smt2
index f82ae193238dc35a4cd9e8fe07f13789df1ec164..247311390e1fd652bf61ab805d5150678b37e21f 100644 (file)
--- a/test/regress/regress0/arrays/bug4957.smt2
+++ b/test/regress/regress0/arrays/bug4957.smt2
@@ -1,4 +1,4 @@
-; COMMAND-LINE: --ackermann --no-check-unsat-cores
+; COMMAND-LINE: --ackermann
 ; EXPECT: unsat
 (set-logic QF_ALIA)
 (declare-fun a () (Array Int Int))

diff --git a/test/regress/regress0/bug528a.smt2 b/test/regress/regress0/bug528a.smt2
index fb4899425aef1f3f0df5b6fe71ba77b010e0c10b..97b891415c5165af1ad81ea16359ba40dbac903c 100644 (file)
--- a/test/regress/regress0/bug528a.smt2
+++ b/test/regress/regress0/bug528a.smt2
@@ -1,5 +1,5 @@
 ; EXPECT: unsat
-; COMMAND-LINE: --incremental --repeat-simp
+; COMMAND-LINE: --incremental --repeat-simp --no-check-unsat-cores
 (set-logic QF_LIA)
 (declare-fun i () Int)
 (assert (ite (= i 0) false true))

diff --git a/test/regress/regress0/bv/ackermann1.smt2 b/test/regress/regress0/bv/ackermann1.smt2
index fa1963322606eb5994c245ffb959c146266a3dd3..579e438a56082b70f224848c7229e97307430171 100644 (file)
--- a/test/regress/regress0/bv/ackermann1.smt2
+++ b/test/regress/regress0/bv/ackermann1.smt2
@@ -1,5 +1,5 @@
-; COMMAND-LINE: --bitblast=eager --no-check-models  --no-check-unsat-cores
-; COMMAND-LINE: --bitblast=eager --bv-solver=simple --no-check-models  --no-check-unsat-cores
+; COMMAND-LINE: --bitblast=eager --no-check-models 
+; COMMAND-LINE: --bitblast=eager --bv-solver=simple --no-check-models 
 ; EXPECT: sat
 (set-logic QF_UFBV)
 (set-info :smt-lib-version 2.6)

diff --git a/test/regress/regress0/bv/ackermann2.smt2 b/test/regress/regress0/bv/ackermann2.smt2
index 5eea40acb02eb8b5fc6339417f5601b105d90369..e4eb37d89c6bb65c7e93d79340bc0846da07d914 100644 (file)
--- a/test/regress/regress0/bv/ackermann2.smt2
+++ b/test/regress/regress0/bv/ackermann2.smt2
@@ -1,6 +1,6 @@
-; COMMAND-LINE: --bitblast=eager  --no-check-unsat-cores
+; COMMAND-LINE: --bitblast=eager 
 ; REQUIRES: cryptominisat
-; COMMAND-LINE: --bitblast=eager --bv-sat-solver=cryptominisat --no-check-unsat-cores
+; COMMAND-LINE: --bitblast=eager --bv-sat-solver=cryptominisat
 ; EXPECT: unsat
 (set-logic QF_UFBV)
 (set-info :smt-lib-version 2.6)

diff --git a/test/regress/regress0/bv/ackermann4.smt2 b/test/regress/regress0/bv/ackermann4.smt2
index 69bf769373f6d9a0e01b521e3ba8fb38b34831f2..ad65d8ca406f7cbc25dd73815e3fdc8daaf50f38 100644 (file)
--- a/test/regress/regress0/bv/ackermann4.smt2
+++ b/test/regress/regress0/bv/ackermann4.smt2
@@ -1,4 +1,4 @@
-; COMMAND-LINE: --bitblast=eager --no-check-models --no-check-unsat-cores
+; COMMAND-LINE: --bitblast=eager --no-check-models
 ; EXPECT: sat
 (set-logic QF_UFBV)
 (set-info :smt-lib-version 2.6)

diff --git a/test/regress/regress0/bv/ackermann5.smt2 b/test/regress/regress0/bv/ackermann5.smt2
index 44d0f4dab8a5189582234e13dc99f62b1bed1cac..78bf51481a797e028c763244e401f0ef0524b638 100644 (file)
--- a/test/regress/regress0/bv/ackermann5.smt2
+++ b/test/regress/regress0/bv/ackermann5.smt2
@@ -1,4 +1,4 @@
-; COMMAND-LINE: --ackermann --no-check-unsat-cores
+; COMMAND-LINE: --ackermann
 ; EXPECT: sat
 (set-logic QF_UFBV)
 

diff --git a/test/regress/regress0/bv/ackermann6.smt2 b/test/regress/regress0/bv/ackermann6.smt2
index 8be60bf806731155b367e6e42977d1b8a2fb0671..8eaf4a79fda0527fff3e5f91c2b256eb3ec88f05 100644 (file)
--- a/test/regress/regress0/bv/ackermann6.smt2
+++ b/test/regress/regress0/bv/ackermann6.smt2
@@ -1,4 +1,4 @@
-; COMMAND-LINE: --ackermann --no-check-unsat-cores
+; COMMAND-LINE: --ackermann
 ; EXPECT: unsat
 (set-logic QF_UFBV)
 

diff --git a/test/regress/regress0/bv/ackermann7.smt2 b/test/regress/regress0/bv/ackermann7.smt2
index 2d43bc6068dd700707326ed40ea6e96bb2c80bbf..c070dd6483f474eb53b10ecf7bd1efb3357ee7c2 100644 (file)
--- a/test/regress/regress0/bv/ackermann7.smt2
+++ b/test/regress/regress0/bv/ackermann7.smt2
@@ -1,4 +1,4 @@
-; COMMAND-LINE: --ackermann --no-check-unsat-cores
+; COMMAND-LINE: --ackermann
 ; EXPECT: sat
 (set-logic QF_UFBV)
 

diff --git a/test/regress/regress0/bv/ackermann8.smt2 b/test/regress/regress0/bv/ackermann8.smt2
index 5ca49011f9eac69d9db61851345637eece9a0807..5cfe55ec6e4e7f0495c8c94b581a1914cf2deefc 100644 (file)
--- a/test/regress/regress0/bv/ackermann8.smt2
+++ b/test/regress/regress0/bv/ackermann8.smt2
@@ -1,4 +1,4 @@
-; COMMAND-LINE: --ackermann --no-check-unsat-cores
+; COMMAND-LINE: --ackermann
 ; EXPECT: unsat
 (set-logic QF_UFBV)
 

diff --git a/test/regress/regress0/bv/bv-int-collapse1.smt2 b/test/regress/regress0/bv/bv-int-collapse1.smt2
index 942cdffdecadd78979c59eb7648bbee59fcc5391..5968fe00c178d19d12fecd4113d611f16e5c78a9 100644 (file)
--- a/test/regress/regress0/bv/bv-int-collapse1.smt2
+++ b/test/regress/regress0/bv/bv-int-collapse1.smt2
@@ -1,4 +1,4 @@
-; COMMAND-LINE: --no-check-unsat-cores
+; COMMAND-LINE:
 ; EXPECT: unsat
 (set-logic ALL_SUPPORTED)
 (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 65c9d26735a36c5c5fecf51eb74bf62b8b1eb7ec..b7e390592f12d460993512380ced381b1afefbd2 100644 (file)
--- a/test/regress/regress0/bv/bv-int-collapse2.smt2
+++ b/test/regress/regress0/bv/bv-int-collapse2.smt2
@@ -1,4 +1,4 @@
-; COMMAND-LINE: --no-check-unsat-cores
+; COMMAND-LINE:
 ; EXPECT: unsat
 (set-logic ALL_SUPPORTED)
 (set-info :status unsat)

diff --git a/test/regress/regress0/bv/core/slice-12.smtv1.smt2 b/test/regress/regress0/bv/core/slice-12.smtv1.smt2
index f370c0f0f9b6040b331d7d577269eda2be1a9273..341ff65a2fcf32d628d123ac9c53ce8bc0d7a58a 100644 (file)
--- a/test/regress/regress0/bv/core/slice-12.smtv1.smt2
+++ b/test/regress/regress0/bv/core/slice-12.smtv1.smt2
@@ -1,5 +1,5 @@
 ; REQUIRES: cryptominisat
-; COMMAND-LINE: --bitblast=eager --bv-sat-solver=cryptominisat --no-check-unsat-cores
+; COMMAND-LINE: --bitblast=eager --bv-sat-solver=cryptominisat
 ; EXPECT: unsat
 (set-option :incremental false)
 (set-info :status unsat)

diff --git a/test/regress/regress0/bv/pr4993-bvugt-bvurem-a.smt2 b/test/regress/regress0/bv/pr4993-bvugt-bvurem-a.smt2
index b53f6f0cceb4d4b2ee5770c2d53c0b7c598e99e2..3d1e323d18a23364213f6b5841a6c647394e379b 100644 (file)
--- a/test/regress/regress0/bv/pr4993-bvugt-bvurem-a.smt2
+++ b/test/regress/regress0/bv/pr4993-bvugt-bvurem-a.smt2
@@ -1,4 +1,4 @@
-; COMMAND-LINE: --no-check-unsat-cores
+; COMMAND-LINE:
 (set-logic QF_BV)
 (set-info :status unsat)
 (declare-const x (_ BitVec 4))

diff --git a/test/regress/regress0/bv/pr4993-bvugt-bvurem-b.smt2 b/test/regress/regress0/bv/pr4993-bvugt-bvurem-b.smt2
index a514d8b0927b76788cb32ad38e02748d8abc538c..0c6e7e0eb2c14224bd768e65a918e90e0f3baa16 100644 (file)
--- a/test/regress/regress0/bv/pr4993-bvugt-bvurem-b.smt2
+++ b/test/regress/regress0/bv/pr4993-bvugt-bvurem-b.smt2
@@ -1,5 +1,5 @@
-; COMMAND-LINE: --no-check-unsat-cores
-; COMMAND-LINE: --bv-solver=simple --no-check-unsat-cores
+; COMMAND-LINE:
+; COMMAND-LINE: --bv-solver=simple
 (set-logic QF_BV)
 (set-info :status unsat)
 (declare-const x (_ BitVec 4))

diff --git a/test/regress/regress0/datatypes/empty_tuprec.cvc b/test/regress/regress0/datatypes/empty_tuprec.cvc
index 185f7eca85c55d4e9effef86423471bf168ce5a0..6e8ffef8d63638b03b71a9ef3b9d9875b5492a53 100644 (file)
--- a/test/regress/regress0/datatypes/empty_tuprec.cvc
+++ b/test/regress/regress0/datatypes/empty_tuprec.cvc
@@ -1,4 +1,4 @@
-% COMMAND-LINE: --no-check-unsat-cores
+% COMMAND-LINE:
 %
 OPTION "incremental";
 

diff --git a/test/regress/regress0/quantifiers/mix-match.smt2 b/test/regress/regress0/quantifiers/mix-match.smt2
index fbf996a0a3892f68fff7818c50c530778340552a..110df2fa4e47c9b8d10ad80a331af7355ebc3aad 100644 (file)
--- a/test/regress/regress0/quantifiers/mix-match.smt2
+++ b/test/regress/regress0/quantifiers/mix-match.smt2
@@ -1,4 +1,4 @@
-; COMMAND-LINE: --no-check-unsat-cores
+; COMMAND-LINE:
 ; EXPECT: unsat
 (set-logic ALL_SUPPORTED)
 (set-info :status unsat)

diff --git a/test/regress/regress1/bv/bv2nat-ground.smt2 b/test/regress/regress1/bv/bv2nat-ground.smt2
index 9d26a06edbfa8ee55adfd4e0295402cef934d7ce..50550f530d54e195cc655862fd647e4d4234d5dc 100644 (file)
--- a/test/regress/regress1/bv/bv2nat-ground.smt2
+++ b/test/regress/regress1/bv/bv2nat-ground.smt2
@@ -1,4 +1,4 @@
-; COMMAND-LINE: --no-check-unsat-cores
+; COMMAND-LINE:
 ; EXPECT: unsat
 (set-logic QF_BVLIA)
 (set-info :status unsat)

diff --git a/test/regress/regress1/fmf/PUZ001+1.smt2 b/test/regress/regress1/fmf/PUZ001+1.smt2
index 9c36ac56198a559ffe562595271dd2de51fa9e40..81daf6c9cdc6621e7a4080c86964c718fa88750a 100644 (file)
--- a/test/regress/regress1/fmf/PUZ001+1.smt2
+++ b/test/regress/regress1/fmf/PUZ001+1.smt2
@@ -1,4 +1,4 @@
-; COMMAND-LINE: --finite-model-find --no-check-unsat-cores
+; COMMAND-LINE: --finite-model-find
 ; EXPECT: unsat
 ;%------------------------------------------------------------------------------
 ;% File     : PUZ001+1 : TPTP v5.4.0. Released v2.0.0.

diff --git a/test/regress/regress1/model-blocker-values.smt2 b/test/regress/regress1/model-blocker-values.smt2
index 1c9e80642642449a5b8a916591de403426350f2d..b5ab4609b47ef355261e01f44be09b225b9ce6ac 100644 (file)
--- a/test/regress/regress1/model-blocker-values.smt2
+++ b/test/regress/regress1/model-blocker-values.smt2
@@ -1,4 +1,4 @@
-; COMMAND-LINE: --incremental --produce-models --block-models=values
+; COMMAND-LINE: --incremental --produce-models --block-models=values --no-check-unsat-cores
 ; EXPECT: sat
 ; EXPECT: sat
 ; if we only block models restricted to (a,b), then there are only 2 models

diff --git a/test/regress/regress1/nl/nl_uf_lalt.smt2 b/test/regress/regress1/nl/nl_uf_lalt.smt2
index fc224d59a827c7dd5fed7000060bc97eab466380..f1040214725ffdd60cbb54794341859a82a9cedf 100644 (file)
--- a/test/regress/regress1/nl/nl_uf_lalt.smt2
+++ b/test/regress/regress1/nl/nl_uf_lalt.smt2
@@ -1,4 +1,4 @@
-; COMMAND-LINE: --no-check-unsat-cores --decision=justification
+; COMMAND-LINE: --decision=justification
 (set-logic QF_UFNIA)
 (set-info :status unsat)
 (declare-fun c (Int) Int)

diff --git a/test/regress/regress1/push-pop/quant-fun-proc.smt2 b/test/regress/regress1/push-pop/quant-fun-proc.smt2
index 2a12cb6776b7747fea273ceb9f9c3bceecfc7885..2b5c6cab9096e6c6636e0ce1b3acdcaf831822dc 100644 (file)
--- a/test/regress/regress1/push-pop/quant-fun-proc.smt2
+++ b/test/regress/regress1/push-pop/quant-fun-proc.smt2
@@ -1,4 +1,4 @@
-; COMMAND-LINE: --incremental --fmf-fun --macros-quant --macros-quant-mode=ground --no-check-models
+; COMMAND-LINE: --incremental --fmf-fun --macros-quant --macros-quant-mode=ground --no-check-models --no-check-unsat-cores
 (set-logic UFLIA)
 
 (define-fun f ((x Int)) Int x)

diff --git a/test/regress/regress1/quantifiers/dump-inst-proof.smt2 b/test/regress/regress1/quantifiers/dump-inst-proof.smt2
index c2ae56b88655467f7af089c2ae22b5afca6aca90..bc01bb6c04ab82920ee065160177265cb3ace007 100644 (file)
--- a/test/regress/regress1/quantifiers/dump-inst-proof.smt2
+++ b/test/regress/regress1/quantifiers/dump-inst-proof.smt2
@@ -1,4 +1,4 @@
-; COMMAND-LINE: --dump-instantiations --produce-proofs --print-inst-full --no-check-unsat-cores
+; COMMAND-LINE: --dump-instantiations --produce-proofs --print-inst-full
 ; EXPECT: unsat
 ; EXPECT: (instantiations (forall ((x Int)) (or (P x) (Q x)))
 ; EXPECT:   ( 2 )

diff --git a/test/regress/regress1/sygus/issue4009-qep.smt2 b/test/regress/regress1/sygus/issue4009-qep.smt2
index c2cae2ca2c8420e47f912a00b9fb3334bc8c1cb7..71b9f20bd6937031310f8cd85d40367125a6c948 100644 (file)
--- a/test/regress/regress1/sygus/issue4009-qep.smt2
+++ b/test/regress/regress1/sygus/issue4009-qep.smt2
@@ -1,5 +1,5 @@
 ; EXPECT: unsat
-; COMMAND-LINE: --sygus-inference --sygus-qe-preproc --no-check-unsat-cores -q
+; COMMAND-LINE: --sygus-inference --sygus-qe-preproc -q
 (set-logic ALL)
 (declare-fun a () Real)
 (declare-fun b () Real)

diff --git a/test/regress/regress2/bv_to_int_bitwise.smt2 b/test/regress/regress2/bv_to_int_bitwise.smt2
index 66d9e237917e63d74e7dc1e22b93a9bf208d2e39..23624e12c3aa6a0f273621c928c20ee9f4c0427b 100644 (file)
--- a/test/regress/regress2/bv_to_int_bitwise.smt2
+++ b/test/regress/regress2/bv_to_int_bitwise.smt2
@@ -1,8 +1,8 @@
-; COMMAND-LINE: --solve-bv-as-int=sum --bvand-integer-granularity=1 --no-check-unsat-cores
-; COMMAND-LINE: --solve-bv-as-int=sum --bvand-integer-granularity=5 --no-check-unsat-cores
-; COMMAND-LINE: --solve-bv-as-int=iand --iand-mode=value --no-check-unsat-cores
-; COMMAND-LINE: --solve-bv-as-int=iand --iand-mode=sum --no-check-unsat-cores
-; COMMAND-LINE: --solve-bv-as-int=bv --no-check-unsat-cores
+; COMMAND-LINE: --solve-bv-as-int=sum --bvand-integer-granularity=1
+; COMMAND-LINE: --solve-bv-as-int=sum --bvand-integer-granularity=5
+; COMMAND-LINE: --solve-bv-as-int=iand --iand-mode=value
+; COMMAND-LINE: --solve-bv-as-int=iand --iand-mode=sum
+; COMMAND-LINE: --solve-bv-as-int=bv
 ; EXPECT: unsat
 (set-logic QF_BV)
 (declare-fun s () (_ BitVec 4))

diff --git a/test/regress/regress2/bv_to_int_mask_array_1.smt2 b/test/regress/regress2/bv_to_int_mask_array_1.smt2
index d587735e57ac0777c476a54ef7461be7d339bc76..c8cf40abf8c0881ca1a940d69f6ec8c5ea9e31fb 100644 (file)
--- a/test/regress/regress2/bv_to_int_mask_array_1.smt2
+++ b/test/regress/regress2/bv_to_int_mask_array_1.smt2
@@ -1,7 +1,7 @@
-; COMMAND-LINE: --solve-bv-as-int=sum --bvand-integer-granularity=1 --no-check-unsat-cores
-; COMMAND-LINE: --solve-bv-as-int=iand --iand-mode=value --no-check-unsat-cores
-; COMMAND-LINE: --solve-bv-as-int=iand --iand-mode=sum --no-check-unsat-cores
-; COMMAND-LINE: --solve-bv-as-int=bv --no-check-unsat-cores
+; COMMAND-LINE: --solve-bv-as-int=sum --bvand-integer-granularity=1
+; COMMAND-LINE: --solve-bv-as-int=iand --iand-mode=value
+; COMMAND-LINE: --solve-bv-as-int=iand --iand-mode=sum
+; COMMAND-LINE: --solve-bv-as-int=bv
 ; EXPECT: unsat
 (set-logic ALL)
 (declare-fun A () (Array Int Int))

diff --git a/test/regress/regress2/ho/partial_app_interpreted_SWW474^2.p b/test/regress/regress2/ho/partial_app_interpreted_SWW474^2.p
index a521fdddc9853514a3d7f72fa707706149218b7c..37c7a02e883c37ee6a46b1bc70548219d35ca9b6 100644 (file)
--- a/test/regress/regress2/ho/partial_app_interpreted_SWW474^2.p
+++ b/test/regress/regress2/ho/partial_app_interpreted_SWW474^2.p
@@ -1,4 +1,4 @@
-% COMMAND-LINE: --uf-ho --full-saturate-quant --ho-elim --no-check-unsat-cores
+% COMMAND-LINE: --uf-ho --full-saturate-quant --ho-elim
 % EXPECT: % SZS status Theorem for partial_app_interpreted_SWW474^2
 
 %------------------------------------------------------------------------------

diff --git a/test/regress/regress3/arith_prp-13-24.smt2 b/test/regress/regress3/arith_prp-13-24.smt2
index 9b2b164fdad53b77ce40ea0e693e664cd2d893db..a847f7951aba418482b9d83c463ccfeb6a1e249f 100644 (file)
--- a/test/regress/regress3/arith_prp-13-24.smt2
+++ b/test/regress/regress3/arith_prp-13-24.smt2
@@ -1,4 +1,4 @@
-; COMMAND-LINE: --no-check-unsat-cores
+; COMMAND-LINE:
 ; EXPECT: unsat
 (set-logic QF_LIA)
 (set-option :ite-simp true)

diff --git a/test/regress/regress3/bv_to_int_and_or.smt2 b/test/regress/regress3/bv_to_int_and_or.smt2
index 2524e8772c30a4450bef08404ccd8e2783d69d76..2c728417d27dc33d26e0371da8d5fabd479e7d19 100644 (file)
--- a/test/regress/regress3/bv_to_int_and_or.smt2
+++ b/test/regress/regress3/bv_to_int_and_or.smt2
@@ -1,5 +1,5 @@
-; COMMAND-LINE: --solve-bv-as-int=sum --bvand-integer-granularity=1   --no-check-unsat-cores
-; COMMAND-LINE: --solve-bv-as-int=sum --bvand-integer-granularity=2   --no-check-unsat-cores
+; COMMAND-LINE: --solve-bv-as-int=sum --bvand-integer-granularity=1  
+; COMMAND-LINE: --solve-bv-as-int=sum --bvand-integer-granularity=2  
 ; EXPECT: unsat
 (set-logic QF_BV)
 (declare-fun a () (_ BitVec 4))

diff --git a/test/regress/regress3/bv_to_int_check_ne_bvlshr0_4bit.smt2.minimized.smt2 b/test/regress/regress3/bv_to_int_check_ne_bvlshr0_4bit.smt2.minimized.smt2
index 1db79b1e9e8cd0c09f882d20da7ff0688c3674f7..b07cfb3c46fc87eb748f109679adbb1ca248b385 100644 (file)
--- a/test/regress/regress3/bv_to_int_check_ne_bvlshr0_4bit.smt2.minimized.smt2
+++ b/test/regress/regress3/bv_to_int_check_ne_bvlshr0_4bit.smt2.minimized.smt2
@@ -1,5 +1,5 @@
-; COMMAND-LINE:  --solve-bv-as-int=bv --no-check-unsat-cores
-; COMMAND-LINE:  --cegqi-all --full-saturate-quant --bvand-integer-granularity=1 --solve-bv-as-int=sum  --no-check-unsat-cores
+; COMMAND-LINE:  --solve-bv-as-int=bv
+; COMMAND-LINE:  --cegqi-all --full-saturate-quant --bvand-integer-granularity=1 --solve-bv-as-int=sum 
 ; EXPECT: unsat
 (set-logic BV)
 (declare-fun s () (_ BitVec 4))

diff --git a/test/regress/regress3/bv_to_int_quant1.smt2 b/test/regress/regress3/bv_to_int_quant1.smt2
index 22656d17f4abcd8ceec1894aa5e3c6149809fe08..48d0388d2c1b44c51c5f0b9db3f694a4b936ce73 100644 (file)
--- a/test/regress/regress3/bv_to_int_quant1.smt2
+++ b/test/regress/regress3/bv_to_int_quant1.smt2
@@ -1,4 +1,4 @@
-; COMMAND-LINE:  --cegqi-all --full-saturate-quant --bvand-integer-granularity=1 --solve-bv-as-int=sum  --no-check-unsat-cores
+; COMMAND-LINE:  --cegqi-all --full-saturate-quant --bvand-integer-granularity=1 --solve-bv-as-int=sum 
 ; EXPECT: unsat
 (set-logic BV)
 (declare-fun s () (_ BitVec 4))

diff --git a/test/regress/regress3/quantifiers/sygus-inst-ufbv-sdlx-fixpoint-5.smt2 b/test/regress/regress3/quantifiers/sygus-inst-ufbv-sdlx-fixpoint-5.smt2
index 23b4c8cbd91236d8bb6cf57976375091c82e8b71..e1cd9099b525da2c3cd58d1d745db9aa2cbece29 100644 (file)
--- a/test/regress/regress3/quantifiers/sygus-inst-ufbv-sdlx-fixpoint-5.smt2
+++ b/test/regress/regress3/quantifiers/sygus-inst-ufbv-sdlx-fixpoint-5.smt2
@@ -1,4 +1,4 @@
-; COMMAND-LINE: --sygus-inst --no-check-unsat-cores
+; COMMAND-LINE: --sygus-inst
 
 ; times out during unsat core checking since 6b673474
 (set-info :smt-lib-version 2.6)

diff --git a/test/regress/run_regression.py b/test/regress/run_regression.py
index 5ff9628f0e7c6cbb73d5a199e80c29cfdb959c7d..0f9bcda1a40b2054a93675352c04c49d649548b0 100755 (executable)
--- a/test/regress/run_regression.py
+++ b/test/regress/run_regression.py
@@ -343,7 +343,7 @@ def run_regression(check_unsat_cores, check_proofs, dump, use_skip_return_code,
                '--no-produce-unsat-cores' not in all_args and \
                '--no-check-unsat-cores' not in all_args and \
                '--check-unsat-cores' not in all_args and \
-               '--incremental' not in all_args and \
+               'sygus-inference' not in benchmark_content and \
                '--unconstrained-simp' not in all_args:
                 extra_command_line_args += ['--check-unsat-cores']
             if check_proofs and \