From: Andrew Reynolds <andrew.j.reynolds@gmail.com>
Date: Fri, 21 May 2021 21:46:48 +0000 (-0500)
Subject: Fix tests of unsat cores (#6593)
X-Git-Tag: cvc5-1.0.0~1706
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0e9fed387aaf5d0cb1844ab20551fbebfcb8893d;p=cvc5.git

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 e7870e4d7..849d775c3 100644
--- 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 e0f3b85f9..fa7bec409 100644
--- 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 38de29734..b68ccdd7d 100644
--- 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 2f02c9d1e..0281805fb 100644
--- 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 627118777..a2e170c53 100644
--- 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 fe17aa536..b1906423f 100644
--- 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 b1477732c..720ae5337 100644
--- 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 a8a5234a0..8023ea0a4 100644
--- 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 24eec2977..cb879bb0c 100644
--- 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 677ba24ff..81fb17275 100644
--- 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 3013071f9..9c02c830b 100644
--- 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 cf3526768..707b39c3e 100644
--- 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 cae429f93..b1d177686 100644
--- 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 f82ae1932..247311390 100644
--- 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 fb4899425..97b891415 100644
--- 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 fa1963322..579e438a5 100644
--- 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 5eea40acb..e4eb37d89 100644
--- 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 69bf76937..ad65d8ca4 100644
--- 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 44d0f4dab..78bf51481 100644
--- 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 8be60bf80..8eaf4a79f 100644
--- 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 2d43bc606..c070dd648 100644
--- 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 5ca49011f..5cfe55ec6 100644
--- 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 942cdffde..5968fe00c 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: --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 65c9d2673..b7e390592 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: --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 f370c0f0f..341ff65a2 100644
--- 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 b53f6f0cc..3d1e323d1 100644
--- 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 a514d8b09..0c6e7e0eb 100644
--- 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 185f7eca8..6e8ffef8d 100644
--- 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 fbf996a0a..110df2fa4 100644
--- 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 9d26a06ed..50550f530 100644
--- 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 9c36ac561..81daf6c9c 100644
--- 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 1c9e80642..b5ab4609b 100644
--- 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 fc224d59a..f10402147 100644
--- 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 2a12cb677..2b5c6cab9 100644
--- 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 c2ae56b88..bc01bb6c0 100644
--- 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 c2cae2ca2..71b9f20bd 100644
--- 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 66d9e2379..23624e12c 100644
--- 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 d587735e5..c8cf40abf 100644
--- 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 a521fdddc..37c7a02e8 100644
--- 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 9b2b164fd..a847f7951 100644
--- 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 2524e8772..2c728417d 100644
--- 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 1db79b1e9..b07cfb3c4 100644
--- 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 22656d17f..48d0388d2 100644
--- 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 23b4c8cbd..e1cd9099b 100644
--- 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 5ff9628f0..0f9bcda1a 100755
--- 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 \