mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-05-04 17:35:17 +00:00
Code Activity

use mod counts

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2026-04-01 08:41:49 -07:00
parent 3ad6df3258
commit f5382144e6
1 changed files with 8 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/smt/seq/seq_nielsen.cpp
View file

@ -3697,17 +3697,10 @@ namespace seq {
e->add_side_constraint(mk_constraint(a.mk_ge(lhs, a.mk_int(0)), s.m_dep)); e->add_side_constraint(mk_constraint(a.mk_ge(lhs, a.mk_int(0)), s.m_dep));
} }
if (has_non_elim) { // Step 2: Bump mod counts for all non-eliminating variables at once.
// Step 2: Bump mod counts for all non-eliminating variables at once. if (has_non_elim)
for (auto const& s : substs) { inc_edge_mod_counts(e);
if (s.is_eliminating())
continue;
unsigned id = s.m_var->id();
unsigned prev = 0;
m_mod_cnt.find(id, prev);
m_mod_cnt.insert(id, prev + 1);
}
}
// Step 3: Compute RHS (|u|) with bumped mod counts and add |x| = |u|. // Step 3: Compute RHS (|u|) with bumped mod counts and add |x| = |u|.
for (auto const& p : lhs_exprs) { for (auto const& p : lhs_exprs) {
@ -3718,21 +3711,9 @@ namespace seq {
e->add_side_constraint(mk_constraint(m.mk_eq(lhs_expr, rhs), s.m_dep)); e->add_side_constraint(mk_constraint(m.mk_eq(lhs_expr, rhs), s.m_dep));
} }
if (has_non_elim) { // Step 4: Restore mod counts (temporary bump for computing RHS only).
// Step 4: Restore mod counts (temporary bump for computing RHS only). if (has_non_elim)
for (auto const& s : substs) { dec_edge_mod_counts(e);
if (s.is_eliminating())
continue;
unsigned id = s.m_var->id();
unsigned prev = 0;
m_mod_cnt.find(id, prev);
SASSERT(prev >= 1);
if (prev <= 1)
m_mod_cnt.remove(id);
else
m_mod_cnt.insert(id, prev - 1);
}
}
} }
void nielsen_graph::inc_edge_mod_counts(nielsen_edge* e) { void nielsen_graph::inc_edge_mod_counts(nielsen_edge* e) {
@ -3750,7 +3731,7 @@ namespace seq {
if (s.is_eliminating()) continue; if (s.is_eliminating()) continue;
unsigned id = s.m_var->id(); unsigned id = s.m_var->id();
unsigned prev = 0; unsigned prev = 0;
m_mod_cnt.find(id, prev); VERIFY(m_mod_cnt.find(id, prev));
SASSERT(prev >= 1); SASSERT(prev >= 1);
if (prev <= 1) if (prev <= 1)
m_mod_cnt.remove(id); m_mod_cnt.remove(id);