From c8a123b7dd21284fb71f516fd39abae8f3fdaf26 Mon Sep 17 00:00:00 2001 From: Alex Horn Date: Thu, 11 Jun 2015 16:16:47 +0100 Subject: [PATCH] Disable a few rule transformations For this prototype, we need to disable three rule transformations, namely coi_filter, similarity_compressor, rule_inliner. But disabling the inliner causes problems with the tracer in the datalog interpreter. Since a new proprocessor is underway, we skip the problematic trace outputs for now. Signed-off-by: Alex Horn --- src/muz/rel/dl_instruction.cpp | 4 ++-- src/muz/rel/rel_context.cpp | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/muz/rel/dl_instruction.cpp b/src/muz/rel/dl_instruction.cpp index 77ba387bb..f93f88a76 100644 --- a/src/muz/rel/dl_instruction.cpp +++ b/src/muz/rel/dl_instruction.cpp @@ -553,7 +553,7 @@ namespace datalog { if (r.fast_empty()) { ctx.make_empty(m_reg); } - TRACE("dl_verbose", r.display(tout <<"post-filter-interpreted:\n");); + //TRACE("dl_verbose", r.display(tout <<"post-filter-interpreted:\n");); return true; } @@ -610,7 +610,7 @@ namespace datalog { if (ctx.reg(m_res)->fast_empty()) { ctx.make_empty(m_res); } - TRACE("dl_verbose", reg.display(tout << "post-filter-interpreted-and-project:\n");); + //TRACE("dl_verbose", reg.display(tout << "post-filter-interpreted-and-project:\n");); return true; } diff --git a/src/muz/rel/rel_context.cpp b/src/muz/rel/rel_context.cpp index c3ffdceae..44f59486e 100644 --- a/src/muz/rel/rel_context.cpp +++ b/src/muz/rel/rel_context.cpp @@ -292,17 +292,23 @@ namespace datalog { void rel_context::transform_rules() { rule_transformer transf(m_context); +#ifdef _MIN_DONE_ transf.register_plugin(alloc(mk_coi_filter, m_context)); +#endif transf.register_plugin(alloc(mk_filter_rules, m_context)); transf.register_plugin(alloc(mk_simple_joins, m_context)); if (m_context.unbound_compressor()) { transf.register_plugin(alloc(mk_unbound_compressor, m_context)); } +#ifdef _MIN_DONE_ if (m_context.similarity_compressor()) { transf.register_plugin(alloc(mk_similarity_compressor, m_context)); } +#endif transf.register_plugin(alloc(mk_partial_equivalence_transformer, m_context)); +#ifdef _MIN_DONE_ transf.register_plugin(alloc(mk_rule_inliner, m_context)); +#endif transf.register_plugin(alloc(mk_interp_tail_simplifier, m_context)); transf.register_plugin(alloc(mk_separate_negated_tails, m_context));