mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-02 09:20:22 +00:00
Code Activity

more consistent use of parallel mode when enabled, takes care of example test from #1898 that didn't trigger parallel mode

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-11-02 18:44:53 -05:00
parent d9e77ba443
commit cf4bf7b591
20 changed files with 73 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -48,7 +48,7 @@ tactic * mk_default_tactic(ast_manager & m, params_ref const & p) {
cond(mk_is_qffp_probe(), mk_qffp_tactic(m, p),
cond(mk_is_qffplra_probe(), mk_qffplra_tactic(m, p),
//cond(mk_is_qfufnra_probe(), mk_qfufnra_tactic(m, p),
mk_smt_tactic()))))))))))))),
mk_smt_tactic(m)))))))))))))),
p);
return st;
}

6
src/tactic/portfolio/smt_strategic_solver.cpp
View file

@ -41,6 +41,9 @@ Notes:
#include "sat/sat_solver/inc_sat_solver.h"
#include "ast/rewriter/bv_rewriter.h"
#include "solver/solver2tactic.h"
#include "solver/parallel_tactic.h"
#include "solver/parallel_params.hpp"
tactic * mk_tactic_for_logic(ast_manager & m, params_ref const & p, symbol const & logic) {
@ -99,7 +102,8 @@ tactic * mk_tactic_for_logic(ast_manager & m, params_ref const & p, symbol const
}
static solver* mk_special_solver_for_logic(ast_manager & m, params_ref const & p, symbol const& logic) {
if ((logic == "QF_FD" || logic == "SAT") && !m.proofs_enabled())
parallel_params pp(p);
if ((logic == "QF_FD" || logic == "SAT") && !m.proofs_enabled() && !pp.enable())
return mk_fd_solver(m, p);
return nullptr;
}