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

optimize model pruning

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2012-10-13 17:52:37 -07:00
parent 0a8be25149
commit 148416122f
3 changed files with 32 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/dl_bmc_engine.cpp
View file

@ -215,6 +215,7 @@ namespace datalog {
lbool bmc::check_linear() { lbool bmc::check_linear() {
for (unsigned i = 0; ; ++i) { for (unsigned i = 0; ; ++i) {
IF_VERBOSE(1, verbose_stream() << "level: " << i << "\n";); IF_VERBOSE(1, verbose_stream() << "level: " << i << "\n";);
checkpoint();
compile_linear(i); compile_linear(i);
lbool res = check_linear(i); lbool res = check_linear(i);
if (res == l_undef) { if (res == l_undef) {

39
lib/pdr_util.cpp
View file

@ -290,7 +290,7 @@ void ternary_model_evaluator::minimize_model(ptr_vector<expr> const & formulas,
for (unsigned i = 0; i < formulas.size(); ++i) tout << mk_pp(formulas[i], m) << "\n"; for (unsigned i = 0; i < formulas.size(); ++i) tout << mk_pp(formulas[i], m) << "\n";
); );
prune_cone_of_influence(formulas, model); prune_by_cone_of_influence(formulas, model);
// prune_by_probing(formulas, model); // prune_by_probing(formulas, model);
@ -335,7 +335,7 @@ void ternary_model_evaluator::prune_by_probing(ptr_vector<expr> const& formulas,
TRACE("pdr", tout << sz1 << " ==> " << model.size() << "\n";); TRACE("pdr", tout << sz1 << " ==> " << model.size() << "\n";);
} }
void ternary_model_evaluator::prune_cone_of_influence(ptr_vector<expr> const & formulas, expr_ref_vector& model) { void ternary_model_evaluator::prune_by_cone_of_influence(ptr_vector<expr> const & formulas, expr_ref_vector& model) {
ptr_vector<expr> todo, tocollect; ptr_vector<expr> todo, tocollect;
todo.append(formulas); todo.append(formulas);
m_visited.reset(); m_visited.reset();
@ -364,28 +364,35 @@ void ternary_model_evaluator::prune_cone_of_influence(ptr_vector<expr> const & f
case OP_EQ: case OP_EQ:
case OP_IFF: case OP_IFF:
if (e->get_arg(0) == e->get_arg(1)) { if (e->get_arg(0) == e->get_arg(1)) {
break; // no-op
} }
if (!m.is_bool(e->get_arg(0))) { else if (!m.is_bool(e->get_arg(0))) {
tocollect.push_back(e); tocollect.push_back(e);
break;
} }
todo.append(sz, args); else {
todo.append(sz, args);
}
break; break;
case OP_DISTINCT: case OP_DISTINCT:
tocollect.push_back(e); tocollect.push_back(e);
break; break;
case OP_ITE: case OP_ITE:
if (e->get_arg(1) == e->get_arg(2)) { if (args[1] == args[2]) {
break; //
} }
todo.push_back(args[0]); else if (is_true(args[1]) && is_true(args[2])) {
if (is_true(args[0])) { todo.append(2, args+1);
}
else if (is_false(args[2]) && is_false(args[2])) {
todo.append(2, args+1);
}
else if (is_true(args[0])) {
todo.push_back(args[0]);
todo.push_back(args[1]); todo.push_back(args[1]);
} }
else { else {
SASSERT(is_false(args[0])); SASSERT(is_false(args[0]));
todo.push_back(args[0]);
todo.push_back(args[2]); todo.push_back(args[2]);
} }
break; break;
@ -396,7 +403,10 @@ void ternary_model_evaluator::prune_cone_of_influence(ptr_vector<expr> const & f
else { else {
unsigned i = 0; unsigned i = 0;
for (; !is_false(args[i]) && i < sz; ++i); for (; !is_false(args[i]) && i < sz; ++i);
SASSERT(i < sz); if (i == sz) {
fatal_error(1);
}
VERIFY(i < sz);
todo.push_back(args[i]); todo.push_back(args[i]);
} }
break; break;
@ -404,7 +414,10 @@ void ternary_model_evaluator::prune_cone_of_influence(ptr_vector<expr> const & f
if (v) { if (v) {
unsigned i = 0; unsigned i = 0;
for (; !is_true(args[i]) && i < sz; ++i); for (; !is_true(args[i]) && i < sz; ++i);
SASSERT(i < sz); if (i == sz) {
fatal_error(1);
}
VERIFY(i < sz);
todo.push_back(args[i]); todo.push_back(args[i]);
} }
else { else {

5
lib/pdr_util.h
View file

@ -214,7 +214,7 @@ class ternary_model_evaluator : public model_evaluator_base {
void del_model(expr* e); void del_model(expr* e);
bool get_assignment(expr* e, expr*& var, expr*& val); bool get_assignment(expr* e, expr*& var, expr*& val);
void prune_cone_of_influence(ptr_vector<expr> const & formulas, expr_ref_vector& model); void prune_by_cone_of_influence(ptr_vector<expr> const & formulas, expr_ref_vector& model);
void prune_by_probing(ptr_vector<expr> const & formulas, expr_ref_vector& model); void prune_by_probing(ptr_vector<expr> const & formulas, expr_ref_vector& model);
//00 -- non-visited //00 -- non-visited
@ -246,7 +246,8 @@ public:
ternary_model_evaluator(ast_manager& m) : m(m), m_arith(m), m_bv(m) {} ternary_model_evaluator(ast_manager& m) : m(m), m_arith(m), m_bv(m) {}
virtual void minimize_model(ptr_vector<expr> const & formulas, expr_ref_vector & model); virtual void minimize_model(ptr_vector<expr> const & formulas, expr_ref_vector & model);
void operator()(expr* e) { m_visited.mark(e, true); } // for_each_expr visitor.
void operator()(expr* e) {}
}; };
void get_value_from_model(const model_core & mdl, func_decl * f, expr_ref& res); void get_value_from_model(const model_core & mdl, func_decl * f, expr_ref& res);