mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-07-15 03:25:43 +00:00
Code Activity

smt: add smt.relevancy.watch_filter toggle for the watch-list filter

Browse source 
Make the relevancy_propagator watch-list membership filter (m_is_watched)
runtime-toggleable via a new boolean parameter smt.relevancy.watch_filter
(default true). When false, get_watches() always probes m_watches, giving
the pre-filter behavior. This enables A/B performance comparison of the
same binary (filter on vs off) under the Ramon benchmark harness.

Behavior-preserving either way: verified identical results on QF_LIA with
the filter on and off.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
Lev Nachmanson 2026-07-03 12:43:57 -07:00
parent caa34b7937
commit 435e4d7897
4 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/params/smt_params.cpp
View file

@ -26,6 +26,7 @@ void smt_params::updt_local_params(params_ref const & _p) {
m_auto_config = p.auto_config() && gparams::get_value("auto_config") == "true"; // auto-config is not scoped by smt in gparams.
m_random_seed = p.random_seed();
m_relevancy_lvl = p.relevancy();
m_relevancy_watch_filter = p.relevancy_watch_filter();
m_ematching = p.ematching();
m_ho_matching = p.ho_matching();
m_induction = p.induction();

1
src/params/smt_params.h
View file

@ -88,6 +88,7 @@ struct smt_params : public preprocessor_params,
bool m_eq_propagation = true;
bool m_binary_clause_opt = true;
unsigned m_relevancy_lvl = 2;
bool m_relevancy_watch_filter = true;
bool m_relevancy_lemma = false;
unsigned m_random_seed = 0;
double m_random_var_freq = 0.01;

1
src/params/smt_params_helper.pyg
View file

@ -6,6 +6,7 @@ def_module_params(module_name='smt',
('logic', SYMBOL, '', 'logic used to setup the SMT solver'),
('random_seed', UINT, 0, 'random seed for the smt solver'),
('relevancy', UINT, 2, 'relevancy propagation heuristic: 0 - disabled, 1 - relevancy is tracked by only affects quantifier instantiation, 2 - relevancy is tracked, and an atom is only asserted if it is relevant'),
('relevancy.watch_filter', BOOL, True, 'use a monotonic membership filter to skip the watch-list map probe for unwatched literals in the relevancy propagator (behavior-preserving performance toggle)'),
('macro_finder', BOOL, False, 'try to find universally quantified formulas that can be viewed as macros'),
('quasi_macros', BOOL, False, 'try to find universally quantified formulas that are quasi-macros'),
('restricted_quasi_macros', BOOL, False, 'try to find universally quantified formulas that are restricted quasi-macros'),

13
src/smt/smt_relevancy.cpp
View file

@ -148,6 +148,10 @@ namespace smt {
// obj_map pointer-hash probe for the common unwatched-literal case at the
// assign_eh hotspot.
uint_set m_is_watched[2];
// When false, the m_is_watched fast-path filter is disabled and
// get_watches() always probes m_watches (original behavior). Toggle via
// the smt.relevancy.watch_filter parameter for A/B performance testing.
bool m_use_watch_filter = true;
struct eh_trail {
enum class kind { POS_WATCH, NEG_WATCH, HANDLER };
kind m_kind;
@ -166,7 +170,9 @@ namespace smt {
bool m_propagating = false;
relevancy_propagator_imp(context & ctx):
relevancy_propagator(ctx), m_relevant_exprs(ctx.get_manager()) {}
relevancy_propagator(ctx), m_relevant_exprs(ctx.get_manager()) {
m_use_watch_filter = ctx.get_fparams().m_relevancy_watch_filter;
}
~relevancy_propagator_imp() override {
ast_manager & m = get_manager();
@ -193,7 +199,7 @@ namespace smt {
relevancy_ehs * get_watches(expr * n, bool val) {
unsigned idx = val ? 1 : 0;
if (!m_is_watched[idx].contains(n->get_id()))
if (m_use_watch_filter && !m_is_watched[idx].contains(n->get_id()))
return nullptr;
relevancy_ehs * r = nullptr;
m_watches[idx].find(n, r);
@ -207,7 +213,8 @@ namespace smt {
m_watches[idx].erase(n);
else {
m_watches[idx].insert(n, ehs);
m_is_watched[idx].insert(n->get_id());
if (m_use_watch_filter)
m_is_watched[idx].insert(n->get_id());
}
}