mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +00:00
Code Activity

Merge branch 'master' of https://github.com/z3prover/z3 into opt

Browse source
This commit is contained in:
Nikolaj Bjorner 2017-02-01 12:09:31 -08:00
commit cfff592a7f
6 changed files with 45 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/sat/sat_config.cpp
View file

@ -35,6 +35,7 @@ namespace sat {
m_glue("glue"),
m_glue_psm("glue_psm"),
m_psm_glue("psm_glue") {
m_num_parallel = 1;
updt_params(p);
}

39
src/sat/sat_solver.cpp
View file

@ -808,20 +808,24 @@ namespace sat {
lbool solver::check_par(unsigned num_lits, literal const* lits) {
int num_threads = static_cast<int>(m_config.m_num_parallel);
int num_extra_solvers = num_threads - 1;
scoped_limits scoped_rlimit(rlimit());
vector<reslimit> rlims(num_threads);
ptr_vector<sat::solver> solvers(num_threads);
vector<reslimit> rlims(num_extra_solvers);
ptr_vector<sat::solver> solvers(num_extra_solvers);
sat::par par;
for (int i = 0; i < num_threads; ++i) {
m_params.set_uint("random_seed", i);
if (i < num_threads/2) {
symbol saved_phase = m_params.get_sym("phase", symbol("caching"));
for (int i = 0; i < num_extra_solvers; ++i) {
m_params.set_uint("random_seed", m_rand());
if (i == 1 + num_threads/2) {
m_params.set_sym("phase", symbol("random"));
}
}
solvers[i] = alloc(sat::solver, m_params, rlims[i], 0);
solvers[i]->copy(*this);
solvers[i]->set_par(&par);
scoped_rlimit.push_child(&solvers[i]->rlimit());
scoped_rlimit.push_child(&solvers[i]->rlimit());
}
set_par(&par);
m_params.set_sym("phase", saved_phase);
int finished_id = -1;
std::string ex_msg;
par_exception_kind ex_kind;
@ -830,7 +834,13 @@ namespace sat {
#pragma omp parallel for
for (int i = 0; i < num_threads; ++i) {
try {
lbool r = solvers[i]->check(num_lits, lits);
lbool r = l_undef;
if (i < num_extra_solvers) {
r = solvers[i]->check(num_lits, lits);
}
else {
r = check(num_lits, lits);
}
bool first = false;
#pragma omp critical (par_solver)
{
@ -841,14 +851,14 @@ namespace sat {
}
}
if (first) {
if (r == l_true) {
if (r == l_true && i < num_extra_solvers) {
set_model(solvers[i]->get_model());
}
else if (r == l_false) {
else if (r == l_false && i < num_extra_solvers) {
m_core.reset();
m_core.append(solvers[i]->get_core());
}
for (int j = 0; j < num_threads; ++j) {
for (int j = 0; j < num_extra_solvers; ++j) {
if (i != j) {
rlims[j].cancel();
}
@ -868,7 +878,12 @@ namespace sat {
}
}
}
for (int i = 0; i < num_threads; ++i) {
set_par(0);
if (finished_id != -1 && finished_id < num_extra_solvers) {
m_stats = solvers[finished_id]->m_stats;
}
for (int i = 0; i < num_extra_solvers; ++i) {
dealloc(solvers[i]);
}
if (finished_id == -1) {