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

64 bit clause offset fix

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-06-10 10:46:51 -07:00
parent a55416351f
commit bc54197fb3
3 changed files with 30 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/cmd_context/basic_cmds.cpp
View file

@ -198,28 +198,29 @@ ATOMIC_CMD(get_proof_cmd, "get-proof", "retrieve proof", {
} }
}); });
#define PRINT_CORE() \ static void print_core(cmd_context& ctx) {
ptr_vector<expr> core; \ ptr_vector<expr> core;
ctx.get_check_sat_result()->get_unsat_core(core); \ ctx.get_check_sat_result()->get_unsat_core(core);
ctx.regular_stream() << "("; \ ctx.regular_stream() << "(";
ptr_vector<expr>::const_iterator it = core.begin(); \ ptr_vector<expr>::const_iterator it = core.begin();
ptr_vector<expr>::const_iterator end = core.end(); \ ptr_vector<expr>::const_iterator end = core.end();
for (bool first = true; it != end; ++it) { \ for (bool first = true; it != end; ++it) {
if (first) \ if (first)
first = false; \ first = false;
else \ else
ctx.regular_stream() << " "; \ ctx.regular_stream() << " ";
ctx.regular_stream() << mk_ismt2_pp(*it, ctx.m()); \ ctx.regular_stream() << mk_ismt2_pp(*it, ctx.m());
} \ }
ctx.regular_stream() << ")" << std::endl; \ ctx.regular_stream() << ")" << std::endl;
}
ATOMIC_CMD(get_unsat_core_cmd, "get-unsat-core", "retrieve unsat core", { TOMIC_CMD(get_unsat_core_cmd, "get-unsat-core", "retrieve unsat core", {
if (!ctx.produce_unsat_cores()) if (!ctx.produce_unsat_cores())
throw cmd_exception("unsat core construction is not enabled, use command (set-option :produce-unsat-cores true)"); throw cmd_exception("unsat core construction is not enabled, use command (set-option :produce-unsat-cores true)");
if (!ctx.has_manager() || if (!ctx.has_manager() ||
ctx.cs_state() != cmd_context::css_unsat) ctx.cs_state() != cmd_context::css_unsat)
throw cmd_exception("unsat core is not available"); throw cmd_exception("unsat core is not available");
PRINT_CORE(); print_core(ctx);
}); });
ATOMIC_CMD(get_unsat_assumptions_cmd, "get-unsat-assumptions", "retrieve subset of assumptions sufficient for unsatisfiability", { ATOMIC_CMD(get_unsat_assumptions_cmd, "get-unsat-assumptions", "retrieve subset of assumptions sufficient for unsatisfiability", {
@ -228,7 +229,7 @@ ATOMIC_CMD(get_unsat_assumptions_cmd, "get-unsat-assumptions", "retrieve subset
if (!ctx.has_manager() || ctx.cs_state() != cmd_context::css_unsat) { if (!ctx.has_manager() || ctx.cs_state() != cmd_context::css_unsat) {
throw cmd_exception("unsat assumptions is not available"); throw cmd_exception("unsat assumptions is not available");
} }
PRINT_CORE(); print_core(ctx);
}); });

46
src/sat/sat_clause.cpp
View file

@ -130,23 +130,19 @@ namespace sat {
clause * clause_allocator::get_clause(clause_offset cls_off) const { clause * clause_allocator::get_clause(clause_offset cls_off) const {
#if defined(_AMD64_) #if defined(_AMD64_)
#if defined (Z3DEBUG)
clause const* result;
if (((cls_off & c_alignment_mask) == c_last_segment)) { if (((cls_off & c_alignment_mask) == c_last_segment)) {
unsigned id = cls_off >> c_cls_alignment; unsigned id = cls_off >> c_cls_alignment;
bool check = m_last_seg_id2cls.find(id, result); return const_cast<clause*>(m_last_seg_id2cls[id]);
SASSERT(check);
return const_cast<clause*>(result);
} }
#endif
return reinterpret_cast<clause *>(m_segments[cls_off & c_alignment_mask] + (static_cast<size_t>(cls_off) & ~c_alignment_mask)); return reinterpret_cast<clause *>(m_segments[cls_off & c_alignment_mask] + (static_cast<size_t>(cls_off) & ~c_alignment_mask));
#else #else
return reinterpret_cast<clause *>(cls_off); return reinterpret_cast<clause *>(cls_off);
#endif #endif
} }
clause_offset clause_allocator::get_offset(clause const * cls) const {
#if defined(_AMD64_) #if defined(_AMD64_)
unsigned clause_allocator::get_segment(clause const* cls) {
size_t ptr = reinterpret_cast<size_t>(cls); size_t ptr = reinterpret_cast<size_t>(cls);
SASSERT((ptr & c_alignment_mask) == 0); SASSERT((ptr & c_alignment_mask) == 0);
@ -154,41 +150,18 @@ namespace sat {
unsigned i = 0; unsigned i = 0;
for (i = 0; i < m_num_segments; ++i) for (i = 0; i < m_num_segments; ++i)
if (m_segments[i] == ptr) if (m_segments[i] == ptr)
return i; return static_cast<clause_offset>(reinterpret_cast<size_t>(cls)) + i;
i = m_num_segments; SASSERT(i == m_num_segments);
SASSERT(i <= c_last_segment); SASSERT(i <= c_last_segment);
#if defined(Z3DEBUG)
if (i == c_last_segment) { if (i == c_last_segment) {
if (!m_last_seg_id2cls.contains(cls->id())) m_last_seg_id2cls.setx(cls->id(), cls, 0);
m_last_seg_id2cls.insert(cls->id(), cls); return (cls->id() << c_cls_alignment) | c_last_segment;
} }
else { else {
++m_num_segments; ++m_num_segments;
m_segments[i] = ptr; m_segments[i] = ptr;
return static_cast<clause_offset>(reinterpret_cast<size_t>(cls)) + i;
} }
#else
if (i == c_last_segment) {
throw default_exception("segment out of range");
}
m_segments[i] = ptr;
++m_num_segments;
#endif
return i;
}
#endif
clause_offset clause_allocator::get_offset(clause const * cls) const {
#if defined(_AMD64_)
unsigned segment = const_cast<clause_allocator*>(this)->get_segment(cls);
#if defined(Z3DEBUG)
SASSERT(segment <= c_last_segment);
if (segment == c_last_segment) {
SASSERT(m_last_seg_id2cls.contains(cls->id()));
return (cls->id() << c_cls_alignment) | c_last_segment;
}
#endif
return static_cast<unsigned>(reinterpret_cast<size_t>(cls)) + segment;
#else #else
return reinterpret_cast<size_t>(cls); return reinterpret_cast<size_t>(cls);
#endif #endif
@ -207,9 +180,6 @@ namespace sat {
TRACE("sat_clause", tout << "delete: " << cls->id() << " " << *cls << "\n";); TRACE("sat_clause", tout << "delete: " << cls->id() << " " << *cls << "\n";);
m_id_gen.recycle(cls->id()); m_id_gen.recycle(cls->id());
#if defined(_AMD64_) #if defined(_AMD64_)
#if defined(Z3DEBUG)
m_last_seg_id2cls.remove(cls->id());
#endif
#endif #endif
size_t size = clause::get_obj_size(cls->m_capacity); size_t size = clause::get_obj_size(cls->m_capacity);
cls->~clause(); cls->~clause();

10
src/sat/sat_clause.h
View file

@ -132,15 +132,13 @@ namespace sat {
small_object_allocator m_allocator; small_object_allocator m_allocator;
id_gen m_id_gen; id_gen m_id_gen;
#if defined(_AMD64_) #if defined(_AMD64_)
unsigned get_segment(clause const* cls);
static const unsigned c_cls_alignment = 3; static const unsigned c_cls_alignment = 3;
static const unsigned c_last_segment = (1ull << c_cls_alignment) - 1ull; static const unsigned c_last_segment = (1ull << c_cls_alignment) - 1ull;
static const size_t c_alignment_mask = (1ull << c_cls_alignment) - 1ull; static const size_t c_alignment_mask = (1ull << c_cls_alignment) - 1ull;
unsigned m_num_segments; mutable unsigned m_num_segments;
size_t m_segments[c_last_segment]; mutable size_t m_segments[c_last_segment];
#if defined(Z3DEBUG) mutable svector<size_t> m_aux_segments;
u_map<clause const*> m_last_seg_id2cls; mutable ptr_vector<clause const> m_last_seg_id2cls;
#endif
#endif #endif
public: public:
clause_allocator(); clause_allocator();