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

save

Browse source
This commit is contained in:
Nikolaj Bjorner 2024-02-13 20:28:18 +07:00
parent f39756c74b
commit bd323d6fab
3 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ast/sls/bv_sls.cpp
View file

@ -55,6 +55,7 @@ namespace bv {
unsigned index = m_rand(m_repair_down.size()); unsigned index = m_rand(m_repair_down.size());
unsigned expr_id = m_repair_down.elem_at(index); unsigned expr_id = m_repair_down.elem_at(index);
auto e = m_terms.term(expr_id); auto e = m_terms.term(expr_id);
IF_VERBOSE(20, verbose_stream() << "d " << mk_bounded_pp(e, m, 1) << "\n");
if (eval_is_correct(e)) if (eval_is_correct(e))
m_repair_down.remove(expr_id); m_repair_down.remove(expr_id);
else else
@ -64,6 +65,7 @@ namespace bv {
unsigned index = m_rand(m_repair_up.size()); unsigned index = m_rand(m_repair_up.size());
unsigned expr_id = m_repair_up.elem_at(index); unsigned expr_id = m_repair_up.elem_at(index);
auto e = m_terms.term(expr_id); auto e = m_terms.term(expr_id);
IF_VERBOSE(20, verbose_stream() << "u " << mk_bounded_pp(e, m, 1) << "\n");
if (eval_is_correct(e)) if (eval_is_correct(e))
m_repair_up.remove(expr_id); m_repair_up.remove(expr_id);
else else
@ -76,7 +78,6 @@ namespace bv {
} }
bool sls::try_repair_down(app* e) { bool sls::try_repair_down(app* e) {
IF_VERBOSE(20, verbose_stream() << "d " << mk_bounded_pp(e, m, 1) << "\n");
unsigned n = e->get_num_args(); unsigned n = e->get_num_args();
unsigned s = m_rand(n); unsigned s = m_rand(n);
for (unsigned i = 0; i < n; ++i) for (unsigned i = 0; i < n; ++i)
@ -97,7 +98,6 @@ namespace bv {
} }
bool sls::try_repair_up(app* e) { bool sls::try_repair_up(app* e) {
IF_VERBOSE(20, verbose_stream() << "u " << mk_bounded_pp(e, m, 1) << "\n");
m_repair_up.remove(e->get_id()); m_repair_up.remove(e->get_id());
if (m_terms.is_assertion(e)) { if (m_terms.is_assertion(e)) {
m_repair_down.insert(e->get_id()); m_repair_down.insert(e->get_id());
@ -114,7 +114,7 @@ namespace bv {
if (m.is_bool(e)) if (m.is_bool(e))
return m_eval.bval0(e) == m_eval.bval1(e); return m_eval.bval0(e) == m_eval.bval1(e);
if (bv.is_bv(e)) if (bv.is_bv(e))
return 0 == memcmp(m_eval.wval0(e).bits.data(), m_eval.wval1(e).data(), m_eval.wval0(e).nw * 8); return 0 == m_eval.wval0(e).eq(m_eval.wval1(e));
UNREACHABLE(); UNREACHABLE();
return false; return false;
} }

11
src/ast/sls/sls_valuation.cpp
View file

@ -55,13 +55,14 @@ namespace bv {
m.compare(bits.data(), nb, hi.data(), nb) < 0; m.compare(bits.data(), nb, hi.data(), nb) < 0;
} }
bool sls_valuation::eq(sls_valuation const& other) const { bool sls_valuation::eq(svector<digit_t> const& other) const {
SASSERT(bw == other.bw); auto c = 0 == memcmp(bits.data(), other.data(), bw / 8);
auto c = 0 == memcmp(bits.data(), other.bits.data(), bw / 8);
if (bw % 8 == 0 || !c) if (bw % 8 == 0 || !c)
return c; return c;
NOT_IMPLEMENTED_YET(); for (unsigned i = 8 * (bw / 8); i < bw; ++i)
return false; if (get(bits, i) != get(other, i))
return false;
return true;
} }
void sls_valuation::clear_overflow_bits(svector<digit_t>& bits) const { void sls_valuation::clear_overflow_bits(svector<digit_t>& bits) const {

4
src/ast/sls/sls_valuation.h
View file

@ -46,7 +46,9 @@ namespace bv {
void clear_overflow_bits(svector<digit_t>& bits) const; void clear_overflow_bits(svector<digit_t>& bits) const;
bool can_set(svector<digit_t> const& bits) const; bool can_set(svector<digit_t> const& bits) const;
bool eq(sls_valuation const& other) const; bool eq(sls_valuation const& other) const { return eq(other.bits); }
bool eq(svector<digit_t> const& other) const;
bool gt(svector<digit_t> const& a, svector<digit_t> const& b) const { bool gt(svector<digit_t> const& a, svector<digit_t> const& b) const {
return 0 > memcmp(a.data(), b.data(), num_bytes()); return 0 > memcmp(a.data(), b.data(), num_bytes());