mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-10-09 17:31:57 +00:00
Code Activity

remove backoff alltogether

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2025-09-09 12:45:32 -07:00
parent e916065f7c
commit 9b2cb8a359
2 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/smt/smt_parallel.cpp
View file

@ -399,6 +399,7 @@ namespace smt {
lbool r = l_undef;
ctx->get_fparams().m_max_conflicts = std::min(m_config.m_threads_max_conflicts, m_config.m_max_conflicts);
IF_VERBOSE(1, verbose_stream() << " Checking cube " << cube << " with max_conflicts: " << ctx->get_fparams().m_max_conflicts << "\n";);
try {
r = ctx->check(asms.size(), asms.data());
}

22
src/smt/smt_parallel2.cpp
View file

@ -17,6 +17,7 @@ Author:
#include "util/scoped_ptr_vector.h"
#include "ast/ast_util.h"
#include "ast/ast_pp.h"
@ -28,6 +29,22 @@ Author:
#include <cmath>
class bounded_pp_exprs {
expr_ref_vector const& es;
public:
bounded_pp_exprs(expr_ref_vector const& es): es(es) {}
std::ostream& display(std::ostream& out) const {
for (auto e : es)
out << mk_bounded_pp(e, es.get_manager()) << "\n";
return out;
}
};
inline std::ostream& operator<<(std::ostream& out, bounded_pp_exprs const& pp) {
return pp.display(out);
}
#ifdef SINGLE_THREAD
namespace smt {
@ -204,7 +221,7 @@ namespace smt {
}
m_search_tree.backtrack(node, g_core);
IF_VERBOSE(1, m_search_tree.display(verbose_stream() << core << "\n"););
IF_VERBOSE(1, m_search_tree.display(verbose_stream() << bounded_pp_exprs(core) << "\n"););
if (m_search_tree.is_closed()) {
m_state = state::is_unsat;
cancel_workers();
@ -266,7 +283,8 @@ namespace smt {
asms.push_back(atom);
lbool r = l_undef;
ctx->get_fparams().m_max_conflicts = std::min((cube.size() + 1) *m_config.m_threads_max_conflicts, m_config.m_max_conflicts);
ctx->get_fparams().m_max_conflicts = std::min(cube.size() * 0 + m_config.m_threads_max_conflicts, m_config.m_max_conflicts);
IF_VERBOSE(1, verbose_stream() << " Checking cube\n" << bounded_pp_exprs(cube) << "with max_conflicts: " << ctx->get_fparams().m_max_conflicts << "\n";);
try {
r = ctx->check(asms.size(), asms.data());
}