mirror of
https://github.com/Z3Prover/z3
synced 2026-07-23 07:22:33 +00:00
lp: gate Gomory-with-dio on genuine dio failures; separate config from runtime state (#9958)
## Summary Improves the Diophantine (`dio`) integer-feasibility controller in `int_solver`, and fixes a latent bug where the user's Gomory-cut configuration could be silently overridden at runtime. Also includes the earlier `lia_w` work: randomized hammer gates, the `int_hammer_period` / `random_hammers` parameters, and the linear `dio_calls_period` recovery. ## Motivation The controller used a **single field** both as the static `lp.dio_cuts_enable_gomory` parameter and as the live "is Gomory running" flag. It started running Gomory (and the gcd test) once `dio_calls_period` crossed a hard-coded `16`. Because `dio_calls_period` is also driven by the randomized hammer gate, on instances where `dio` is only intermittently productive the period could be ratcheted past 16 *by chance*, turning on Gomory + gcd and thrashing — e.g. `dillig/20-14` went from a 100s solve (deterministic) to a 600s timeout (randomized) purely from this spurious activation. ## Changes - **Separate config from runtime state.** Split the shared field into `m_dio_cuts_enable_gomory` (static config, never mutated) and `m_run_gomory_with_dio` (runtime flag). Toggling the runtime state can no longer clobber the user's `dio_cuts_enable_gomory` parameter. - **Trigger on genuine dio failures, not the period proxy.** Running Gomory-with-dio now starts after a count of **consecutive `undef` dio returns** (reset on a dio conflict) rather than when the randomization-inflated period crosses a threshold — robust to `random_hammers` gate variance. - **Parameterize the threshold.** New `lp.dio_gomory_enable_period` (default 16). Set it very large to never auto-start Gomory, so Gomory follows `dio_cuts_enable_gomory` only. - **Try `dio` before Gomory** in `check()` so a productive dio conflict preempts Gomory on dio-dominated instances. ## Evaluation (QF_LIA, full set, 600s, seed 555 paired) - Dio-before-Gomory: **+33** problems across the 6 `random_hammers x int_hammer_period` cells (5/6 cells improve). - New trigger (`dio_gomory_enable_period=32`, random): **6417** vs the period-16 baseline **6409**; no short-cutoff regression. - Linear `dio_calls_period` recovery: keeping it on is worth ~+20 vs off; `decrease=1` slightly ahead of the default 2. Default behavior (`dio_gomory_enable_period=16`) is byte-for-byte equivalent to the previous threshold logic. ## Notes Debug-only tracing used during analysis (the `dio_calls_period_trace` parameter plus per-hammer / period-evolution verbose output) is **not** included. --------- Signed-off-by: Lev Nachmanson <levnach@hotmail.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
parent
6fd303c4b9
commit
57fb719007
4 changed files with 72 additions and 15 deletions
|
|
@ -258,12 +258,16 @@ private:
|
|||
bool m_print_external_var_name = false;
|
||||
bool m_propagate_eqs = false;
|
||||
bool m_dio = false;
|
||||
bool m_dio_enable_gomory_cuts = false;
|
||||
bool m_dio_cuts_enable_gomory = false;
|
||||
bool m_run_gomory_with_dio = false;
|
||||
unsigned m_dio_gomory_enable_period = 16;
|
||||
bool m_dio_enable_hnf_cuts = true;
|
||||
bool m_dump_bound_lemmas = false;
|
||||
bool m_dio_ignore_big_nums = false;
|
||||
unsigned m_dio_calls_period = 4;
|
||||
unsigned m_dio_calls_period_decrease = 2;
|
||||
bool m_dio_run_gcd = true;
|
||||
bool m_random_hammers = true;
|
||||
bool m_lcube = true;
|
||||
unsigned m_lcube_flips = 16;
|
||||
public:
|
||||
|
|
@ -271,6 +275,10 @@ public:
|
|||
unsigned lcube_flips() const { return m_lcube_flips; }
|
||||
unsigned dio_calls_period() const { return m_dio_calls_period; }
|
||||
unsigned & dio_calls_period() { return m_dio_calls_period; }
|
||||
unsigned dio_calls_period_decrease() const { return m_dio_calls_period_decrease; }
|
||||
unsigned & dio_calls_period_decrease() { return m_dio_calls_period_decrease; }
|
||||
bool random_hammers() const { return m_random_hammers; }
|
||||
bool & random_hammers() { return m_random_hammers; }
|
||||
bool print_external_var_name() const { return m_print_external_var_name; }
|
||||
bool propagate_eqs() const { return m_propagate_eqs;}
|
||||
unsigned hnf_cut_period() const { return m_hnf_cut_period; }
|
||||
|
|
@ -278,8 +286,19 @@ public:
|
|||
unsigned random_next() { return m_rand(); }
|
||||
unsigned random_next(unsigned u ) { return m_rand(u); }
|
||||
bool dio() { return m_dio; }
|
||||
bool & dio_enable_gomory_cuts() { return m_dio_enable_gomory_cuts; }
|
||||
bool dio_enable_gomory_cuts() const { return m_dio && m_dio_enable_gomory_cuts; }
|
||||
// Static config: did the user request Gomory cuts up front? (lp.dio_cuts_enable_gomory)
|
||||
bool dio_cuts_enable_gomory() const { return m_dio_cuts_enable_gomory; }
|
||||
// dio_calls_period at which the Diophantine back-off starts running Gomory (lp.dio_gomory_enable_period)
|
||||
unsigned dio_gomory_enable_period() const { return m_dio_gomory_enable_period; }
|
||||
// Runtime flag owned by the Diophantine controller, kept separate from the static
|
||||
// config above so toggling it never clobbers the user's parameter: once dio has
|
||||
// backed off enough it starts running Gomory cuts alongside dio, and a productive
|
||||
// dio conflict stops them again.
|
||||
void start_running_gomory_with_dio() { m_run_gomory_with_dio = true; }
|
||||
void stop_running_gomory_with_dio() { m_run_gomory_with_dio = false; }
|
||||
// Effective state read by should_gomory_cut(): allowed if either the user enabled it
|
||||
// statically or the dio controller started running it, guarded by dio being active.
|
||||
bool dio_enable_gomory_cuts() const { return m_dio && (m_dio_cuts_enable_gomory || m_run_gomory_with_dio); }
|
||||
bool dio_run_gcd() const { return m_dio && m_dio_run_gcd; }
|
||||
bool dio_enable_hnf_cuts() const { return m_dio && m_dio_enable_hnf_cuts; }
|
||||
bool dio_ignore_big_nums() const { return m_dio_ignore_big_nums; }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue