3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-26 18:45:33 +00:00

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

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

View file

@ -35,11 +35,18 @@ solver * mk_fd_solver(ast_manager & m, params_ref const & p, bool incremental_mo
return s;
}
tactic * mk_fd_tactic(ast_manager & m, params_ref const& p) {
static tactic * mk_seq_fd_tactic(ast_manager & m, params_ref const& p) {
return mk_solver2tactic(mk_fd_solver(m, p, false));
}
tactic * mk_parallel_qffd_tactic(ast_manager& m, params_ref const& p) {
solver* s = mk_fd_solver(m, p);
return mk_parallel_tactic(s, p);
return mk_parallel_tactic(mk_fd_solver(m, p), p);
}
tactic * mk_fd_tactic(ast_manager & m, params_ref const& _p) {
parallel_params pp(_p);
params_ref p = _p;
return pp.enable() ? mk_parallel_qffd_tactic(m, p) : mk_seq_fd_tactic(m, p);
}