michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

perf(kernel/justification): make sure depends_on doesn't get 'lost' in justification objects with a lot of shared objects

Browse source 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
This commit is contained in:
Leonardo de Moura 2014-07-23 11:55:50 -07:00
parent 35481cb045
commit 4286f5dd36
1 changed files with 54 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/kernel/justification.cpp
View file

@ -12,6 +12,10 @@ Author: Leonardo de Moura
#include "kernel/justification.h" #include "kernel/justification.h"
#include "kernel/metavar.h" #include "kernel/metavar.h"
#ifndef LEAN_DEFAULT_DEPENDS_ON_CACHE_CAPACITY
#define LEAN_DEFAULT_DEPENDS_ON_CACHE_CAPACITY 1024*8
#endif
namespace lean { namespace lean {
format to_pos(optional<expr> const & e, pos_info_provider const * p) { format to_pos(optional<expr> const & e, pos_info_provider const * p) {
if (!p || !e) if (!p || !e)
@ -33,11 +37,17 @@ enum class justification_kind { Asserted, Composite, ExtComposite, Assumption, E
approx_set get_approx_assumption_set(justification const & j); approx_set get_approx_assumption_set(justification const & j);
MK_THREAD_LOCAL_GET(unsigned, get_hash_alloc_jst_counter, 0)
struct justification_cell { struct justification_cell {
MK_LEAN_RC(); MK_LEAN_RC();
justification_kind m_kind; justification_kind m_kind;
unsigned m_hash_alloc;
void dealloc(); void dealloc();
justification_cell(justification_kind k):m_rc(0), m_kind(k) {} justification_cell(justification_kind k):m_rc(0), m_kind(k) {
m_hash_alloc = get_hash_alloc_jst_counter();
get_hash_alloc_jst_counter()++;
}
bool is_asserted() const { return m_kind == justification_kind::Asserted; } bool is_asserted() const { return m_kind == justification_kind::Asserted; }
bool is_assumption() const { return m_kind == justification_kind::Assumption || m_kind == justification_kind::ExtAssumption; } bool is_assumption() const { return m_kind == justification_kind::Assumption || m_kind == justification_kind::ExtAssumption; }
bool is_composite() const { return m_kind == justification_kind::Composite || m_kind == justification_kind::ExtComposite; } bool is_composite() const { return m_kind == justification_kind::Composite || m_kind == justification_kind::ExtComposite; }
@ -149,9 +159,50 @@ void justification_cell::dealloc() {
} }
} }
struct depends_on_cache {
unsigned m_capacity;
std::vector<justification_cell const *> m_cache;
std::vector<unsigned> m_used;
depends_on_cache(unsigned c):m_capacity(c), m_cache(c, nullptr) {}
bool visited(justification_cell const * j) {
unsigned i = j->m_hash_alloc % m_capacity;
if (m_cache[i]) {
if (m_cache[i] == j) {
return true;
} else {
m_cache[i] = j;
return false;
}
} else {
m_cache[i] = j;
m_used.push_back(i);
return false;
}
}
void clear() {
for (unsigned i : m_used) {
lean_assert(m_cache[i]);
m_cache[i] = nullptr;
}
m_used.clear();
}
};
MK_THREAD_LOCAL_GET(depends_on_cache, get_depends_on_cache, LEAN_DEFAULT_DEPENDS_ON_CACHE_CAPACITY);
struct depends_on_cache_ref {
depends_on_cache & m_cache;
depends_on_cache_ref():m_cache(get_depends_on_cache()) {}
~depends_on_cache_ref() { m_cache.clear(); }
depends_on_cache * operator->() { return &m_cache; }
};
bool depends_on(justification const & j, unsigned i) { bool depends_on(justification const & j, unsigned i) {
if (!may_contain(get_approx_assumption_set(j), i)) if (!may_contain(get_approx_assumption_set(j), i))
return false; return false;
depends_on_cache_ref cache;
buffer<justification_cell *> todo; buffer<justification_cell *> todo;
todo.push_back(j.raw()); todo.push_back(j.raw());
while (!todo.empty()) { while (!todo.empty()) {
@ -167,7 +218,7 @@ bool depends_on(justification const & j, unsigned i) {
case justification_kind::Composite: case justification_kind::ExtComposite: case justification_kind::Composite: case justification_kind::ExtComposite:
for (unsigned k = 0; k < 2; k++) { for (unsigned k = 0; k < 2; k++) {
justification c = to_composite(curr)->m_child[k]; justification c = to_composite(curr)->m_child[k];
if (may_contain(get_approx_assumption_set(c), i)) if (!cache->visited(c.raw()) && may_contain(get_approx_assumption_set(c), i))
todo.push_back(c.raw()); todo.push_back(c.raw());
} }
} }