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

cut fixes

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-02-20 09:55:07 -08:00
parent c9be09b18c
commit 8b97e26fd7
5 changed files with 86 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

123
src/sat/sat_aig_cuts.cpp
View file

@ -15,9 +15,9 @@
--*/ --*/
#include "util/trace.h"
#include "sat/sat_aig_cuts.h" #include "sat/sat_aig_cuts.h"
#include "sat/sat_solver.h" #include "sat/sat_solver.h"
#include "util/trace.h"
namespace sat { namespace sat {
@ -47,6 +47,19 @@ namespace sat {
for (node const& n : m_aig[id]) { for (node const& n : m_aig[id]) {
augment(id, n); augment(id, n);
} }
#if 0
// augment cuts directly
m_cut_save.reset();
cut_set& cs = m_cuts[id];
for (cut const& c : cs) {
if (c.size() > 1) m_cut_save.push_back(c);
}
for (cut const& c : m_cut_save) {
lut lut(*this, c);
augment_lut(id, lut, cs);
}
#endif
IF_VERBOSE(20, m_cuts[id].display(verbose_stream() << "after\n")); IF_VERBOSE(20, m_cuts[id].display(verbose_stream() << "after\n"));
} }
} }
@ -62,7 +75,8 @@ namespace sat {
SASSERT(!n.sign()); SASSERT(!n.sign());
} }
else if (n.is_lut()) { else if (n.is_lut()) {
augment_lut(id, n, cs); lut lut(*this, n);
augment_lut(id, lut, cs);
} }
else if (n.is_ite()) { else if (n.is_ite()) {
augment_ite(id, n, cs); augment_ite(id, n, cs);
@ -100,32 +114,29 @@ namespace sat {
return true; return true;
} }
void aig_cuts::augment_lut(unsigned v, node const& n, cut_set& cs) { void aig_cuts::augment_lut(unsigned v, lut const& n, cut_set& cs) {
IF_VERBOSE(4, display(verbose_stream() << "augment_lut " << v << " ", n) << "\n"); IF_VERBOSE(4, n.display(verbose_stream() << "augment_lut " << v << " ") << "\n");
literal l1 = child(n, 0); literal l1 = n.child(0);
VERIFY(&cs != &m_cuts[l1.var()]); VERIFY(&cs != &lit2cuts(l1));
for (auto const& a : m_cuts[l1.var()]) { for (auto const& a : lit2cuts(l1)) {
if (a.size() > 0) {
m_tables[0] = &a; m_tables[0] = &a;
m_lits[0] = l1; m_lits[0] = l1;
cut b(a); cut b(a);
augment_lut_rec(v, n, b, 1, cs); augment_lut_rec(v, n, b, 1, cs);
} }
} }
}
void aig_cuts::augment_lut_rec(unsigned v, node const& n, cut& a, unsigned idx, cut_set& cs) { void aig_cuts::augment_lut_rec(unsigned v, lut const& n, cut& a, unsigned idx, cut_set& cs) {
if (idx < n.size()) { if (idx < n.size()) {
literal lit = child(n, idx); literal lit = n.child(idx);
VERIFY(&cs != &m_cuts[lit.var()]); VERIFY(&cs != &lit2cuts(lit));
for (auto const& b : m_cuts[lit.var()]) { for (auto const& b : lit2cuts(lit)) {
cut ab; cut ab;
if (b.size() > 0 && ab.merge(a, b)) { if (!ab.merge(a, b)) continue;
m_tables[idx] = &b; m_tables[idx] = &b;
m_lits[idx] = lit; m_lits[idx] = lit;
augment_lut_rec(v, n, ab, idx + 1, cs); augment_lut_rec(v, n, ab, idx + 1, cs);
} }
}
return; return;
} }
for (unsigned i = n.size(); i-- > 0; ) { for (unsigned i = n.size(); i-- > 0; ) {
@ -143,9 +154,14 @@ namespace sat {
for (unsigned i = n.size(); i-- > 0; ) { for (unsigned i = n.size(); i-- > 0; ) {
w |= (((m_luts[i] >> j) ^ (uint64_t)m_lits[i].sign()) & 1u) << i; w |= (((m_luts[i] >> j) ^ (uint64_t)m_lits[i].sign()) & 1u) << i;
} }
r |= ((n.lut() >> w) & 1u) << j; r |= ((n.table() >> w) & 1u) << j;
} }
a.set_table(r); a.set_table(r);
IF_VERBOSE(8,
verbose_stream() << "lut: " << v << " - " << a << "\n";
for (unsigned i = 0; i < n.size(); ++i) {
verbose_stream() << m_lits[i] << ": " << *m_tables[i] << "\n";
});
insert_cut(v, a, cs); insert_cut(v, a, cs);
} }
@ -154,23 +170,16 @@ namespace sat {
literal l1 = child(n, 0); literal l1 = child(n, 0);
literal l2 = child(n, 1); literal l2 = child(n, 1);
literal l3 = child(n, 2); literal l3 = child(n, 2);
VERIFY(&cs != &m_cuts[l1.var()]); VERIFY(&cs != &lit2cuts(l1));
VERIFY(&cs != &m_cuts[l2.var()]); VERIFY(&cs != &lit2cuts(l2));
VERIFY(&cs != &m_cuts[l3.var()]); VERIFY(&cs != &lit2cuts(l3));
for (auto const& a : m_cuts[l1.var()]) { for (auto const& a : lit2cuts(l1)) {
if (a.size() == 0) continue; for (auto const& b : lit2cuts(l2)) {
for (auto const& b : m_cuts[l2.var()]) {
if (b.size() == 0) continue;
cut ab; cut ab;
if (!ab.merge(a, b)) { if (!ab.merge(a, b)) continue;
continue; for (auto const& c : lit2cuts(l3)) {
}
for (auto const& c : m_cuts[l3.var()]) {
cut abc; cut abc;
if (c.size() == 0) continue; if (!abc.merge(ab, c)) continue;
if (!abc.merge(ab, c)) {
continue;
}
uint64_t t1 = a.shift_table(abc); uint64_t t1 = a.shift_table(abc);
uint64_t t2 = b.shift_table(abc); uint64_t t2 = b.shift_table(abc);
uint64_t t3 = c.shift_table(abc); uint64_t t3 = c.shift_table(abc);
@ -198,34 +207,25 @@ namespace sat {
IF_VERBOSE(4, display(verbose_stream() << "augment_aig1 " << v << " ", n) << "\n"); IF_VERBOSE(4, display(verbose_stream() << "augment_aig1 " << v << " ", n) << "\n");
SASSERT(n.is_and()); SASSERT(n.is_and());
literal lit = child(n, 0); literal lit = child(n, 0);
VERIFY(&cs != &m_cuts[lit.var()]); VERIFY(&cs != &lit2cuts(lit));
for (auto const& a : m_cuts[lit.var()]) { for (auto const& a : lit2cuts(lit)) {
if (a.size() > 0) {
cut c(a); cut c(a);
if (n.sign()) c.negate(); if (n.sign()) c.negate();
if (!insert_cut(v, c, cs)) return; if (!insert_cut(v, c, cs)) return;
} }
} }
}
void aig_cuts::augment_aig2(unsigned v, node const& n, cut_set& cs) { void aig_cuts::augment_aig2(unsigned v, node const& n, cut_set& cs) {
IF_VERBOSE(4, display(verbose_stream() << "augment_aig2 " << v << " ", n) << "\n"); IF_VERBOSE(4, display(verbose_stream() << "augment_aig2 " << v << " ", n) << "\n");
SASSERT(n.is_and() || n.is_xor()); SASSERT(n.is_and() || n.is_xor());
literal l1 = child(n, 0); literal l1 = child(n, 0);
literal l2 = child(n, 1); literal l2 = child(n, 1);
if (&cs == &m_cuts[l2.var()]) { VERIFY(&cs != &lit2cuts(l1));
IF_VERBOSE(0, display(verbose_stream() << "augment_aig2 " << v << " ", n) << "\n"); VERIFY(&cs != &lit2cuts(l2));
} for (auto const& a : lit2cuts(l1)) {
VERIFY(&cs != &m_cuts[l1.var()]); for (auto const& b : lit2cuts(l2)) {
VERIFY(&cs != &m_cuts[l2.var()]);
for (auto const& a : m_cuts[l1.var()]) {
if (a.size() == 0) continue;
for (auto const& b : m_cuts[l2.var()]) {
if (b.size() == 0) continue;
cut c; cut c;
if (!c.merge(a, b)) { if (!c.merge(a, b)) continue;
continue;
}
uint64_t t1 = a.shift_table(c); uint64_t t1 = a.shift_table(c);
uint64_t t2 = b.shift_table(c); uint64_t t2 = b.shift_table(c);
if (l1.sign()) t1 = ~t1; if (l1.sign()) t1 = ~t1;
@ -244,8 +244,7 @@ namespace sat {
m_cut_set1.reset(m_on_cut_del); m_cut_set1.reset(m_on_cut_del);
SASSERT(n.is_and() || n.is_xor()); SASSERT(n.is_and() || n.is_xor());
literal lit = child(n, 0); literal lit = child(n, 0);
for (auto const& a : m_cuts[lit.var()]) { for (auto const& a : lit2cuts(lit)) {
if (a.size() == 0) continue;
cut b(a); cut b(a);
if (lit.sign()) { if (lit.sign()) {
b.negate(); b.negate();
@ -257,12 +256,9 @@ namespace sat {
lit = child(n, i); lit = child(n, i);
m_insertions = 0; m_insertions = 0;
for (auto const& a : m_cut_set1) { for (auto const& a : m_cut_set1) {
for (auto const& b : m_cuts[lit.var()]) { for (auto const& b : lit2cuts(lit)) {
if (b.size() == 0) continue;
cut c; cut c;
if (!c.merge(a, b)) { if (!c.merge(a, b)) continue;
continue;
}
uint64_t t1 = a.shift_table(c); uint64_t t1 = a.shift_table(c);
uint64_t t2 = b.shift_table(c); uint64_t t2 = b.shift_table(c);
if (lit.sign()) t2 = ~t2; if (lit.sign()) t2 = ~t2;
@ -441,23 +437,10 @@ namespace sat {
} }
} }
void aig_cuts::flush_units() {
return;
// TBD: remove unit literals from cuts
for (unsigned i = 0; i < m_cuts.size(); ++i) {
}
}
void aig_cuts::flush_units(cut_set& cs) {
}
lbool aig_cuts::get_value(bool_var v) const { lbool aig_cuts::get_value(bool_var v) const {
if (m_aig[v].size() == 1 && m_aig[v][0].is_const()) { return (m_aig[v].size() == 1 && m_aig[v][0].is_const()) ?
return m_aig[v][0].sign() ? l_false : l_true; (m_aig[v][0].sign() ? l_false : l_true) :
} l_undef;
return l_undef;
} }
void aig_cuts::init_cut_set(unsigned id) { void aig_cuts::init_cut_set(unsigned id) {

25
src/sat/sat_aig_cuts.h
View file

@ -117,6 +117,19 @@ namespace sat {
uint64_t m_luts[6]; uint64_t m_luts[6];
literal m_lits[6]; literal m_lits[6];
class lut {
aig_cuts& a;
node const* n;
cut const* c;
public:
lut(aig_cuts& a, node const& n) : a(a), n(&n), c(nullptr) {}
lut(aig_cuts& a, cut const& c) : a(a), n(nullptr), c(&c) {}
unsigned size() const { return n ? n->size() : c->size(); }
literal child(unsigned idx) const { return n ? a.child(*n, idx) : a.child(*c, idx); }
uint64_t table() const { return n ? n->lut() : c->table(); }
std::ostream& display(std::ostream& out) const { return n ? a.display(out, *n) : out << *c; }
};
bool is_touched(bool_var v, node const& n); bool is_touched(bool_var v, node const& n);
bool is_touched(literal lit) const { return is_touched(lit.var()); } bool is_touched(literal lit) const { return is_touched(lit.var()); }
bool is_touched(bool_var v) const { return m_last_touched[v] + m_aig.size() >= m_num_cut_calls * m_aig.size(); } bool is_touched(bool_var v) const { return m_last_touched[v] + m_aig.size() >= m_num_cut_calls * m_aig.size(); }
@ -136,8 +149,11 @@ namespace sat {
void augment_aig2(unsigned v, node const& n, cut_set& cs); void augment_aig2(unsigned v, node const& n, cut_set& cs);
void augment_aigN(unsigned v, node const& n, cut_set& cs); void augment_aigN(unsigned v, node const& n, cut_set& cs);
void augment_lut(unsigned v, node const& n, cut_set& cs);
void augment_lut_rec(unsigned v, node const& n, cut& a, unsigned idx, cut_set& cs); void augment_lut(unsigned v, lut const& n, cut_set& cs);
void augment_lut_rec(unsigned v, lut const& n, cut& a, unsigned idx, cut_set& cs);
cut_set const& lit2cuts(literal lit) const { return m_cuts[lit.var()]; }
bool insert_cut(unsigned v, cut const& c, cut_set& cs); bool insert_cut(unsigned v, cut const& c, cut_set& cs);
@ -145,14 +161,13 @@ namespace sat {
bool flush_roots(bool_var var, literal_vector const& to_root, node& n); bool flush_roots(bool_var var, literal_vector const& to_root, node& n);
void flush_roots(literal_vector const& to_root, cut_set& cs); void flush_roots(literal_vector const& to_root, cut_set& cs);
void flush_units(cut_set& cs);
cut_val eval(node const& n, cut_eval const& env) const; cut_val eval(node const& n, cut_eval const& env) const;
lbool get_value(bool_var v) const; lbool get_value(bool_var v) const;
std::ostream& display(std::ostream& out, node const& n) const; std::ostream& display(std::ostream& out, node const& n) const;
literal child(node const& n, unsigned idx) const { SASSERT(!n.is_var()); SASSERT(idx < n.size()); return m_literals[n.offset() + idx]; } literal child(node const& n, unsigned idx) const { SASSERT(!n.is_var()); SASSERT(idx < n.size()); return m_literals[n.offset() + idx]; }
literal child(cut const& n, unsigned idx) const { SASSERT(idx < n.size()); return literal(n[idx], false); }
void on_node_add(unsigned v, node const& n); void on_node_add(unsigned v, node const& n);
void on_node_del(unsigned v, node const& n); void on_node_del(unsigned v, node const& n);
@ -186,8 +201,6 @@ namespace sat {
void inc_max_cutset_size(unsigned v) { m_max_cutset_size[v] += 10; touch(v); } void inc_max_cutset_size(unsigned v) { m_max_cutset_size[v] += 10; touch(v); }
unsigned max_cutset_size(unsigned v) const { return v == UINT_MAX ? m_config.m_max_cutset_size : m_max_cutset_size[v]; } unsigned max_cutset_size(unsigned v) const { return v == UINT_MAX ? m_config.m_max_cutset_size : m_max_cutset_size[v]; }
void flush_units();
vector<cut_set> const & operator()(); vector<cut_set> const & operator()();
unsigned num_cuts() const { return m_num_cuts; } unsigned num_cuts() const { return m_num_cuts; }

6
src/sat/sat_cut_simplifier.cpp
View file

@ -176,16 +176,10 @@ namespace sat {
*/ */
void cut_simplifier::clauses2aig() { void cut_simplifier::clauses2aig() {
// update units
bool has_units = false;
for (; m_config.m_enable_units && m_trail_size < s.init_trail_size(); ++m_trail_size) { for (; m_config.m_enable_units && m_trail_size < s.init_trail_size(); ++m_trail_size) {
has_units = true;
literal lit = s.trail_literal(m_trail_size); literal lit = s.trail_literal(m_trail_size);
m_aig_cuts.add_node(lit, and_op, 0, 0); m_aig_cuts.add_node(lit, and_op, 0, 0);
} }
if (has_units) {
m_aig_cuts.flush_units();
}
std::function<void (literal head, literal_vector const& ands)> on_and = std::function<void (literal head, literal_vector const& ands)> on_and =
[&,this](literal head, literal_vector const& ands) { [&,this](literal head, literal_vector const& ands) {

1
src/sat/sat_cutset.h
View file

@ -15,6 +15,7 @@
#include "util/region.h" #include "util/region.h"
#include "util/debug.h" #include "util/debug.h"
#include "util/util.h" #include "util/util.h"
#include "util/lbool.h"
#include "util/vector.h" #include "util/vector.h"
#include <algorithm> #include <algorithm>
#include <cstring> #include <cstring>

2
src/smt/smt_model_checker.cpp
View file

@ -572,7 +572,7 @@ namespace smt {
} }
void model_checker::restart_eh() { void model_checker::restart_eh() {
IF_VERBOSE(100, verbose_stream() << "(smt.mbqi \"instantiating new instances...\")\n";); IF_VERBOSE(100, if (has_new_instances()) verbose_stream() << "(smt.mbqi \"instantiating new instances...\")\n";);
assert_new_instances(); assert_new_instances();
reset_new_instances(); reset_new_instances();
} }