mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 17:45:32 +00:00
Code Activity

fix backtracking of m_needs_congruence

Browse source
This commit is contained in:
Jakob Rath 2023-07-18 16:00:26 +02:00
parent a96df2292e
commit 28ed3bd7ab
3 changed files with 32 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/ast/euf/euf_egraph.h
View file

@ -245,7 +245,7 @@ namespace euf {
enode* find(expr* f, unsigned n, enode* const* args);
enode* mk(expr* f, unsigned generation, unsigned n, enode *const* args);
enode_vector const& enodes_of(func_decl* f);
void push() { if (!m_to_merge.empty()) propagate(); ++m_num_scopes; }
void push() { if (can_propagate()) propagate(); ++m_num_scopes; }
void pop(unsigned num_scopes);
/**
@ -254,6 +254,7 @@ namespace euf {
void merge(enode* n1, enode* n2, void* reason) { merge(n1, n2, justification::external(reason)); }
void new_diseq(enode* n);
bool can_propagate() const { return !m_to_merge.empty(); }
/**
\brief propagate set of merges.

32
src/math/polysat/slicing.cpp
View file

@ -147,8 +147,11 @@ namespace polysat {
}
void slicing::push_scope() {
if (can_propagate())
propagate();
m_scopes.push_back(m_trail.size());
m_egraph.push();
SASSERT(m_needs_congruence.empty());
}
void slicing::pop_scope(unsigned num_scopes) {
@ -168,6 +171,7 @@ namespace polysat {
m_trail.pop_back();
}
m_egraph.pop(num_scopes);
m_needs_congruence.reset();
}
void slicing::add_var(unsigned bit_width) {
@ -252,9 +256,25 @@ namespace polysat {
info(s).set_cut(cut, sub_hi, sub_lo);
m_trail.push_back(trail_item::split_core);
m_split_trail.push_back(s);
for (enode* n = s; n != nullptr; n = parent(n))
if (slice2var(n) != null_var)
m_needs_congruence.insert(slice2var(n));
for (enode* n = s; n != nullptr; n = parent(n)) {
pvar const v = slice2var(n);
if (v == null_var)
continue;
if (m_needs_congruence.contains(v)) {
SASSERT(invariant_needs_congruence());
break; // added parents already previously
}
m_needs_congruence.insert(v);
}
}
bool slicing::invariant_needs_congruence() const {
for (pvar v : m_needs_congruence)
for (enode* s = var2slice(v); s != nullptr; s = parent(s))
if (slice2var(s) != null_var) {
VERIFY(m_needs_congruence.contains(slice2var(s)));
}
return true;
}
void slicing::undo_split_core() {
@ -277,7 +297,6 @@ namespace polysat {
m_egraph.merge(sub_hi(n), sub_hi(target), j.ext<void>());
m_egraph.merge(sub_lo(n), sub_lo(target), j.ext<void>());
}
// m_egraph.propagate();
}
void slicing::mk_slice(enode* src, unsigned const hi, unsigned const lo, enode_vector& out, bool output_full_src, bool output_base) {
@ -467,6 +486,10 @@ namespace polysat {
end_explain();
}
bool slicing::can_propagate() const {
return !m_needs_congruence.empty() || m_egraph.can_propagate();
}
void slicing::propagate() {
// m_egraph.propagate();
if (is_conflict())
@ -480,7 +503,6 @@ namespace polysat {
SASSERT(!has_sub(s1));
SASSERT(!has_sub(s2));
m_egraph.merge(s1, s2, encode_dep(dep));
// m_egraph.propagate();
return !m_egraph.inconsistent();
}

3
src/math/polysat/slicing.h
View file

@ -214,6 +214,7 @@ namespace polysat {
pvar mk_slice_extract(enode* src, unsigned hi, unsigned lo);
bool invariant() const;
bool invariant_needs_congruence() const;
/** Get variable representing x[hi:lo] */
pvar mk_extract_var(pvar x, unsigned hi, unsigned lo);
@ -243,6 +244,8 @@ namespace polysat {
void add_value(pvar v, rational const& value);
void add_constraint(signed_constraint c);
bool can_propagate() const;
// update congruences, egraph
void propagate();