mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-28 17:08:45 +00:00
Code Activity

fix #3177

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-03-10 20:13:25 -07:00
parent f946fc516c
commit 13883de389
2 changed files with 51 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

84
src/tactic/core/reduce_invertible_tactic.cpp
View file

@ -51,43 +51,49 @@ public:
} }
void operator()(goal_ref const & g, goal_ref_buffer & result) override { void operator()(goal_ref const & g, goal_ref_buffer & result) override {
TRACE("reduce_invertible", g->display(tout););
tactic_report report("reduce-invertible", *g); tactic_report report("reduce-invertible", *g);
m_inverted.reset(); bool change = true;
m_parents.reset(); while (change) {
collect_parents(g); change = false;
collect_occs occs; m_inverted.reset();
obj_hashtable<expr> vars; m_parents.reset();
generic_model_converter_ref mc; collect_parents(g);
occs(*g, vars); collect_occs occs;
expr_safe_replace sub(m); obj_hashtable<expr> vars;
expr_ref new_v(m); generic_model_converter_ref mc;
expr * p; occs(*g, vars);
for (expr* v : vars) { expr_safe_replace sub(m);
if (is_invertible(v, p, new_v, &mc)) { expr_ref new_v(m);
mark_inverted(p); expr * p;
sub.insert(p, new_v); for (expr* v : vars) {
if (is_invertible(v, p, new_v, &mc)) {
mark_inverted(p);
sub.insert(p, new_v);
TRACE("invertible_tactic", tout << mk_pp(p, m) << " " << new_v << "\n";);
change = true;
break;
}
} }
} reduce_q_rw rw(*this);
reduce_q_rw rw(*this); unsigned sz = g->size();
unsigned sz = g->size(); for (unsigned idx = 0; idx < sz; idx++) {
for (unsigned idx = 0; idx < sz; idx++) { checkpoint();
checkpoint(); expr* f = g->form(idx);
expr* f = g->form(idx); expr_ref f_new(m);
expr_ref f_new(m); sub(f, f_new);
sub(f, f_new); rw(f_new, f_new);
rw(f_new, f_new); if (f == f_new) continue;
if (f == f_new) continue; proof_ref new_pr(m);
proof_ref new_pr(m); if (g->proofs_enabled()) {
if (g->proofs_enabled()) { proof * pr = g->pr(idx);
proof * pr = g->pr(idx); new_pr = m.mk_modus_ponens(pr, new_pr);
new_pr = m.mk_modus_ponens(pr, new_pr); }
g->update(idx, f_new, new_pr, g->dep(idx));
} }
g->update(idx, f_new, new_pr, g->dep(idx)); if (mc) g->add(mc.get());
result.push_back(g.get());
g->inc_depth();
} }
if (mc) g->add(mc.get());
result.push_back(g.get());
g->inc_depth();
} }
void cleanup() override {} void cleanup() override {}
@ -239,11 +245,13 @@ private:
// TBD: could be made to be recursive, by walking multiple layers of parents. // TBD: could be made to be recursive, by walking multiple layers of parents.
bool is_invertible(expr* v, expr*& p, expr_ref& new_v, generic_model_converter_ref* mc, unsigned max_var = 0) { bool is_invertible(expr* v, expr*& p, expr_ref& new_v, generic_model_converter_ref* mc, unsigned max_var = 0) {
if (m_parents.size() <= v->get_id()) return false; if (m_parents.size() <= v->get_id()) {
return false;
}
p = m_parents[v->get_id()].get(); p = m_parents[v->get_id()].get();
if (!p) return false; if (!p || m_inverted.is_marked(p) || (mc && !is_ground(p))) {
if (m_inverted.is_marked(p)) return false; return false;
if (mc && !is_ground(p)) return false; }
if (m_bv.is_bv_xor(p) || if (m_bv.is_bv_xor(p) ||
m_bv.is_bv_not(p) || m_bv.is_bv_not(p) ||
@ -380,6 +388,7 @@ private:
} }
if (m.is_eq(p, e1, e2)) { if (m.is_eq(p, e1, e2)) {
TRACE("invertible_tactic", tout << mk_pp(v, m) << "\n";);
if (mc && has_diagonal(e1)) { if (mc && has_diagonal(e1)) {
ensure_mc(mc); ensure_mc(mc);
new_v = m.mk_fresh_const("eq", m.mk_bool_sort()); new_v = m.mk_fresh_const("eq", m.mk_bool_sort());
@ -465,6 +474,7 @@ private:
for (unsigned i = 0; i < vars.size(); ++i) { for (unsigned i = 0; i < vars.size(); ++i) {
var* v = vars[i]; var* v = vars[i];
if (!occurs_under_nested_q(v, new_body) && t.is_invertible(v, p, new_v, nullptr, vars.size())) { if (!occurs_under_nested_q(v, new_body) && t.is_invertible(v, p, new_v, nullptr, vars.size())) {
TRACE("invertible_tactic", tout << mk_pp(v, m) << " " << mk_pp(p, m) << "\n";);
t.mark_inverted(p); t.mark_inverted(p);
sub.insert(p, new_v); sub.insert(p, new_v);
new_sorts[i] = m.get_sort(new_v); new_sorts[i] = m.get_sort(new_v);

2
src/tactic/tactic.cpp
View file

@ -34,11 +34,13 @@ struct tactic_report::imp {
m_goal(g), m_goal(g),
m_start_memory(static_cast<double>(memory::get_allocation_size())/static_cast<double>(1024*1024)) { m_start_memory(static_cast<double>(memory::get_allocation_size())/static_cast<double>(1024*1024)) {
m_watch.start(); m_watch.start();
TRACE("tactic", g.display(tout << id << "\n"););
} }
~imp() { ~imp() {
m_watch.stop(); m_watch.stop();
double end_memory = static_cast<double>(memory::get_allocation_size())/static_cast<double>(1024*1024); double end_memory = static_cast<double>(memory::get_allocation_size())/static_cast<double>(1024*1024);
TRACE("tactic", m_goal.display(tout););
IF_VERBOSE(0, IF_VERBOSE(0,
verbose_stream() << "(" << m_id verbose_stream() << "(" << m_id
<< " :num-exprs " << m_goal.num_exprs() << " :num-exprs " << m_goal.num_exprs()