mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-28 11:25:51 +00:00
Code Activity

early return, statistics, remove unused field

Browse source
This commit is contained in:
Nikolaj Bjorner 2021-01-21 23:53:34 -08:00
parent 4c82350ca4
commit db17ae03c6
3 changed files with 27 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/smt/seq_unicode.cpp
View file

@ -24,7 +24,6 @@ namespace smt {
th(th),
m(th.get_manager()),
seq(m),
bv(m),
m_bb(m, ctx().get_fparams())
{
m_enabled = gparams::get_value("unicode") == "true";
@ -67,6 +66,7 @@ namespace smt {
bits.push_back(literal(ctx().get_bool_var(arg)));
for (literal bit : bits)
ctx().mark_as_relevant(bit);
++m_stats.m_num_blast;
}
void seq_unicode::internalize_le(literal lit, app* term) {
@ -164,7 +164,6 @@ namespace smt {
// extract the initial set of constants.
uint_set values;
unsigned c = 0, d = 0;
bool requires_fix = false;
for (unsigned v = th.get_num_vars(); v-- > 0; ) {
expr* e = th.get_expr(v);
if (seq.is_char(e) && m_var2value[v] == UINT_MAX && get_value(v, c)) {
@ -174,20 +173,19 @@ namespace smt {
theory_var u = m_value2var[c];
if (u != null_theory_var && r != th.get_enode(u)->get_root()) {
enforce_ackerman(u, v);
requires_fix = true;
continue;
return false;
}
if (c >= zstring::max_char()) {
enforce_value_bound(v);
requires_fix = true;
continue;
return false;
}
for (enode* n : *r) {
u = n->get_th_var(th.get_id());
if (u == null_theory_var)
continue;
if (get_value(u, d) && d != c) {
enforce_ackerman(u, v);
requires_fix = true;
break;
return false;
}
m_var2value[u] = c;
}
@ -195,8 +193,6 @@ namespace smt {
m_value2var[c] = v;
}
}
if (requires_fix)
return false;
// assign values to other unassigned nodes
c = 'a';
@ -241,6 +237,7 @@ namespace smt {
expr_ref le(m);
m_bb.mk_ule(bits.size(), bits.c_ptr(), mbits.c_ptr(), le);
ctx().assign(th.mk_literal(le), nullptr);
++m_stats.m_num_bounds;
}
void seq_unicode::enforce_ackerman(theory_var v, theory_var w) {
@ -262,6 +259,7 @@ namespace smt {
// a = b => eq
lits.push_back(eq);
ctx().mk_th_axiom(th.get_id(), lits.size(), lits.c_ptr());
++m_stats.m_num_ackerman;
}
unsigned seq_unicode::get_value(theory_var v) {
@ -281,5 +279,11 @@ namespace smt {
}
return true;
}
void seq_unicode::collect_statistics(::statistics& st) const {
st.update("seq char ackerman", m_stats.m_num_ackerman);
st.update("seq char bounds", m_stats.m_num_bounds);
st.update("seq char2bit", m_stats.m_num_blast);
}
}

13
src/smt/seq_unicode.h
View file

@ -25,16 +25,25 @@ namespace smt {
class seq_unicode {
struct stats {
unsigned m_num_ackerman;
unsigned m_num_bounds;
unsigned m_num_blast;
stats() { reset(); }
void reset() { memset(this, 0, sizeof(*this)); }
};
theory& th;
ast_manager& m;
seq_util seq;
bv_util bv;
vector<literal_vector> m_bits;
vector<expr_ref_vector> m_ebits;
unsigned_vector m_var2value;
svector<theory_var> m_value2var;
bool m_enabled { false };
bit_blaster m_bb;
stats m_stats;
struct reset_bits;
@ -82,6 +91,8 @@ namespace smt {
unsigned get_value(theory_var v);
void internalize_le(literal lit, app* term);
void collect_statistics(::statistics& st) const;
};

1
src/smt/theory_seq.cpp
View file

@ -1769,6 +1769,7 @@ void theory_seq::collect_statistics(::statistics & st) const {
st.update("seq extensionality", m_stats.m_extensionality);
st.update("seq fixed length", m_stats.m_fixed_length);
st.update("seq int.to.str", m_stats.m_int_string);
m_unicode.collect_statistics(st);
}
void theory_seq::init_search_eh() {