mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-30 16:03:16 +00:00
Code Activity

enable passive, add check for bloom up-to-date

Browse source
This commit is contained in:
Nikolaj Bjorner 2025-07-27 17:18:23 -07:00
parent 67695b4cd6
commit f77123c13c
2 changed files with 27 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/ast/euf/euf_ac_plugin.cpp
View file

@ -361,16 +361,13 @@ namespace euf {
if (!orient_equation(eq)) if (!orient_equation(eq))
return false; return false;
#if 0 #if 1
if (is_reducing(eq)) if (is_reducing(eq))
is_active = true; is_active = true;
#endif #else
is_active = true; // set to active because forward reduction is not implemented yet. is_active = true; // set to active by default
// we will have to forward reduce a passive equation before it can be activated. #endif
// this means that we have to iterate over all overlaps of variables in equation with
// reducing eqations. Otherwise, we will not have the invariant that reducing variables
// are eliminated from all equations.
if (!is_active) { if (!is_active) {
m_passive.push_back(eq); m_passive.push_back(eq);
@ -489,10 +486,7 @@ namespace euf {
auto& bloom = m.m_bloom; auto& bloom = m.m_bloom;
if (bloom.m_tick == m_tick) { if (bloom.m_tick == m_tick) {
uint64_t f = 0; SASSERT(bloom_filter_is_correct(m.m_nodes, m.m_bloom));
for (auto n : m)
f |= (1ull << (n->id() % 64ull));
SASSERT(f == bloom.m_filter);
return bloom.m_filter; return bloom.m_filter;
} }
bloom.m_filter = 0; bloom.m_filter = 0;
@ -501,7 +495,14 @@ namespace euf {
if (!is_sorted(m)) if (!is_sorted(m))
sort(m); sort(m);
bloom.m_tick = m_tick; bloom.m_tick = m_tick;
return bloom.m_filter; return bloom.m_filter;
}
bool ac_plugin::bloom_filter_is_correct(ptr_vector<node> const& m, bloom const& b) const {
uint64_t f = 0;
for (auto n : m)
f |= (1ull << (n->id() % 64ull));
return b.m_filter == f;
} }
bool ac_plugin::can_be_subset(monomial_t& subset, monomial_t& superset) { bool ac_plugin::can_be_subset(monomial_t& subset, monomial_t& superset) {
@ -515,6 +516,7 @@ namespace euf {
bool ac_plugin::can_be_subset(monomial_t& subset, ptr_vector<node> const& m, bloom& bloom) { bool ac_plugin::can_be_subset(monomial_t& subset, ptr_vector<node> const& m, bloom& bloom) {
if (subset.size() > m.size()) if (subset.size() > m.size())
return false; return false;
SASSERT(bloom.m_tick != m_tick || bloom_filter_is_correct(m, bloom));
if (bloom.m_tick != m_tick) { if (bloom.m_tick != m_tick) {
bloom.m_filter = 0; bloom.m_filter = 0;
for (auto n : m) for (auto n : m)
@ -674,7 +676,7 @@ namespace euf {
} }
if (!m_passive.empty()) { if (!m_passive.empty()) {
auto eq = m_passive.back(); auto eq = m_passive.back();
verbose_stream() << "pick passive " << eq_pp_ll(*this, eq) << "\n"; // verbose_stream() << "pick passive " << eq_pp_ll(*this, eq) << "\n";
m_passive.pop_back(); m_passive.pop_back();
init_equation(eq, true); init_equation(eq, true);
goto init_pick; goto init_pick;
@ -1245,6 +1247,16 @@ namespace euf {
SASSERT(is_active(other_eq)); SASSERT(is_active(other_eq));
backward_reduce(eq, other_eq); backward_reduce(eq, other_eq);
} }
for (auto p : m_passive) {
bool change = false;
if (backward_reduce_monomial(eq, p, monomial(p.l)))
change = true;
if (backward_reduce_monomial(eq, p, monomial(p.r)))
change = true;
(void)change;
CTRACE(plugin, change,
verbose_stream() << "backward reduce " << eq_pp_ll(*this, eq) << " " << eq_pp_ll(*this, p) << "\n");
}
} }
void ac_plugin::backward_reduce(eq const& eq, unsigned other_eq_id) { void ac_plugin::backward_reduce(eq const& eq, unsigned other_eq_id) {

2
src/ast/euf/euf_ac_plugin.h
View file

@ -179,6 +179,7 @@ namespace euf {
enode* from_monomial(ptr_vector<node> const& m); enode* from_monomial(ptr_vector<node> const& m);
monomial_t const& monomial(unsigned i) const { return m_monomials[i]; } monomial_t const& monomial(unsigned i) const { return m_monomials[i]; }
monomial_t& monomial(unsigned i) { return m_monomials[i]; } monomial_t& monomial(unsigned i) { return m_monomials[i]; }
void sort(monomial_t& monomial); void sort(monomial_t& monomial);
bool is_sorted(monomial_t const& monomial) const; bool is_sorted(monomial_t const& monomial) const;
uint64_t filter(monomial_t& m); uint64_t filter(monomial_t& m);
@ -189,6 +190,7 @@ namespace euf {
bool are_equal(eq const& a, eq const& b) { bool are_equal(eq const& a, eq const& b) {
return are_equal(monomial(a.l), monomial(b.l)) && are_equal(monomial(a.r), monomial(b.r)); return are_equal(monomial(a.l), monomial(b.l)) && are_equal(monomial(a.r), monomial(b.r));
} }
bool bloom_filter_is_correct(ptr_vector<node> const& m, bloom const& b) const;
bool well_formed(eq const& e) const; bool well_formed(eq const& e) const;
bool is_reducing(eq const& e) const; bool is_reducing(eq const& e) const;
void backward_reduce(unsigned eq_id); void backward_reduce(unsigned eq_id);