mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-06 14:13:23 +00:00
Code Activity

Optimizing qe_lite

Browse source
This commit is contained in:
Arie Gurfinkel 2018-06-01 10:48:47 -07:00
parent bfeb15b876
commit aa77a918cd
4 changed files with 42 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ast/rewriter/rewriter.h
View file

@ -346,6 +346,8 @@ public:
void set_bindings(unsigned num_bindings, expr * const * bindings); void set_bindings(unsigned num_bindings, expr * const * bindings);
void set_inv_bindings(unsigned num_bindings, expr * const * bindings); void set_inv_bindings(unsigned num_bindings, expr * const * bindings);
void update_binding_at(unsigned i, expr* binding);
void update_inv_binding_at(unsigned i, expr* binding);
void operator()(expr * t, expr_ref & result, proof_ref & result_pr); void operator()(expr * t, expr_ref & result, proof_ref & result_pr);
void operator()(expr * t, expr_ref & result) { operator()(t, result, m_pr); } void operator()(expr * t, expr_ref & result) { operator()(t, result, m_pr); }
void operator()(expr * n, unsigned num_bindings, expr * const * bindings, expr_ref & result) { void operator()(expr * n, unsigned num_bindings, expr * const * bindings, expr_ref & result) {

11
src/ast/rewriter/rewriter_def.h
View file

@ -639,6 +639,17 @@ void rewriter_tpl<Config>::set_inv_bindings(unsigned num_bindings, expr * const
TRACE("rewriter", display_bindings(tout);); TRACE("rewriter", display_bindings(tout););
} }
template<typename Config>
void rewriter_tpl<Config>::update_inv_binding_at(unsigned i, expr* binding) {
m_bindings[i] = binding;
}
template<typename Config>
void rewriter_tpl<Config>::update_binding_at(unsigned i, expr* binding) {
m_bindings[m_bindings.size() - i - 1] = binding;
}
template<typename Config> template<typename Config>
template<bool ProofGen> template<bool ProofGen>
void rewriter_tpl<Config>::main_loop(expr * t, expr_ref & result, proof_ref & result_pr) { void rewriter_tpl<Config>::main_loop(expr * t, expr_ref & result, proof_ref & result_pr) {

4
src/ast/rewriter/var_subst.cpp
View file

@ -24,6 +24,10 @@ Notes:
#include "ast/for_each_expr.h" #include "ast/for_each_expr.h"
void var_subst::operator()(expr * n, unsigned num_args, expr * const * args, expr_ref & result) { void var_subst::operator()(expr * n, unsigned num_args, expr * const * args, expr_ref & result) {
if (is_ground(n)) {
result = n;
return;
}
SASSERT(is_well_sorted(result.m(), n)); SASSERT(is_well_sorted(result.m(), n));
m_reducer.reset(); m_reducer.reset();
if (m_std_order) if (m_std_order)

43
src/qe/qe_lite.cpp
View file

@ -40,6 +40,7 @@ Revision History:
namespace eq { namespace eq {
bool occurs_var(unsigned idx, expr* e) { bool occurs_var(unsigned idx, expr* e) {
if (is_ground(e)) return false;
ptr_buffer<expr> todo; ptr_buffer<expr> todo;
todo.push_back(e); todo.push_back(e);
ast_mark mark; ast_mark mark;
@ -48,6 +49,7 @@ namespace eq {
todo.pop_back(); todo.pop_back();
if (mark.is_marked(e)) continue; if (mark.is_marked(e)) continue;
mark.mark(e, true); mark.mark(e, true);
if (is_ground(e)) continue;
if (is_var(e)) { if (is_var(e)) {
if (to_var(e)->get_idx() == idx) return true; if (to_var(e)->get_idx() == idx) return true;
} }
@ -67,7 +69,8 @@ namespace eq {
arith_util a; arith_util a;
datatype_util dt; datatype_util dt;
is_variable_proc* m_is_variable; is_variable_proc* m_is_variable;
var_subst m_subst; beta_reducer m_subst;
expr_ref_vector m_subst_map;
expr_ref_vector m_new_exprs; expr_ref_vector m_new_exprs;
ptr_vector<expr> m_map; ptr_vector<expr> m_map;
@ -75,7 +78,6 @@ namespace eq {
int_vector m_var2pos; int_vector m_var2pos;
ptr_vector<var> m_inx2var; ptr_vector<var> m_inx2var;
unsigned_vector m_order; unsigned_vector m_order;
expr_ref_vector m_subst_map;
expr_ref_buffer m_new_args; expr_ref_buffer m_new_args;
th_rewriter m_rewriter; th_rewriter m_rewriter;
params_ref m_params; params_ref m_params;
@ -149,7 +151,7 @@ namespace eq {
done.mark(t); done.mark(t);
} }
} }
done.mark(t); done.mark(t);
todo.pop_back(); todo.pop_back();
break; break;
case AST_QUANTIFIER: case AST_QUANTIFIER:
@ -426,26 +428,29 @@ namespace eq {
TRACE("qe_lite", TRACE("qe_lite",
tout << "Elimination m_order:" << std::endl; tout << "Elimination m_order:" << std::endl;
for(unsigned i=0; i<m_order.size(); i++) tout << m_order << std::endl;
{
if (i != 0) tout << ",";
tout << m_order[i];
}
tout << std::endl;
); );
} }
void create_substitution(unsigned sz) { void create_substitution(unsigned sz) {
m_subst_map.reset(); m_subst_map.reset();
m_subst_map.resize(sz, nullptr); m_subst_map.resize(sz, nullptr);
for (unsigned i = 0; i < m_order.size(); i++) { m_subst.reset();
expr_ref cur(m_map[m_order[i]], m); m_subst.set_inv_bindings(sz, m_subst_map.c_ptr());
for (unsigned idx : m_order) {
// do all the previous substitutions before inserting // do all the previous substitutions before inserting
expr* cur = m_map[idx];
expr_ref r(m); expr_ref r(m);
m_subst(cur, m_subst_map.size(), m_subst_map.c_ptr(), r); if (is_ground(cur)) r = cur; else m_subst(cur, r);
unsigned inx = sz - m_order[i]- 1; unsigned inx = sz - idx - 1;
SASSERT(m_subst_map[inx]==nullptr); CTRACE("topo_sort", m_subst_map.get(inx) != nullptr,
tout << "inx is " << inx << "\n"
<< "idx is " << idx << "\n"
<< "sz is " << sz << "\n"
<< "subst_map[inx]: " << mk_pp(m_subst_map.get(inx), m) << "\n";);
SASSERT(m_subst_map.get(inx) == nullptr);
m_subst_map[inx] = r; m_subst_map[inx] = r;
m_subst.update_inv_binding_at(inx, r);
} }
} }
@ -487,20 +492,20 @@ namespace eq {
rw.mk_and(m_new_args.size(), m_new_args.c_ptr(), t); rw.mk_and(m_new_args.size(), m_new_args.c_ptr(), t);
} }
expr_ref new_e(m); expr_ref new_e(m);
m_subst(t, m_subst_map.size(), m_subst_map.c_ptr(), new_e); m_subst(t, new_e);
// don't forget to update the quantifier patterns // don't forget to update the quantifier patterns
expr_ref_buffer new_patterns(m); expr_ref_buffer new_patterns(m);
expr_ref_buffer new_no_patterns(m); expr_ref_buffer new_no_patterns(m);
for (unsigned j = 0; j < q->get_num_patterns(); j++) { for (unsigned j = 0; j < q->get_num_patterns(); j++) {
expr_ref new_pat(m); expr_ref new_pat(m);
m_subst(q->get_pattern(j), m_subst_map.size(), m_subst_map.c_ptr(), new_pat); m_subst(q->get_pattern(j), new_pat);
new_patterns.push_back(new_pat); new_patterns.push_back(new_pat);
} }
for (unsigned j = 0; j < q->get_num_no_patterns(); j++) { for (unsigned j = 0; j < q->get_num_no_patterns(); j++) {
expr_ref new_nopat(m); expr_ref new_nopat(m);
m_subst(q->get_no_pattern(j), m_subst_map.size(), m_subst_map.c_ptr(), new_nopat); m_subst(q->get_no_pattern(j), new_nopat);
new_no_patterns.push_back(new_nopat); new_no_patterns.push_back(new_nopat);
} }
@ -748,7 +753,7 @@ namespace eq {
expr_ref r(m), new_r(m); expr_ref r(m), new_r(m);
r = m.mk_and(conjs.size(), conjs.c_ptr()); r = m.mk_and(conjs.size(), conjs.c_ptr());
create_substitution(largest_vinx + 1); create_substitution(largest_vinx + 1);
m_subst(r, m_subst_map.size(), m_subst_map.c_ptr(), new_r); m_subst(r, new_r);
m_rewriter(new_r); m_rewriter(new_r);
conjs.reset(); conjs.reset();
flatten_and(new_r, conjs); flatten_and(new_r, conjs);
@ -776,8 +781,8 @@ namespace eq {
dt(m), dt(m),
m_is_variable(nullptr), m_is_variable(nullptr),
m_subst(m), m_subst(m),
m_new_exprs(m),
m_subst_map(m), m_subst_map(m),
m_new_exprs(m),
m_new_args(m), m_new_args(m),
m_rewriter(m), m_rewriter(m),
m_params(p) {} m_params(p) {}