fixes based on unit tests

Z3Prover · Mar 5, 2024 · 9915378 · 9915378
1 parent 046db66
commit 9915378
Show file tree

Hide file tree

Showing 10 changed files with 363 additions and 111 deletions.
diff --git a/src/ast/bv_decl_plugin.h b/src/ast/bv_decl_plugin.h
@@ -557,15 +557,15 @@ class bv_util : public bv_recognizers {
     app* mk_bv_rotate_right(expr* arg, unsigned n);
 
     // TODO: all these binary ops commute (right?) but it'd be more logical to swap `n` & `m` in the `return`
-    app * mk_bvsmul_no_ovfl(expr* m, expr* n) { return m_manager.mk_app(get_fid(), OP_BSMUL_NO_OVFL, n, m); }
-    app * mk_bvsmul_no_udfl(expr* m, expr* n) { return m_manager.mk_app(get_fid(), OP_BSMUL_NO_UDFL, n, m); }
-    app * mk_bvumul_no_ovfl(expr* m, expr* n) { return m_manager.mk_app(get_fid(), OP_BUMUL_NO_OVFL, n, m); }
-    app * mk_bvsmul_ovfl(expr* m, expr* n) { return m_manager.mk_app(get_fid(), OP_BSMUL_OVFL, n, m); }
-    app * mk_bvumul_ovfl(expr* m, expr* n) { return m_manager.mk_app(get_fid(), OP_BUMUL_OVFL, n, m); }
+    app * mk_bvsmul_no_ovfl(expr* m, expr* n) { return m_manager.mk_app(get_fid(), OP_BSMUL_NO_OVFL, m, n); }
+    app * mk_bvsmul_no_udfl(expr* m, expr* n) { return m_manager.mk_app(get_fid(), OP_BSMUL_NO_UDFL, m, n); }
+    app * mk_bvumul_no_ovfl(expr* m, expr* n) { return m_manager.mk_app(get_fid(), OP_BUMUL_NO_OVFL, m, n); }
+    app * mk_bvsmul_ovfl(expr* m, expr* n) { return m_manager.mk_app(get_fid(), OP_BSMUL_OVFL, m, n); }
+    app * mk_bvumul_ovfl(expr* m, expr* n) { return m_manager.mk_app(get_fid(), OP_BUMUL_OVFL, m, n); }
     app * mk_bvsdiv_ovfl(expr* m, expr* n) { return m_manager.mk_app(get_fid(), OP_BSDIV_OVFL, m, n); }
     app * mk_bvneg_ovfl(expr* m) { return m_manager.mk_app(get_fid(), OP_BNEG_OVFL, m); }
-    app * mk_bvuadd_ovfl(expr* m, expr* n) { return m_manager.mk_app(get_fid(), OP_BUADD_OVFL, n, m); }
-    app * mk_bvsadd_ovfl(expr* m, expr* n) { return m_manager.mk_app(get_fid(), OP_BSADD_OVFL, n, m); }
+    app * mk_bvuadd_ovfl(expr* m, expr* n) { return m_manager.mk_app(get_fid(), OP_BUADD_OVFL, m, n); }
+    app * mk_bvsadd_ovfl(expr* m, expr* n) { return m_manager.mk_app(get_fid(), OP_BSADD_OVFL, m, n); }
     app * mk_bvusub_ovfl(expr* m, expr* n) { return m_manager.mk_app(get_fid(), OP_BUSUB_OVFL, m, n); }
     app * mk_bvssub_ovfl(expr* m, expr* n) { return m_manager.mk_app(get_fid(), OP_BSSUB_OVFL, m, n); }
 

diff --git a/src/ast/sls/bv_sls.cpp b/src/ast/sls/bv_sls.cpp
@@ -46,6 +46,31 @@ namespace bv {
         m_eval.init_fixed(m_terms.assertions());
     }
 
+    void sls::reinit_eval() {
+        std::function<bool(expr*, unsigned)> eval = [&](expr* e, unsigned i) {
+            if (m.is_bool(e)) {
+                if (m_eval.is_fixed0(e))
+                    return m_eval.bval0(e);
+            }
+            else if (bv.is_bv(e)) {
+                auto& w = m_eval.wval0(e);
+                if (w.get(w.fixed, i))
+                    return w.get(w.bits, i);
+
+            }
+            return m_rand() % 2 == 0;
+        };
+        m_eval.init_eval(m_terms.assertions(), eval);
+        m_repair_down.reset();
+        m_repair_up.reset();
+        for (auto* e : m_terms.assertions()) {
+            if (!m_eval.bval0(e)) {
+                m_eval.set(e, true);
+                m_repair_down.insert(e->get_id());
+            }
+        }
+    }
+
     std::pair<bool, app*> sls::next_to_repair() {
         app* e = nullptr;
         if (!m_repair_down.empty()) {
@@ -59,30 +84,48 @@ namespace bv {
         return { !m_repair_down.empty(), e };
     }
 
-    lbool sls::operator()() {
+    lbool sls::search() {
         // init and init_eval were invoked.
         unsigned& n = m_stats.m_moves;
         n = 0;
         for (; n < m_config.m_max_repairs && m.inc(); ++n) {
             auto [down, e] = next_to_repair();
             if (!e)
                 return l_true;
-            IF_VERBOSE(20, verbose_stream() << (down?"d ":"u ") << mk_bounded_pp(e, m, 1) << "\n");
+            IF_VERBOSE(20, verbose_stream() << (down ? "d " : "u ") << mk_bounded_pp(e, m, 1) << "\n");
             if (eval_is_correct(e)) {
                 if (down)
                     m_repair_down.remove(e->get_id());
                 else
                     m_repair_up.remove(e->get_id());
             }
             else if (down) {
-                try_repair_down(e);                
+                try_repair_down(e);
             }
-            else 
-                try_repair_up(e);            
+            else
+                try_repair_up(e);
         }
         return l_undef;
     }
 
+    lbool sls::operator()() {
+        lbool res = l_undef;
+        do {
+            if (!m.inc())
+                return l_undef;
+
+            res = search();
+
+            if (res != l_undef)
+                return res;
+
+            reinit_eval();
+        } 
+        while (m_stats.m_restarts++ < m_config.m_max_restarts);
+
+        return res;
+    }
+
     void sls::try_repair_down(app* e) {
         unsigned n = e->get_num_args();
         if (n > 0) {

diff --git a/src/ast/sls/bv_sls.h b/src/ast/sls/bv_sls.h
@@ -57,6 +57,9 @@ namespace bv {
 
         bool try_repair_down(app* e, unsigned i);
 
+        lbool search();
+        void reinit_eval();
+
     public:
         sls(ast_manager& m);