mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-06 14:13:23 +00:00
Code Activity

debug model evaluator

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-06-15 14:58:02 -07:00
parent e94b97376c
commit a51d6cbcbc
4 changed files with 27 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/model/model_evaluator.cpp
View file

@ -290,6 +290,7 @@ struct evaluator_cfg : public default_rewriter_cfg {
br_status mk_array_eq(expr* a, expr* b, expr_ref& result) { br_status mk_array_eq(expr* a, expr* b, expr_ref& result) {
TRACE("model_evaluator", tout << "mk_array_eq " << m_array_equalities << "\n";);
if (a == b) { if (a == b) {
result = m.mk_true(); result = m.mk_true();
return BR_DONE; return BR_DONE;
@ -315,6 +316,7 @@ struct evaluator_cfg : public default_rewriter_cfg {
conj.push_back(m.mk_eq(else1, else2)); conj.push_back(m.mk_eq(else1, else2));
} }
if (args_are_unique1 && args_are_unique2 && !stores1.empty()) { if (args_are_unique1 && args_are_unique2 && !stores1.empty()) {
TRACE("model_evalator", tout << "argss are unique";);
return mk_array_eq_core(stores1, else1, stores2, else2, conj, result); return mk_array_eq_core(stores1, else1, stores2, else2, conj, result);
} }
@ -329,7 +331,10 @@ struct evaluator_cfg : public default_rewriter_cfg {
expr_ref s2(m_ar.mk_select(args2.size(), args2.c_ptr()), m); expr_ref s2(m_ar.mk_select(args2.size(), args2.c_ptr()), m);
conj.push_back(m.mk_eq(s1, s2)); conj.push_back(m.mk_eq(s1, s2));
} }
result = m.mk_and(conj.size(), conj.c_ptr()); result = mk_and(conj);
TRACE("model_evaluator", tout << mk_pp(a, m) << " == " << mk_pp(b, m) << " -> " << conj << "\n";
for (auto& s : stores1) tout << "store: " << s << "\n";
);
return BR_REWRITE_FULL; return BR_REWRITE_FULL;
} }
return BR_FAILED; return BR_FAILED;
@ -454,7 +459,7 @@ struct evaluator_cfg : public default_rewriter_cfg {
func_decl* f = m_ar.get_as_array_func_decl(to_app(a)); func_decl* f = m_ar.get_as_array_func_decl(to_app(a));
func_interp* g = m_model.get_func_interp(f); func_interp* g = m_model.get_func_interp(f);
if (!g) return false; if (!g) return false;
unsigned sz = g->num_entries(); unsigned sz = g->num_entries();
unsigned arity = f->get_arity(); unsigned arity = f->get_arity();
unsigned base_sz = stores.size(); unsigned base_sz = stores.size();

30
src/muz/rel/dl_sparse_table.h
View file

@ -327,28 +327,28 @@ namespace datalog {
unsigned m_offset; //!< in bits unsigned m_offset; //!< in bits
unsigned m_length; //!< in bits unsigned m_length; //!< in bits
column_info(unsigned offset, unsigned length) \ column_info(unsigned offset, unsigned length)
: m_big_offset(offset/8), : m_big_offset(offset / 8),
m_small_offset(offset%8), m_small_offset(offset % 8),
m_mask( length==64 ? ULLONG_MAX : (static_cast<uint64_t>(1)<<length)-1 ), m_mask( length == 64 ? ULLONG_MAX : (static_cast<uint64_t>(1)<<length)-1 ),
m_write_mask( ~(m_mask<<m_small_offset) ), m_write_mask( ~(m_mask << m_small_offset) ),
m_offset(offset), m_offset(offset),
m_length(length) { m_length(length) {
SASSERT(length<=64); SASSERT(length <= 64);
SASSERT(length+m_small_offset<=64); SASSERT(length + m_small_offset <= 64);
} }
table_element get(const char * rec) const { table_element get(const char * rec) const {
const uint64_t * ptr = reinterpret_cast<const uint64_t*>(rec+m_big_offset); const uint64_t * ptr = reinterpret_cast<const uint64_t*>(rec + m_big_offset);
uint64_t res = *ptr; uint64_t res = *ptr;
res>>=m_small_offset; res >>= m_small_offset;
res&=m_mask; res &= m_mask;
return res; return res;
} }
void set(char * rec, table_element val) const { void set(char * rec, table_element val) const {
SASSERT( (val&~m_mask)==0 ); //the value fits into the column SASSERT( (val&~m_mask)==0 ); //the value fits into the column
uint64_t * ptr = reinterpret_cast<uint64_t*>(rec+m_big_offset); uint64_t * ptr = reinterpret_cast<uint64_t*>(rec + m_big_offset);
*ptr&=m_write_mask; *ptr &= m_write_mask;
*ptr|=val<<m_small_offset; *ptr |= val << m_small_offset;
} }
unsigned next_ofs() const { return m_offset+m_length; } unsigned next_ofs() const { return m_offset+m_length; }
}; };

2
src/smt/smt_model_checker.cpp
View file

@ -438,7 +438,7 @@ namespace smt {
} }
else if (!check(q)) { else if (!check(q)) {
if (m_params.m_mbqi_trace || get_verbosity_level() >= 5) { if (m_params.m_mbqi_trace || get_verbosity_level() >= 5) {
verbose_stream() << "(smt.mbqi :failed " << q->get_qid() << ")\n"; IF_VERBOSE(0, verbose_stream() << "(smt.mbqi :failed " << q->get_qid() << ")\n");
} }
TRACE("model_checker", tout << "checking quantifier " << mk_pp(q, m) << " failed\n";); TRACE("model_checker", tout << "checking quantifier " << mk_pp(q, m) << " failed\n";);
num_failures++; num_failures++;

4
src/util/util.h
View file

@ -193,8 +193,10 @@ bool is_threaded();
#ifdef _MSC_VER #ifdef _MSC_VER
#define DO_PRAGMA(x) __pragma(x) #define DO_PRAGMA(x) __pragma(x)
#define PRAGMA_LOCK __pragma(omp critical (verbose_lock))
#else #else
#define DO_PRAGMA(x) _Pragma(#x) #define DO_PRAGMA(x) _Pragma(#x)
#define PRAGMA_LOCK _Pragma("omp critical (verbose_lock){)
#endif #endif
#ifdef _NO_OMP_ #ifdef _NO_OMP_
@ -202,7 +204,7 @@ bool is_threaded();
#else #else
#define LOCK_CODE(CODE) \ #define LOCK_CODE(CODE) \
{ \ { \
DO_PRAGMA(omp critical (verbose_lock)) \ PRAGMA_LOCK \
{ \ { \
CODE; \ CODE; \
} \ } \