mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-29 17:38:45 +00:00
Code Activity

bail out dominators after log number of steps

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-10-06 12:08:37 +01:00
parent 6df628edc7
commit cb548404bc
3 changed files with 792 additions and 468 deletions
Download patch file Download diff file Expand all files Collapse all files

1227
src/tactic/bv/bv_bounds_tactic.cpp
View file

File diff suppressed because it is too large Load diff

25
src/tactic/core/dom_simplify_tactic.cpp
View file

@ -83,11 +83,12 @@ expr* expr_dominators::intersect(expr* x, expr * y) {
return x; return x;
} }
void expr_dominators::compute_dominators() { bool expr_dominators::compute_dominators() {
expr * e = m_root; expr * e = m_root;
SASSERT(m_doms.empty()); SASSERT(m_doms.empty());
m_doms.insert(e, e); m_doms.insert(e, e);
bool change = true; bool change = true;
unsigned iterations = 1;
while (change) { while (change) {
change = false; change = false;
SASSERT(m_post2expr.empty() || m_post2expr.back() == e); SASSERT(m_post2expr.empty() || m_post2expr.back() == e);
@ -109,7 +110,12 @@ void expr_dominators::compute_dominators() {
change = true; change = true;
} }
} }
iterations *= 2;
if (change && iterations > m_post2expr.size()) {
return false;
}
} }
return true;
} }
void expr_dominators::extract_tree() { void expr_dominators::extract_tree() {
@ -118,17 +124,18 @@ void expr_dominators::extract_tree() {
} }
} }
void expr_dominators::compile(expr * e) { bool expr_dominators::compile(expr * e) {
reset(); reset();
m_root = e; m_root = e;
compute_post_order(); compute_post_order();
compute_dominators(); if (!compute_dominators()) return false;
extract_tree(); extract_tree();
return true;
} }
void expr_dominators::compile(unsigned sz, expr * const* es) { bool expr_dominators::compile(unsigned sz, expr * const* es) {
expr_ref e(m.mk_and(sz, es), m); expr_ref e(m.mk_and(sz, es), m);
compile(e); return compile(e);
} }
void expr_dominators::reset() { void expr_dominators::reset() {
@ -293,14 +300,14 @@ expr_ref dom_simplify_tactic::simplify_and_or(bool is_and, app * e) {
} }
void dom_simplify_tactic::init(goal& g) { bool dom_simplify_tactic::init(goal& g) {
expr_ref_vector args(m); expr_ref_vector args(m);
unsigned sz = g.size(); unsigned sz = g.size();
for (unsigned i = 0; i < sz; ++i) args.push_back(g.form(i)); for (unsigned i = 0; i < sz; ++i) args.push_back(g.form(i));
expr_ref fml = mk_and(args); expr_ref fml = mk_and(args);
m_result.reset(); m_result.reset();
m_trail.reset(); m_trail.reset();
m_dominators.compile(fml); return m_dominators.compile(fml);
} }
void dom_simplify_tactic::simplify_goal(goal& g) { void dom_simplify_tactic::simplify_goal(goal& g) {
@ -312,7 +319,7 @@ void dom_simplify_tactic::simplify_goal(goal& g) {
change = false; change = false;
// go forwards // go forwards
init(g); if (!init(g)) return;
unsigned sz = g.size(); unsigned sz = g.size();
for (unsigned i = 0; !g.inconsistent() && i < sz; ++i) { for (unsigned i = 0; !g.inconsistent() && i < sz; ++i) {
expr_ref r = simplify(g.form(i)); expr_ref r = simplify(g.form(i));
@ -329,7 +336,7 @@ void dom_simplify_tactic::simplify_goal(goal& g) {
pop(scope_level()); pop(scope_level());
// go backwards // go backwards
init(g); if (!init(g)) return;
sz = g.size(); sz = g.size();
for (unsigned i = sz; !g.inconsistent() && i > 0; ) { for (unsigned i = sz; !g.inconsistent() && i > 0; ) {
--i; --i;

8
src/tactic/core/dom_simplify_tactic.h
View file

@ -45,14 +45,14 @@ private:
void compute_post_order(); void compute_post_order();
expr* intersect(expr* x, expr * y); expr* intersect(expr* x, expr * y);
void compute_dominators(); bool compute_dominators();
void extract_tree(); void extract_tree();
public: public:
expr_dominators(ast_manager& m): m(m), m_root(m) {} expr_dominators(ast_manager& m): m(m), m_root(m) {}
void compile(expr * e); bool compile(expr * e);
void compile(unsigned sz, expr * const* es); bool compile(unsigned sz, expr * const* es);
tree_t const& get_tree() { return m_tree; } tree_t const& get_tree() { return m_tree; }
void reset(); void reset();
@ -115,7 +115,7 @@ private:
void pop(unsigned n) { SASSERT(n <= m_scope_level); m_scope_level -= n; m_simplifier->pop(n); } void pop(unsigned n) { SASSERT(n <= m_scope_level); m_scope_level -= n; m_simplifier->pop(n); }
bool assert_expr(expr* f, bool sign) { m_scope_level++; return m_simplifier->assert_expr(f, sign); } bool assert_expr(expr* f, bool sign) { m_scope_level++; return m_simplifier->assert_expr(f, sign); }
void init(goal& g); bool init(goal& g);
public: public:
dom_simplify_tactic(ast_manager & m, dom_simplifier* s, params_ref const & p = params_ref()): dom_simplify_tactic(ast_manager & m, dom_simplifier* s, params_ref const & p = params_ref()):