mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-15 13:28:47 +00:00
Code Activity

fixes to lookahead

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-06-08 17:25:06 -07:00
parent 964102726d
commit c870b77366
11 changed files with 40 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/opt/opt_solver.h
View file

@ -107,6 +107,7 @@ namespace opt {
virtual ast_manager& get_manager() const { return m; }
virtual lbool find_mutexes(expr_ref_vector const& vars, vector<expr_ref_vector>& mutexes);
virtual lbool preferred_sat(expr_ref_vector const& asms, vector<expr_ref_vector>& cores);
virtual expr_ref lookahead(expr_ref_vector const& candidates) { return expr_ref(m.mk_true(), m); }
void set_logic(symbol const& logic);
smt::theory_var add_objective(app* term);

15
src/sat/sat_lookahead.cpp
View file

@ -151,7 +151,7 @@ namespace sat {
}
if (m_num_tc1 < m_config.m_tc1_limit) {
++m_num_tc1;
IF_VERBOSE(3, verbose_stream() << "tc1: " << u << " " << w << "\n";);
IF_VERBOSE(30, verbose_stream() << "tc1: " << u << " " << w << "\n";);
add_binary(u, w);
}
}
@ -285,9 +285,11 @@ namespace sat {
for (bool_var const* it = m_freevars.begin(), * end = m_freevars.end(); it != end; ++it) {
SASSERT(is_undef(*it));
bool_var x = *it;
if (!m_select_lookahead_vars.empty() && m_select_lookahead_vars.contains(x)) {
m_candidates.push_back(candidate(x, m_rating[x]));
sum += m_rating[x];
if (!m_select_lookahead_vars.empty()) {
if (m_select_lookahead_vars.contains(x)) {
m_candidates.push_back(candidate(x, m_rating[x]));
sum += m_rating[x];
}
}
else if (newbies || active_prefix(x)) {
m_candidates.push_back(candidate(x, m_rating[x]));
@ -1214,7 +1216,7 @@ namespace sat {
continue;
}
if (scope_lvl() == 1) {
IF_VERBOSE(3, verbose_stream() << scope_lvl() << " " << lit << " binary: " << m_binary_trail.size() << " trail: " << m_trail_lim.back() << "\n";);
IF_VERBOSE(30, verbose_stream() << scope_lvl() << " " << lit << " binary: " << m_binary_trail.size() << " trail: " << m_trail_lim.back() << "\n";);
}
TRACE("sat", tout << "lookahead: " << lit << " @ " << m_lookahead[i].m_offset << "\n";);
reset_wnb(lit);
@ -1602,12 +1604,13 @@ namespace sat {
literal lookahead::select_lookahead(bool_var_vector const& vars) {
IF_VERBOSE(1, verbose_stream() << "(sat-select " << vars.size() << ")\n";);
scoped_ext _sext(*this);
m_search_mode = lookahead_mode::searching;
scoped_level _sl(*this, c_fixed_truth);
init();
if (inconsistent()) return null_literal;
inc_istamp();
inc_istamp();
for (auto v : vars) {
m_select_lookahead_vars.insert(v);
}

8
src/sat/sat_solver/inc_sat_solver.cpp
View file

@ -281,8 +281,10 @@ public:
}
virtual expr_ref lookahead(expr_ref_vector const& candidates) {
IF_VERBOSE(1, verbose_stream() << "(sat-lookahead " << candidates.size() << ")\n";);
sat::bool_var_vector vars;
expr_ref_vector lit2expr(m);
lit2expr.resize(m_solver.num_vars() * 2);
m_map.mk_inv(lit2expr);
for (auto c : candidates) {
sat::bool_var v = m_map.to_bool_var(c);
@ -290,17 +292,21 @@ public:
vars.push_back(v);
}
}
IF_VERBOSE(1, verbose_stream() << "vars: " << vars.size() << "\n";);
if (vars.empty()) {
return expr_ref(m.mk_true(), m);
}
sat::literal l = m_solver.select_lookahead(vars);
if (m_solver.inconsistent()) {
IF_VERBOSE(1, verbose_stream() << "(sat-lookahead inconsistent)\n";);
return expr_ref(m.mk_false(), m);
}
if (l == sat::null_literal) {
return expr_ref(m.mk_true(), m);
}
return expr_ref(lit2expr[l.index()].get(), m);
expr_ref result(lit2expr[l.index()].get(), m);
IF_VERBOSE(1, verbose_stream() << "solution: " << l << " " << result << "\n";);
return result;
}
virtual void get_lemmas(expr_ref_vector & lemmas) {
IF_VERBOSE(1, verbose_stream() << "(sat-get-lemmas " << lemmas.size() << ")\n";);

5
src/smt/smt_solver.cpp
View file

@ -219,6 +219,11 @@ namespace smt {
return m_context.get_formulas()[idx];
}
virtual expr_ref lookahead(expr_ref_vector const& candidates) {
ast_manager& m = get_manager();
return expr_ref(m.mk_true(), m);
}
struct collect_fds_proc {
ast_manager & m;
func_decl_set & m_fds;

4
src/solver/combined_solver.cpp
View file

@ -274,6 +274,10 @@ public:
return m_solver1->get_num_assumptions() + m_solver2->get_num_assumptions();
}
virtual expr_ref lookahead(expr_ref_vector const& candidates) {
return m_solver1->lookahead(candidates);
}
virtual expr * get_assumption(unsigned idx) const {
unsigned c1 = m_solver1->get_num_assumptions();
if (idx < c1) return m_solver1->get_assumption(idx);

4
src/solver/solver.cpp
View file

@ -162,9 +162,13 @@ bool solver::is_literal(ast_manager& m, expr* e) {
return is_uninterp_const(e) || (m.is_not(e, e) && is_uninterp_const(e));
}
#if 0
expr_ref solver::lookahead(expr_ref_vector const& candidates) {
std::cout << "lookahead: " << candidates.size() << "\n";
INVOKE_DEBUGGER();
ast_manager& m = candidates.get_manager();
return expr_ref(m.mk_true(), m);
}
#endif

2
src/solver/solver.h
View file

@ -176,7 +176,7 @@ public:
\brief extract a lookahead candidates for branching.
*/
virtual expr_ref lookahead(expr_ref_vector const& candidates);
virtual expr_ref lookahead(expr_ref_vector const& candidates) = 0;
/**
\brief extract learned lemmas.

6
src/solver/tactic2solver.cpp
View file

@ -75,6 +75,12 @@ public:
virtual expr * get_assertion(unsigned idx) const;
virtual ast_manager& get_manager() const;
virtual expr_ref lookahead(expr_ref_vector const& candidates) {
ast_manager& m = get_manager();
std::cout << "tactic2solver\n";
return expr_ref(m.mk_true(), m);
}
};
ast_manager& tactic2solver::get_manager() const { return m_assertions.get_manager(); }

2
src/tactic/portfolio/bounded_int2bv_solver.cpp
View file

@ -149,7 +149,7 @@ public:
virtual void set_reason_unknown(char const* msg) { m_solver->set_reason_unknown(msg); }
virtual void get_labels(svector<symbol> & r) { m_solver->get_labels(r); }
virtual ast_manager& get_manager() const { return m; }
virtual expr_ref lookahead(expr_ref_vector& candidates) { flush_assertions(); return m_solver->lookahead(candidates); }
virtual expr_ref lookahead(expr_ref_vector const& candidates) { flush_assertions(); return m_solver->lookahead(candidates); }
virtual void get_lemmas(expr_ref_vector & lemmas) { flush_assertions(); m_solver->get_lemmas(lemmas); }
virtual lbool find_mutexes(expr_ref_vector const& vars, vector<expr_ref_vector>& mutexes) { return m_solver->find_mutexes(vars, mutexes); }
virtual lbool get_consequences_core(expr_ref_vector const& asms, expr_ref_vector const& vars, expr_ref_vector& consequences) {

2
src/tactic/portfolio/enum2bv_solver.cpp
View file

@ -97,7 +97,7 @@ public:
virtual void get_labels(svector<symbol> & r) { m_solver->get_labels(r); }
virtual ast_manager& get_manager() const { return m; }
virtual lbool find_mutexes(expr_ref_vector const& vars, vector<expr_ref_vector>& mutexes) { return m_solver->find_mutexes(vars, mutexes); }
virtual expr_ref lookahead(expr_ref_vector& candidates) { return m_solver->lookahead(candidates); }
virtual expr_ref lookahead(expr_ref_vector const& candidates) { return m_solver->lookahead(candidates); }
virtual void get_lemmas(expr_ref_vector & lemmas) { m_solver->get_lemmas(lemmas); }
virtual lbool get_consequences_core(expr_ref_vector const& asms, expr_ref_vector const& vars, expr_ref_vector& consequences) {

2
src/tactic/portfolio/pb2bv_solver.cpp
View file

@ -93,7 +93,7 @@ public:
virtual void set_reason_unknown(char const* msg) { m_solver->set_reason_unknown(msg); }
virtual void get_labels(svector<symbol> & r) { m_solver->get_labels(r); }
virtual ast_manager& get_manager() const { return m; }
virtual expr_ref lookahead(expr_ref_vector& candidates) { flush_assertions(); return m_solver->lookahead(candidates); }
virtual expr_ref lookahead(expr_ref_vector const& candidates) { flush_assertions(); return m_solver->lookahead(candidates); }
virtual void get_lemmas(expr_ref_vector & lemmas) { flush_assertions(); m_solver->get_lemmas(lemmas); }
virtual lbool find_mutexes(expr_ref_vector const& vars, vector<expr_ref_vector>& mutexes) { return m_solver->find_mutexes(vars, mutexes); }
virtual lbool get_consequences_core(expr_ref_vector const& asms, expr_ref_vector const& vars, expr_ref_vector& consequences) {