mirror of
https://github.com/Z3Prover/z3
synced 2025-08-26 21:16:02 +00:00
Centralize and document TRACE tags using X-macros (#7657)
* Introduce X-macro-based trace tag definition - Created trace_tags.def to centralize TRACE tag definitions - Each tag includes a symbolic name and description - Set up enum class TraceTag for type-safe usage in TRACE macros * Add script to generate Markdown documentation from trace_tags.def - Python script parses trace_tags.def and outputs trace_tags.md * Refactor TRACE_NEW to prepend TraceTag and pass enum to is_trace_enabled * trace: improve trace tag handling system with hierarchical tagging - Introduce hierarchical tag-class structure: enabling a tag class activates all child tags - Unify TRACE, STRACE, SCTRACE, and CTRACE under enum TraceTag - Implement initial version of trace_tag.def using X(tag, tag_class, description) (class names and descriptions to be refined in a future update) * trace: replace all string-based TRACE tags with enum TraceTag - Migrated all TRACE, STRACE, SCTRACE, and CTRACE macros to use enum TraceTag values instead of raw string literals * trace : add cstring header * trace : Add Markdown documentation generation from trace_tags.def via mk_api_doc.py * trace : rename macro parameter 'class' to 'tag_class' and remove Unicode comment in trace_tags.h. * trace : Add TODO comment for future implementation of tag_class activation * trace : Disable code related to tag_class until implementation is ready (#7663).
This commit is contained in:
LeeYoungJoon
GitHub
parent
d766292dab
commit
0a93ff515d
583 changed files with 8698 additions and 7299 deletions
|
|
@ -97,7 +97,7 @@ protected:
|
|||
void reduce(goal& g) {
|
||||
if (m.proofs_enabled())
|
||||
return;
|
||||
TRACE("ctx_solver_simplify_tactic", g.display(tout););
|
||||
TRACE(ctx_solver_simplify_tactic, g.display(tout););
|
||||
expr_ref fml(m);
|
||||
tactic_report report("ctx-solver-simplify", g);
|
||||
if (g.inconsistent())
|
||||
|
|
@ -111,7 +111,7 @@ protected:
|
|||
if (!m.inc())
|
||||
return;
|
||||
SASSERT(m_solver.get_scope_level() == 0);
|
||||
TRACE("ctx_solver_simplify_tactic",
|
||||
TRACE(ctx_solver_simplify_tactic,
|
||||
for (expr* f : fmls) {
|
||||
tout << mk_pp(f, m) << "\n";
|
||||
}
|
||||
|
|
@ -127,11 +127,11 @@ protected:
|
|||
fml1 = m.mk_not(fml1);
|
||||
m_solver.assert_expr(fml1);
|
||||
lbool is_sat = m_solver.check();
|
||||
TRACE("ctx_solver_simplify_tactic", tout << "is non-equivalence sat?: " << is_sat << "\n";);
|
||||
TRACE(ctx_solver_simplify_tactic, tout << "is non-equivalence sat?: " << is_sat << "\n";);
|
||||
if (is_sat == l_true) {
|
||||
model_ref mdl;
|
||||
m_solver.get_model(mdl);
|
||||
TRACE("ctx_solver_simplify_tactic",
|
||||
TRACE(ctx_solver_simplify_tactic,
|
||||
tout << "result is not equivalent to input\n";
|
||||
tout << mk_pp(fml1, m) << "\n";
|
||||
tout << "evaluates to: " << (*mdl)(fml1) << "\n";
|
||||
|
|
@ -203,7 +203,7 @@ protected:
|
|||
goto done;
|
||||
}
|
||||
if (m.is_bool(e) && simplify_bool(n, res)) {
|
||||
TRACE("ctx_solver_simplify_tactic",
|
||||
TRACE(ctx_solver_simplify_tactic,
|
||||
m_solver.display(tout) << "\n";
|
||||
tout << "simplified: " << mk_pp(n, m) << "\n" << mk_pp(e, m) << " |-> " << mk_pp(res, m) << "\n";);
|
||||
goto done;
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ public:
|
|||
m_params_ref(p),
|
||||
m_vars(m) {
|
||||
updt_params_core(p);
|
||||
TRACE("smt_tactic", tout << "p: " << p << "\n";);
|
||||
TRACE(smt_tactic, tout << "p: " << p << "\n";);
|
||||
}
|
||||
|
||||
tactic * translate(ast_manager & m) override {
|
||||
|
|
@ -83,7 +83,7 @@ public:
|
|||
}
|
||||
|
||||
void updt_params(params_ref const & p) override {
|
||||
TRACE("smt_tactic", tout << "updt_params: " << p << "\n";);
|
||||
TRACE(smt_tactic, tout << "updt_params: " << p << "\n";);
|
||||
updt_params_core(p);
|
||||
fparams().updt_params(p);
|
||||
m_params_ref.copy(p);
|
||||
|
|
@ -132,7 +132,7 @@ public:
|
|||
m_params_ref.reset();
|
||||
m_params_ref.append(o.params());
|
||||
smt::kernel * new_ctx = alloc(smt::kernel, m, m_params, m_params_ref);
|
||||
TRACE("smt_tactic", tout << "logic: " << o.m_logic << "\n";);
|
||||
TRACE(smt_tactic, tout << "logic: " << o.m_logic << "\n";);
|
||||
new_ctx->set_logic(o.m_logic);
|
||||
if (o.m_callback) {
|
||||
new_ctx->set_progress_callback(o.m_callback);
|
||||
|
|
@ -159,15 +159,15 @@ public:
|
|||
try {
|
||||
IF_VERBOSE(10, verbose_stream() << "(smt.tactic start)\n";);
|
||||
tactic_report report("smt", *in);
|
||||
TRACE("smt_tactic", tout << this << "\nAUTO_CONFIG: " << fparams().m_auto_config << " HIDIV0: " << fparams().m_hi_div0 << " "
|
||||
TRACE(smt_tactic, tout << this << "\nAUTO_CONFIG: " << fparams().m_auto_config << " HIDIV0: " << fparams().m_hi_div0 << " "
|
||||
<< " PREPROCESS: " << fparams().m_preprocess << "\n";
|
||||
tout << "RELEVANCY: " << fparams().m_relevancy_lvl << "\n";
|
||||
tout << "fail-if-inconclusive: " << m_fail_if_inconclusive << "\n";
|
||||
tout << "params_ref: " << m_params_ref << "\n";
|
||||
tout << "nnf: " << fparams().m_nnf_cnf << "\n";);
|
||||
TRACE("smt_tactic_params", m_params.display(tout););
|
||||
TRACE("smt_tactic_detail", in->display(tout););
|
||||
TRACE("smt_tactic_memory", tout << "wasted_size: " << m.get_allocator().get_wasted_size() << "\n";);
|
||||
TRACE(smt_tactic_params, m_params.display(tout););
|
||||
TRACE(smt_tactic_detail, in->display(tout););
|
||||
TRACE(smt_tactic_memory, tout << "wasted_size: " << m.get_allocator().get_wasted_size() << "\n";);
|
||||
scoped_init_ctx init(*this, m);
|
||||
SASSERT(m_ctx);
|
||||
|
||||
|
|
@ -177,7 +177,7 @@ public:
|
|||
ref<generic_model_converter> fmc;
|
||||
if (in->unsat_core_enabled()) {
|
||||
extract_clauses_and_dependencies(in, clauses, assumptions, bool2dep, fmc);
|
||||
TRACE("mus", in->display_with_dependencies(tout);
|
||||
TRACE(mus, in->display_with_dependencies(tout);
|
||||
tout << clauses << "\n";);
|
||||
if (in->proofs_enabled() && !assumptions.empty())
|
||||
throw tactic_exception("smt tactic does not support simultaneous generation of proofs and unsat cores");
|
||||
|
|
@ -210,14 +210,14 @@ public:
|
|||
r = m_ctx->check(assumptions.size(), assumptions.data());
|
||||
}
|
||||
catch(...) {
|
||||
TRACE("smt_tactic", tout << "exception\n";);
|
||||
TRACE(smt_tactic, tout << "exception\n";);
|
||||
m_ctx->collect_statistics(m_stats);
|
||||
throw;
|
||||
}
|
||||
SASSERT(m_ctx);
|
||||
m_ctx->collect_statistics(m_stats);
|
||||
proof_ref pr(m_ctx->get_proof(), m);
|
||||
TRACE("smt_tactic", tout << r << " " << pr << "\n";);
|
||||
TRACE(smt_tactic, tout << r << " " << pr << "\n";);
|
||||
switch (r) {
|
||||
case l_true: {
|
||||
if (m_fail_if_inconclusive && !in->sat_preserved())
|
||||
|
|
@ -244,7 +244,7 @@ public:
|
|||
}
|
||||
case l_false: {
|
||||
if (m_fail_if_inconclusive && !in->unsat_preserved()) {
|
||||
TRACE("smt_tactic", tout << "failed to show to be unsat...\n";);
|
||||
TRACE(smt_tactic, tout << "failed to show to be unsat...\n";);
|
||||
throw tactic_exception("under-approximated goal found to be unsat");
|
||||
}
|
||||
// formula is unsat, reset the goal, and store false there.
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ struct unit_subsumption_tactic : public tactic {
|
|||
r->elim_true();
|
||||
result.push_back(r.get());
|
||||
m_context.pop(2);
|
||||
TRACE("unit_subsumption_tactic", g->display(tout); r->display(tout););
|
||||
TRACE(unit_subsumption_tactic, g->display(tout); r->display(tout););
|
||||
}
|
||||
|
||||
void assert_clauses(goal_ref const& g) {
|
||||
|
|
@ -104,7 +104,7 @@ struct unit_subsumption_tactic : public tactic {
|
|||
bool is_unsat = m_context.inconsistent();
|
||||
m_context.pop(2);
|
||||
if (is_unsat) {
|
||||
TRACE("unit_subsumption_tactic", tout << "Removing clause " << i << "\n";);
|
||||
TRACE(unit_subsumption_tactic, tout << "Removing clause " << i << "\n";);
|
||||
m_is_deleted.set(i, true);
|
||||
m_deleted.push_back(i);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue