Added rewriting distinct with bitvectors to false if bit-size is too low #5956
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
src/ast/rewriter/bv_rewriter.cpp
Outdated
| br_status bv_rewriter::mk_bvsmul_no_overflow(unsigned num, expr * const * args, bool is_overflow, expr_ref & result) { | ||
| br_status bv_rewriter::mk_distinct(unsigned num_args, expr * const * args, expr_ref & result) { | ||
| if (num_args == 0) { | ||
| return BR_FAILED; |
There was a problem hiding this comment.
and if num_args = 1 then result = false.
OTOH, these rewrites are already handled by bool_rewriter
There was a problem hiding this comment.
Do you mean result = true for num_args = 1?
There was a problem hiding this comment.
yes, right, true for both 0 and 1 arguments.
src/ast/rewriter/bv_rewriter.cpp
Outdated
| exact &= (num_args % 2) == 0; | ||
| num_args /= 2; | ||
| sz--; | ||
| } while (num_args > 1 && sz > 0); |
There was a problem hiding this comment.
convention: while on the next line after }.
I know this is contrary to some automatic formatting modes
src/ast/rewriter/th_rewriter.cpp
Outdated
| to_app(args[0])->get_family_id() == m_seq_rw.get_fid()) { | ||
| st = m_seq_rw.mk_eq_core(args[0], args[1], result); | ||
| if (st != BR_FAILED) | ||
| return st; | ||
| } | ||
| if (k == OP_DISTINCT) { | ||
| SASSERT(num > 0); |
There was a problem hiding this comment.
just add it to the if statement
if (k == OP_DISTINCT && num > 0)
and for that matter m_bv_rw.is_bv_sort(args[0]->get_sort())
| return BR_DONE; | ||
| } | ||
| unsigned sz = get_bv_size(args[0]); | ||
| // check if num_args > 2^sz |
There was a problem hiding this comment.
this may be clever code, but not easy to read.
Here is something simpler:
if (sz >= 32)
return BR_FAILED;
if (num_args <= 1u << sz)
return BR_FAILED;
result = m().mk_false();
return BR_DONE;
src/ast/rewriter/th_rewriter.cpp
Outdated
| to_app(args[0])->get_family_id() == m_seq_rw.get_fid()) { | ||
| st = m_seq_rw.mk_eq_core(args[0], args[1], result); | ||
| if (st != BR_FAILED) | ||
| return st; | ||
| } | ||
| if (k == OP_DISTINCT && num > 0) { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.