mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-29 01:18:45 +00:00
Code Activity

parallelizing ccc

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-04-24 08:36:33 -07:00
parent 3aaea6b920
commit 07ef79d664
3 changed files with 67 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

71
src/sat/sat_ccc.cpp
View file

@ -54,7 +54,7 @@ std::ostream& ccc::pp(std::ostream& out, svector<decision> const& v) {
lbool ccc::cube() { lbool ccc::cube() {
m_branch_id = 0; m_branch_id = 0;
m_last_closure_level = UINT_MAX; m_last_closure_level = 1000;
lookahead lh(m_s); lookahead lh(m_s);
lh.init_search(); lh.init_search();
@ -68,7 +68,7 @@ lbool ccc::cube() {
if (r == l_true) { if (r == l_true) {
m_model = lh.get_model(); m_model = lh.get_model();
} }
lh.collect_statistics(m_stats); lh.collect_statistics(m_lh_stats);
return r; return r;
} }
@ -102,8 +102,9 @@ lbool ccc::cube(svector<decision>& decisions, lookahead& lh) {
++lh.m_stats.m_decisions; ++lh.m_stats.m_decisions;
unsigned parent_id = decisions.empty() ? 0 : decisions.back().m_id; unsigned parent_id = decisions.empty() ? 0 : decisions.back().m_id;
unsigned spawn_id = spawn_conquer(decisions); unsigned spawn_id = spawn_conquer(decisions);
unsigned branch_id = ++m_branch_id; unsigned branch1 = m_branch_id++;
decision d(branch_id, decisions.size() + 1, l, parent_id, spawn_id); unsigned branch2 = m_branch_id++;
decision d(branch1, decisions.size() + 1, l, parent_id, spawn_id);
decisions.push_back(d); decisions.push_back(d);
IF_VERBOSE(1, verbose_stream() << "select " << pp_prefix(lh.m_prefix, lh.m_trail_lim.size()) << ": " << l << " " << lh.m_trail.size() << "\n";); IF_VERBOSE(1, verbose_stream() << "select " << pp_prefix(lh.m_prefix, lh.m_trail_lim.size()) << ": " << l << " " << lh.m_trail.size() << "\n";);
@ -116,39 +117,50 @@ lbool ccc::cube(svector<decision>& decisions, lookahead& lh) {
lh.pop(); lh.pop();
if (decisions.back().is_closed()) { if (decisions.back().is_closed()) {
// branch was solved by a spawned conquer process // branch was solved by a spawned conquer process
IF_VERBOSE(1, verbose_stream() << "closed " << decisions.back().m_id << "\n";); IF_VERBOSE(0, verbose_stream() << "closed " << decisions.back().m_id << "\n";);
r = l_false; r = l_false;
decisions.pop_back();
} }
else { else {
lh.inc_istamp();
lh.flip_prefix(); lh.flip_prefix();
lh.push(~l, lh.c_fixed_truth); lh.push(~l, lh.c_fixed_truth);
decisions.back().negate(); decisions.back().negate();
decisions.back().m_id = branch2;
r = cube(decisions, lh); r = cube(decisions, lh);
} if (r == l_false) {
if (r == l_false) { lh.pop();
lh.pop(); decisions.pop_back();
decisions.pop_back(); }
} }
} }
return r; return r;
} }
void ccc::update_closure_level(decision const& d, int offset) {
m_last_closure_level = (d.m_depth + 3*m_last_closure_level) / 4 + offset;
}
unsigned ccc::spawn_conquer(svector<decision> const& decisions) { unsigned ccc::spawn_conquer(svector<decision> const& decisions) {
unsigned result = 0; unsigned result = 0;
// //
// decisions must have been solved at a higher level by a conquer thread // decisions must have been solved at a higher level by a conquer thread
// //
if (!m_free_threads.empty() && m_last_closure_level <= 1 + decisions.size() + m_free_threads.size()) { if (m_ccc_stats.m_cdcl_closed < 10) {
return 0;
}
if (!m_free_threads.empty() && m_last_closure_level >= decisions.size()) {
result = m_free_threads.back(); result = m_free_threads.back();
m_free_threads.pop_back(); m_free_threads.pop_back();
IF_VERBOSE(1, verbose_stream() << "spawn " << result << "\n";); IF_VERBOSE(0, verbose_stream() << "spawn " << decisions.size() << " " << result << "\n";);
} }
return result; return result;
} }
void ccc::free_conquer(unsigned thread_id) { void ccc::free_conquer(unsigned thread_id) {
m_free_threads.push_back(thread_id); if (thread_id != 0) {
m_free_threads.push_back(thread_id);
}
} }
@ -208,21 +220,32 @@ bool ccc::get_solved(svector<decision>& decisions) {
unsigned branch_id = sol.m_branch_id; unsigned branch_id = sol.m_branch_id;
unsigned thread_id = sol.m_thread_id; unsigned thread_id = sol.m_thread_id;
SASSERT(thread_id > 0); SASSERT(thread_id > 0);
free_conquer(thread_id);
for (unsigned i = decisions.size(); i > 0; ) { for (unsigned i = decisions.size(); i > 0; ) {
--i; --i;
decision& d = decisions[i]; decision& d = decisions[i];
if (branch_id == d.m_id) { if (branch_id == d.m_id) {
if (d.m_spawn_id == thread_id) { if (d.m_spawn_id == thread_id && thread_id != 0) {
SASSERT(d.m_spawn_id > 0); SASSERT(d.m_spawn_id > 0);
free_conquer(thread_id); IF_VERBOSE(0, verbose_stream() << "spawn close " << branch_id << " " << thread_id << " " << d.m_depth << "\n";);
IF_VERBOSE(1, verbose_stream() << "close " << i << "\n";); ++m_ccc_stats.m_spawn_closed;
d.close(); d.close();
update_closure_level(d, -1);
} }
else { else {
// IF_VERBOSE(1, verbose_stream() << "conquer " << branch_id << " " << i << " " << d.get_literal(thread_id) << "\n";); IF_VERBOSE(0, verbose_stream() << "conquer " << branch_id << " " << thread_id << " " << d.m_depth << " " << d.get_literal(thread_id) << "\n";);
found = true; found = true;
++m_ccc_stats.m_cdcl_closed;
update_closure_level(d, 1);
} }
m_last_closure_level = d.m_depth; break;
}
// branch is even, d has moved to the next branch
if (branch_id == (d.m_id & ~0x1) && d.m_spawn_id == thread_id && thread_id != 0) {
IF_VERBOSE(0, verbose_stream() << "spawn conquer " << branch_id << " " << thread_id << " " << d.m_depth << "\n";);
found = true;
++m_ccc_stats.m_cdcl_closed;
update_closure_level(d, 1);
break; break;
} }
} }
@ -233,6 +256,7 @@ bool ccc::get_solved(svector<decision>& decisions) {
m_solved.pop(); m_solved.pop();
} }
} }
return found; return found;
} }
@ -262,14 +286,7 @@ bool ccc::push_decision(solver& s, svector<decision> const& decisions, decision
literal lit = d.get_literal(thread_id); literal lit = d.get_literal(thread_id);
switch (s.value(lit)) { switch (s.value(lit)) {
case l_false: case l_false:
// TBD: we leak conquer threads if they backjump below spawn point. thread_id = (d.m_spawn_id == thread_id || (!decisions.empty() && decisions.back().m_spawn_id == thread_id)) ? thread_id : 0;
if (decisions.empty() && decisions.back().m_spawn_id == thread_id && decisions.back().m_id != d.m_id) {
IF_VERBOSE(0, verbose_stream() << "LEAK avoided\n";);
#pragma omp critical (ccc_solved)
{
m_solved.push(solution(thread_id, decisions.back().m_id));
}
}
#pragma omp critical (ccc_solved) #pragma omp critical (ccc_solved)
{ {
m_solved.push(solution(thread_id, d.m_id)); m_solved.push(solution(thread_id, d.m_id));
@ -431,7 +448,7 @@ lbool ccc::search() {
} }
for (unsigned i = 0; i < solvers.size(); ++i) { for (unsigned i = 0; i < solvers.size(); ++i) {
solvers[i]->collect_statistics(m_stats); solvers[i]->collect_statistics(m_lh_stats);
dealloc(solvers[i]); dealloc(solvers[i]);
} }

22
src/sat/sat_ccc.h
View file

@ -41,7 +41,7 @@ namespace sat {
void close() { SASSERT(m_spawn_id > 0); m_spawn_id = -m_spawn_id; } void close() { SASSERT(m_spawn_id > 0); m_spawn_id = -m_spawn_id; }
bool is_closed() const { return m_spawn_id < 0; } bool is_closed() const { return m_spawn_id < 0; }
void negate() { m_literal.neg(); m_spawn_id = 0; } void negate() { m_literal.neg(); }
literal get_literal(unsigned thread_id) const { return thread_id == m_spawn_id ? ~m_literal : m_literal; } literal get_literal(unsigned thread_id) const { return thread_id == m_spawn_id ? ~m_literal : m_literal; }
std::ostream& pp(std::ostream& out) const; std::ostream& pp(std::ostream& out) const;
}; };
@ -52,6 +52,15 @@ namespace sat {
solution(unsigned t, unsigned s): m_thread_id(t), m_branch_id(s) {} solution(unsigned t, unsigned s): m_thread_id(t), m_branch_id(s) {}
}; };
struct stats {
unsigned m_spawn_closed;
unsigned m_cdcl_closed;
stats() { reset(); }
void reset() {
memset(this, 0, sizeof(*this));
}
};
solver& m_s; solver& m_s;
queue<solution> m_solved; queue<solution> m_solved;
vector<queue<decision> > m_decisions; vector<queue<decision> > m_decisions;
@ -61,7 +70,8 @@ namespace sat {
unsigned m_branch_id; unsigned m_branch_id;
unsigned_vector m_free_threads; unsigned_vector m_free_threads;
unsigned m_last_closure_level; unsigned m_last_closure_level;
::statistics m_stats; ::statistics m_lh_stats;
stats m_ccc_stats;
lbool conquer(solver& s, unsigned thread_id); lbool conquer(solver& s, unsigned thread_id);
bool cube_decision(solver& s, svector<decision>& decisions, unsigned thread_id); bool cube_decision(solver& s, svector<decision>& decisions, unsigned thread_id);
@ -74,6 +84,8 @@ namespace sat {
bool get_decision(unsigned thread_id, decision& d); bool get_decision(unsigned thread_id, decision& d);
bool get_solved(svector<decision>& decisions); bool get_solved(svector<decision>& decisions);
void update_closure_level(decision const& d, int offset);
void replay_decisions(solver& s, svector<decision>& decisions, unsigned thread_id); void replay_decisions(solver& s, svector<decision>& decisions, unsigned thread_id);
static std::ostream& pp(std::ostream& out, svector<decision> const& v); static std::ostream& pp(std::ostream& out, svector<decision> const& v);
@ -95,7 +107,11 @@ namespace sat {
model const& get_model() const { return m_model; } model const& get_model() const { return m_model; }
void collect_statistics(::statistics& st) { st.copy(m_stats); } void collect_statistics(::statistics& st) {
st.copy(m_lh_stats);
st.update("ccc-spawn-closed", m_ccc_stats.m_spawn_closed);
st.update("ccc-cdcl-closed", m_ccc_stats.m_cdcl_closed);
}
}; };
} }

4
src/sat/sat_lookahead.h
View file

@ -344,6 +344,9 @@ namespace sat {
void try_add_binary(literal u, literal v) { void try_add_binary(literal u, literal v) {
SASSERT(m_search_mode == lookahead_mode::searching); SASSERT(m_search_mode == lookahead_mode::searching);
SASSERT(u.var() != v.var()); SASSERT(u.var() != v.var());
if (!is_undef(u) || !is_undef(v)) {
IF_VERBOSE(0, verbose_stream() << "adding assigned binary " << v << " " << u << "\n";);
}
set_bstamps(~u); set_bstamps(~u);
if (is_stamped(~v)) { if (is_stamped(~v)) {
TRACE("sat", tout << "try_add_binary: " << u << "\n";); TRACE("sat", tout << "try_add_binary: " << u << "\n";);
@ -1120,6 +1123,7 @@ namespace sat {
} }
void pop() { void pop() {
if (m_assumptions.empty()) IF_VERBOSE(0, verbose_stream() << "empty pop\n";);
m_assumptions.pop_back(); m_assumptions.pop_back();
m_inconsistent = false; m_inconsistent = false;
SASSERT(m_search_mode == lookahead_mode::searching); SASSERT(m_search_mode == lookahead_mode::searching);