mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-11-05 22:06:03 +00:00
Code Activity

fix some argument-evaluation non-determinism, and mark the rest

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2025-10-28 18:01:44 -07:00
parent efd5d04af5
commit 51f6dfeb83
62 changed files with 765 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/util/sorting_network.h
View file

@ -343,6 +343,7 @@ Notes:
return mk_not(out[k]);
}
else {
//non-deterministic order no change: too complex
return mk_min(out[k-1], mk_not(out[k]));
}
case sorting_network_encoding::unate_at_most:
@ -384,6 +385,7 @@ Notes:
}
literal eq(unsigned k, unsigned n, unsigned const* ws, literal const* xs) {
//non-deterministic order no change: too complex
return mk_and(ge(k, n, ws, xs), le(k, n, ws, xs));
#if 0
m_t = EQ;
@ -479,7 +481,12 @@ Notes:
for (unsigned j = last; j-- > 0; ) {
// c'[j] <-> (xs[i] & c[j-1]) | c[j]
literal c0 = j > 0 ? carry[j-1] : ctx.mk_true();
carry[j] = mk_or(mk_and(xs[i], c0), carry[j]);
//non-deterministic order change start
{
auto mk_and_1 = mk_and(xs[i], c0);
carry[j] = mk_or(mk_and_1, carry[j]);
}
//non-deterministic order change end
}
}
switch (cmp) {
@ -490,6 +497,7 @@ Notes:
case GE_FULL:
return carry[k-1];
case EQ:
//non-deterministic order no change: too complex
return mk_and(mk_not(carry[k]), carry[k-1]);
default:
UNREACHABLE();
@ -522,6 +530,7 @@ Notes:
// out[i] = c + x[i] + y[i]
// c' = c&x[i] | c&y[i] | x[i]&y[i];
literal_vector ors;
//non-deterministic order no change: too complex
ors.push_back(mk_and(c, mk_not(x[i]), mk_not(y[i])));
ors.push_back(mk_and(x[i], mk_not(c), mk_not(y[i])));
ors.push_back(mk_and(y[i], mk_not(c), mk_not(x[i])));
@ -578,7 +587,9 @@ Notes:
literal_vector eqs;
SASSERT(kvec.size() == out.size());
for (unsigned i = 0; i < num_bits; ++i) {
//non-deterministic order no change: too complex
eqs.push_back(mk_or(mk_not(kvec[i]), out[i]));
//non-deterministic order no change: too complex
eqs.push_back(mk_or(kvec[i], mk_not(out[i])));
}
eqs.push_back(mk_not(ovfl));
@ -686,6 +697,7 @@ Notes:
case 1:
return ands[0];
case 2:
//non-deterministic order no change: too complex
return mk_min(ands[0], ands[1]);
default: {
return ctx.mk_min(ands.size(), ands.data());