mirror of
https://github.com/Z3Prover/z3
synced 2025-05-09 00:35:47 +00:00
Merge branch 'master' of https://github.com/Z3Prover/z3
This commit is contained in:
Nikolaj Bjorner
commit
69ccc02931
27 changed files with 849 additions and 407 deletions
|
|
@ -85,8 +85,63 @@ namespace smt {
|
|||
}
|
||||
|
||||
void theory_fpa::fpa2bv_converter_wrapped::mk_uninterpreted_function(func_decl * f, unsigned num, expr * const * args, expr_ref & result) {
|
||||
// TODO: This introduces temporary variables/func_decls that should be filtered in the end.
|
||||
fpa2bv_converter::mk_uninterpreted_function(f, num, args, result);
|
||||
// TODO: This introduces temporary func_decls that should be filtered in the end.
|
||||
|
||||
TRACE("t_fpa", tout << "UF: " << mk_ismt2_pp(f, m) << std::endl; );
|
||||
SASSERT(f->get_arity() == num);
|
||||
|
||||
expr_ref_buffer new_args(m);
|
||||
|
||||
for (unsigned i = 0; i < num; i++) {
|
||||
if (is_float(args[i]) || is_rm(args[i])) {
|
||||
expr_ref ai(m), wrapped(m);
|
||||
ai = args[i];
|
||||
wrapped = m_th.wrap(ai);
|
||||
new_args.push_back(wrapped);
|
||||
m_extra_assertions.push_back(m.mk_eq(m_th.unwrap(wrapped, m.get_sort(ai)), ai));
|
||||
}
|
||||
else
|
||||
new_args.push_back(args[i]);
|
||||
}
|
||||
|
||||
func_decl * fd;
|
||||
if (m_uf2bvuf.find(f, fd))
|
||||
mk_uninterpreted_output(f->get_range(), fd, new_args, result);
|
||||
else {
|
||||
sort_ref_buffer new_domain(m);
|
||||
|
||||
for (unsigned i = 0; i < f->get_arity(); i++) {
|
||||
sort * di = f->get_domain()[i];
|
||||
if (is_float(di))
|
||||
new_domain.push_back(m_bv_util.mk_sort(m_util.get_sbits(di) + m_util.get_ebits(di)));
|
||||
else if (is_rm(di))
|
||||
new_domain.push_back(m_bv_util.mk_sort(3));
|
||||
else
|
||||
new_domain.push_back(di);
|
||||
}
|
||||
|
||||
sort * frng = f->get_range();
|
||||
sort_ref rng(frng, m);
|
||||
if (m_util.is_float(frng))
|
||||
rng = m_bv_util.mk_sort(m_util.get_ebits(frng) + m_util.get_sbits(frng));
|
||||
else if (m_util.is_rm(frng))
|
||||
rng = m_bv_util.mk_sort(3);
|
||||
|
||||
func_decl_ref fbv(m);
|
||||
fbv = m.mk_fresh_func_decl(new_domain.size(), new_domain.c_ptr(), rng);
|
||||
TRACE("t_fpa", tout << "New UF func_decl : " << mk_ismt2_pp(fbv, m) << std::endl;);
|
||||
|
||||
m_uf2bvuf.insert(f, fbv);
|
||||
m.inc_ref(f);
|
||||
m.inc_ref(fbv);
|
||||
|
||||
mk_uninterpreted_output(frng, fbv, new_args, result);
|
||||
}
|
||||
|
||||
expr_ref fapp(m);
|
||||
fapp = m.mk_app(f, num, args);
|
||||
m_extra_assertions.push_back(m.mk_eq(fapp, result));
|
||||
TRACE("t_fpa", tout << "UF result: " << mk_ismt2_pp(result, m) << std::endl; );
|
||||
}
|
||||
|
||||
expr_ref theory_fpa::fpa2bv_converter_wrapped::mk_min_unspecified(func_decl * f, expr * x, expr * y) {
|
||||
|
|
@ -284,30 +339,40 @@ namespace smt {
|
|||
app_ref theory_fpa::wrap(expr * e) {
|
||||
SASSERT(!m_fpa_util.is_wrap(e));
|
||||
ast_manager & m = get_manager();
|
||||
sort * e_srt = m.get_sort(e);
|
||||
app_ref res(m);
|
||||
|
||||
func_decl *w;
|
||||
if (is_app(e) &&
|
||||
to_app(e)->get_family_id() == get_family_id() &&
|
||||
to_app(e)->get_decl_kind() == OP_FPA_FP) {
|
||||
expr * cargs[3] = { to_app(e)->get_arg(0), to_app(e)->get_arg(1), to_app(e)->get_arg(2) };
|
||||
res = m_bv_util.mk_concat(3, cargs);
|
||||
m_th_rw((expr_ref&)res);
|
||||
}
|
||||
else {
|
||||
sort * e_srt = m.get_sort(e);
|
||||
func_decl * w;
|
||||
|
||||
if (!m_wraps.find(e_srt, w)) {
|
||||
SASSERT(!m_wraps.contains(e_srt));
|
||||
if (!m_wraps.find(e_srt, w)) {
|
||||
SASSERT(!m_wraps.contains(e_srt));
|
||||
|
||||
sort * bv_srt;
|
||||
if (m_converter.is_rm(e_srt))
|
||||
bv_srt = m_bv_util.mk_sort(3);
|
||||
else {
|
||||
SASSERT(m_converter.is_float(e_srt));
|
||||
unsigned ebits = m_fpa_util.get_ebits(e_srt);
|
||||
unsigned sbits = m_fpa_util.get_sbits(e_srt);
|
||||
bv_srt = m_bv_util.mk_sort(ebits + sbits);
|
||||
sort * bv_srt;
|
||||
if (m_converter.is_rm(e_srt))
|
||||
bv_srt = m_bv_util.mk_sort(3);
|
||||
else {
|
||||
SASSERT(m_converter.is_float(e_srt));
|
||||
unsigned ebits = m_fpa_util.get_ebits(e_srt);
|
||||
unsigned sbits = m_fpa_util.get_sbits(e_srt);
|
||||
bv_srt = m_bv_util.mk_sort(ebits + sbits);
|
||||
}
|
||||
|
||||
w = m.mk_func_decl(get_family_id(), OP_FPA_INTERNAL_BVWRAP, 0, 0, 1, &e_srt, bv_srt);
|
||||
m_wraps.insert(e_srt, w);
|
||||
m.inc_ref(w);
|
||||
}
|
||||
|
||||
w = m.mk_func_decl(get_family_id(), OP_FPA_INTERNAL_BVWRAP, 0, 0, 1, &e_srt, bv_srt);
|
||||
m_wraps.insert(e_srt, w);
|
||||
m.inc_ref(w);
|
||||
res = m.mk_app(w, e);
|
||||
}
|
||||
|
||||
app_ref res(m);
|
||||
res = m.mk_app(w, e);
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
|
|
@ -389,59 +454,6 @@ namespace smt {
|
|||
return res;
|
||||
}
|
||||
|
||||
#if 0
|
||||
expr_ref theory_fpa::convert_uf(expr * e) {
|
||||
SASSERT(is_app(e));
|
||||
ast_manager & m = get_manager();
|
||||
expr_ref res(m);
|
||||
|
||||
app * a = to_app(e);
|
||||
func_decl * f = a->get_decl();
|
||||
sort * const * domain = f->get_domain();
|
||||
unsigned arity = f->get_arity();
|
||||
|
||||
expr_ref_buffer new_args(m);
|
||||
expr_ref unwrapped(m);
|
||||
|
||||
for (unsigned i = 0; i < arity; i++) {
|
||||
expr * ai = a->get_arg(i);
|
||||
if (m_fpa_util.is_float(ai) || m_fpa_util.is_rm(ai)) {
|
||||
if (m_fpa_util.is_unwrap(ai))
|
||||
unwrapped = ai;
|
||||
else {
|
||||
// unwrapped = unwrap(wrap(ai), domain[i]);
|
||||
// assert_cnstr(m.mk_eq(unwrapped, ai));
|
||||
// assert_cnstr();
|
||||
unwrapped = convert_term(ai);
|
||||
}
|
||||
|
||||
new_args.push_back(unwrapped);
|
||||
TRACE("t_fpa_detail", tout << "UF arg(" << i << ") = " << mk_ismt2_pp(unwrapped, get_manager()) << "\n";);
|
||||
}
|
||||
else
|
||||
new_args.push_back(ai);
|
||||
}
|
||||
|
||||
sort * rng = f->get_range();
|
||||
if (m_fpa_util.is_float(rng)) {
|
||||
unsigned sbits = m_fpa_util.get_sbits(rng);
|
||||
unsigned bv_sz = m_fpa_util.get_ebits(rng) + sbits;
|
||||
expr_ref wrapped(m);
|
||||
wrapped = wrap(m.mk_app(f, new_args.size(), new_args.c_ptr()));
|
||||
|
||||
m_converter.mk_fp(m_bv_util.mk_extract(bv_sz - 1, bv_sz - 1, wrapped),
|
||||
m_bv_util.mk_extract(bv_sz - 2, sbits - 1, wrapped),
|
||||
m_bv_util.mk_extract(sbits - 2, 0, wrapped),
|
||||
res);
|
||||
}
|
||||
else
|
||||
res = m.mk_app(f, new_args.size(), new_args.c_ptr());
|
||||
|
||||
TRACE("t_fpa_detail", tout << "UF call = " << mk_ismt2_pp(res, get_manager()) << "\n";);
|
||||
return res;
|
||||
}
|
||||
#endif
|
||||
|
||||
expr_ref theory_fpa::convert_conversion_term(expr * e) {
|
||||
/* This is for the conversion functions fp.to_* */
|
||||
ast_manager & m = get_manager();
|
||||
|
|
@ -606,6 +618,7 @@ namespace smt {
|
|||
// Therefore, we translate and assert them here.
|
||||
fpa_op_kind k = (fpa_op_kind)term->get_decl_kind();
|
||||
switch (k) {
|
||||
case OP_FPA_TO_FP:
|
||||
case OP_FPA_TO_UBV:
|
||||
case OP_FPA_TO_SBV:
|
||||
case OP_FPA_TO_REAL:
|
||||
|
|
@ -966,4 +979,16 @@ namespace smt {
|
|||
out << r->get_id() << " --> " << mk_ismt2_pp(n, m) << std::endl;
|
||||
}
|
||||
}
|
||||
|
||||
bool theory_fpa::include_func_interp(func_decl * f) {
|
||||
TRACE("t_fpa", tout << "f = " << mk_ismt2_pp(f, get_manager()) << std::endl;);
|
||||
func_decl * wt;
|
||||
|
||||
if (m_wraps.find(f->get_range(), wt) || m_unwraps.find(f->get_range(), wt))
|
||||
return wt == f;
|
||||
else if (m_converter.is_uf2bvuf(f) || m_converter.is_special(f))
|
||||
return false;
|
||||
else
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ namespace smt {
|
|||
virtual ~fpa2bv_converter_wrapped() {}
|
||||
virtual void mk_const(func_decl * f, expr_ref & result);
|
||||
virtual void mk_rm_const(func_decl * f, expr_ref & result);
|
||||
virtual void mk_uninterpreted_function(func_decl * f, unsigned num, expr * const * args, expr_ref & result);
|
||||
virtual void mk_uninterpreted_function(func_decl * f, unsigned num, expr * const * args, expr_ref & result);
|
||||
|
||||
virtual expr_ref mk_min_unspecified(func_decl * f, expr * x, expr * y);
|
||||
virtual expr_ref mk_max_unspecified(func_decl * f, expr * x, expr * y);
|
||||
|
|
@ -112,7 +112,7 @@ namespace smt {
|
|||
result.append(m_deps);
|
||||
}
|
||||
|
||||
virtual app * mk_value(model_generator & mg, ptr_vector<expr> & values);
|
||||
virtual app * mk_value(model_generator & mg, ptr_vector<expr> & values);
|
||||
};
|
||||
|
||||
class fpa_rm_value_proc : public model_value_proc {
|
||||
|
|
@ -163,6 +163,7 @@ namespace smt {
|
|||
virtual char const * get_name() const { return "fpa"; }
|
||||
|
||||
virtual model_value_proc * mk_value(enode * n, model_generator & mg);
|
||||
virtual bool include_func_interp(func_decl * f);
|
||||
|
||||
void assign_eh(bool_var v, bool is_true);
|
||||
virtual void relevant_eh(app * n);
|
||||
|
|
|
|||
|
|
@ -2823,6 +2823,7 @@ void theory_seq::add_elim_string_axiom(expr* n) {
|
|||
- len(unit(u)) = 1 if x = unit(u)
|
||||
- len(str) = str.length() if x = str
|
||||
- len(empty) = 0 if x = empty
|
||||
- len(int.to.str(i)) >= 1 if x = int.to.str(i) and more generally if i = 0 then 1 else 1+floor(log(|i|))
|
||||
- len(x) >= 0 otherwise
|
||||
*/
|
||||
void theory_seq::add_length_axiom(expr* n) {
|
||||
|
|
@ -2837,16 +2838,17 @@ void theory_seq::add_length_axiom(expr* n) {
|
|||
m_rewrite(len);
|
||||
SASSERT(n != len);
|
||||
add_axiom(mk_eq(len, n, false));
|
||||
if (!ctx.at_base_level()) {
|
||||
m_trail_stack.push(push_replay(alloc(replay_axiom, m, n)));
|
||||
}
|
||||
}
|
||||
else if (m_util.str.is_itos(x)) {
|
||||
add_axiom(mk_literal(m_autil.mk_ge(n, m_autil.mk_int(1))));
|
||||
}
|
||||
else {
|
||||
add_axiom(mk_literal(m_autil.mk_ge(n, m_autil.mk_int(0))));
|
||||
if (!ctx.at_base_level()) {
|
||||
m_trail_stack.push(push_replay(alloc(replay_axiom, m, n)));
|
||||
}
|
||||
}
|
||||
if (!ctx.at_base_level()) {
|
||||
m_trail_stack.push(push_replay(alloc(replay_axiom, m, n)));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue