mirror of
https://github.com/Z3Prover/z3
synced 2025-10-31 11:42:28 +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
|
|
@ -17,8 +17,13 @@ Author:
|
|||
#pragma once
|
||||
|
||||
#include "sat/smt/sat_th.h"
|
||||
#include "sat/smt/bv_ackerman.h"
|
||||
#include "ast/rewriter/bit_blaster/bit_blaster.h"
|
||||
|
||||
namespace euf {
|
||||
class solver;
|
||||
}
|
||||
|
||||
namespace bv {
|
||||
|
||||
class solver : public euf::th_euf_solver {
|
||||
|
|
@ -32,15 +37,42 @@ namespace bv {
|
|||
typedef std::pair<numeral, unsigned> value_sort_pair;
|
||||
typedef pair_hash<obj_hash<numeral>, unsigned_hash> value_sort_pair_hash;
|
||||
typedef map<value_sort_pair, theory_var, value_sort_pair_hash, default_eq<value_sort_pair> > value2var;
|
||||
typedef union_find<solver> th_union_find;
|
||||
typedef union_find<solver, euf::solver> bv_union_find;
|
||||
typedef std::pair<theory_var, unsigned> var_pos;
|
||||
|
||||
friend class ackerman;
|
||||
|
||||
struct stats {
|
||||
unsigned m_num_diseq_static, m_num_diseq_dynamic, m_num_bit2core, m_num_th2core_eq, m_num_conflicts;
|
||||
unsigned m_num_eq_dynamic;
|
||||
unsigned m_ackerman;
|
||||
void reset() { memset(this, 0, sizeof(stats)); }
|
||||
stats() { reset(); }
|
||||
};
|
||||
|
||||
struct bv_justification {
|
||||
enum kind_t { bv2bit, bit2bv };
|
||||
kind_t m_kind;
|
||||
theory_var m_v1;
|
||||
theory_var m_v2;
|
||||
sat::literal m_consequent;
|
||||
sat::literal m_antecedent;
|
||||
bv_justification(theory_var v1, theory_var v2, sat::literal c, sat::literal a) :
|
||||
m_kind(kind_t::bv2bit), m_v1(v1), m_v2(v2), m_consequent(c), m_antecedent(a) {}
|
||||
bv_justification(theory_var v1, theory_var v2):
|
||||
m_kind(kind_t::bit2bv), m_v1(v1), m_v2(v2) {}
|
||||
sat::ext_constraint_idx to_index() const {
|
||||
return sat::constraint_base::mem2base(this);
|
||||
}
|
||||
static bv_justification& from_index(size_t idx) {
|
||||
return *reinterpret_cast<bv_justification*>(sat::constraint_base::from_index(idx)->mem());
|
||||
}
|
||||
static size_t get_obj_size() { return sat::constraint_base::obj_size(sizeof(bv_justification)); }
|
||||
};
|
||||
|
||||
sat::justification mk_bv2bit_justification(theory_var v1, theory_var v2, sat::literal c, sat::literal a);
|
||||
sat::ext_justification_idx mk_bit2bv_justification(theory_var v1, theory_var v2);
|
||||
void log_drat(bv_justification const& c);
|
||||
|
||||
|
||||
/**
|
||||
\brief Structure used to store the position of a bitvector variable that
|
||||
|
|
@ -66,17 +98,31 @@ namespace bv {
|
|||
|
||||
typedef svector<zero_one_bit> zero_one_bits;
|
||||
|
||||
struct bit_atom;
|
||||
struct def_atom;
|
||||
class atom {
|
||||
public:
|
||||
virtual ~atom() {}
|
||||
virtual bool is_bit() const = 0;
|
||||
bit_atom& to_bit();
|
||||
def_atom& to_def();
|
||||
};
|
||||
|
||||
struct var_pos_occ {
|
||||
theory_var m_var;
|
||||
unsigned m_idx;
|
||||
var_pos m_vp;
|
||||
var_pos_occ * m_next;
|
||||
var_pos_occ(theory_var v = euf::null_theory_var, unsigned idx = 0, var_pos_occ * next = nullptr):m_var(v), m_idx(idx), m_next(next) {}
|
||||
var_pos_occ(theory_var v = euf::null_theory_var, unsigned idx = 0, var_pos_occ * next = nullptr):m_vp(v, idx), m_next(next) {}
|
||||
};
|
||||
|
||||
class var_pos_it {
|
||||
var_pos_occ* m_first;
|
||||
public:
|
||||
var_pos_it(var_pos_occ* c) : m_first(c) {}
|
||||
var_pos operator*() { return m_first->m_vp; }
|
||||
var_pos_it& operator++() { m_first = m_first->m_next; return *this; }
|
||||
var_pos_it operator++(int) { var_pos_it tmp = *this; ++* this; return tmp; }
|
||||
bool operator==(var_pos_it const& other) const { return m_first == other.m_first; }
|
||||
bool operator!=(var_pos_it const& other) const { return !(*this == other); }
|
||||
};
|
||||
|
||||
struct bit_atom : public atom {
|
||||
|
|
@ -84,44 +130,51 @@ namespace bv {
|
|||
bit_atom():m_occs(nullptr) {}
|
||||
~bit_atom() override {}
|
||||
bool is_bit() const override { return true; }
|
||||
var_pos_it begin() const { return var_pos_it(m_occs); }
|
||||
var_pos_it end() const { return var_pos_it(nullptr); }
|
||||
};
|
||||
|
||||
struct le_atom : public atom {
|
||||
struct def_atom : public atom {
|
||||
literal m_var;
|
||||
literal m_def;
|
||||
le_atom(literal v, literal d):m_var(v), m_def(d) {}
|
||||
~le_atom() override {}
|
||||
def_atom(literal v, literal d):m_var(v), m_def(d) {}
|
||||
~def_atom() override {}
|
||||
bool is_bit() const override { return false; }
|
||||
};
|
||||
|
||||
friend class add_var_pos_trail;
|
||||
friend class mk_atom_trail;
|
||||
class bit_trail;
|
||||
class add_var_pos_trail;
|
||||
class mk_atom_trail;
|
||||
typedef ptr_vector<atom> bool_var2atom;
|
||||
|
||||
bv_util bv;
|
||||
arith_util m_autil;
|
||||
stats m_stats;
|
||||
ackerman m_ackerman;
|
||||
bit_blaster m_bb;
|
||||
th_union_find m_find;
|
||||
bv_union_find m_find;
|
||||
vector<literal_vector> m_bits; // per var, the bits of a given variable.
|
||||
ptr_vector<expr> m_bits_expr;
|
||||
svector<unsigned> m_wpos; // per var, watch position for fixed variable detection.
|
||||
unsigned_vector m_wpos; // per var, watch position for fixed variable detection.
|
||||
vector<zero_one_bits> m_zero_one_bits; // per var, see comment in the struct zero_one_bit
|
||||
bool_var2atom m_bool_var2atom;
|
||||
value2var m_fixed_var_table;
|
||||
mutable vector<rational> m_power2;
|
||||
literal_vector m_tmp_literals;
|
||||
svector<var_pos> m_prop_queue;
|
||||
unsigned_vector m_prop_queue_lim;
|
||||
unsigned m_prop_queue_head { 0 };
|
||||
|
||||
|
||||
sat::solver* m_solver;
|
||||
sat::solver& s() { return *m_solver; }
|
||||
|
||||
// internalize:
|
||||
|
||||
// internalize
|
||||
void insert_bv2a(bool_var bv, atom * a) { m_bool_var2atom.setx(bv, a, 0); }
|
||||
void erase_bv2a(bool_var bv) { m_bool_var2atom[bv] = 0; }
|
||||
atom * get_bv2a(bool_var bv) const { return m_bool_var2atom.get(bv, 0); }
|
||||
|
||||
sat::literal false_literal;
|
||||
sat::literal true_literal;
|
||||
bool visit(expr* e) override;
|
||||
bool visited(expr* e) override;
|
||||
bool post_visit(expr* e, bool sign, bool root) override { return true; }
|
||||
bool post_visit(expr* e, bool sign, bool root) override;
|
||||
unsigned get_bv_size(euf::enode* n);
|
||||
unsigned get_bv_size(theory_var v);
|
||||
theory_var get_var(euf::enode* n);
|
||||
|
|
@ -129,66 +182,55 @@ namespace bv {
|
|||
inline theory_var get_arg_var(euf::enode* n, unsigned idx);
|
||||
void get_bits(theory_var v, expr_ref_vector& r);
|
||||
void get_bits(euf::enode* n, expr_ref_vector& r);
|
||||
void get_arg_bits(euf::enode* n, unsigned idx, expr_ref_vector& r);
|
||||
void get_arg_bits(app* n, unsigned idx, expr_ref_vector& r);
|
||||
euf::enode* mk_enode(expr* n, ptr_vector<euf::enode> const& args);
|
||||
void fixed_var_eh(theory_var v);
|
||||
|
||||
bool is_bv(theory_var v) const { return bv.is_bv(var2expr(v)); }
|
||||
sat::status status() const { return sat::status::th(m_is_redundant, get_id()); }
|
||||
void add_unit(sat::literal lit);
|
||||
void register_true_false_bit(theory_var v, unsigned i);
|
||||
void add_bit(theory_var v, sat::literal lit);
|
||||
void init_bits(euf::enode * n, expr_ref_vector const & bits);
|
||||
void set_bit_eh(theory_var v, literal l, unsigned idx);
|
||||
void init_bits(expr* e, expr_ref_vector const & bits);
|
||||
void mk_bits(theory_var v);
|
||||
expr_ref mk_bit2bool(expr* b, unsigned idx);
|
||||
void internalize_num(app * n, theory_var v);
|
||||
void internalize_add(app * n);
|
||||
void internalize_sub(app * n);
|
||||
void internalize_mul(app * n);
|
||||
void internalize_udiv(app * n);
|
||||
void internalize_sdiv(app * n);
|
||||
void internalize_urem(app * n);
|
||||
void internalize_srem(app * n);
|
||||
void internalize_smod(app * n);
|
||||
void internalize_shl(app * n);
|
||||
void internalize_lshr(app * n);
|
||||
void internalize_ashr(app * n);
|
||||
void internalize_ext_rotate_left(app * n);
|
||||
void internalize_ext_rotate_right(app * n);
|
||||
void internalize_and(app * n);
|
||||
void internalize_or(app * n);
|
||||
void internalize_not(app * n);
|
||||
void internalize_nand(app * n);
|
||||
void internalize_nor(app * n);
|
||||
void internalize_xor(app * n);
|
||||
void internalize_xnor(app * n);
|
||||
void internalize_concat(app * n);
|
||||
void internalize_sign_extend(app * n);
|
||||
void internalize_zero_extend(app * n);
|
||||
void internalize_extract(app * n);
|
||||
void internalize_redand(app * n);
|
||||
void internalize_redor(app * n);
|
||||
void internalize_comp(app * n);
|
||||
void internalize_rotate_left(app * n);
|
||||
void internalize_rotate_right(app * n);
|
||||
void add_def(sat::literal def, sat::literal l);
|
||||
void internalize_unary(app* n, std::function<void(unsigned, expr* const*, expr_ref_vector&)>& fn);
|
||||
void internalize_binary(app* n, std::function<void(unsigned, expr* const*, expr* const*, expr_ref_vector&)>& fn);
|
||||
void internalize_ac_binary(app* n, std::function<void(unsigned, expr* const*, expr* const*, expr_ref_vector&)>& fn);
|
||||
void internalize_par_unary(app* n, std::function<void(unsigned, expr* const*, unsigned p, expr_ref_vector&)>& fn);
|
||||
void internalize_novfl(app* n, std::function<void(unsigned, expr* const*, expr* const*, expr_ref&)>& fn);
|
||||
void internalize_num(app * n, theory_var v);
|
||||
void internalize_concat(app * n);
|
||||
void internalize_bv2int(app* n);
|
||||
void internalize_int2bv(app* n);
|
||||
void internalize_mkbv(app* n);
|
||||
void internalize_umul_no_overflow(app *n);
|
||||
void internalize_smul_no_overflow(app *n);
|
||||
void internalize_smul_no_underflow(app *n);
|
||||
|
||||
void internalize_xor3(app* n);
|
||||
void internalize_carry(app* n);
|
||||
void internalize_sub(app* n);
|
||||
void internalize_extract(app* n);
|
||||
void internalize_bit2bool(app* n);
|
||||
template<bool Signed>
|
||||
void internalize_le(app* n);
|
||||
void assert_bv2int_axiom(app * n);
|
||||
void assert_int2bv_axiom(app* n);
|
||||
void assert_ackerman(theory_var v1, theory_var v2);
|
||||
|
||||
// solving
|
||||
theory_var find(theory_var v) const { return m_find.find(v); }
|
||||
void find_wpos(theory_var v);
|
||||
void find_new_diseq_axioms(var_pos_occ* occs, theory_var v, unsigned idx);
|
||||
void find_new_diseq_axioms(bit_atom& a, theory_var v, unsigned idx);
|
||||
void mk_new_diseq_axiom(theory_var v1, theory_var v2, unsigned idx);
|
||||
bool get_fixed_value(theory_var v, numeral& result) const;
|
||||
void add_fixed_eq(theory_var v1, theory_var v2);
|
||||
svector<theory_var> m_merge_aux[2]; //!< auxiliary vector used in merge_zero_one_bits
|
||||
bool merge_zero_one_bits(theory_var r1, theory_var r2);
|
||||
void assign_bit(literal consequent, theory_var v1, theory_var v2, unsigned idx, literal antecedent, bool propagate_eqc);
|
||||
void propagate_bits(var_pos entry);
|
||||
numeral const& power2(unsigned i) const;
|
||||
|
||||
|
||||
// invariants
|
||||
bool check_zero_one_bits(theory_var v);
|
||||
|
||||
public:
|
||||
solver(euf::solver& ctx);
|
||||
solver(euf::solver& ctx, theory_id id);
|
||||
~solver() override {}
|
||||
void set_solver(sat::solver* s) override { m_solver = s; }
|
||||
void set_lookahead(sat::lookahead* s) override { }
|
||||
|
|
@ -197,19 +239,22 @@ namespace bv {
|
|||
bool is_extended_binary(sat::ext_justification_idx idx, literal_vector& r) override;
|
||||
bool is_external(bool_var v) override;
|
||||
bool propagate(literal l, sat::ext_constraint_idx idx) override;
|
||||
void get_antecedents(literal l, sat::ext_justification_idx idx, literal_vector & r) override;
|
||||
void get_antecedents(literal l, sat::ext_justification_idx idx, literal_vector & r, bool probing) override;
|
||||
void asserted(literal l) override;
|
||||
sat::check_result check() override;
|
||||
void push() override;
|
||||
void pop(unsigned n) override;
|
||||
void pre_simplify() override;
|
||||
void simplify() override;
|
||||
bool set_root(literal l, literal r) override;
|
||||
void flush_roots() override;
|
||||
void clauses_modifed() override;
|
||||
lbool get_phase(bool_var v) override;
|
||||
std::ostream& display(std::ostream& out) const override;
|
||||
std::ostream& display_justification(std::ostream& out, sat::ext_justification_idx idx) const override;
|
||||
std::ostream& display_constraint(std::ostream& out, sat::ext_constraint_idx idx) const override;
|
||||
void collect_statistics(statistics& st) const override;
|
||||
euf::th_solver* fresh(sat::solver* s, euf::solver& ctx) override;
|
||||
extension* copy(sat::solver* s) override;
|
||||
void find_mutexes(literal_vector& lits, vector<literal_vector> & mutexes) override {}
|
||||
void gc() override {}
|
||||
|
|
@ -220,18 +265,31 @@ namespace bv {
|
|||
bool check_model(sat::model const& m) const override;
|
||||
unsigned max_var(unsigned w) const override;
|
||||
|
||||
void new_eq_eh(euf::th_eq const& eq) override;
|
||||
bool unit_propagate() override;
|
||||
|
||||
void add_value(euf::enode* n, expr_ref_vector& values) override;
|
||||
|
||||
bool extract_pb(std::function<void(unsigned sz, literal const* c, unsigned k)>& card,
|
||||
std::function<void(unsigned sz, literal const* c, unsigned const* coeffs, unsigned k)>& pb) override { return false; }
|
||||
|
||||
bool to_formulas(std::function<expr_ref(sat::literal)>& l2e, expr_ref_vector& fmls) override { return false; }
|
||||
sat::literal internalize(expr* e, bool sign, bool root, bool learned) override;
|
||||
void internalize(expr* e, bool redundant) override;
|
||||
euf::theory_var mk_var(euf::enode* n) override;
|
||||
void apply_sort_cnstr(euf::enode * n, sort * s) override;
|
||||
|
||||
|
||||
void merge_eh(theory_var, theory_var, theory_var v1, theory_var v2);
|
||||
void after_merge_eh(theory_var r1, theory_var r2, theory_var v1, theory_var v2) { SASSERT(check_zero_one_bits(r1)); }
|
||||
void unmerge_eh(theory_var v1, theory_var v2);
|
||||
trail_stack<euf::solver>& get_trail_stack();
|
||||
|
||||
// disagnostics
|
||||
std::ostream& display(std::ostream& out, theory_var v) const;
|
||||
std::ostream& display(std::ostream& out, theory_var v) const;
|
||||
typedef std::pair<solver const*, theory_var> pp_var;
|
||||
pp_var pp(theory_var v) const { return pp_var(this, v); }
|
||||
|
||||
};
|
||||
|
||||
inline std::ostream& operator<<(std::ostream& out, solver::pp_var const& p) { return p.first->display(out, p.second); }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue