mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 12:08:18 +00:00
Code Activity

add experiment with quot-rem encoding

Browse source 
experiment seeks to determine whether quot-rem encoding can substitute the division circuit encoding.
A first test suggests it makes no difference.
This commit is contained in:
Nikolaj Bjorner 2022-10-21 09:25:45 -07:00
parent 31914d8ecf
commit ad5fa9433f
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/smt/theory_bv.cpp
View file

@ -24,6 +24,7 @@ Revision History:
#include "smt/smt_model_generator.h" #include "smt/smt_model_generator.h"
#include "util/stats.h" #include "util/stats.h"
#define ENABLE_QUOT_REM_ENCODING 0
namespace smt { namespace smt {
@ -898,8 +899,11 @@ namespace smt {
case OP_BSUB: internalize_sub(term); return true; case OP_BSUB: internalize_sub(term); return true;
case OP_BMUL: internalize_mul(term); return true; case OP_BMUL: internalize_mul(term); return true;
case OP_BSDIV_I: internalize_sdiv(term); return true; case OP_BSDIV_I: internalize_sdiv(term); return true;
#if ENABLE_QUOT_REM_ENCODING
case OP_BUDIV_I: internalize_udiv_quot_rem(term); return true;
#else
case OP_BUDIV_I: internalize_udiv(term); return true; case OP_BUDIV_I: internalize_udiv(term); return true;
// case OP_BUDIV_I: internalize_udiv_quot_rem(term); return true; #endif
case OP_BSREM_I: internalize_srem(term); return true; case OP_BSREM_I: internalize_srem(term); return true;
case OP_BUREM_I: internalize_urem(term); return true; case OP_BUREM_I: internalize_urem(term); return true;
case OP_BSMOD_I: internalize_smod(term); return true; case OP_BSMOD_I: internalize_smod(term); return true;
@ -1394,7 +1398,7 @@ namespace smt {
ctx.mark_as_relevant(n->get_arg(0)); ctx.mark_as_relevant(n->get_arg(0));
assert_int2bv_axiom(n); assert_int2bv_axiom(n);
} }
#if 0 #if ENABLE_QUOT_REM_ENCODING
else if (m_util.is_bv_udivi(n)) { else if (m_util.is_bv_udivi(n)) {
ctx.mark_as_relevant(n->get_arg(0)); ctx.mark_as_relevant(n->get_arg(0));
ctx.mark_as_relevant(n->get_arg(1)); ctx.mark_as_relevant(n->get_arg(1));
@ -1994,7 +1998,7 @@ namespace smt {
return true; return true;
} }
#if 0 #if ENABLE_QUOT_REM_ENCODING
void theory_bv::internalize_udiv_quot_rem(app* n) { void theory_bv::internalize_udiv_quot_rem(app* n) {
process_args(n); process_args(n);
mk_enode(n); mk_enode(n);

2
src/solver/assertions/asserted_formulas.cpp
View file

@ -332,8 +332,8 @@ bool asserted_formulas::invoke(simplify_fmls& s) {
IF_VERBOSE(10000, verbose_stream() << "total size: " << get_total_size() << "\n";); IF_VERBOSE(10000, verbose_stream() << "total size: " << get_total_size() << "\n";);
TRACE("reduce_step_ll", ast_mark visited; display_ll(tout, visited);); TRACE("reduce_step_ll", ast_mark visited; display_ll(tout, visited););
CASSERT("well_sorted",check_well_sorted()); CASSERT("well_sorted",check_well_sorted());
TRACE("after_reduce", display(tout << s.id() << "\n"););
if (inconsistent() || canceled()) { if (inconsistent() || canceled()) {
TRACE("after_reduce", display(tout););
TRACE("after_reduce_ll", ast_mark visited; display_ll(tout, visited);); TRACE("after_reduce_ll", ast_mark visited; display_ll(tout, visited););
return false; return false;
} }