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

fix mbqi value caching issue raised by Clemens and Martin

Browse source
This commit is contained in:
Nikolaj Bjorner 2023-01-15 22:47:34 -05:00
parent d5fde2e578
commit dde5218b29
2 changed files with 32 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/smt/smt_model_checker.cpp
View file

@ -82,22 +82,18 @@ namespace smt {
app* fresh_term; app* fresh_term;
if (is_app(val) && to_app(val)->get_num_args() > 0) { if (is_app(val) && to_app(val)->get_num_args() > 0) {
ptr_buffer<expr> args; ptr_buffer<expr> args;
for (expr* arg : *to_app(val)) { for (expr* arg : *to_app(val))
args.push_back(get_type_compatible_term(arg)); args.push_back(get_type_compatible_term(arg));
}
fresh_term = m.mk_app(to_app(val)->get_decl(), args.size(), args.data()); fresh_term = m.mk_app(to_app(val)->get_decl(), args.size(), args.data());
} }
else { else {
expr * sk_term = get_term_from_ctx(val); expr * sk_term = get_term_from_ctx(val);
if (sk_term != nullptr) { if (sk_term != nullptr)
return sk_term; return sk_term;
}
for (expr* f : m_fresh_exprs) { for (expr* f : m_fresh_exprs)
if (f->get_sort() == val->get_sort()) { if (f->get_sort() == val->get_sort())
return f; return f;
}
}
fresh_term = m.mk_fresh_const("sk", val->get_sort()); fresh_term = m.mk_fresh_const("sk", val->get_sort());
} }
m_fresh_exprs.push_back(fresh_term); m_fresh_exprs.push_back(fresh_term);
@ -106,13 +102,16 @@ namespace smt {
} }
void model_checker::init_value2expr() { void model_checker::init_value2expr() {
if (m_value2expr.empty()) { if (m_value2expr.empty()) {
// populate m_value2expr // populate m_value2expr
for (auto const& kv : *m_root2value) { for (auto const& kv : *m_root2value) {
enode * n = kv.m_key; enode * n = kv.m_key;
expr * val = kv.m_value; expr * val = kv.m_value;
n = n->get_eq_enode_with_min_gen(); n = n->get_eq_enode_with_min_gen();
m_value2expr.insert(val, n->get_expr()); expr* e = n->get_expr();
if (!m.is_value(e))
m_value2expr.insert(val, e);
} }
} }
} }

43
src/smt/smt_model_generator.cpp
View file

@ -330,27 +330,32 @@ namespace smt {
enode * n = curr.get_enode(); enode * n = curr.get_enode();
SASSERT(n->get_root() == n); SASSERT(n->get_root() == n);
TRACE("mg_top_sort", tout << curr << "\n";); TRACE("mg_top_sort", tout << curr << "\n";);
dependencies.reset(); app* val = nullptr;
dependency_values.reset(); if (m.is_value(n->get_expr()))
model_value_proc * proc = root2proc[n]; val = to_app(n->get_expr());
SASSERT(proc); else {
proc->get_dependencies(dependencies); dependencies.reset();
for (model_value_dependency const& d : dependencies) { dependency_values.reset();
if (d.is_fresh_value()) { model_value_proc * proc = root2proc[n];
CTRACE("mg_top_sort", !d.get_value()->get_value(), SASSERT(proc);
tout << "#" << n->get_owner_id() << " " << mk_pp(n->get_expr(), m) << " -> " << d << "\n";); proc->get_dependencies(dependencies);
SASSERT(d.get_value()->get_value()); for (model_value_dependency const& d : dependencies) {
dependency_values.push_back(d.get_value()->get_value()); if (d.is_fresh_value()) {
} CTRACE("mg_top_sort", !d.get_value()->get_value(),
else { tout << "#" << n->get_owner_id() << " " << mk_pp(n->get_expr(), m) << " -> " << d << "\n";);
enode * child = d.get_enode(); SASSERT(d.get_value()->get_value());
TRACE("mg_top_sort", tout << "#" << n->get_owner_id() << " (" << mk_pp(n->get_expr(), m) << "): " dependency_values.push_back(d.get_value()->get_value());
<< mk_pp(child->get_expr(), m) << " " << mk_pp(child->get_root()->get_expr(), m) << "\n";); }
child = child->get_root(); else {
dependency_values.push_back(m_root2value[child]); enode * child = d.get_enode();
TRACE("mg_top_sort", tout << "#" << n->get_owner_id() << " (" << mk_pp(n->get_expr(), m) << "): "
<< mk_pp(child->get_expr(), m) << " " << mk_pp(child->get_root()->get_expr(), m) << "\n";);
child = child->get_root();
dependency_values.push_back(m_root2value[child]);
}
} }
val = proc->mk_value(*this, dependency_values);
} }
app * val = proc->mk_value(*this, dependency_values);
register_value(val); register_value(val);
m_asts.push_back(val); m_asts.push_back(val);
m_root2value.insert(n, val); m_root2value.insert(n, val);