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

Improvements in caching of bv_trailing.

Browse source
This commit is contained in:
Mikolas Janota 2016-04-05 18:43:59 +01:00
parent 9ba5bbfd33
commit dbffc15b98
1 changed files with 32 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -18,9 +18,9 @@
#include"bv_decl_plugin.h" #include"bv_decl_plugin.h"
#include"ast_smt2_pp.h" #include"ast_smt2_pp.h"
// This is not very elegant at this point, this number shouldn't be too big, // The analyzer gives up analysis after going TRAILING_DEPTH deep.
// give up analysis after TRAILING_DEPTH depth. // This number shouldn't be too big.
#define TRAILING_DEPTH 4 #define TRAILING_DEPTH 5
struct bv_trailing::imp { struct bv_trailing::imp {
typedef rational numeral; typedef rational numeral;
@ -28,13 +28,17 @@ struct bv_trailing::imp {
mk_extract_proc& m_mk_extract; mk_extract_proc& m_mk_extract;
bv_util& m_util; bv_util& m_util;
ast_manager& m_m; ast_manager& m_m;
map m_count_cache[TRAILING_DEPTH + 1];
// keep a cache for each depth, using the convention that m_count_cache[TRAILING_DEPTH] is top-level
map* m_count_cache[TRAILING_DEPTH + 1];
imp(mk_extract_proc& mk_extract) imp(mk_extract_proc& mk_extract)
: m_mk_extract(mk_extract) : m_mk_extract(mk_extract)
, m_util(mk_extract.bvutil()) , m_util(mk_extract.bvutil())
, m_m(mk_extract.m()) , m_m(mk_extract.m()) {
{ } for (unsigned i = 0; i <= TRAILING_DEPTH; ++i)
m_count_cache[i] = NULL;
}
virtual ~imp() { virtual ~imp() {
reset_cache(0); reset_cache(0);
@ -93,7 +97,7 @@ struct bv_trailing::imp {
return retv; return retv;
} }
// assumes that count_trailing gives me a lower bound, which 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(); const unsigned num = a->get_num_args();
@ -221,8 +225,7 @@ 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) return 0; if (!depth || !n) return 0;
if (n == 0) return 0;
unsigned sz; unsigned sz;
unsigned retv = 0; unsigned retv = 0;
numeral e_val; numeral e_val;
@ -336,14 +339,24 @@ struct bv_trailing::imp {
void cache(unsigned depth, expr * e, unsigned min, unsigned max) { void cache(unsigned depth, expr * e, unsigned min, unsigned max) {
SASSERT(depth <= TRAILING_DEPTH); SASSERT(depth <= TRAILING_DEPTH);
if (depth == 0) return;
if (m_count_cache[depth] == NULL)
m_count_cache[depth] = alloc(map);
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_ismt2_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) {
SASSERT(depth <= TRAILING_DEPTH); SASSERT(depth <= TRAILING_DEPTH);
const map::obj_map_entry * const oe = m_count_cache[depth].find_core(e); if (depth == 0) {
min = 0;
max = m_util.get_bv_size(e);
return true;
}
if (m_count_cache[depth] == NULL)
return false;
const map::obj_map_entry * const oe = m_count_cache[depth]->find_core(e);
if (oe == NULL) return false; if (oe == NULL) 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;
@ -351,14 +364,16 @@ struct bv_trailing::imp {
return true; return true;
} }
void reset_cache(unsigned condition) { void reset_cache(unsigned condition) {
for (unsigned i = 0; i <= TRAILING_DEPTH; ++i) { SASSERT(m_count_cache[0] == NULL);
if (m_count_cache[i].size() < condition) continue; for (unsigned i = 1; i <= TRAILING_DEPTH; ++i) {
map::iterator it = m_count_cache[i].begin(); if (m_count_cache[i] == NULL) continue;
map::iterator end = m_count_cache[i].end(); if (m_count_cache[i]->size() < condition) continue;
map::iterator it = m_count_cache[i]->begin();
map::iterator end = m_count_cache[i]->end();
for (; it != end; ++it) m().dec_ref(it->m_key); for (; it != end; ++it) m().dec_ref(it->m_key);
m_count_cache[i].reset(); dealloc(m_count_cache[i]);
m_count_cache[i] = NULL;
} }
} }