mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 20:18:18 +00:00
Code Activity

have bool rewriter use flat_and_or, and integrate hoist rewriter

Browse source
This commit is contained in:
Nikolaj Bjorner 2022-11-08 12:21:50 -08:00
parent 238ea0a264
commit f769e2f1f6
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/ast/rewriter/bool_rewriter.cpp
View file

@ -24,7 +24,7 @@ Notes:
void bool_rewriter::updt_params(params_ref const & _p) { void bool_rewriter::updt_params(params_ref const & _p) {
bool_rewriter_params p(_p); bool_rewriter_params p(_p);
m_flat_and_or = p.flat(); m_flat_and_or = p.flat_and_or();
m_elim_and = p.elim_and(); m_elim_and = p.elim_and();
m_elim_ite = p.elim_ite(); m_elim_ite = p.elim_ite();
m_local_ctx = p.local_ctx(); m_local_ctx = p.local_ctx();
@ -267,6 +267,15 @@ br_status bool_rewriter::mk_nflat_or_core(unsigned num_args, expr * const * args
return BR_DONE; return BR_DONE;
} }
#if 1
br_status st;
st = m_hoist.mk_or(buffer.size(), buffer.data(), result);
if (st == BR_DONE)
return BR_REWRITE1;
if (st != BR_FAILED)
return st;
#endif
if (s) { if (s) {
ast_lt lt; ast_lt lt;
std::sort(buffer.begin(), buffer.end(), lt); std::sort(buffer.begin(), buffer.end(), lt);

4
src/ast/rewriter/bool_rewriter.h
View file

@ -20,6 +20,7 @@ Notes:
#include "ast/ast.h" #include "ast/ast.h"
#include "ast/rewriter/rewriter.h" #include "ast/rewriter/rewriter.h"
#include "ast/rewriter/hoist_rewriter.h"
#include "util/params.h" #include "util/params.h"
/** /**
@ -50,6 +51,7 @@ Notes:
*/ */
class bool_rewriter { class bool_rewriter {
ast_manager & m_manager; ast_manager & m_manager;
hoist_rewriter m_hoist;
bool m_flat_and_or; bool m_flat_and_or;
bool m_local_ctx; bool m_local_ctx;
bool m_elim_and; bool m_elim_and;
@ -78,7 +80,7 @@ class bool_rewriter {
void push_new_arg(expr* arg, expr_ref_vector& new_args, expr_fast_mark1& neg_lits, expr_fast_mark2& pos_lits); void push_new_arg(expr* arg, expr_ref_vector& new_args, expr_fast_mark1& neg_lits, expr_fast_mark2& pos_lits);
public: public:
bool_rewriter(ast_manager & m, params_ref const & p = params_ref()):m_manager(m), m_local_ctx_cost(0) { updt_params(p); } bool_rewriter(ast_manager & m, params_ref const & p = params_ref()):m_manager(m), m_hoist(m), m_local_ctx_cost(0) { updt_params(p); }
ast_manager & m() const { return m_manager; } ast_manager & m() const { return m_manager; }
family_id get_fid() const { return m().get_basic_family_id(); } family_id get_fid() const { return m().get_basic_family_id(); }
bool is_eq(expr * t) const { return m().is_eq(t); } bool is_eq(expr * t) const { return m().is_eq(t); }