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

finish (inefficient) BMC for non-linear Horn

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2012-10-15 10:48:42 -07:00
parent bf0481c4d0
commit b6e7d4ecc6
3 changed files with 53 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
lib/dl_bmc_engine.cpp
View file

@ -40,11 +40,10 @@ namespace datalog {
m_query_pred(m),
m_answer(m),
m_path_sort(m) {
m_fparams.m_relevancy_lvl = 0;
m_fparams.m_model = true;
m_fparams.m_model_compact = true;
m_fparams.m_mbqi = false;
m_fparams.m_auto_config = false;
m_fparams.m_model = true;
m_fparams.m_model_compact = true;
m_fparams.m_mbqi = false;
// m_fparams.m_auto_config = false;
}
bmc::~bmc() {}
@ -99,9 +98,8 @@ namespace datalog {
return check_linear();
}
else {
IF_VERBOSE(0, verbose_stream() << "WARNING: non-linear BMC is highly inefficient\n";);
return check_nonlinear();
IF_VERBOSE(1, verbose_stream() << "non-linear BMC is not supported\n";);
return l_undef;
}
}
@ -213,6 +211,7 @@ namespace datalog {
lbool bmc::check_linear() {
m_fparams.m_relevancy_lvl = 0;
for (unsigned i = 0; ; ++i) {
IF_VERBOSE(1, verbose_stream() << "level: " << i << "\n";);
checkpoint();
@ -365,6 +364,7 @@ namespace datalog {
lbool bmc::check_nonlinear() {
m_fparams.m_relevancy_lvl = 2;
declare_datatypes();
compile_nonlinear();
return check_query();
@ -702,28 +702,51 @@ namespace datalog {
func_decl_ref q = mk_predicate(m_query_pred);
expr_ref trace(m), path(m);
trace = m.mk_const(symbol("trace"), trace_sort);
path = m.mk_const(symbol("path"),m_path_sort);
path = m.mk_const(symbol("path"), m_path_sort);
assert_expr(m.mk_app(q, trace.get(), path.get()));
lbool is_sat = m_solver.check();
if (is_sat == l_undef) {
while (true) {
lbool is_sat = m_solver.check();
model_ref md;
proof_ref pr(m);
m_solver.get_model(md);
IF_VERBOSE(2, model_smt2_pp(verbose_stream(), m, *md, 0););
md->eval(trace, trace);
md->eval(path, path);
IF_VERBOSE(2, verbose_stream() << mk_pp(trace, m) << "\n";);
ast_smt_pp pp(m);
for (unsigned i = 0; i < m_solver.size(); ++i) {
pp.add_assumption(m_solver.get_formulas()[i]);
if (is_sat == l_false) {
return is_sat;
}
IF_VERBOSE(2, pp.display_smt2(verbose_stream(), m.mk_true()); verbose_stream() << "\n";);
m_answer = get_proof(md, to_app(trace), to_app(path));
is_sat = l_true;
m_solver.get_model(md);
mk_answer_nonlinear(md, trace, path);
return l_true;
}
return is_sat;
}
bool bmc::check_model_nonlinear(model_ref& md, expr* trace) {
expr_ref trace_val(m), eq(m);
md->eval(trace, trace_val);
eq = m.mk_eq(trace, trace_val);
m_solver.push();
m_solver.assert_expr(eq);
lbool is_sat = m_solver.check();
if (is_sat != l_false) {
m_solver.get_model(md);
}
m_solver.pop(1);
if (is_sat == l_false) {
IF_VERBOSE(1, verbose_stream() << "infeasible trace " << mk_pp(trace_val, m) << "\n";);
m_solver.assert_expr(m.mk_not(eq));
}
return is_sat != l_false;
}
void bmc::mk_answer_nonlinear(model_ref& md, expr_ref& trace, expr_ref& path) {
proof_ref pr(m);
IF_VERBOSE(2, model_smt2_pp(verbose_stream(), m, *md, 0););
md->eval(trace, trace);
md->eval(path, path);
IF_VERBOSE(2, verbose_stream() << mk_pp(trace, m) << "\n";
for (unsigned i = 0; i < m_solver.size(); ++i) {
verbose_stream() << mk_pp(m_solver.get_formulas()[i], m) << "\n";
});
m_answer = get_proof(md, to_app(trace), to_app(path));
}
void bmc::checkpoint() {
if (m_cancel) {
throw default_exception("bmc canceled");
@ -741,23 +764,15 @@ namespace datalog {
}
void bmc::display_certificate(std::ostream& out) const {
out << mk_pp(m_answer, m) << "\n";
}
void bmc::collect_statistics(statistics& st) const {
m_solver.collect_statistics(st);
}
expr_ref bmc::get_answer() {
return m_answer;
}
void bmc::collect_params(param_descrs& p) {
}
void bmc::updt_params() {
}
};

7
lib/dl_bmc_engine.h
View file

@ -66,6 +66,10 @@ namespace datalog {
bool is_linear() const;
lbool check_nonlinear();
bool check_model_nonlinear(model_ref& md, expr* trace);
void mk_answer_nonlinear(model_ref& md, expr_ref& trace, expr_ref& path);
func_decl_ref mk_predicate(func_decl* p);
@ -115,9 +119,6 @@ namespace datalog {
expr_ref get_answer();
static void collect_params(param_descrs& p);
void updt_params();
};
};

1
lib/pdr_context.cpp
View file

@ -386,6 +386,7 @@ namespace pdr {
tout << "is-reachable: " << head()->get_name() << " level: " << n.level() << "\n";
tout << mk_pp(n.state(), m) << "\n";);
ensure_level(n.level());
model_ref model;
prop_solver::scoped_level _sl(m_solver, n.level());
m_solver.set_core(core);
m_solver.set_model(&model);