mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-05-09 16:55:47 +00:00
Code Activity

fix pb rewriter

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-03-12 11:22:05 -07:00
parent f04e805fa4
commit e7d43ed516
16 changed files with 215 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/tactic/bv/bit_blaster_model_converter.cpp
View file

@ -31,10 +31,15 @@ template<bool TO_BOOL>
struct bit_blaster_model_converter : public model_converter {
func_decl_ref_vector m_vars;
expr_ref_vector m_bits;
func_decl_ref_vector m_newbits;
ast_manager & m() const { return m_vars.get_manager(); }
bit_blaster_model_converter(ast_manager & m, obj_map<func_decl, expr*> const & const2bits):m_vars(m), m_bits(m) {
bit_blaster_model_converter(
ast_manager & m,
obj_map<func_decl, expr*> const & const2bits,
ptr_vector<func_decl> const& newbits):
m_vars(m), m_bits(m), m_newbits(m) {
for (auto const& kv : const2bits) {
func_decl * v = kv.m_key;
expr * bits = kv.m_value;
@ -43,6 +48,8 @@ struct bit_blaster_model_converter : public model_converter {
m_vars.push_back(v);
m_bits.push_back(bits);
}
for (func_decl* f : newbits)
m_newbits.push_back(f);
}
virtual ~bit_blaster_model_converter() {
@ -200,10 +207,11 @@ struct bit_blaster_model_converter : public model_converter {
}
void display(std::ostream & out) override {
for (func_decl * f : m_newbits)
display_del(out, f);
unsigned sz = m_vars.size();
for (unsigned i = 0; i < sz; i++) {
for (unsigned i = 0; i < sz; i++)
display_add(out, m(), m_vars.get(i), m_bits.get(i));
}
}
void get_units(obj_map<expr, bool>& units) override {
@ -211,7 +219,7 @@ struct bit_blaster_model_converter : public model_converter {
}
protected:
bit_blaster_model_converter(ast_manager & m):m_vars(m), m_bits(m) { }
bit_blaster_model_converter(ast_manager & m):m_vars(m), m_bits(m), m_newbits(m) { }
public:
model_converter * translate(ast_translation & translator) override {
@ -220,16 +228,18 @@ public:
res->m_vars.push_back(translator(v));
for (expr* b : m_bits)
res->m_bits.push_back(translator(b));
for (func_decl* f : m_newbits)
res->m_newbits.push_back(translator(f));
return res;
}
};
model_converter * mk_bit_blaster_model_converter(ast_manager & m, obj_map<func_decl, expr*> const & const2bits) {
return const2bits.empty() ? nullptr : alloc(bit_blaster_model_converter<true>, m, const2bits);
model_converter * mk_bit_blaster_model_converter(ast_manager & m, obj_map<func_decl, expr*> const & const2bits, ptr_vector<func_decl> const& newbits) {
return const2bits.empty() ? nullptr : alloc(bit_blaster_model_converter<true>, m, const2bits, newbits);
}
model_converter * mk_bv1_blaster_model_converter(ast_manager & m, obj_map<func_decl, expr*> const & const2bits) {
return const2bits.empty() ? nullptr : alloc(bit_blaster_model_converter<false>, m, const2bits);
model_converter * mk_bv1_blaster_model_converter(ast_manager & m, obj_map<func_decl, expr*> const & const2bits, ptr_vector<func_decl> const& newbits) {
return const2bits.empty() ? nullptr : alloc(bit_blaster_model_converter<false>, m, const2bits, newbits);
}

4
src/tactic/bv/bit_blaster_model_converter.h
View file

@ -21,7 +21,7 @@ Notes:
#include "tactic/model_converter.h"
model_converter * mk_bit_blaster_model_converter(ast_manager & m, obj_map<func_decl, expr*> const & const2bits);
model_converter * mk_bv1_blaster_model_converter(ast_manager & m, obj_map<func_decl, expr*> const & const2bits);
model_converter * mk_bit_blaster_model_converter(ast_manager & m, obj_map<func_decl, expr*> const & const2bits, ptr_vector<func_decl> const& newbits);
model_converter * mk_bv1_blaster_model_converter(ast_manager & m, obj_map<func_decl, expr*> const & const2bits, ptr_vector<func_decl> const& newbits);
#endif

5
src/tactic/bv/bit_blaster_tactic.cpp
View file

@ -86,8 +86,9 @@ class bit_blaster_tactic : public tactic {
if (change && g->models_enabled()) {
obj_map<func_decl, expr*> const2bits;
m_rewriter->end_rewrite(const2bits);
g->add(mk_bit_blaster_model_converter(m(), const2bits));
ptr_vector<func_decl> newbits;
m_rewriter->end_rewrite(const2bits, newbits);
g->add(mk_bit_blaster_model_converter(m(), const2bits, newbits));
}
g->inc_depth();
result.push_back(g.get());

4
src/tactic/bv/bv1_blaster_tactic.cpp
View file

@ -36,6 +36,7 @@ class bv1_blaster_tactic : public tactic {
ast_manager & m_manager;
bv_util m_util;
obj_map<func_decl, expr*> m_const2bits;
ptr_vector<func_decl> m_newbits;
expr_ref_vector m_saved;
expr_ref m_bit1;
expr_ref m_bit0;
@ -107,6 +108,7 @@ class bv1_blaster_tactic : public tactic {
ptr_buffer<expr> bits;
for (unsigned i = 0; i < bv_size; i++) {
bits.push_back(m().mk_fresh_const(0, b));
m_newbits.push_back(to_app(bits.back())->get_decl());
}
r = butil().mk_concat(bits.size(), bits.c_ptr());
m_saved.push_back(r);
@ -405,7 +407,7 @@ class bv1_blaster_tactic : public tactic {
}
if (g->models_enabled())
g->add(mk_bv1_blaster_model_converter(m(), m_rw.cfg().m_const2bits));
g->add(mk_bv1_blaster_model_converter(m(), m_rw.cfg().m_const2bits, m_rw.cfg().m_newbits));
g->inc_depth();
result.push_back(g.get());
m_rw.cfg().cleanup();