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

move to hide bits

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2024-02-22 10:33:37 -08:00
parent cfa6bd4534
commit acc9c21653
6 changed files with 253 additions and 220 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -68,7 +68,7 @@ namespace bv {
else if (bv.is_bv(e)) { else if (bv.is_bv(e)) {
auto& w = m_eval.wval0(e); auto& w = m_eval.wval0(e);
if (w.get(w.fixed, i) || should_keep()) if (w.get(w.fixed, i) || should_keep())
return w.get(w.bits, i); return w.get_bit(i);
} }
return m_rand() % 2 == 0; return m_rand() % 2 == 0;
}; };
@ -98,22 +98,24 @@ namespace bv {
if (!e) if (!e)
return l_true; return l_true;
bool is_correct = eval_is_correct(e); bool is_correct = eval_is_correct(e);
IF_VERBOSE(20, verbose_stream() << (down ? "d #" : "u #")
<< e->get_id() << ": "
<< mk_bounded_pp(e, m, 1) << " ";
if (bv.is_bv(e)) verbose_stream() << m_eval.wval0(e) << " ";
if (m.is_bool(e)) verbose_stream() << m_eval.bval0(e) << " ";
verbose_stream() << (is_correct?"C":"U") << "\n");
if (is_correct) { if (is_correct) {
if (down) if (down)
m_repair_down.remove(e->get_id()); m_repair_down.remove(e->get_id());
else else
m_repair_up.remove(e->get_id()); m_repair_up.remove(e->get_id());
} }
else if (down) else {
try_repair_down(e); IF_VERBOSE(20, verbose_stream() << (down ? "d #" : "u #")
else << e->get_id() << ": "
try_repair_up(e); << mk_bounded_pp(e, m, 1) << " ";
if (bv.is_bv(e)) verbose_stream() << m_eval.wval0(e) << " " << (m_eval.is_fixed0(e)?"fixed ":" ");
if (m.is_bool(e)) verbose_stream() << m_eval.bval0(e) << " ";
verbose_stream() << "\n");
if (down)
try_repair_down(e);
else
try_repair_up(e);
}
} }
return l_undef; return l_undef;
} }
@ -210,7 +212,7 @@ namespace bv {
else if (bv.is_bv(e)) { else if (bv.is_bv(e)) {
auto const& v = m_eval.wval0(e); auto const& v = m_eval.wval0(e);
rational n; rational n;
v.get_value(v.bits, n); v.get_value(v.bits(), n);
mdl->register_decl(f, bv.mk_numeral(n, v.bw)); mdl->register_decl(f, bv.mk_numeral(n, v.bw));
} }
} }

274
src/ast/sls/bv_sls_eval.cpp
View file

