mirror of
https://github.com/Z3Prover/z3
synced 2025-04-24 01:25:31 +00:00
running updates to bv_solver (#4674)
* na Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * na Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * na Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * na Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * na Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * na Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * na Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * na Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * dbg Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * bv Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * drat and fresh Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * move ackerman functionality Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * na Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * debugability Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * towards debugability Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * missing file Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * na Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * na Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * remove csp Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner
GitHub
parent
4d1a2a2784
commit
d02b0cde7a
63 changed files with 3060 additions and 3095 deletions
|
|
@ -20,6 +20,7 @@ endforeach()
|
|||
add_executable(shell
|
||||
datalog_frontend.cpp
|
||||
dimacs_frontend.cpp
|
||||
drat_frontend.cpp
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/gparams_register_modules.cpp"
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/install_tactic.cpp"
|
||||
main.cpp
|
||||
|
|
|
|||
197
src/shell/drat_frontend.cpp
Normal file
197
src/shell/drat_frontend.cpp
Normal file
|
|
@ -0,0 +1,197 @@
|
|||
/*++
|
||||
Copyright (c) 2020 Microsoft Corporation
|
||||
|
||||
--*/
|
||||
|
||||
#include<iostream>
|
||||
#include<fstream>
|
||||
#include "util/memory_manager.h"
|
||||
#include "util/statistics.h"
|
||||
#include "sat/dimacs.h"
|
||||
#include "sat/sat_solver.h"
|
||||
#include "sat/sat_drat.h"
|
||||
#include "smt/smt_solver.h"
|
||||
#include "shell/drat_frontend.h"
|
||||
#include "parsers/smt2/smt2parser.h"
|
||||
#include "cmd_context/cmd_context.h"
|
||||
|
||||
class smt_checker {
|
||||
ast_manager& m;
|
||||
expr_ref_vector const& m_b2e;
|
||||
expr_ref_vector m_fresh_exprs;
|
||||
expr_ref_vector m_core;
|
||||
params_ref m_params;
|
||||
scoped_ptr<solver> m_solver;
|
||||
|
||||
expr* fresh(expr* e) {
|
||||
unsigned i = e->get_id();
|
||||
m_fresh_exprs.reserve(i + 1);
|
||||
expr* r = m_fresh_exprs.get(i);
|
||||
if (!r) {
|
||||
r = m.mk_fresh_const("sk", m.get_sort(e));
|
||||
m_fresh_exprs[i] = r;
|
||||
}
|
||||
return r;
|
||||
}
|
||||
|
||||
expr_ref define(expr* e, unsigned depth) {
|
||||
expr_ref r(fresh(e), m);
|
||||
m_core.push_back(m.mk_eq(r, e));
|
||||
if (depth == 0)
|
||||
return r;
|
||||
r = e;
|
||||
if (is_app(e)) {
|
||||
expr_ref_vector args(m);
|
||||
for (expr* arg : *to_app(e))
|
||||
args.push_back(define(arg, depth - 1));
|
||||
r = m.mk_app(to_app(e)->get_decl(), args.size(), args.c_ptr());
|
||||
}
|
||||
return r;
|
||||
}
|
||||
|
||||
void unfold1(sat::literal_vector const& lits) {
|
||||
m_core.reset();
|
||||
for (sat::literal lit : lits) {
|
||||
expr* e = m_b2e[lit.var()];
|
||||
expr_ref fml = define(e, 2);
|
||||
if (!lit.sign())
|
||||
fml = m.mk_not(fml);
|
||||
m_core.push_back(fml);
|
||||
}
|
||||
}
|
||||
public:
|
||||
smt_checker(expr_ref_vector const& b2e):
|
||||
m(b2e.m()), m_b2e(b2e), m_fresh_exprs(m), m_core(m) {
|
||||
m_solver = mk_smt_solver(m, m_params, symbol());
|
||||
}
|
||||
|
||||
void check_shallow(sat::literal_vector const& lits) {
|
||||
unfold1(lits);
|
||||
m_solver->push();
|
||||
for (auto* c : m_core)
|
||||
m_solver->assert_expr(c);
|
||||
lbool is_sat = m_solver->check_sat();
|
||||
m_solver->pop(1);
|
||||
if (is_sat == l_true) {
|
||||
std::cout << "did not verify: " << lits << "\n" << m_core << "\n";
|
||||
for (sat::literal lit : lits) {
|
||||
expr_ref e(m_b2e[lit.var()], m);
|
||||
if (lit.sign())
|
||||
e = m.mk_not(e);
|
||||
std::cout << e << " ";
|
||||
}
|
||||
std::cout << "\n";
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
static void verify_smt(char const* drat_file, char const* smt_file) {
|
||||
cmd_context ctx;
|
||||
ctx.set_ignore_check(true);
|
||||
ctx.set_regular_stream(std::cerr);
|
||||
ctx.set_solver_factory(mk_smt_strategic_solver_factory());
|
||||
if (smt_file) {
|
||||
std::ifstream smt_in(smt_file);
|
||||
if (!parse_smt2_commands(ctx, smt_in)) {
|
||||
std::cerr << "could not read file " << smt_file << "\n";
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
std::ifstream ins(drat_file);
|
||||
dimacs::drat_parser drat(ins, std::cerr);
|
||||
std::function<int(char const* read_theory)> read_theory = [&](char const* r) {
|
||||
if (strcmp(r, "euf") == 0)
|
||||
return 0;
|
||||
return ctx.m().mk_family_id(symbol(r));
|
||||
};
|
||||
drat.set_read_theory(read_theory);
|
||||
params_ref p;
|
||||
reslimit lim;
|
||||
p.set_bool("drat.check_unsat", true);
|
||||
sat::solver solver(p, lim);
|
||||
sat::drat drat_checker(solver);
|
||||
drat_checker.updt_config();
|
||||
|
||||
expr_ref_vector bool_var2expr(ctx.m());
|
||||
expr_ref_vector exprs(ctx.m()), args(ctx.m());
|
||||
func_decl* f = nullptr;
|
||||
ptr_vector<sort> sorts;
|
||||
|
||||
smt_checker checker(bool_var2expr);
|
||||
|
||||
auto check_smt = [&](dimacs::drat_record const& r) {
|
||||
auto const& st = r.m_status;
|
||||
if (st.is_input())
|
||||
;
|
||||
else if (st.is_sat() && st.is_asserted()) {
|
||||
std::cout << "Tseitin tautology " << r;
|
||||
checker.check_shallow(r.m_lits);
|
||||
}
|
||||
else if (st.is_sat())
|
||||
;
|
||||
else if (st.is_deleted())
|
||||
;
|
||||
else {
|
||||
std::cout << "check smt " << r;
|
||||
checker.check_shallow(r.m_lits);
|
||||
// TBD: shallow check may fail because it doesn't include
|
||||
// all RUP units, whish are sometimes required.
|
||||
}
|
||||
};
|
||||
|
||||
for (auto const& r : drat) {
|
||||
std::cout << r;
|
||||
std::cout.flush();
|
||||
switch (r.m_tag) {
|
||||
case dimacs::drat_record::tag_t::is_clause:
|
||||
for (sat::literal lit : r.m_lits)
|
||||
while (lit.var() >= solver.num_vars())
|
||||
solver.mk_var(true);
|
||||
drat_checker.add(r.m_lits, r.m_status);
|
||||
check_smt(r);
|
||||
break;
|
||||
case dimacs::drat_record::tag_t::is_node:
|
||||
args.reset();
|
||||
sorts.reset();
|
||||
for (auto n : r.m_args) {
|
||||
args.push_back(exprs.get(n));
|
||||
sorts.push_back(ctx.m().get_sort(args.back()));
|
||||
}
|
||||
if (r.m_name[0] == '(') {
|
||||
std::cout << "parsing sexprs is TBD\n";
|
||||
exit(0);
|
||||
}
|
||||
f = ctx.find_func_decl(symbol(r.m_name.c_str()), 0, nullptr, args.size(), sorts.c_ptr(), nullptr);
|
||||
if (!f) {
|
||||
std::cout << "could not find function\n";
|
||||
exit(0);
|
||||
}
|
||||
exprs.reserve(r.m_node_id+1);
|
||||
exprs.set(r.m_node_id, ctx.m().mk_app(f, args.size(), args.c_ptr()));
|
||||
break;
|
||||
case dimacs::drat_record::is_bool_def:
|
||||
bool_var2expr.reserve(r.m_node_id+1);
|
||||
bool_var2expr.set(r.m_node_id, exprs.get(r.m_args[0]));
|
||||
break;
|
||||
default:
|
||||
UNREACHABLE();
|
||||
break;
|
||||
}
|
||||
}
|
||||
statistics st;
|
||||
drat_checker.collect_statistics(st);
|
||||
std::cout << st << "\n";
|
||||
}
|
||||
|
||||
|
||||
unsigned read_drat(char const* drat_file, char const* problem_file) {
|
||||
if (!problem_file) {
|
||||
std::cerr << "No smt2 file provided to checker\n";
|
||||
return -1;
|
||||
}
|
||||
verify_smt(drat_file, problem_file);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
8
src/shell/drat_frontend.h
Normal file
8
src/shell/drat_frontend.h
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
/*++
|
||||
Copyright (c) 2011 Microsoft Corporation
|
||||
--*/
|
||||
#pragma once
|
||||
|
||||
unsigned read_drat(char const * drat_file, char const* problem_file);
|
||||
|
||||
|
||||
|
|
@ -38,15 +38,17 @@ Revision History:
|
|||
#include "util/env_params.h"
|
||||
#include "util/file_path.h"
|
||||
#include "shell/lp_frontend.h"
|
||||
#include "shell/drat_frontend.h"
|
||||
|
||||
#if defined( _WINDOWS ) && defined( __MINGW32__ ) && ( defined( __GNUG__ ) || defined( __clang__ ) )
|
||||
#include <crtdbg.h>
|
||||
#endif
|
||||
|
||||
typedef enum { IN_UNSPECIFIED, IN_SMTLIB_2, IN_DATALOG, IN_DIMACS, IN_WCNF, IN_OPB, IN_LP, IN_Z3_LOG, IN_MPS } input_kind;
|
||||
typedef enum { IN_UNSPECIFIED, IN_SMTLIB_2, IN_DATALOG, IN_DIMACS, IN_WCNF, IN_OPB, IN_LP, IN_Z3_LOG, IN_MPS, IN_DRAT } input_kind;
|
||||
|
||||
static std::string g_aux_input_file;
|
||||
static char const * g_input_file = nullptr;
|
||||
static char const * g_drat_input_file = nullptr;
|
||||
static bool g_standard_input = false;
|
||||
static input_kind g_input_kind = IN_UNSPECIFIED;
|
||||
bool g_display_statistics = false;
|
||||
|
|
@ -301,12 +303,14 @@ static void parse_cmd_line_args(int argc, char ** argv) {
|
|||
gparams::set(key, value);
|
||||
}
|
||||
else {
|
||||
if (g_input_file) {
|
||||
if (get_extension(arg) && strcmp(get_extension(arg), "drat") == 0) {
|
||||
g_input_kind = IN_DRAT;
|
||||
g_drat_input_file = arg;
|
||||
}
|
||||
else if (g_input_file)
|
||||
warning_msg("input file was already specified.");
|
||||
}
|
||||
else {
|
||||
else
|
||||
g_input_file = arg;
|
||||
}
|
||||
}
|
||||
i++;
|
||||
}
|
||||
|
|
@ -361,7 +365,7 @@ int STD_CALL main(int argc, char ** argv) {
|
|||
g_input_kind = IN_MPS;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
switch (g_input_kind) {
|
||||
case IN_SMTLIB_2:
|
||||
memory::exit_when_out_of_memory(true, "(error \"out of memory\")");
|
||||
|
|
@ -388,6 +392,9 @@ int STD_CALL main(int argc, char ** argv) {
|
|||
case IN_MPS:
|
||||
return_value = read_mps_file(g_input_file);
|
||||
break;
|
||||
case IN_DRAT:
|
||||
return_value = read_drat(g_drat_input_file, g_input_file);
|
||||
break;
|
||||
default:
|
||||
UNREACHABLE();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
/*++
|
||||
Copyright (c) 2015 Microsoft Corporation
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue