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

fixing prop-queue

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2024-11-04 17:18:02 -08:00
parent b870ed192a
commit fa6f3f2dba
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/sat/smt/bv_solver.cpp
View file

@ -533,11 +533,13 @@ namespace bv {
} }
} }
bool solver::unit_propagate() { bool solver::unit_propagate() {
if (m_prop_queue.empty()) if (m_prop_queue_head == m_prop_queue.size())
return false; return false;
for (unsigned i = 0; i < m_prop_queue.size() && !s().inconsistent(); ++i) { force_push();
auto const p = m_prop_queue[i]; ctx.push(value_trail<unsigned>(m_prop_queue_head));
for (; m_prop_queue_head < m_prop_queue.size() && !s().inconsistent(); ++m_prop_queue_head) {
auto const p = m_prop_queue[m_prop_queue_head];
if (p.m_atom) { if (p.m_atom) {
for (auto vp : *p.m_atom) for (auto vp : *p.m_atom)
propagate_bits(vp); propagate_bits(vp);
@ -547,11 +549,11 @@ namespace bv {
else else
propagate_bits(p.m_vp); propagate_bits(p.m_vp);
} }
m_prop_queue.reset();
// check_missing_propagation(); // check_missing_propagation();
return true; return true;
} }
bool solver::propagate_eq_occurs(eq_occurs const& occ) { bool solver::propagate_eq_occurs(eq_occurs const& occ) {
auto lit = occ.m_literal; auto lit = occ.m_literal;
@ -628,7 +630,7 @@ namespace bv {
*/ */
sat::check_result solver::check() { sat::check_result solver::check() {
force_push(); force_push();
SASSERT(m_prop_queue.empty()); SASSERT(m_prop_queue.size() == m_prop_queue_head);
bool ok = true; bool ok = true;
svector<std::pair<expr*, internalize_mode>> delay; svector<std::pair<expr*, internalize_mode>> delay;
for (auto kv : m_delay_internalize) for (auto kv : m_delay_internalize)
@ -652,20 +654,23 @@ namespace bv {
return sat::check_result::CR_DONE; return sat::check_result::CR_DONE;
} }
void solver::push_core() { void solver::push_core() {
TRACE("bv", tout << "push: " << get_num_vars() << "@" << m_prop_queue.size() << "\n";); TRACE("bv", tout << "push: " << get_num_vars() << "@" << m_prop_queue_lim.size() << "\n";);
th_euf_solver::push_core(); th_euf_solver::push_core();
m_prop_queue_lim.push_back(m_prop_queue.size());
} }
void solver::pop_core(unsigned n) { void solver::pop_core(unsigned n) {
SASSERT(m_num_scopes == 0); SASSERT(m_num_scopes == 0);
unsigned old_sz = m_prop_queue_lim.size() - n;
m_prop_queue.shrink(m_prop_queue_lim[old_sz]);
m_prop_queue_lim.shrink(old_sz);
th_euf_solver::pop_core(n); th_euf_solver::pop_core(n);
unsigned old_sz = get_num_vars(); old_sz = get_num_vars();
m_bits.shrink(old_sz); m_bits.shrink(old_sz);
m_wpos.shrink(old_sz); m_wpos.shrink(old_sz);
m_zero_one_bits.shrink(old_sz); m_zero_one_bits.shrink(old_sz);
m_prop_queue.reset(); TRACE("bv", tout << "num vars " << old_sz << "@" << m_prop_queue_lim.size() << "\n";);
TRACE("bv", tout << "num vars " << old_sz << "\n";);
} }
void solver::simplify() { void solver::simplify() {
@ -892,7 +897,6 @@ namespace bv {
TRACE("bv", tout << "conflict detected\n";); TRACE("bv", tout << "conflict detected\n";);
return; // conflict was detected return; // conflict was detected
} }
m_prop_queue.reset();
SASSERT(m_bits[v1].size() == m_bits[v2].size()); SASSERT(m_bits[v1].size() == m_bits[v2].size());
unsigned sz = m_bits[v1].size(); unsigned sz = m_bits[v1].size();
if (sz == 1) if (sz == 1)

2
src/sat/smt/bv_solver.h
View file

@ -234,6 +234,8 @@ namespace bv {
mutable vector<rational> m_power2; mutable vector<rational> m_power2;
literal_vector m_tmp_literals; literal_vector m_tmp_literals;
svector<propagation_item> m_prop_queue; svector<propagation_item> m_prop_queue;
unsigned_vector m_prop_queue_lim;
unsigned m_prop_queue_head = 0;
sat::literal m_true = sat::null_literal; sat::literal m_true = sat::null_literal;
euf::enode_vector m_bv2ints; euf::enode_vector m_bv2ints;
obj_map<app, lazy_mul*> m_lazymul; obj_map<app, lazy_mul*> m_lazymul;