mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-19 10:52:02 +00:00
Code Activity

fix #3165

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-03-06 06:26:18 +01:00
parent d3bd3bd4fc
commit c8c415c2de
2 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/ast/rewriter/bv_rewriter.cpp
View file

@ -2609,7 +2609,6 @@ br_status bv_rewriter::mk_eq_core(expr * lhs, expr * rhs, expr_ref & result) {
} }
if (m_trailing) { if (m_trailing) {
st = m_rm_trailing.eq_remove_trailing(lhs, rhs, result); st = m_rm_trailing.eq_remove_trailing(lhs, rhs, result);
m_rm_trailing.reset_cache(1 << 12); m_rm_trailing.reset_cache(1 << 12);
if (st != BR_FAILED) { if (st != BR_FAILED) {

41
src/ast/rewriter/bv_trailing.cpp
View file

@ -16,7 +16,7 @@
--*/ --*/
#include "ast/rewriter/bv_trailing.h" #include "ast/rewriter/bv_trailing.h"
#include "ast/bv_decl_plugin.h" #include "ast/bv_decl_plugin.h"
#include "ast/ast_smt2_pp.h" #include "ast/ast_pp.h"
// The analyzer gives up analysis after going TRAILING_DEPTH deep. // The analyzer gives up analysis after going TRAILING_DEPTH deep.
// This number shouldn't be too big. // This number shouldn't be too big.
@ -48,7 +48,7 @@ struct bv_trailing::imp {
} }
br_status eq_remove_trailing(expr * e1, expr * e2, expr_ref& result) { br_status eq_remove_trailing(expr * e1, expr * e2, expr_ref& result) {
TRACE("bv-trailing", tout << mk_ismt2_pp(e1, m) << "\n=\n" << mk_ismt2_pp(e2, m) << "\n";); TRACE("bv-trailing", tout << mk_pp(e1, m) << "\n=\n" << mk_pp(e2, m) << "\n";);
SASSERT(m_util.is_bv(e1) && m_util.is_bv(e2)); SASSERT(m_util.is_bv(e1) && m_util.is_bv(e2));
SASSERT(m_util.get_bv_size(e1) == m_util.get_bv_size(e2)); SASSERT(m_util.get_bv_size(e1) == m_util.get_bv_size(e2));
unsigned max1, min1, max2, min2; unsigned max1, min1, max2, min2;
@ -60,7 +60,6 @@ struct bv_trailing::imp {
} }
const unsigned min = std::min(min1, min2); // remove the minimum of the two lower bounds const unsigned min = std::min(min1, min2); // remove the minimum of the two lower bounds
if (min == 0) { // nothing to remove if (min == 0) { // nothing to remove
result = m.mk_eq(e1, e2);
return BR_FAILED; return BR_FAILED;
} }
const unsigned sz = m_util.get_bv_size(e1); const unsigned sz = m_util.get_bv_size(e1);
@ -84,7 +83,7 @@ struct bv_trailing::imp {
SASSERT(e && m_util.is_bv(e)); SASSERT(e && m_util.is_bv(e));
if (is_cached(depth, e, min, max)) return; if (is_cached(depth, e, min, max)) return;
count_trailing_core(e, min, max, depth); count_trailing_core(e, min, max, depth);
TRACE("bv-trailing", tout << mk_ismt2_pp(e, m) << "\n:" << min << " - " << max << "\n";); TRACE("bv-trailing", tout << mk_pp(e, m) << "\n:" << min << " - " << max << "\n";);
SASSERT(min <= max); SASSERT(min <= max);
SASSERT(max <= m_util.get_bv_size(e)); SASSERT(max <= m_util.get_bv_size(e));
cache(depth, e, min, max); // store result into the cache cache(depth, e, min, max); // store result into the cache
@ -92,15 +91,13 @@ struct bv_trailing::imp {
unsigned remove_trailing(expr * e, unsigned n, expr_ref& result, unsigned depth) { unsigned remove_trailing(expr * e, unsigned n, expr_ref& result, unsigned depth) {
const unsigned retv = remove_trailing_core(e, n, result, depth); const unsigned retv = remove_trailing_core(e, n, result, depth);
CTRACE("bv-trailing", result.get(), tout << mk_ismt2_pp(e, m) << "\n--->\n" << mk_ismt2_pp(result.get(), m) << "\n";); TRACE("bv-trailing", tout << mk_pp(e, m) << "\n--->\n" << retv << ": " << result << "\n";);
CTRACE("bv-trailing", !result.get(), tout << mk_ismt2_pp(e, m) << "\n---> [EMPTY]\n";);
return retv; return retv;
} }
// Assumes that count_trailing gives me a lower bound that we can also remove from each summand. // Assumes that count_trailing gives me a lower bound that we can also remove from each summand.
unsigned remove_trailing_add(app * a, unsigned n, expr_ref& result, unsigned depth) { unsigned remove_trailing_add(app * a, unsigned n, expr_ref& result, unsigned depth) {
SASSERT(m_util.is_bv_add(a)); SASSERT(m_util.is_bv_add(a));
const unsigned num = a->get_num_args();
if (depth <= 1) { if (depth <= 1) {
result = a; result = a;
return 0; return 0;
@ -122,8 +119,7 @@ struct bv_trailing::imp {
expr_ref_vector new_args(m); expr_ref_vector new_args(m);
expr_ref tmp(m); expr_ref tmp(m);
for (unsigned i = 0; i < num; ++i) { for (expr * curr : *a) {
expr * const curr = a->get_arg(i);
VERIFY(to_rm == remove_trailing(curr, to_rm, tmp, depth - 1)); VERIFY(to_rm == remove_trailing(curr, to_rm, tmp, depth - 1));
new_args.push_back(std::move(tmp)); new_args.push_back(std::move(tmp));
} }
@ -146,20 +142,23 @@ struct bv_trailing::imp {
result = a; result = a;
return 0; return 0;
} }
const unsigned sz = m_util.get_bv_size(coefficient);
const unsigned new_sz = sz - retv;
SASSERT(m_util.get_bv_size(tmp) == new_sz);
expr_ref_vector new_args(m); expr_ref_vector new_args(m);
numeral c_val; numeral c_val;
unsigned c_sz; unsigned c_sz;
if (!m_util.is_numeral(tmp, c_val, c_sz) || !c_val.is_one()) if (!m_util.is_numeral(tmp, c_val, c_sz) || !c_val.is_one())
new_args.push_back(std::move(tmp)); new_args.push_back(std::move(tmp));
const unsigned sz = m_util.get_bv_size(coefficient);
const unsigned new_sz = sz - retv;
if (!new_sz) {
if (new_sz == 0) {
result = nullptr; result = nullptr;
return retv; return retv;
} }
SASSERT(m_util.get_bv_size(tmp) == new_sz);
for (unsigned i = 1; i < num; i++) { for (unsigned i = 1; i < num; i++) {
expr * const curr = a->get_arg(i); expr * const curr = a->get_arg(i);
new_args.push_back(m_mk_extract(new_sz - 1, 0, curr)); new_args.push_back(m_mk_extract(new_sz - 1, 0, curr));
@ -223,7 +222,9 @@ struct bv_trailing::imp {
unsigned remove_trailing_core(expr * e, unsigned n, expr_ref& result, unsigned depth) { unsigned remove_trailing_core(expr * e, unsigned n, expr_ref& result, unsigned depth) {
SASSERT(m_util.is_bv(e)); SASSERT(m_util.is_bv(e));
if (!depth || !n) return 0; if (!depth || !n) {
return 0;
}
unsigned sz; unsigned sz;
unsigned retv = 0; unsigned retv = 0;
numeral e_val; numeral e_val;
@ -343,7 +344,7 @@ struct bv_trailing::imp {
SASSERT(!m_count_cache[depth]->contains(e)); SASSERT(!m_count_cache[depth]->contains(e));
m.inc_ref(e); m.inc_ref(e);
m_count_cache[depth]->insert(e, std::make_pair(min, max)); m_count_cache[depth]->insert(e, std::make_pair(min, max));
TRACE("bv-trailing", tout << "caching@" << depth <<": " << mk_ismt2_pp(e, m) << '[' << m_util.get_bv_size(e) << "]\n: " << min << '-' << max << "\n";); TRACE("bv-trailing", tout << "caching@" << depth <<": " << mk_pp(e, m) << '[' << m_util.get_bv_size(e) << "]\n: " << min << '-' << max << "\n";);
} }
bool is_cached(unsigned depth, expr * e, unsigned& min, unsigned& max) { bool is_cached(unsigned depth, expr * e, unsigned& min, unsigned& max) {
@ -359,7 +360,7 @@ struct bv_trailing::imp {
if (oe == nullptr) return false; if (oe == nullptr) return false;
min = oe->get_data().m_value.first; min = oe->get_data().m_value.first;
max = oe->get_data().m_value.second; max = oe->get_data().m_value.second;
TRACE("bv-trailing", tout << "cached@" << depth << ": " << mk_ismt2_pp(e, m) << '[' << m_util.get_bv_size(e) << "]\n: " << min << '-' << max << "\n";); TRACE("bv-trailing", tout << "cached@" << depth << ": " << mk_pp(e, m) << '[' << m_util.get_bv_size(e) << "]\n: " << min << '-' << max << "\n";);
return true; return true;
} }
@ -368,11 +369,11 @@ struct bv_trailing::imp {
for (unsigned i = 1; i <= TRAILING_DEPTH; ++i) { for (unsigned i = 1; i <= TRAILING_DEPTH; ++i) {
if (m_count_cache[i] == nullptr) continue; if (m_count_cache[i] == nullptr) continue;
TRACE("bv-trailing", tout << "may reset cache " << i << " " << condition << "\n";); TRACE("bv-trailing", tout << "may reset cache " << i << " " << condition << "\n";);
if (condition && m_count_cache[i]->size() < condition) continue; if (m_count_cache[i]->size() < condition) continue;
TRACE("bv-trailing", tout << "reset cache " << i << "\n";); TRACE("bv-trailing", tout << "reset cache " << i << "\n";);
map::iterator it = m_count_cache[i]->begin(); for (auto& kv : *m_count_cache[i]) {
map::iterator end = m_count_cache[i]->end(); m.dec_ref(kv.m_key);
for (; it != end; ++it) m.dec_ref(it->m_key); }
dealloc(m_count_cache[i]); dealloc(m_count_cache[i]);
m_count_cache[i] = nullptr; m_count_cache[i] = nullptr;
} }