@ -39,7 +39,7 @@ namespace bv {
if (bv.is_bv(e)) { if (bv.is_bv(e)) {
auto& v = wval0(e); auto& v = wval0(e);
for (unsigned i = 0; i < v.bw; ++i) for (unsigned i = 0; i < v.bw; ++i)
v.set(v.bits, i, eval(e, i)); v.set_bit(i, eval(e, i));
} }
else if (m.is_bool(e)) else if (m.is_bool(e))
m_eval.setx(e->get_id(), eval(e, 0), false); m_eval.setx(e->get_id(), eval(e, 0), false);
@ -84,7 +84,7 @@ namespace bv {
return false; return false;
m_values1.reserve(e->get_id() + 1); m_values1.reserve(e->get_id() + 1);
m_values0.set(e->get_id(), alloc_valuation(bw)); m_values0.set(e->get_id(), alloc_valuation(bw));
m_values1.set(e->get_id(), alloc_valuation(bw)); m_values1.set(e->get_id(), alloc(sls_pre_valuation, bw));
return true; return true;
} }
@ -118,9 +118,9 @@ namespace bv {
auto& val_th = wval0(e->get_arg(1)); auto& val_th = wval0(e->get_arg(1));
auto& val_el = wval0(e->get_arg(2)); auto& val_el = wval0(e->get_arg(2));
if (bval0(e->get_arg(0))) if (bval0(e->get_arg(0)))
val.set(val_th.bits); val.set(val_th.bits());
else else
val.set(val_el.bits); val.set(val_el.bits());
} }
else { else {
UNREACHABLE(); UNREACHABLE();
@ -130,7 +130,7 @@ namespace bv {
void sls_eval::init_eval_bv(app* e) { void sls_eval::init_eval_bv(app* e) {
if (bv.is_bv(e)) { if (bv.is_bv(e)) {
auto& v = wval0(e); auto& v = wval0(e);
v.set(wval1(e).bits); v.set(wval1(e).bits());
} }
else if (m.is_bool(e)) else if (m.is_bool(e))
m_eval.setx(e->get_id(), bval1_bv(e), false); m_eval.setx(e->get_id(), bval1_bv(e), false);
@ -222,7 +222,7 @@ namespace bv {
auto ucompare = [&](std::function<bool(int)> const& f) { auto ucompare = [&](std::function<bool(int)> const& f) {
auto& a = wval0(e->get_arg(0)); auto& a = wval0(e->get_arg(0));
auto& b = wval0(e->get_arg(1)); auto& b = wval0(e->get_arg(1));
return f(mpn.compare(a.bits.data(), a.nw, b.bits.data(), b.nw)); return f(mpn.compare(a.bits().data(), a.nw, b.bits().data(), b.nw));
}; };
// x <s y <=> x + 2^{bw-1} <u y + 2^{bw-1} // x <s y <=> x + 2^{bw-1} <u y + 2^{bw-1}
@ -238,7 +238,7 @@ namespace bv {
SASSERT(e->get_num_args() == 2); SASSERT(e->get_num_args() == 2);
auto const& a = wval0(e->get_arg(0)); auto const& a = wval0(e->get_arg(0));
auto const& b = wval0(e->get_arg(1)); auto const& b = wval0(e->get_arg(1));
return a.set_mul(m_tmp2, a.bits, b.bits); return a.set_mul(m_tmp2, a.bits(), b.bits());
}; };
switch (e->get_decl_kind()) { switch (e->get_decl_kind()) {
@ -263,7 +263,7 @@ namespace bv {
unsigned idx; unsigned idx;
VERIFY(bv.is_bit2bool(e, child, idx)); VERIFY(bv.is_bit2bool(e, child, idx));
auto& a = wval0(child); auto& a = wval0(child);
return a.get(a.bits, idx); return a.get_bit(idx);
} }
case OP_BUMUL_NO_OVFL: case OP_BUMUL_NO_OVFL:
return !umul_overflow(); return !umul_overflow();
@ -273,7 +273,7 @@ namespace bv {
SASSERT(e->get_num_args() == 2); SASSERT(e->get_num_args() == 2);
auto const& a = wval0(e->get_arg(0)); auto const& a = wval0(e->get_arg(0));
auto const& b = wval0(e->get_arg(1)); auto const& b = wval0(e->get_arg(1));
return a.set_add(m_tmp, a.bits, b.bits); return a.set_add(m_tmp, a.bits(), b.bits());
} }
case OP_BNEG_OVFL: case OP_BNEG_OVFL:
case OP_BSADD_OVFL: case OP_BSADD_OVFL:
@ -305,20 +305,20 @@ namespace bv {
return val; return val;
} }
void sls_eval::wval1(app* e, sls_valuation& val) const { void sls_eval::wval1(app* e, sls_pre_valuation& val) const {
SASSERT(bv.is_bv(e)); SASSERT(bv.is_bv(e));
if (m.is_ite(e)) { if (m.is_ite(e)) {
SASSERT(bv.is_bv(e->get_arg(1))); SASSERT(bv.is_bv(e->get_arg(1)));
auto& val_th = wval0(e->get_arg(1)); auto& val_th = wval0(e->get_arg(1));
auto& val_el = wval0(e->get_arg(2)); auto& val_el = wval0(e->get_arg(2));
if (bval0(e->get_arg(0))) if (bval0(e->get_arg(0)))
val.set(val_th.bits); val.set(val_th.bits());
else else
val.set(val_el.bits); val.set(val_el.bits());
return; return;
} }
if (e->get_family_id() == null_family_id) { if (e->get_family_id() == null_family_id) {
val.set(wval0(e).bits); val.set(wval0(e).bits());
return; return;
} }
auto set_sdiv = [&]() { auto set_sdiv = [&]() {
@ -344,12 +344,12 @@ namespace bv {
val.set(m_zero); val.set(m_zero);
else { else {
if (sign_a) if (sign_a)
a.set_sub(m_tmp, m_zero, a.bits); a.set_sub(m_tmp, m_zero, a.bits());
else else
a.get(m_tmp); a.get(m_tmp);
if (sign_b) if (sign_b)
b.set_sub(m_tmp2, m_zero, b.bits); b.set_sub(m_tmp2, m_zero, b.bits());
else else
b.get(m_tmp2); b.get(m_tmp2);
@ -357,7 +357,7 @@ namespace bv {
if (sign_a == sign_b) if (sign_a == sign_b)
val.set(m_tmp3); val.set(m_tmp3);
else else
val.set_sub(val.bits, m_zero, m_tmp3); val.set_sub(val.bits(), m_zero, m_tmp3);
} }
}; };
@ -371,7 +371,8 @@ namespace bv {
case OP_BV_NUM: { case OP_BV_NUM: {
rational n; rational n;
VERIFY(bv.is_numeral(e, n)); VERIFY(bv.is_numeral(e, n));
val.set_value(val.bits, n); val.set_value(m_tmp, n);
val.set(m_tmp);
break; break;
} }
case OP_BAND: { case OP_BAND: {
@ -379,7 +380,7 @@ namespace bv {
auto const& a = wval0(e->get_arg(0)); auto const& a = wval0(e->get_arg(0));
auto const& b = wval0(e->get_arg(1)); auto const& b = wval0(e->get_arg(1));
for (unsigned i = 0; i < a.nw; ++i) for (unsigned i = 0; i < a.nw; ++i)
val.bits[i] = a.bits[i] & b.bits[i]; val.bits()[i] = a.bits()[i] & b.bits()[i];
break; break;
} }
case OP_BOR: { case OP_BOR: {
@ -387,7 +388,7 @@ namespace bv {
auto const& a = wval0(e->get_arg(0)); auto const& a = wval0(e->get_arg(0));
auto const& b = wval0(e->get_arg(1)); auto const& b = wval0(e->get_arg(1));
for (unsigned i = 0; i < a.nw; ++i) for (unsigned i = 0; i < a.nw; ++i)
val.bits[i] = a.bits[i] | b.bits[i]; val.bits()[i] = a.bits()[i] | b.bits()[i];
break; break;
} }
case OP_BXOR: { case OP_BXOR: {
@ -395,7 +396,7 @@ namespace bv {
auto const& a = wval0(e->get_arg(0)); auto const& a = wval0(e->get_arg(0));
auto const& b = wval0(e->get_arg(1)); auto const& b = wval0(e->get_arg(1));
for (unsigned i = 0; i < a.nw; ++i) for (unsigned i = 0; i < a.nw; ++i)
val.bits[i] = a.bits[i] ^ b.bits[i]; val.bits()[i] = a.bits()[i] ^ b.bits()[i];
break; break;
} }
case OP_BNAND: { case OP_BNAND: {
@ -403,28 +404,28 @@ namespace bv {
auto const& a = wval0(e->get_arg(0)); auto const& a = wval0(e->get_arg(0));
auto const& b = wval0(e->get_arg(1)); auto const& b = wval0(e->get_arg(1));
for (unsigned i = 0; i < a.nw; ++i) for (unsigned i = 0; i < a.nw; ++i)
val.bits[i] = ~(a.bits[i] & b.bits[i]); val.bits()[i] = ~(a.bits()[i] & b.bits()[i]);
break; break;
} }
case OP_BADD: { case OP_BADD: {
SASSERT(e->get_num_args() == 2); SASSERT(e->get_num_args() == 2);
auto const& a = wval0(e->get_arg(0)); auto const& a = wval0(e->get_arg(0));
auto const& b = wval0(e->get_arg(1)); auto const& b = wval0(e->get_arg(1));
val.set_add(val.bits, a.bits, b.bits); val.set_add(val.bits(), a.bits(), b.bits());
break; break;
} }
case OP_BSUB: { case OP_BSUB: {
SASSERT(e->get_num_args() == 2); SASSERT(e->get_num_args() == 2);
auto const& a = wval0(e->get_arg(0)); auto const& a = wval0(e->get_arg(0));
auto const& b = wval0(e->get_arg(1)); auto const& b = wval0(e->get_arg(1));
val.set_sub(val.bits, a.bits, b.bits); val.set_sub(val.bits(), a.bits(), b.bits());
break; break;
} }
case OP_BMUL: { case OP_BMUL: {
SASSERT(e->get_num_args() == 2); SASSERT(e->get_num_args() == 2);
auto const& a = wval0(e->get_arg(0)); auto const& a = wval0(e->get_arg(0));
auto const& b = wval0(e->get_arg(1)); auto const& b = wval0(e->get_arg(1));
val.set_mul(m_tmp2, a.bits, b.bits); val.set_mul(m_tmp2, a.bits(), b.bits());
val.set(m_tmp2); val.set(m_tmp2);
break; break;
} }
@ -433,9 +434,9 @@ namespace bv {
auto const& a = wval0(e->get_arg(0)); auto const& a = wval0(e->get_arg(0));
auto const& b = wval0(e->get_arg(1)); auto const& b = wval0(e->get_arg(1));
for (unsigned i = 0; i < b.bw; ++i) for (unsigned i = 0; i < b.bw; ++i)
val.set(val.bits, i, b.get(b.bits, i)); val.set_bit(i, b.get_bit(i));
for (unsigned i = 0; i < a.bw; ++i) for (unsigned i = 0; i < a.bw; ++i)
val.set(val.bits, i + b.bw, a.get(a.bits, i)); val.set_bit(i + b.bw, a.get_bit(i));
break; break;
} }
case OP_EXTRACT: { case OP_EXTRACT: {
@ -445,86 +446,92 @@ namespace bv {
auto const& a = wval0(child); auto const& a = wval0(child);
SASSERT(lo <= hi && hi + 1 <= a.bw && hi - lo + 1 == val.bw); SASSERT(lo <= hi && hi + 1 <= a.bw && hi - lo + 1 == val.bw);
for (unsigned i = lo; i <= hi; ++i) for (unsigned i = lo; i <= hi; ++i)
val.set(val.bits, i - lo, a.get(a.bits, i)); val.set_bit(i - lo, a.get_bit(i));
break; break;
} }
case OP_BNOT: { case OP_BNOT: {
auto& a = wval0(e->get_arg(0)); auto& a = wval0(e->get_arg(0));
for (unsigned i = 0; i < a.nw; ++i) for (unsigned i = 0; i < a.nw; ++i)
val.bits[i] = ~a.bits[i]; val.bits()[i] = ~a.bits()[i];
break; break;
} }
case OP_BNEG: { case OP_BNEG: {
auto& a = wval0(e->get_arg(0)); auto& a = wval0(e->get_arg(0));
val.set_sub(val.bits, m_zero, a.bits); val.set_sub(val.bits(), m_zero, a.bits());
break; break;
} }
case OP_BIT0: case OP_BIT0:
val.set(val.bits, 0, false); val.set(val.bits(), 0, false);
break; break;
case OP_BIT1: case OP_BIT1:
val.set(val.bits, 0, true); val.set(val.bits(), 0, true);
break; break;
case OP_BSHL: { case OP_BSHL: {
auto& a = wval0(e->get_arg(0)); auto& a = wval0(e->get_arg(0));
auto& b = wval0(e->get_arg(1)); auto& b = wval0(e->get_arg(1));
auto sh = b.to_nat(b.bits, b.bw); auto sh = b.to_nat(b.bits(), b.bw);
if (sh == 0) if (sh == 0)
val.set(a.bits); val.set(a.bits());
else if (sh >= b.bw) else if (sh >= b.bw)
val.set_zero(); val.set_zero();
else { else {
for (unsigned i = 0; i < a.bw; ++i) for (unsigned i = 0; i < a.bw; ++i)
val.set(val.bits, i, i >= sh && a.get(a.bits, i - sh)); val.set(val.bits(), i, i >= sh && a.get_bit(i - sh));
} }
break; break;
} }
case OP_BLSHR: { case OP_BLSHR: {
auto& a = wval0(e->get_arg(0)); auto& a = wval0(e->get_arg(0));
auto& b = wval0(e->get_arg(1)); auto& b = wval0(e->get_arg(1));
auto sh = b.to_nat(b.bits, b.bw); auto sh = b.to_nat(b.bits(), b.bw);
if (sh == 0) if (sh == 0)
val.set(a.bits); val.set(a.bits());
else if (sh >= b.bw) else if (sh >= b.bw)
val.set_zero(); val.set_zero();
else { else {
for (unsigned i = 0; i < a.bw; ++i) for (unsigned i = 0; i < a.bw; ++i)
val.set(val.bits, i, i + sh < a.bw && a.get(a.bits, i + sh)); val.set(val.bits(), i, i + sh < a.bw && a.get_bit(i + sh));
} }
break; break;
} }
case OP_BASHR: { case OP_BASHR: {
auto& a = wval0(e->get_arg(0)); auto& a = wval0(e->get_arg(0));
auto& b = wval0(e->get_arg(1)); auto& b = wval0(e->get_arg(1));
auto sh = b.to_nat(b.bits, b.bw); auto sh = b.to_nat(b.bits(), b.bw);
auto sign = a.sign(); auto sign = a.sign();
if (sh == 0) if (sh == 0)
val.set(a.bits); val.set(a.bits());
else if (sh >= b.bw) { else if (sh >= b.bw) {
for (unsigned i = 0; i < a.nw; ++i) for (unsigned i = 0; i < a.nw; ++i)
val.bits[i] = sign ? ~0 : 0; m_tmp[i] = sign ? ~0 : 0;
val.set(m_tmp);
} }
else { else {
for (unsigned i = 0; i < a.nw; ++i)
m_tmp[i] = 0;
for (unsigned i = 0; i < a.bw; ++i) for (unsigned i = 0; i < a.bw; ++i)
val.set(val.bits, i, i + sh < a.bw && a.get(a.bits, i + sh)); val.set(m_tmp, i, i + sh < a.bw && a.get_bit(i + sh));
if (sign) if (sign)
val.set_range(val.bits, a.bw - sh, a.bw, true); val.set_range(m_tmp, a.bw - sh, a.bw, true);
val.set(m_tmp);
} }
break; break;
} }
case OP_SIGN_EXT: { case OP_SIGN_EXT: {
auto& a = wval0(e->get_arg(0)); auto& a = wval0(e->get_arg(0));
for (unsigned i = 0; i < a.bw; ++i) for (unsigned i = 0; i < a.bw; ++i)
val.set(val.bits, i, a.get(a.bits, i)); val.set(m_tmp, i, a.get_bit(i));
bool sign = a.sign(); bool sign = a.sign();
val.set_range(val.bits, a.bw, val.bw, sign); val.set_range(m_tmp, a.bw, val.bw, sign);
val.set(m_tmp);
break; break;
} }
case OP_ZERO_EXT: { case OP_ZERO_EXT: {
auto& a = wval0(e->get_arg(0)); auto& a = wval0(e->get_arg(0));
for (unsigned i = 0; i < a.bw; ++i) for (unsigned i = 0; i < a.bw; ++i)
val.set(val.bits, i, a.get(a.bits, i)); val.set(m_tmp, i, a.get_bit(i));
val.set_range(val.bits, a.bw, val.bw, false); val.set_range(m_tmp, a.bw, val.bw, false);
val.set(m_tmp);
break; break;
} }
case OP_BUREM: case OP_BUREM:
@ -534,9 +541,9 @@ namespace bv {
auto& b = wval0(e->get_arg(1)); auto& b = wval0(e->get_arg(1));
if (b.is_zero()) if (b.is_zero())
val.set(a.bits); val.set(a.bits());
else { else {
set_div(a.bits, b.bits, b.bw, m_tmp, m_tmp2); set_div(a.bits(), b.bits(), b.bw, m_tmp, m_tmp2);
val.set(m_tmp2); val.set(m_tmp2);
} }
break; break;
@ -554,25 +561,25 @@ namespace bv {
auto& a = wval0(e->get_arg(0)); auto& a = wval0(e->get_arg(0));
auto& b = wval0(e->get_arg(1)); auto& b = wval0(e->get_arg(1));
if (b.is_zero()) if (b.is_zero())
val.set(a.bits); val.set(a.bits());
else { else {
if (a.sign()) if (a.sign())
a.set_sub(m_tmp3, m_zero, a.bits); a.set_sub(m_tmp3, m_zero, a.bits());
else else
a.set(m_tmp3, a.bits); a.set(m_tmp3, a.bits());
if (b.sign()) if (b.sign())
b.set_sub(m_tmp4, m_zero, b.bits); b.set_sub(m_tmp4, m_zero, b.bits());
else else
a.set(m_tmp4, b.bits); a.set(m_tmp4, b.bits());
set_div(m_tmp3, m_tmp4, a.bw, m_tmp, m_tmp2); set_div(m_tmp3, m_tmp4, a.bw, m_tmp, m_tmp2);
if (val.is_zero(m_tmp2)) if (val.is_zero(m_tmp2))
val.set(m_tmp2); val.set(m_tmp2);
else if (a.sign() && b.sign()) else if (a.sign() && b.sign())
val.set_sub(val.bits, m_zero, m_tmp2); val.set_sub(val.bits(), m_zero, m_tmp2);
else if (a.sign()) else if (a.sign())
val.set_sub(val.bits, b.bits, m_tmp2); val.set_sub(val.bits(), b.bits(), m_tmp2);
else if (b.sign()) else if (b.sign())
val.set_add(val.bits, b.bits, m_tmp2); val.set_add(val.bits(), b.bits(), m_tmp2);
else else
val.set(m_tmp2); val.set(m_tmp2);
} }
@ -587,7 +594,7 @@ namespace bv {
if (b.is_zero()) if (b.is_zero())
val.set(m_minus_one); val.set(m_minus_one);
else { else {
set_div(a.bits, b.bits, a.bw, m_tmp, m_tmp2); set_div(a.bits(), b.bits(), a.bw, m_tmp, m_tmp2);
val.set(m_tmp); val.set(m_tmp);
} }
break; break;
@ -608,11 +615,11 @@ namespace bv {
auto& a = wval0(e->get_arg(0)); auto& a = wval0(e->get_arg(0));
auto& b = wval0(e->get_arg(1)); auto& b = wval0(e->get_arg(1));
if (b.is_zero()) if (b.is_zero())
val.set(a.bits); val.set(a.bits());
else { else {
set_sdiv(); set_sdiv();
val.set_mul(m_tmp, val.bits, b.bits); val.set_mul(m_tmp, val.bits(), b.bits());
val.set_sub(val.bits, a.bits, m_tmp); val.set_sub(val.bits(), a.bits(), m_tmp);
} }
break; break;
} }
@ -629,7 +636,7 @@ namespace bv {
case OP_EXT_ROTATE_LEFT: { case OP_EXT_ROTATE_LEFT: {
auto& b = wval0(e->get_arg(1)); auto& b = wval0(e->get_arg(1));
rational n; rational n;
b.get_value(b.bits, n); b.get_value(b.bits(), n);
n = mod(n, rational(val.bw)); n = mod(n, rational(val.bw));
SASSERT(n.is_unsigned()); SASSERT(n.is_unsigned());
mk_rotate_left(n.get_unsigned()); mk_rotate_left(n.get_unsigned());
@ -638,7 +645,7 @@ namespace bv {
case OP_EXT_ROTATE_RIGHT: { case OP_EXT_ROTATE_RIGHT: {
auto& b = wval0(e->get_arg(1)); auto& b = wval0(e->get_arg(1));
rational n; rational n;
b.get_value(b.bits, n); b.get_value(b.bits(), n);
n = mod(n, rational(val.bw)); n = mod(n, rational(val.bw));
SASSERT(n.is_unsigned()); SASSERT(n.is_unsigned());
mk_rotate_left(val.bw - n.get_unsigned()); mk_rotate_left(val.bw - n.get_unsigned());
@ -676,7 +683,7 @@ namespace bv {
UNREACHABLE(); UNREACHABLE();
break; break;
} }
val.clear_overflow_bits(val.bits); val.clear_overflow_bits(val.bits());
} }
digit_t sls_eval::random_bits() { digit_t sls_eval::random_bits() {
@ -891,7 +898,7 @@ namespace bv {
auto & a = wval0(e->get_arg(i)); auto & a = wval0(e->get_arg(i));
auto & b = wval0(e->get_arg(1 - i)); auto & b = wval0(e->get_arg(1 - i));
if (ev) if (ev)
return a.try_set(b.bits); return a.try_set(b.bits());
else { else {
// pick random bit to differ // pick random bit to differ
a.get(m_tmp); a.get(m_tmp);
@ -899,11 +906,11 @@ namespace bv {
for (unsigned idx = 0; idx < a.bw; ++idx) { for (unsigned idx = 0; idx < a.bw; ++idx) {
unsigned j = (idx + start) % a.bw; unsigned j = (idx + start) % a.bw;
if (!a.get(a.fixed, j)) { if (!a.get(a.fixed, j)) {
a.set(m_tmp, idx, !b.get(b.bits, j)); a.set(m_tmp, idx, !b.get_bit(j));
bool r = a.try_set(m_tmp); bool r = a.try_set(m_tmp);
if (r) if (r)
return true; return true;
a.set(m_tmp, j, b.get(b.bits, j)); a.set(m_tmp, j, b.get_bit(j));
} }
} }
// could be due to bounds? // could be due to bounds?
@ -935,7 +942,7 @@ namespace bv {
return true; return true;
} }
if (bv.is_bv(e)) if (bv.is_bv(e))
return wval0(child).try_set(wval0(e).bits); return wval0(child).try_set(wval0(e).bits());
return false; return false;
} }
@ -963,9 +970,8 @@ namespace bv {
bool sls_eval::try_repair_band(bvval const& e, bvval& a, bvval const& b) { bool sls_eval::try_repair_band(bvval const& e, bvval& a, bvval const& b) {
for (unsigned i = 0; i < e.nw; ++i) for (unsigned i = 0; i < e.nw; ++i)
m_tmp[i] = (e.bits[i] & ~a.fixed[i]) | (~b.bits[i] & ~a.fixed[i] & random_bits()); m_tmp[i] = (e.bits()[i] & ~a.fixed[i]) | (~b.bits()[i] & ~a.fixed[i] & random_bits());
a.set_repair(random_bool(), m_tmp); return a.set_repair(random_bool(), m_tmp);
return true;
} }
// //
@ -975,39 +981,35 @@ namespace bv {
// //
bool sls_eval::try_repair_bor(bvval const& e, bvval& a, bvval const& b) { bool sls_eval::try_repair_bor(bvval const& e, bvval& a, bvval const& b) {
for (unsigned i = 0; i < e.nw; ++i) for (unsigned i = 0; i < e.nw; ++i)
m_tmp[i] = e.bits[i] & (~b.bits[i] | random_bits()); m_tmp[i] = e.bits()[i] & (~b.bits()[i] | random_bits());
a.set_repair(random_bool(), m_tmp); return a.set_repair(random_bool(), m_tmp);
return true;
} }
bool sls_eval::try_repair_bxor(bvval const& e, bvval& a, bvval const& b) { bool sls_eval::try_repair_bxor(bvval const& e, bvval& a, bvval const& b) {
for (unsigned i = 0; i < e.nw; ++i) for (unsigned i = 0; i < e.nw; ++i)
m_tmp[i] = e.bits[i] ^ b.bits[i]; m_tmp[i] = e.bits()[i] ^ b.bits()[i];
a.clear_overflow_bits(m_tmp); a.clear_overflow_bits(m_tmp);
a.set_repair(random_bool(), m_tmp); return a.set_repair(random_bool(), m_tmp);
return true;
} }
bool sls_eval::try_repair_add(bvval const& e, bvval& a, bvval const& b) { bool sls_eval::try_repair_add(bvval const& e, bvval& a, bvval const& b) {
a.set_sub(m_tmp, e.bits, b.bits); a.set_sub(m_tmp, e.bits(), b.bits());
a.set_repair(random_bool(), m_tmp); return a.set_repair(random_bool(), m_tmp);
return true;
} }
bool sls_eval::try_repair_sub(bvval const& e, bvval& a, bvval & b, unsigned i) { bool sls_eval::try_repair_sub(bvval const& e, bvval& a, bvval & b, unsigned i) {
if (i == 0) { if (i == 0) {
// e = a - b -> a := e + b // e = a - b -> a := e + b
a.set_add(m_tmp, e.bits, b.bits); a.set_add(m_tmp, e.bits(), b.bits());
a.set_repair(random_bool(), m_tmp); return a.set_repair(random_bool(), m_tmp);
} }
else { else {
// b := a - e // b := a - e
b.set_sub(m_tmp, a.bits, e.bits); b.set_sub(m_tmp, a.bits(), e.bits());
b.set_repair(random_bool(), m_tmp); return b.set_repair(random_bool(), m_tmp);
} }
return true;
} }
/** /**
@ -1020,11 +1022,12 @@ namespace bv {
a.set(m_tmp, 1); a.set(m_tmp, 1);
return a.try_set(m_tmp); return a.try_set(m_tmp);
} }
verbose_stream() << "cannot repair 0\n";
return false; return false;
} }
unsigned parity_e = e.parity(e.bits); unsigned parity_e = e.parity(e.bits());
unsigned parity_b = b.parity(b.bits); unsigned parity_b = b.parity(b.bits());
#if 1 #if 1
@ -1100,7 +1103,7 @@ namespace bv {
if (parity_e > 0 && parity_b > 0) if (parity_e > 0 && parity_b > 0)
b.shift_right(m_tmp2, std::min(parity_b, parity_e)); b.shift_right(m_tmp2, std::min(parity_b, parity_e));
a.set_mul(m_tmp, tb, m_tmp2); a.set_mul(m_tmp, tb, m_tmp2);
a.set_repair(random_bool(), m_tmp); return a.set_repair(random_bool(), m_tmp);
#else #else
@ -1120,31 +1123,31 @@ namespace bv {
bool sls_eval::try_repair_bnot(bvval const& e, bvval& a) { bool sls_eval::try_repair_bnot(bvval const& e, bvval& a) {
for (unsigned i = 0; i < e.nw; ++i) for (unsigned i = 0; i < e.nw; ++i)
m_tmp[i] = ~e.bits[i]; m_tmp[i] = ~e.bits()[i];
a.clear_overflow_bits(m_tmp); a.clear_overflow_bits(m_tmp);
a.set_repair(random_bool(), m_tmp); a.set_repair(random_bool(), m_tmp);
return true; return true;
} }
bool sls_eval::try_repair_bneg(bvval const& e, bvval& a) { bool sls_eval::try_repair_bneg(bvval const& e, bvval& a) {
a.set_sub(m_tmp, m_zero, e.bits); a.set_sub(m_tmp, m_zero, e.bits());
a.set_repair(random_bool(), m_tmp); a.set_repair(random_bool(), m_tmp);
return true; return true;
} }
bool sls_eval::try_repair_ule(bool e, bvval& a, bvval const& b) { bool sls_eval::try_repair_ule(bool e, bvval& a, bvval const& b) {
return try_repair_ule(e, a, b.bits); return try_repair_ule(e, a, b.bits());
} }
bool sls_eval::try_repair_uge(bool e, bvval& a, bvval const& b) { bool sls_eval::try_repair_uge(bool e, bvval& a, bvval const& b) {
return try_repair_uge(e, a, b.bits); return try_repair_uge(e, a, b.bits());
} }
// a <=s b <-> a + p2 <=u b + p2 // a <=s b <-> a + p2 <=u b + p2
bool sls_eval::try_repair_sle(bool e, bvval& a, bvval const& b) { bool sls_eval::try_repair_sle(bool e, bvval& a, bvval const& b) {
//add_p2_1(b, m_tmp4); //add_p2_1(b, m_tmp4);
a.set(m_tmp, b.bits); a.set(m_tmp, b.bits());
if (e) { if (e) {
a.set_repair(true, m_tmp); a.set_repair(true, m_tmp);
} }
@ -1156,7 +1159,7 @@ namespace bv {
} }
bool sls_eval::try_repair_sge(bool e, bvval& a, bvval const& b) { bool sls_eval::try_repair_sge(bool e, bvval& a, bvval const& b) {
a.set(m_tmp, b.bits); a.set(m_tmp, b.bits());
if (e) { if (e) {
a.set_repair(false, m_tmp); a.set_repair(false, m_tmp);
} }
@ -1169,7 +1172,7 @@ namespace bv {
void sls_eval::add_p2_1(bvval const& a, svector<digit_t>& t) const { void sls_eval::add_p2_1(bvval const& a, svector<digit_t>& t) const {
a.set(m_zero, a.bw - 1, true); a.set(m_zero, a.bw - 1, true);
a.set_add(t, a.bits, m_zero); a.set_add(t, a.bits(), m_zero);
a.set(m_zero, a.bw - 1, false); a.set(m_zero, a.bw - 1, false);
a.clear_overflow_bits(t); a.clear_overflow_bits(t);
} }
@ -1209,16 +1212,16 @@ namespace bv {
} }
bool sls_eval::try_repair_bit2bool(bvval& a, unsigned idx) { bool sls_eval::try_repair_bit2bool(bvval& a, unsigned idx) {
a.set(m_tmp, a.bits); a.set(m_tmp, a.bits());
a.set(m_tmp, idx, !a.get(a.bits, idx)); a.set(m_tmp, idx, !a.get_bit(idx));
return a.try_set(m_tmp); return a.try_set(m_tmp);
} }
bool sls_eval::try_repair_shl(bvval const& e, bvval& a, bvval& b, unsigned i) { bool sls_eval::try_repair_shl(bvval const& e, bvval& a, bvval& b, unsigned i) {
if (i == 0) { if (i == 0) {
unsigned sh = b.to_nat(b.bits, b.bw); unsigned sh = b.to_nat(b.bits(), b.bw);
if (sh == 0) if (sh == 0)
return a.try_set(e.bits); return a.try_set(e.bits());
else if (sh >= b.bw) else if (sh >= b.bw)
return false; return false;
else { else {
@ -1229,9 +1232,9 @@ namespace bv {
// a[bw - 1: bw - sh] = unchanged // a[bw - 1: bw - sh] = unchanged
// //
for (unsigned i = 0; i < e.bw - sh; ++i) for (unsigned i = 0; i < e.bw - sh; ++i)
e.set(m_tmp, i, e.get(e.bits, sh + i)); e.set(m_tmp, i, e.get_bit(sh + i));
for (unsigned i = e.bw - sh; i < e.bw; ++i) for (unsigned i = e.bw - sh; i < e.bw; ++i)
e.set(m_tmp, i, e.get(a.bits, i)); e.set(m_tmp, i, a.get_bit(i));
return a.try_set(m_tmp); return a.try_set(m_tmp);
} }
} }
@ -1247,19 +1250,19 @@ namespace bv {
bool sls_eval::try_repair_ashr(bvval const& e, bvval & a, bvval& b, unsigned i) { bool sls_eval::try_repair_ashr(bvval const& e, bvval & a, bvval& b, unsigned i) {
if (i == 0) { if (i == 0) {
unsigned sh = b.to_nat(b.bits, b.bw); unsigned sh = b.to_nat(b.bits(), b.bw);
if (sh == 0) if (sh == 0)
return a.try_set(e.bits); return a.try_set(e.bits());
else if (sh >= b.bw) { else if (sh >= b.bw) {
if (e.get(e.bits, e.bw - 1)) { if (e.get_bit(e.bw - 1)) {
if (!a.get(a.bits, a.bw - 1) && !a.get(a.fixed, a.bw - 1)) if (!a.get_bit(a.bw - 1) && !a.get(a.fixed, a.bw - 1))
a.set(a.bits, a.bw - 1, true); a.set_bit(a.bw - 1, true);
else else
return false; return false;
} }
else { else {
if (a.get(a.bits, a.bw - 1) && !a.get(a.fixed, a.bw - 1)) if (a.get_bit(a.bw - 1) && !a.get(a.fixed, a.bw - 1))
a.set(a.bits, a.bw - 1, false); a.set_bit(a.bw - 1, false);
else else
return false; return false;
} }
@ -1271,9 +1274,9 @@ namespace bv {
// a[sh-1:0] = a[sh-1:0] // a[sh-1:0] = a[sh-1:0]
// ignore sign // ignore sign
for (unsigned i = sh; i < a.bw; ++i) for (unsigned i = sh; i < a.bw; ++i)
a.set(m_tmp, i, e.get(e.bits, i - sh)); a.set(m_tmp, i, e.get_bit(i - sh));
for (unsigned i = 0; i < sh; ++i) for (unsigned i = 0; i < sh; ++i)
a.set(m_tmp, i, a.get(a.bits, i)); a.set(m_tmp, i, a.get_bit(i));
a.clear_overflow_bits(m_tmp); a.clear_overflow_bits(m_tmp);
return a.try_set(m_tmp); return a.try_set(m_tmp);
} }
@ -1305,20 +1308,20 @@ namespace bv {
return false; return false;
if (!e.is_ones()) { if (!e.is_ones()) {
for (unsigned i = 0; i < a.nw; ++i) for (unsigned i = 0; i < a.nw; ++i)
m_tmp[i] = ~a.fixed[i] | a.bits[i]; m_tmp[i] = ~a.fixed[i] | a.bits()[i];
a.clear_overflow_bits(m_tmp); a.clear_overflow_bits(m_tmp);
if (a.lt(m_tmp, e.bits)) if (a.lt(m_tmp, e.bits()))
return false; return false;
} }
// e = 1 => a := b // e = 1 => a := b
if (e.is_one()) { if (e.is_one()) {
a.set(m_tmp, b.bits); a.set(m_tmp, b.bits());
a.set_repair(false, m_tmp); a.set_repair(false, m_tmp);
return true; return true;
} }
// b * e + r = a // b * e + r = a
for (unsigned i = 0; i < a.nw; ++i) for (unsigned i = 0; i < a.nw; ++i)
m_tmp[i] = (random_bits() & ~b.fixed[i]) | (b.fixed[i] & b.bits[i]); m_tmp[i] = (random_bits() & ~b.fixed[i]) | (b.fixed[i] & b.bits()[i]);
b.clear_overflow_bits(m_tmp); b.clear_overflow_bits(m_tmp);
while (mul_overflow_on_fixed(e, m_tmp)) { while (mul_overflow_on_fixed(e, m_tmp)) {
auto i = b.msb(m_tmp); auto i = b.msb(m_tmp);
@ -1327,7 +1330,7 @@ namespace bv {
for (unsigned i = 0; i < a.nw; ++i) for (unsigned i = 0; i < a.nw; ++i)
m_tmp2[i] = random_bits(); m_tmp2[i] = random_bits();
b.clear_overflow_bits(m_tmp2); b.clear_overflow_bits(m_tmp2);
while (b.gt(m_tmp2, b.bits)) while (b.gt(m_tmp2, b.bits()))
b.set(m_tmp2, b.msb(m_tmp2), false); b.set(m_tmp2, b.msb(m_tmp2), false);
while (a.set_add(m_tmp3, m_tmp, m_tmp2)) while (a.set_add(m_tmp3, m_tmp, m_tmp2))
b.set(m_tmp2, b.msb(m_tmp2), false); b.set(m_tmp2, b.msb(m_tmp2), false);
@ -1342,7 +1345,7 @@ namespace bv {
return true; return true;
} }
if (e.is_one()) { if (e.is_one()) {
b.set(m_tmp, a.bits); b.set(m_tmp, a.bits());
b.set_repair(true, m_tmp); b.set_repair(true, m_tmp);
return true; return true;
} }
@ -1354,10 +1357,10 @@ namespace bv {
m_tmp[i] = random_bits(); m_tmp[i] = random_bits();
a.clear_overflow_bits(m_tmp); a.clear_overflow_bits(m_tmp);
// ensure r <= m // ensure r <= m
while (a.lt(a.bits, m_tmp)) while (a.lt(a.bits(), m_tmp))
a.set(m_tmp, a.msb(m_tmp), false); a.set(m_tmp, a.msb(m_tmp), false);
a.set_sub(m_tmp2, a.bits, m_tmp); a.set_sub(m_tmp2, a.bits(), m_tmp);
set_div(m_tmp2, e.bits, a.bw, m_tmp3, m_tmp4); set_div(m_tmp2, e.bits(), a.bw, m_tmp3, m_tmp4);
b.set_repair(random_bool(), m_tmp4); b.set_repair(random_bool(), m_tmp4);
} }
return true; return true;
@ -1377,9 +1380,8 @@ namespace bv {
if (i == 0) { if (i == 0) {
if (b.is_zero()) { if (b.is_zero()) {
a.set(m_tmp, e.bits); a.set(m_tmp, e.bits());
a.set_repair(random_bool(), m_tmp); return a.set_repair(random_bool(), m_tmp);
return true;
} }
// a urem b = e: b*y + e = a // a urem b = e: b*y + e = a
// ~Ovfl*(b, y) // ~Ovfl*(b, y)
@ -1395,13 +1397,13 @@ namespace bv {
b.set(m_tmp, i, false); b.set(m_tmp, i, false);
} }
while (true) { while (true) {
a.set_mul(m_tmp2, m_tmp, b.bits); a.set_mul(m_tmp2, m_tmp, b.bits());
if (!add_overflow_on_fixed(e, m_tmp2)) if (!add_overflow_on_fixed(e, m_tmp2))
break; break;
auto i = b.msb(m_tmp); auto i = b.msb(m_tmp);
b.set(m_tmp, i, false); b.set(m_tmp, i, false);
} }
a.set_add(m_tmp3, m_tmp2, e.bits); a.set_add(m_tmp3, m_tmp2, e.bits());
a.set_repair(random_bool(), m_tmp3); a.set_repair(random_bool(), m_tmp3);
return true; return true;
} }
@ -1415,7 +1417,7 @@ namespace bv {
// lower y as long as y*b overflows with fixed bits in b // lower y as long as y*b overflows with fixed bits in b
for (unsigned i = 0; i < a.nw; ++i) for (unsigned i = 0; i < a.nw; ++i)
m_tmp[i] = random_bits(); m_tmp[i] = random_bits();
a.set_sub(m_tmp2, a.bits, e.bits); a.set_sub(m_tmp2, a.bits(), e.bits());
set_div(m_tmp2, m_tmp, a.bw, m_tmp3, m_tmp4); set_div(m_tmp2, m_tmp, a.bw, m_tmp3, m_tmp4);
a.clear_overflow_bits(m_tmp3); a.clear_overflow_bits(m_tmp3);
b.set_repair(random_bool(), m_tmp3); b.set_repair(random_bool(), m_tmp3);
@ -1426,14 +1428,14 @@ namespace bv {
bool sls_eval::add_overflow_on_fixed(bvval const& a, svector<digit_t> const& t) { bool sls_eval::add_overflow_on_fixed(bvval const& a, svector<digit_t> const& t) {
a.set(m_tmp3, m_zero); a.set(m_tmp3, m_zero);
for (unsigned i = 0; i < a.nw; ++i) for (unsigned i = 0; i < a.nw; ++i)
m_tmp3[i] = a.fixed[i] & a.bits[i]; m_tmp3[i] = a.fixed[i] & a.bits()[i];
return a.set_add(m_tmp4, t, m_tmp3); return a.set_add(m_tmp4, t, m_tmp3);
} }
bool sls_eval::mul_overflow_on_fixed(bvval const& a, svector<digit_t> const& t) { bool sls_eval::mul_overflow_on_fixed(bvval const& a, svector<digit_t> const& t) {
a.set(m_tmp3, m_zero); a.set(m_tmp3, m_zero);
for (unsigned i = 0; i < a.nw; ++i) for (unsigned i = 0; i < a.nw; ++i)
m_tmp3[i] = a.fixed[i] & a.bits[i]; m_tmp3[i] = a.fixed[i] & a.bits()[i];
return a.set_mul(m_tmp4, m_tmp3, t); return a.set_mul(m_tmp4, m_tmp3, t);
} }
@ -1441,9 +1443,9 @@ namespace bv {
// a := rotate_right(e, n) // a := rotate_right(e, n)
n = (a.bw - n) % a.bw; n = (a.bw - n) % a.bw;
for (unsigned i = a.bw - n; i < a.bw; ++i) for (unsigned i = a.bw - n; i < a.bw; ++i)
a.set(m_tmp, i + n - a.bw, e.get(e.bits, i)); a.set(m_tmp, i + n - a.bw, e.get_bit(i));
for (unsigned i = 0; i < a.bw - n; ++i) for (unsigned i = 0; i < a.bw - n; ++i)
a.set(m_tmp, i + n, e.get(e.bits, i)); a.set(m_tmp, i + n, e.get_bit(i));
a.set_repair(true, m_tmp); a.set_repair(true, m_tmp);
return true; return true;
} }
@ -1451,7 +1453,7 @@ namespace bv {
bool sls_eval::try_repair_rotate_left(bvval const& e, bvval& a, bvval& b, unsigned i) { bool sls_eval::try_repair_rotate_left(bvval const& e, bvval& a, bvval& b, unsigned i) {
if (i == 0) { if (i == 0) {
rational n; rational n;
b.get_value(b.bits, n); b.get_value(b.bits(), n);
n = mod(n, rational(b.bw)); n = mod(n, rational(b.bw));
return try_repair_rotate_left(e, a, n.get_unsigned()); return try_repair_rotate_left(e, a, n.get_unsigned());
} }
@ -1467,7 +1469,7 @@ namespace bv {
bool sls_eval::try_repair_rotate_right(bvval const& e, bvval& a, bvval& b, unsigned i) { bool sls_eval::try_repair_rotate_right(bvval const& e, bvval& a, bvval& b, unsigned i) {
if (i == 0) { if (i == 0) {
rational n; rational n;
b.get_value(b.bits, n); b.get_value(b.bits(), n);
n = mod(b.bw - n, rational(b.bw)); n = mod(b.bw - n, rational(b.bw));
return try_repair_rotate_left(e, a, n.get_unsigned()); return try_repair_rotate_left(e, a, n.get_unsigned());
} }
@ -1509,20 +1511,20 @@ namespace bv {
bool sls_eval::try_repair_zero_ext(bvval const& e, bvval& a) { bool sls_eval::try_repair_zero_ext(bvval const& e, bvval& a) {
for (unsigned i = 0; i < a.bw; ++i) for (unsigned i = 0; i < a.bw; ++i)
if (!a.get(a.fixed, i)) if (!a.get(a.fixed, i))
a.set(a.bits, i, e.get(e.bits, i)); a.set_bit(i, e.get_bit(i));
return true; return true;
} }
bool sls_eval::try_repair_concat(bvval const& e, bvval& a, bvval& b, unsigned i) { bool sls_eval::try_repair_concat(bvval const& e, bvval& a, bvval& b, unsigned i) {
if (i == 0) { if (i == 0) {
for (unsigned i = 0; i < a.bw; ++i) for (unsigned i = 0; i < a.bw; ++i)
a.set(m_tmp, i, e.get(e.bits, i + b.bw)); a.set(m_tmp, i, e.get_bit(i + b.bw));
a.clear_overflow_bits(m_tmp); a.clear_overflow_bits(m_tmp);
return a.set_repair(random_bool(), m_tmp); return a.set_repair(random_bool(), m_tmp);
} }
else { else {
for (unsigned i = 0; i < b.bw; ++i) for (unsigned i = 0; i < b.bw; ++i)
b.set(m_tmp, i, e.get(e.bits, i)); b.set(m_tmp, i, e.get_bit(i));
b.clear_overflow_bits(m_tmp); b.clear_overflow_bits(m_tmp);
return b.set_repair(random_bool(), m_tmp); return b.set_repair(random_bool(), m_tmp);
} }
@ -1530,10 +1532,10 @@ namespace bv {
bool sls_eval::try_repair_extract(bvval const& e, bvval& a, unsigned lo) { bool sls_eval::try_repair_extract(bvval const& e, bvval& a, unsigned lo) {
for (unsigned i = 0; i < e.bw; ++i) for (unsigned i = 0; i < e.bw; ++i)
if (a.get(a.fixed, i + lo) && a.get(a.bits, i + lo) != e.get(e.bits, i)) if (a.get(a.fixed, i + lo) && a.get_bit(i + lo) != e.get_bit(i))
return false; return false;
for (unsigned i = 0; i < e.bw; ++i) for (unsigned i = 0; i < e.bw; ++i)
a.set(a.bits, i + lo, e.get(e.bits, i)); a.set_bit(i + lo, e.get_bit(i));
return true; return true;
} }
@ -1568,7 +1570,7 @@ namespace bv {
return true; return true;
} }
if (bv.is_bv(e)) if (bv.is_bv(e))
return wval0(e).try_set(wval1(to_app(e)).bits); return wval0(e).try_set(wval1(to_app(e)).bits());
return false; return false;
} }
} }

5
src/ast/sls/bv_sls_eval.h
View file

@ -35,7 +35,8 @@ namespace bv {
ptr_vector<expr> m_todo; ptr_vector<expr> m_todo;
random_gen m_rand; random_gen m_rand;
scoped_ptr_vector<sls_valuation> m_values0, m_values1; // expr-id -> bv valuation scoped_ptr_vector<sls_valuation> m_values0; // expr-id -> bv valuation
scoped_ptr_vector<sls_pre_valuation> m_values1; // expr-id -> bv valuation
bool_vector m_eval; // expr-id -> boolean valuation bool_vector m_eval; // expr-id -> boolean valuation
bool_vector m_fixed; // expr-id -> is Boolean fixed bool_vector m_fixed; // expr-id -> is Boolean fixed
@ -108,7 +109,7 @@ namespace bv {
sls_valuation& wval0(app* e, unsigned i) { return wval0(e->get_arg(i)); } sls_valuation& wval0(app* e, unsigned i) { return wval0(e->get_arg(i)); }
void wval1(app* e, sls_valuation& val) const; void wval1(app* e, sls_pre_valuation& val) const;
public: public:
sls_eval(ast_manager& m); sls_eval(ast_manager& m);

37
src/ast/sls/bv_sls_fixed.cpp
View file

@ -25,7 +25,7 @@ namespace bv {
{} {}
void sls_fixed::init(expr_ref_vector const& es) { void sls_fixed::init(expr_ref_vector const& es) {
init_ranges(es); // init_ranges(es);
ev.sort_assertions(es); ev.sort_assertions(es);
for (expr* e : ev.m_todo) { for (expr* e : ev.m_todo) {
if (!is_app(e)) if (!is_app(e))
@ -110,7 +110,7 @@ namespace bv {
} }
else if (bv.is_bit2bool(e, s, idx)) { else if (bv.is_bit2bool(e, s, idx)) {
auto& val = wval0(s); auto& val = wval0(s);
val.set(val.bits, idx, !sign); val.set_bit(idx, !sign);
val.set(val.fixed, idx, true); val.set(val.fixed, idx, true);
val.init_fixed(); val.init_fixed();
} }
@ -184,7 +184,7 @@ namespace bv {
auto& val_th = wval0(e->get_arg(1)); auto& val_th = wval0(e->get_arg(1));
auto& val_el = wval0(e->get_arg(2)); auto& val_el = wval0(e->get_arg(2));
for (unsigned i = 0; i < val.nw; ++i) for (unsigned i = 0; i < val.nw; ++i)
val.fixed[i] = val_el.fixed[i] & val_th.fixed[i] & ~(val_el.bits[i] ^ val_th.bits[i]); val.fixed[i] = val_el.fixed[i] & val_th.fixed[i] & ~(val_el.bits(i) ^ val_th.bits(i));
val.init_fixed(); val.init_fixed();
} }
} }
@ -232,7 +232,7 @@ namespace bv {
auto& b = wval0(e->get_arg(1)); auto& b = wval0(e->get_arg(1));
// (a.fixed & b.fixed) | (a.fixed & ~a.bits) | (b.fixed & ~b.bits) // (a.fixed & b.fixed) | (a.fixed & ~a.bits) | (b.fixed & ~b.bits)
for (unsigned i = 0; i < a.nw; ++i) for (unsigned i = 0; i < a.nw; ++i)
v.fixed[i] = (a.fixed[i] & b.fixed[i]) | (a.fixed[i] & ~a.bits[i]) | (b.fixed[i] & ~b.bits[i]); v.fixed[i] = (a.fixed[i] & b.fixed[i]) | (a.fixed[i] & ~a.bits(i)) | (b.fixed[i] & ~b.bits(i));
break; break;
} }
case OP_BOR: { case OP_BOR: {
@ -240,7 +240,7 @@ namespace bv {
auto& b = wval0(e->get_arg(1)); auto& b = wval0(e->get_arg(1));
// (a.fixed & b.fixed) | (a.fixed & a.bits) | (b.fixed & b.bits) // (a.fixed & b.fixed) | (a.fixed & a.bits) | (b.fixed & b.bits)
for (unsigned i = 0; i < a.nw; ++i) for (unsigned i = 0; i < a.nw; ++i)
v.fixed[i] = (a.fixed[i] & b.fixed[i]) | (a.fixed[i] & a.bits[i]) | (b.fixed[i] & b.bits[i]); v.fixed[i] = (a.fixed[i] & b.fixed[i]) | (a.fixed[i] & a.bits(i)) | (b.fixed[i] & b.bits(i));
break; break;
} }
case OP_BXOR: { case OP_BXOR: {
@ -264,7 +264,7 @@ namespace bv {
if (pfixed && a.get(a.fixed, i) && b.get(b.fixed, i)) if (pfixed && a.get(a.fixed, i) && b.get(b.fixed, i))
v.set(v.fixed, i, true); v.set(v.fixed, i, true);
else if (!pfixed && a.get(a.fixed, i) && b.get(b.fixed, i) && else if (!pfixed && a.get(a.fixed, i) && b.get(b.fixed, i) &&
!a.get(a.bits, i) && !b.get(b.bits, i)) { !a.get_bit(i) && !b.get_bit(i)) {
pfixed = true; pfixed = true;
v.set(v.fixed, i, false); v.set(v.fixed, i, false);
} }
@ -273,6 +273,17 @@ namespace bv {
v.set(v.fixed, i, false); v.set(v.fixed, i, false);
} }
} }
rational r, rlo, rhi;
if (bv.is_numeral(e->get_arg(0), r) && !b.eq(b.lo, b.hi)) {
b.get_value(b.lo, rlo);
b.get_value(b.hi, rhi);
v.add_range(r + rlo, r + rhi);
}
if (bv.is_numeral(e->get_arg(1), r) && !a.eq(a.lo, a.hi)) {
a.get_value(a.lo, rlo);
a.get_value(a.hi, rhi);
v.add_range(r + rlo, r + rhi);
}
break; break;
} }
case OP_BMUL: { case OP_BMUL: {
@ -288,29 +299,29 @@ namespace bv {
if (!b.get(b.fixed, k)) if (!b.get(b.fixed, k))
break; break;
for (; zj < v.bw; ++zj) for (; zj < v.bw; ++zj)
if (!a.get(a.fixed, zj) || a.get(a.bits, zj)) if (!a.get(a.fixed, zj) || a.get_bit(zj))
break; break;
for (; zk < v.bw; ++zk) for (; zk < v.bw; ++zk)
if (!b.get(b.fixed, zk) || b.get(b.bits, zk)) if (!b.get(b.fixed, zk) || b.get_bit(zk))
break; break;
for (; hzj < v.bw; ++hzj) for (; hzj < v.bw; ++hzj)
if (!a.get(a.fixed, v.bw - hzj - 1) || a.get(a.bits, v.bw - hzj - 1)) if (!a.get(a.fixed, v.bw - hzj - 1) || a.get_bit(v.bw - hzj - 1))
break; break;
for (; hzk < v.bw; ++hzk) for (; hzk < v.bw; ++hzk)
if (!b.get(b.fixed, v.bw - hzk - 1) || b.get(b.bits, v.bw - hzk - 1)) if (!b.get(b.fixed, v.bw - hzk - 1) || b.get_bit(v.bw - hzk - 1))
break; break;
if (j > 0 && k > 0) { if (j > 0 && k > 0) {
for (unsigned i = 0; i < std::min(k, j); ++i) { for (unsigned i = 0; i < std::min(k, j); ++i) {
SASSERT(!v.get(v.bits, i)); SASSERT(!v.get_bit(i));
v.set(v.fixed, i, true); v.set(v.fixed, i, true);
} }
} }
// lower zj + jk bits are 0 // lower zj + jk bits are 0
if (zk > 0 || zj > 0) { if (zk > 0 || zj > 0) {
for (unsigned i = 0; i < zk + zj; ++i) { for (unsigned i = 0; i < zk + zj; ++i) {
SASSERT(!v.get(v.bits, i)); SASSERT(!v.get_bit(i));
v.set(v.fixed, i, true); v.set(v.fixed, i, true);
} }
} }
@ -320,7 +331,7 @@ namespace bv {
hzj = v.bw - hzj; hzj = v.bw - hzj;
hzk = v.bw - hzk; hzk = v.bw - hzk;
for (unsigned i = hzj + hzk - 1; i < v.bw; ++i) { for (unsigned i = hzj + hzk - 1; i < v.bw; ++i) {
SASSERT(!v.get(v.bits, i)); SASSERT(!v.get_bit(i));
v.set(v.fixed, i, true); v.set(v.fixed, i, true);
} }
} }

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

@ -26,11 +26,11 @@ namespace bv {
nw = (bw + sizeof(digit_t) * 8 - 1) / (8 * sizeof(digit_t)); nw = (bw + sizeof(digit_t) * 8 - 1) / (8 * sizeof(digit_t));
lo.reserve(nw + 1); lo.reserve(nw + 1);
hi.reserve(nw + 1); hi.reserve(nw + 1);
bits.reserve(nw + 1); m_bits.reserve(nw + 1);
fixed.reserve(nw + 1); fixed.reserve(nw + 1);
// have lo, hi bits, fixed point to memory allocated within this of size num_bytes each allocated // have lo, hi bits, fixed point to memory allocated within this of size num_bytes each allocated
for (unsigned i = 0; i < nw; ++i) for (unsigned i = 0; i < nw; ++i)
lo[i] = 0, hi[i] = 0, bits[i] = 0, fixed[i] = 0; lo[i] = 0, hi[i] = 0, m_bits[i] = 0, fixed[i] = 0;
for (unsigned i = bw; i < 8 * sizeof(digit_t) * nw; ++i) for (unsigned i = bw; i < 8 * sizeof(digit_t) * nw; ++i)
set(fixed, i, true); set(fixed, i, true);
} }
@ -103,7 +103,7 @@ namespace bv {
bool sls_valuation::get_at_most(svector<digit_t> const& src, svector<digit_t>& dst) const { bool sls_valuation::get_at_most(svector<digit_t> const& src, svector<digit_t>& dst) const {
SASSERT(!has_overflow(src)); SASSERT(!has_overflow(src));
for (unsigned i = 0; i < nw; ++i) for (unsigned i = 0; i < nw; ++i)
dst[i] = src[i] & (~fixed[i] | bits[i]); dst[i] = src[i] & (~fixed[i] | m_bits[i]);
// //
// If dst < src, then find the most significant // If dst < src, then find the most significant
@ -116,7 +116,7 @@ namespace bv {
auto mask = (1 << idx) - 1; auto mask = (1 << idx) - 1;
dst[i] = (~fixed[i] & mask) | dst[i]; dst[i] = (~fixed[i] & mask) | dst[i];
for (unsigned j = i; j-- > 0; ) for (unsigned j = i; j-- > 0; )
dst[j] = (~fixed[j] | bits[j]); dst[j] = (~fixed[j] | m_bits[j]);
break; break;
} }
} }
@ -140,7 +140,7 @@ namespace bv {
bool sls_valuation::get_at_least(svector<digit_t> const& src, svector<digit_t>& dst) const { bool sls_valuation::get_at_least(svector<digit_t> const& src, svector<digit_t>& dst) const {
SASSERT(!has_overflow(src)); SASSERT(!has_overflow(src));
for (unsigned i = 0; i < nw; ++i) for (unsigned i = 0; i < nw; ++i)
dst[i] = (~fixed[i] & src[i]) | (fixed[i] & bits[i]); dst[i] = (~fixed[i] & src[i]) | (fixed[i] & m_bits[i]);
// //
// If dst > src, then find the most significant // If dst > src, then find the most significant
@ -193,13 +193,13 @@ namespace bv {
bool sls_valuation::set_repair(bool try_down, svector<digit_t>& dst) { bool sls_valuation::set_repair(bool try_down, svector<digit_t>& dst) {
for (unsigned i = 0; i < nw; ++i) for (unsigned i = 0; i < nw; ++i)
dst[i] = (~fixed[i] & dst[i]) | (fixed[i] & bits[i]); dst[i] = (~fixed[i] & dst[i]) | (fixed[i] & m_bits[i]);
bool ok = try_down ? round_down(dst) : round_up(dst); bool ok = try_down ? round_down(dst) : round_up(dst);
if (!ok) if (!ok)
VERIFY(try_down ? round_up(dst) : round_down(dst)); VERIFY(try_down ? round_up(dst) : round_down(dst));
if (eq(bits, dst)) if (eq(m_bits, dst))
return false; return false;
set(bits, dst); set(m_bits, dst);
SASSERT(!has_overflow(dst)); SASSERT(!has_overflow(dst));
return true; return true;
} }
@ -211,7 +211,7 @@ namespace bv {
} }
else { else {
for (unsigned i = 0; i < nw; ++i) for (unsigned i = 0; i < nw; ++i)
out[i] = fixed[i] & bits[i]; out[i] = fixed[i] & m_bits[i];
} }
SASSERT(!has_overflow(out)); SASSERT(!has_overflow(out));
} }
@ -224,7 +224,7 @@ namespace bv {
} }
else { else {
for (unsigned i = 0; i < nw; ++i) for (unsigned i = 0; i < nw; ++i)
out[i] = ~fixed[i] | bits[i]; out[i] = ~fixed[i] | m_bits[i];
} }
SASSERT(!has_overflow(out)); SASSERT(!has_overflow(out));
} }
@ -254,7 +254,7 @@ namespace bv {
void sls_valuation::get(svector<digit_t>& dst) const { void sls_valuation::get(svector<digit_t>& dst) const {
for (unsigned i = 0; i < nw; ++i) for (unsigned i = 0; i < nw; ++i)
dst[i] = bits[i]; dst[i] = m_bits[i];
} }
void sls_valuation::set1(svector<digit_t>& bits) { void sls_valuation::set1(svector<digit_t>& bits) {
@ -270,7 +270,7 @@ namespace bv {
bool sls_valuation::can_set(svector<digit_t> const& new_bits) const { bool sls_valuation::can_set(svector<digit_t> const& new_bits) const {
SASSERT(!has_overflow(new_bits)); SASSERT(!has_overflow(new_bits));
for (unsigned i = 0; i < nw; ++i) for (unsigned i = 0; i < nw; ++i)
if (0 != ((new_bits[i] ^ bits[i]) & fixed[i])) if (0 != ((new_bits[i] ^ m_bits[i]) & fixed[i]))
return false; return false;
return in_range(new_bits); return in_range(new_bits);
} }
@ -297,7 +297,7 @@ namespace bv {
void sls_valuation::shift_right(svector<digit_t>& out, unsigned shift) const { void sls_valuation::shift_right(svector<digit_t>& out, unsigned shift) const {
SASSERT(shift < bw); SASSERT(shift < bw);
for (unsigned i = 0; i < bw; ++i) for (unsigned i = 0; i < bw; ++i)
set(out, i, i + shift < bw ? get(bits, i + shift) : false); set(out, i, i + shift < bw ? get(m_bits, i + shift) : false);
SASSERT(!has_overflow(out)); SASSERT(!has_overflow(out));
} }
@ -357,16 +357,16 @@ namespace bv {
for (unsigned i = bw; i-- > 0; ) { for (unsigned i = bw; i-- > 0; ) {
if (!get(fixed, i)) if (!get(fixed, i))
continue; continue;
if (get(bits, i) == get(lo, i)) if (get(m_bits, i) == get(lo, i))
continue; continue;
if (get(bits, i)) { if (get(m_bits, i)) {
set(lo, i, true); set(lo, i, true);
for (unsigned j = i; j-- > 0; ) for (unsigned j = i; j-- > 0; )
set(lo, j, get(fixed, j) && get(bits, j)); set(lo, j, get(fixed, j) && get(m_bits, j));
} }
else { else {
for (unsigned j = bw; j-- > 0; ) for (unsigned j = bw; j-- > 0; )
set(lo, j, get(fixed, j) && get(bits, j)); set(lo, j, get(fixed, j) && get(m_bits, j));
} }
break; break;
} }
@ -379,16 +379,16 @@ namespace bv {
for (unsigned i = bw; i-- > 0; ) { for (unsigned i = bw; i-- > 0; ) {
if (!get(fixed, i)) if (!get(fixed, i))
continue; continue;
if (get(bits, i) == get(hi1, i)) if (get(m_bits, i) == get(hi1, i))
continue; continue;
if (get(hi1, i)) { if (get(hi1, i)) {
set(hi1, i, false); set(hi1, i, false);
for (unsigned j = i; j-- > 0; ) for (unsigned j = i; j-- > 0; )
set(hi1, j, !get(fixed, j) || get(bits, j)); set(hi1, j, !get(fixed, j) || get(m_bits, j));
} }
else { else {
for (unsigned j = bw; j-- > 0; ) for (unsigned j = bw; j-- > 0; )
set(hi1, j, get(fixed, j) && get(bits, j)); set(hi1, j, get(fixed, j) && get(m_bits, j));
} }
mpn_manager().add(hi1.data(), nw, one.data(), nw, hi.data(), nw + 1, &c); mpn_manager().add(hi1.data(), nw, one.data(), nw, hi.data(), nw + 1, &c);
clear_overflow_bits(hi); clear_overflow_bits(hi);
@ -399,7 +399,7 @@ namespace bv {
auto set_fixed_bit = [&](unsigned i, bool b) { auto set_fixed_bit = [&](unsigned i, bool b) {
if (!get(fixed, i)) { if (!get(fixed, i)) {
set(fixed, i, true); set(fixed, i, true);
set(bits, i, b); set(m_bits, i, b);
} }
}; };
@ -420,7 +420,7 @@ namespace bv {
for (unsigned i = 0; i < bw; ++i) for (unsigned i = 0; i < bw; ++i)
set_fixed_bit(i, get(lo, i)); set_fixed_bit(i, get(lo, i));
} }
SASSERT(!has_overflow(bits)); SASSERT(!has_overflow(m_bits));
} }
void sls_valuation::set_sub(svector<digit_t>& out, svector<digit_t> const& a, svector<digit_t> const& b) const { void sls_valuation::set_sub(svector<digit_t>& out, svector<digit_t> const& a, svector<digit_t> const& b) const {

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

@ -27,15 +27,23 @@ Author:
namespace bv { namespace bv {
struct sls_valuation { class sls_valuation {
protected:
svector<digit_t> m_bits;
public:
unsigned bw; // bit-width unsigned bw; // bit-width
unsigned nw; // num words unsigned nw; // num words
svector<digit_t> lo, hi; // range assignment to bit-vector, as wrap-around interval svector<digit_t> lo, hi; // range assignment to bit-vector, as wrap-around interval
svector<digit_t> bits, fixed; // bit assignment and don't care bit svector<digit_t> fixed; // bit assignment and don't care bit
sls_valuation(unsigned bw); sls_valuation(unsigned bw);
unsigned num_bytes() const { return (bw + 7) / 8; } unsigned num_bytes() const { return (bw + 7) / 8; }
digit_t bits(unsigned i) const { return m_bits[i]; }
svector<digit_t> const& bits() const { return m_bits; }
void set_bit(unsigned i, bool v) { set(m_bits, i, v); }
bool get_bit(unsigned i) const { return get(m_bits, i); }
void set_value(svector<digit_t>& bits, rational const& r); void set_value(svector<digit_t>& bits, rational const& r);
void get_value(svector<digit_t> const& bits, rational& r) const; void get_value(svector<digit_t> const& bits, rational& r) const;
void get(svector<digit_t>& dst) const; void get(svector<digit_t>& dst) const;
@ -47,22 +55,22 @@ namespace bv {
bool in_range(svector<digit_t> const& bits) const; bool in_range(svector<digit_t> const& 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 { return eq(other.bits); } bool eq(sls_valuation const& other) const { return eq(other.m_bits); }
bool eq(svector<digit_t> const& other) const { return eq(other, bits); } bool eq(svector<digit_t> const& other) const { return eq(other, m_bits); }
bool eq(svector<digit_t> const& a, svector<digit_t> const& b) const; bool eq(svector<digit_t> const& a, svector<digit_t> const& b) 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;
bool lt(svector<digit_t> const& a, svector<digit_t> const& b) const; bool lt(svector<digit_t> const& a, svector<digit_t> const& b) const;
bool le(svector<digit_t> const& a, svector<digit_t> const& b) const; bool le(svector<digit_t> const& a, svector<digit_t> const& b) const;
bool is_zero() const { return is_zero(bits); } bool is_zero() const { return is_zero(m_bits); }
bool is_zero(svector<digit_t> const& a) const { bool is_zero(svector<digit_t> const& a) const {
for (unsigned i = 0; i < nw; ++i) for (unsigned i = 0; i < nw; ++i)
if (a[i] != 0) if (a[i] != 0)
return false; return false;
return true; return true;
} }
bool is_ones() const { return is_ones(bits); } bool is_ones() const { return is_ones(m_bits); }
bool is_ones(svector<digit_t> const& a) const { bool is_ones(svector<digit_t> const& a) const {
auto bound = bw % (sizeof(digit_t) * 8) == 0 ? nw : nw - 1; auto bound = bw % (sizeof(digit_t) * 8) == 0 ? nw : nw - 1;
for (unsigned i = 0; i < bound; ++i) for (unsigned i = 0; i < bound; ++i)
@ -76,7 +84,7 @@ namespace bv {
return true; return true;
} }
bool is_one() const { return is_one(bits); } bool is_one() const { return is_one(m_bits); }
bool is_one(svector<digit_t> const& bits) const { bool is_one(svector<digit_t> const& bits) const {
if (1 != bits[0]) if (1 != bits[0])
return false; return false;
@ -86,7 +94,7 @@ namespace bv {
return true; return true;
} }
bool sign() const { return get(bits, bw - 1); } bool sign() const { return get(m_bits, bw - 1); }
bool has_overflow(svector<digit_t> const& bits) const { bool has_overflow(svector<digit_t> const& bits) const {
for (unsigned i = bw; i < nw * sizeof(digit_t) * 8; ++i) for (unsigned i = bw; i < nw * sizeof(digit_t) * 8; ++i)
@ -127,8 +135,8 @@ namespace bv {
void set(svector<digit_t> const& src) { void set(svector<digit_t> const& src) {
for (unsigned i = nw; i-- > 0; ) for (unsigned i = nw; i-- > 0; )
bits[i] = src[i]; m_bits[i] = src[i];
clear_overflow_bits(bits); clear_overflow_bits(m_bits);
} }
void set_zero(svector<digit_t>& out) const { void set_zero(svector<digit_t>& out) const {
@ -143,7 +151,7 @@ namespace bv {
} }
void set_zero() { void set_zero() {
set_zero(bits); set_zero(m_bits);
} }
void sub1(svector<digit_t>& out) const { void sub1(svector<digit_t>& out) const {
@ -189,17 +197,7 @@ namespace bv {
unsigned to_nat(svector<digit_t> const& d, unsigned max_n); unsigned to_nat(svector<digit_t> const& d, unsigned max_n);
static digit_t get_pos_mask(unsigned bit_idx) {
return (digit_t)1 << (digit_t)(bit_idx % (8 * sizeof(digit_t)));
}
static digit_t get_bit_word(svector<digit_t> const& bits, unsigned bit_idx) {
return bits[bit_idx / (8 * sizeof(digit_t))];
}
static digit_t& get_bit_word(svector<digit_t>& bits, unsigned bit_idx) {
return bits[bit_idx / (8 * sizeof(digit_t))];
}
std::ostream& display(std::ostream& out) const { std::ostream& display(std::ostream& out) const {
out << "V:"; out << "V:";
@ -213,9 +211,9 @@ namespace bv {
out << v[i], nz = true; out << v[i], nz = true;
if (!nz) if (!nz)
out << "0"; out << "0";
}; };
print_bits(bits); print_bits(m_bits);
out << " fix:"; out << " fix:";
print_bits(fixed); print_bits(fixed);
@ -229,6 +227,25 @@ namespace bv {
out << std::dec; out << std::dec;
return out; return out;
} }
private:
static digit_t get_pos_mask(unsigned bit_idx) {
return (digit_t)1 << (digit_t)(bit_idx % (8 * sizeof(digit_t)));
}
static digit_t get_bit_word(svector<digit_t> const& bits, unsigned bit_idx) {
return bits[bit_idx / (8 * sizeof(digit_t))];
}
static digit_t& get_bit_word(svector<digit_t>& bits, unsigned bit_idx) {
return bits[bit_idx / (8 * sizeof(digit_t))];
}
};
class sls_pre_valuation : public sls_valuation {
public:
sls_pre_valuation(unsigned bw):sls_valuation(bw) {}
svector<digit_t>& bits() { return m_bits; }
}; };
inline std::ostream& operator<<(std::ostream& out, sls_valuation const& v) { return v.display(out); } inline std::ostream& operator<<(std::ostream& out, sls_valuation const& v) { return v.display(out); }