mirror of
https://github.com/Z3Prover/z3
synced 2026-02-23 16:57:51 +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
|
|
@ -150,7 +150,7 @@ struct goal2sat::imp : public sat::sat_internalizer {
|
|||
}
|
||||
|
||||
void mk_clause(unsigned n, sat::literal * lits, euf::th_proof_hint* ph) {
|
||||
TRACE("goal2sat", tout << "mk_clause: "; for (unsigned i = 0; i < n; i++) tout << lits[i] << " "; tout << "\n";);
|
||||
TRACE(goal2sat, tout << "mk_clause: "; for (unsigned i = 0; i < n; i++) tout << lits[i] << " "; tout << "\n";);
|
||||
if (relevancy_enabled())
|
||||
ensure_euf()->add_aux(n, lits);
|
||||
m_solver.add_clause(n, lits, mk_status(ph));
|
||||
|
|
@ -172,7 +172,7 @@ struct goal2sat::imp : public sat::sat_internalizer {
|
|||
}
|
||||
|
||||
void mk_root_clause(unsigned n, sat::literal * lits, euf::th_proof_hint* ph = nullptr) {
|
||||
TRACE("goal2sat", tout << "mk_root_clause: "; for (unsigned i = 0; i < n; i++) tout << lits[i] << " "; tout << "\n";);
|
||||
TRACE(goal2sat, tout << "mk_root_clause: "; for (unsigned i = 0; i < n; i++) tout << lits[i] << " "; tout << "\n";);
|
||||
if (relevancy_enabled())
|
||||
ensure_euf()->add_root(n, lits);
|
||||
m_solver.add_clause(n, lits, ph ? mk_status(ph) : sat::status::input());
|
||||
|
|
@ -324,7 +324,7 @@ struct goal2sat::imp : public sat::sat_internalizer {
|
|||
bool ext = m_default_external || !is_uninterp_const(t) || m_interface_vars.contains(t);
|
||||
if (ext)
|
||||
m_solver.set_external(v);
|
||||
TRACE("sat", tout << "new_var: " << v << ": " << mk_bounded_pp(t, m, 2) << " " << is_uninterp_const(t) << "\n";);
|
||||
TRACE(sat, tout << "new_var: " << v << ": " << mk_bounded_pp(t, m, 2) << " " << is_uninterp_const(t) << "\n";);
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
|
@ -396,7 +396,7 @@ struct goal2sat::imp : public sat::sat_internalizer {
|
|||
convert_euf(t, root, sign);
|
||||
return true;
|
||||
}
|
||||
TRACE("goal2sat_not_handled", tout << mk_ismt2_pp(t, m) << "\n";);
|
||||
TRACE(goal2sat_not_handled, tout << mk_ismt2_pp(t, m) << "\n";);
|
||||
std::ostringstream strm;
|
||||
strm << mk_ismt2_pp(t, m);
|
||||
throw_op_not_handled(strm.str());
|
||||
|
|
@ -408,7 +408,7 @@ struct goal2sat::imp : public sat::sat_internalizer {
|
|||
}
|
||||
|
||||
void convert_or(app * t, bool root, bool sign) {
|
||||
TRACE("goal2sat", tout << "convert_or:\n" << mk_bounded_pp(t, m, 2) << " root " << root << " stack " << m_result_stack.size() << "\n";);
|
||||
TRACE(goal2sat, tout << "convert_or:\n" << mk_bounded_pp(t, m, 2) << " root " << root << " stack " << m_result_stack.size() << "\n";);
|
||||
unsigned num = t->get_num_args();
|
||||
SASSERT(num <= m_result_stack.size());
|
||||
unsigned old_sz = m_result_stack.size() - num;
|
||||
|
|
@ -459,7 +459,7 @@ struct goal2sat::imp : public sat::sat_internalizer {
|
|||
}
|
||||
|
||||
void convert_and(app * t, bool root, bool sign) {
|
||||
TRACE("goal2sat", tout << "convert_and:\n" << mk_bounded_pp(t, m, 2) << " root: " << root << " result stack: " << m_result_stack.size() << "\n";);
|
||||
TRACE(goal2sat, tout << "convert_and:\n" << mk_bounded_pp(t, m, 2) << " root: " << root << " result stack: " << m_result_stack.size() << "\n";);
|
||||
|
||||
unsigned num = t->get_num_args();
|
||||
unsigned old_sz = m_result_stack.size() - num;
|
||||
|
|
@ -685,7 +685,7 @@ struct goal2sat::imp : public sat::sat_internalizer {
|
|||
|
||||
void convert_euf(expr* e, bool root, bool sign) {
|
||||
SASSERT(m_euf);
|
||||
TRACE("goal2sat", tout << "convert-euf " << mk_bounded_pp(e, m, 2) << " root " << root << "\n";);
|
||||
TRACE(goal2sat, tout << "convert-euf " << mk_bounded_pp(e, m, 2) << " root " << root << "\n";);
|
||||
euf::solver* euf = ensure_euf();
|
||||
sat::literal lit;
|
||||
{
|
||||
|
|
@ -783,7 +783,7 @@ struct goal2sat::imp : public sat::sat_internalizer {
|
|||
};
|
||||
|
||||
void process(expr* n, bool is_root) {
|
||||
TRACE("goal2sat", tout << "process-begin " << mk_bounded_pp(n, m, 2)
|
||||
TRACE(goal2sat, tout << "process-begin " << mk_bounded_pp(n, m, 2)
|
||||
<< " root: " << is_root
|
||||
<< " result-stack: " << m_result_stack.size()
|
||||
<< " frame-stack: " << m_frame_stack.size() << "\n";);
|
||||
|
|
@ -803,7 +803,7 @@ struct goal2sat::imp : public sat::sat_internalizer {
|
|||
app * t = _fr.m_t;
|
||||
bool root = _fr.m_root;
|
||||
bool sign = _fr.m_sign;
|
||||
TRACE("goal2sat_bug", tout << "result stack\n";
|
||||
TRACE(goal2sat_bug, tout << "result stack\n";
|
||||
tout << "ref-count: " << t->get_ref_count() << "\n";
|
||||
tout << mk_bounded_pp(t, m, 3) << " root: " << root << " sign: " << sign << "\n";
|
||||
tout << m_result_stack << "\n";);
|
||||
|
|
@ -822,16 +822,16 @@ struct goal2sat::imp : public sat::sat_internalizer {
|
|||
m_frame_stack[fsz - 1].m_idx++;
|
||||
if (!visit(arg, false, false))
|
||||
goto loop;
|
||||
TRACE("goal2sat_bug", tout << "visit " << mk_bounded_pp(arg, m, 2) << " result stack: " << m_result_stack.size() << "\n";);
|
||||
TRACE(goal2sat_bug, tout << "visit " << mk_bounded_pp(arg, m, 2) << " result stack: " << m_result_stack.size() << "\n";);
|
||||
}
|
||||
TRACE("goal2sat_bug", tout << "converting\n";
|
||||
TRACE(goal2sat_bug, tout << "converting\n";
|
||||
tout << mk_bounded_pp(t, m, 2) << " root: " << root << " sign: " << sign << "\n";
|
||||
tout << m_result_stack << "\n";);
|
||||
SASSERT(m_frame_stack.size() > sz);
|
||||
convert(t, root, sign);
|
||||
m_frame_stack.pop_back();
|
||||
}
|
||||
TRACE("goal2sat", tout
|
||||
TRACE(goal2sat, tout
|
||||
<< "done process: " << mk_bounded_pp(n, m, 3)
|
||||
<< " frame-stack: " << m_frame_stack.size()
|
||||
<< " result-stack: " << m_result_stack.size() << "\n";);
|
||||
|
|
@ -843,11 +843,11 @@ struct goal2sat::imp : public sat::sat_internalizer {
|
|||
unsigned sz = m_result_stack.size();
|
||||
(void)sz;
|
||||
SASSERT(n->get_ref_count() > 0);
|
||||
TRACE("goal2sat", tout << "internalize " << mk_bounded_pp(n, m, 2) << "\n";);
|
||||
TRACE(goal2sat, tout << "internalize " << mk_bounded_pp(n, m, 2) << "\n";);
|
||||
process(n, false);
|
||||
SASSERT(m_result_stack.size() == sz + 1);
|
||||
sat::literal result = m_result_stack.back();
|
||||
TRACE("goal2sat", tout << "done internalize " << result << " " << mk_bounded_pp(n, m, 2) << "\n";);
|
||||
TRACE(goal2sat, tout << "done internalize " << result << " " << mk_bounded_pp(n, m, 2) << "\n";);
|
||||
m_result_stack.pop_back();
|
||||
if (!result.sign() && m_map.to_bool_var(n) == sat::null_bool_var) {
|
||||
force_push();
|
||||
|
|
@ -889,9 +889,9 @@ struct goal2sat::imp : public sat::sat_internalizer {
|
|||
void process(expr * n) {
|
||||
flet<bool> _top(m_top_level, true);
|
||||
VERIFY(m_result_stack.empty());
|
||||
TRACE("goal2sat", tout << "assert: " << mk_bounded_pp(n, m, 3) << "\n";);
|
||||
TRACE(goal2sat, tout << "assert: " << mk_bounded_pp(n, m, 3) << "\n";);
|
||||
process(n, true);
|
||||
CTRACE("goal2sat", !m_result_stack.empty(), tout << m_result_stack << "\n";);
|
||||
CTRACE(goal2sat, !m_result_stack.empty(), tout << m_result_stack << "\n";);
|
||||
SASSERT(m_result_stack.empty());
|
||||
}
|
||||
|
||||
|
|
@ -980,7 +980,7 @@ struct goal2sat::imp : public sat::sat_internalizer {
|
|||
}
|
||||
f = m.mk_or(fmls);
|
||||
}
|
||||
TRACE("goal2sat", tout << mk_bounded_pp(f, m, 2) << "\n";);
|
||||
TRACE(goal2sat, tout << mk_bounded_pp(f, m, 2) << "\n";);
|
||||
process(f);
|
||||
skip_dep:
|
||||
;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue