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

slicing: use proper bv sorts for expressions

Browse source
This commit is contained in:
Jakob Rath 2023-07-19 08:54:11 +02:00
parent 66f813154b
commit 970e68c70e
2 changed files with 13 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/math/polysat/slicing.cpp
View file

@ -102,15 +102,10 @@ namespace polysat {
slicing::slicing(solver& s): slicing::slicing(solver& s):
m_solver(s), m_solver(s),
m_slice_sort(m_ast),
m_embed_decls(m_ast),
m_concat_decls(m_ast),
m_egraph(m_ast) m_egraph(m_ast)
{ {
reg_decl_plugins(m_ast); reg_decl_plugins(m_ast);
// m_ast.register_plugin(symbol("bv"), alloc(bv_decl_plugin));
m_bv = alloc(bv_util, m_ast); m_bv = alloc(bv_util, m_ast);
m_slice_sort = m_ast.mk_uninterpreted_sort(symbol("slice"));
m_egraph.set_display_justification(display_dep); m_egraph.set_display_justification(display_dep);
} }
@ -123,27 +118,16 @@ namespace polysat {
return i.is_slice() ? i : info(i.slice); return i.is_slice() ? i : info(i.slice);
} }
func_decl* slicing::get_embed_decl(unsigned bit_width) { func_decl* slicing::mk_concat_decl(ptr_vector<expr> const& args) {
func_decl* decl = m_embed_decls.get(bit_width, nullptr); SASSERT(args.size() >= 2);
if (!decl) { ptr_vector<sort> domain;
decl = m_ast.mk_func_decl(symbol("embed"), m_bv->mk_sort(bit_width), m_slice_sort); unsigned sz = 0;
m_embed_decls.setx(bit_width, decl); for (expr* e : args) {
domain.push_back(e->get_sort());
sz += m_bv->get_bv_size(e);
} }
return decl; sort* range = m_bv->mk_sort(sz);
} return m_ast.mk_func_decl(symbol("slice-concat"), domain.size(), domain.data(), range);
func_decl* slicing::get_concat_decl(unsigned arity) {
SASSERT(arity >= 2);
func_decl* decl = m_concat_decls.get(arity, nullptr);
if (!decl) {
ptr_vector<sort> domain;
for (unsigned i = arity; i-- > 0; )
domain.push_back(m_slice_sort);
SASSERT_EQ(arity, domain.size());
decl = m_ast.mk_func_decl(symbol("slice-concat"), arity, domain.data(), m_slice_sort);
m_concat_decls.setx(arity, decl);
}
return decl;
} }
void slicing::push_scope() { void slicing::push_scope() {
@ -207,8 +191,7 @@ namespace polysat {
} }
slicing::enode* slicing::alloc_slice(unsigned width, pvar var) { slicing::enode* slicing::alloc_slice(unsigned width, pvar var) {
// app* a = m_ast.mk_fresh_const("s", m_bv->mk_sort(width), false); app* a = m_ast.mk_fresh_const("s", m_bv->mk_sort(width), false);
app* a = m_ast.mk_fresh_const("s", m_slice_sort, false);
return alloc_enode(a, 0, nullptr, width, var); return alloc_enode(a, 0, nullptr, width, var);
} }
@ -221,7 +204,7 @@ namespace polysat {
ptr_vector<expr> args; ptr_vector<expr> args;
for (enode* n : base) for (enode* n : base)
args.push_back(n->get_expr()); args.push_back(n->get_expr());
app* a = m_ast.mk_app(get_concat_decl(args.size()), args); app* a = m_ast.mk_app(mk_concat_decl(args), args);
enode* concat = find_or_alloc_enode(a, base.size(), base.data(), width(sv), null_var); enode* concat = find_or_alloc_enode(a, base.size(), base.data(), width(sv), null_var);
base.clear(); base.clear();
m_egraph.merge(sv, concat, encode_dep(dep_t())); m_egraph.merge(sv, concat, encode_dep(dep_t()));
@ -363,7 +346,6 @@ namespace polysat {
slicing::enode* slicing::mk_value_slice(rational const& val, unsigned bit_width) { slicing::enode* slicing::mk_value_slice(rational const& val, unsigned bit_width) {
SASSERT(0 <= val && val < rational::power_of_two(bit_width)); SASSERT(0 <= val && val < rational::power_of_two(bit_width));
app* a = m_bv->mk_numeral(val, bit_width); app* a = m_bv->mk_numeral(val, bit_width);
a = m_ast.mk_app(get_embed_decl(bit_width), a); // adjust sort
enode* s = find_or_alloc_enode(a, 0, nullptr, bit_width, null_var); enode* s = find_or_alloc_enode(a, 0, nullptr, bit_width, null_var);
s->mark_interpreted(); s->mark_interpreted();
SASSERT(s->interpreted()); SASSERT(s->interpreted());
@ -379,7 +361,7 @@ namespace polysat {
} }
bool slicing::try_get_value(enode* s, rational& val) const { bool slicing::try_get_value(enode* s, rational& val) const {
return m_bv->is_numeral(s->get_app()->get_arg(0), val); return m_bv->is_numeral(s->get_expr(), val);
} }
void slicing::begin_explain() { void slicing::begin_explain() {

6
src/math/polysat/slicing.h
View file

@ -90,9 +90,6 @@ namespace polysat {
ast_manager m_ast; ast_manager m_ast;
scoped_ptr<bv_util> m_bv; scoped_ptr<bv_util> m_bv;
sort_ref m_slice_sort;
func_decl_ref_vector m_embed_decls;
func_decl_ref_vector m_concat_decls;
euf::egraph m_egraph; euf::egraph m_egraph;
slice_info_vector m_info; // indexed by enode::get_id() slice_info_vector m_info; // indexed by enode::get_id()
@ -104,8 +101,7 @@ namespace polysat {
void update_var_congruences(); void update_var_congruences();
void add_congruence(pvar v); void add_congruence(pvar v);
func_decl* get_embed_decl(unsigned bit_width); func_decl* mk_concat_decl(ptr_vector<expr> const& args);
func_decl* get_concat_decl(unsigned arity);
static void* encode_dep(dep_t d); static void* encode_dep(dep_t d);
static dep_t decode_dep(void* d); static dep_t decode_dep(void* d);