mirror of
https://github.com/Z3Prover/z3
synced 2026-05-16 23:25:36 +00:00
d02e9fcfab
* Final version of parallel architecture for FMCAD26 submission (#9475) * setting up new backbone experiment * fix phase scores bug * debug crash from negated atoms * backbone thread/global backbones in progress, does NOT compile yet * debug, still need to add backbones worker as a new thread * setting up complicated condition variable thing for backbones worker thread * debug * debug lock contention * it's a little messy, but change how i'm checking backbones by initiating with batch check * don't split on global backbones, share global backbones once detected. still need to prune search tree with backbones * close global backbone branches in search tree * fix backbone ranking (take average of bb age over cubes and incorporate hits/num cubes the bb appears in * add stats to backbone experiment * gate the backbones experiment by local vs global * update stats and fix bug about unsat core size=1 means global backbone * phase negation ablation * unforce phase ablation * reset ablations * add todo notes * fix backbone aging * first draft of Janota Alg 7 * process exactly 10 bb candidates in each batch * fixing the Janota algorithm * add backbone stats for Janota algorithm * fix bug about global backbones not being checked unless local is also true * hopefully fix bug about closing global backbones in search tree * fix another bug in janota alg * report random seed for debug * print random seed for debug * refactor janota alg code, still can't repro the crash * fix some bugs in the janota algorithm * try to fix weird memory leak thing with ramon/linux * revert fix, it didn't work * add second backbones thread * increase chunk size when undef * fix how the 2 backbone threads work on batches (they each race to finish the same batch). this was very complicated to code due to thread synchronization and while it runs there may be bugs * update how we report stats for backbones * first draft of doing the bb threads in neg and pos mode, needs revising * fix some bugs in the positive version of the bb check, still need to review * debug some more things in the positive bb worker * keep bb candidates sorted, increase batch and chunk size * try to resolve a couple of bugs * fix very bad bug about backbones workers not doing anything * ablate positive backbone thread * fix how we record backbones in positive mode (shouldn't impact previous run) * clarify code about adding found backbones * add back the positive bb thread * try to fix the random segfault bug + ablate the postiive bb thread again * clean up logs * share clauses with bb threads * fixes Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * resolve deadlock * add comment about SAT bb case * todo comments * complete TODOs in code, still need to debug bb threads * debug bb threads, add bb_positive thread back in * ablate bb_positive thread * style * configure num bb threads as param * enable sat and unsat mode Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * updates Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * remove while true Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * updates * try to fix rewriter_exception bug * possibly reduce code under lock when only 1 bb thread * add some copilot-suggested optimizations * add copilot suggestions to fix condition variable synchronization with bb threads * revert changes that are too messy with the code * ablate collect clauses * ablate condition variable logic changes * ablate reset batch * revert ablation * remove m_batch_in_progress that makes the bb threads wait until both have exited the batch after one signals cancel (can be long if one is stuck in ctx check) * sharing theory lemmas * finish setup for search tree thread modes, and fix local bb setup to pull from the global pool * variable renames * update bb hyperparams after copilot (hopefully??) ran tuning experiments * fix possible AST manager bug * ablate collect clauses * remove bb collect shared clauses * fix local bb experiment bug and reinstate collect clauses for global bb * local bb cands are thread-local ablation * remove thread-local local bb ablation * fix bug in nonthread-local bb experiment * fix more nonthreadlocal bb bugs * try to fix local bb bug * AST manager mismatch bugfix * attempt to fix another canonicalization bug * try another bugfix * try another bugfix * try yet another bugfix * thread local bb ablation * ablate force phase * ablate set activity * undo ablations since apparently it's not forcing phase or boosting activities * remove old experiments * try guarding m_birthdate size * try to fix several bugs including with m_birthdate initialization and how we're storing original phases * one more bugfix * remove local bb experiment after negative signals on experiments, and change bb ranking to VSIDS scores as opposed to phase * select bb polarity based on phase, not VSIDS * first attempt with codex. Codex notes: What changed: - Each tree node now tracks: - active worker count - lease epoch - cancel epoch - get_cube() now hands each worker an explicit lease: (node, epoch, cancel_epoch). - try_split() and backtrack() now operate on that lease, and the batch manager releases the worker’s lease under the tree lock before mutating the node. - If another worker closes the leased node or subtree, the batch manager cancels only the workers whose current leased nodes are now closed. - Workers detect canceled leases after check(), reset their local cancel flag, abandon the stale lease, and continue instead of turning that into a global exception. - The “reopen immediately into the open queue” policy is preserved. I did not add a barrier waiting for all workers on a node to finish. - Active-worker accounting is now separate from the open/active/closed scheduling status, so reopening a node no longer erases the fact that other workers are still on it. I also updated search_tree bookkeeping so: - closure bumps node cancel/lease epochs - active-node counting uses actual active-worker presence, not just status == active * fix smts bugfix git merge issues with backtrack * fix(parallel-smt): gate split/backtrack by lease epoch What it changes: - util/search_tree.h - bumps node epoch on split - threads epoch through should_split(...) and try_split(...) - always records effort, but only split/reopen if the lease epoch still matches - smt/smt_parallel.cpp - requires is_lease_valid(..., lease.epoch) before backtrack(...) - passes lease.epoch into m_search_tree.try_split(...) * clean up code and add some comments * fix bug about backtracking condition being too strict: The epoch guard should not block backtrack(...) the same way it blocks try_split(...). A stale worker that proves UNSAT for n should still be able to close n, and that closure should then cancel the other workers on n and its subtree. I changed smt/smt_parallel.cpp accordingly: - try_split(...) still uses epoch to reject stale structural splits - backtrack(...) no longer requires is_lease_valid(..., epoch); it only requires that the lease is not already canceled So the intended asymmetry is now restored: - stale split: reject - stale unsat/backtrack: allow closure, then cancel affected workers * ablate to no backtracking on stale leases * fix merge * revert codex change about exception handling * fix linux bugs * ablate backtrack gating * attempt to fix linux crashes * ablate backtracking on global bb * the rare bb bug appears to be from creating the synthetic lease for a bb node and then backtracking on the synthetic lease. this is an attempt to fix it * clean up code * try to fix bug about active worker counts/lease accounting. current policy should hold: - stale leases: release/decrement - canceled leases: do not release/decrement (just ignore since we have an invariant that canceled leases mean closed nodes that are never revisited * delay premature root activation * fix major semantic bug about threads continually choosing the root if their lease is reset * fix cancellation to unknown status * fix very bad bug about all threads needing to start at the root * ablate active ranking: now nodes are only reopened if they are truly inactive (active worker count is 0) * fix some bugs about leases * ablate adding static effort only * fix some bugs about leases * don't explode effort for portfolio nodes * fix: still accumulate per-node effort, but don't over-accumulate on portfolio solves * restore dynamically scaled effort * clean up merge from cherry pick * tighten which nodes we detect for proven global bb closure (only detect nonclosed nodes) * fix cancel to unknown exception on bb code * lease cancellation doens't touch rlimit now, it just sets max conflicts to 0. also fix a VERY BAD BUG about effort never being updated until all leases are done on a node, which meant we never left the root * cross-thread modification of max conflicts is unsafe, so create an atomic lease canceled variable that's ch ecked in ctx where max conflicts is also checked * move atomic lease check in the context to the more global get_cancel_flag function * Fix new SIGSEV. issue: The root cause: get_cancel_flag() is called from within propagation loops (mid-BCP, mid-equality-propagation, mid-atom-propagation). When it returns true there, the solver exits early and leaves the context in an intermediate state — propagation queues partially processed, theory state potentially inconsistent with boolean state. For the global cancel (m.limit().cancel()), this is harmless: the worker exits entirely and the context is destroyed. Intermediate state doesn't matter. For a lease cancel, the context is reused — the worker gets a new cube and calls ctx->check() again on the same context object. Re-entering check() on a context interrupted mid-propagation causes it to access that corrupted intermediate state → SIGSEGV. The m_max_conflicts check is the only checkpoint that's safe for re-entry: it only fires post-conflict-resolution, pre-decision, when propagation queues are empty and theory state is consistent. Fix: Remove m_lease_canceled from get_cancel_flag(). Keep it only at safe, between-phase checkpoints where the context is in a known-consistent state. The result is two safe checkpoints for m_lease_canceled: after each conflict (post-resolution, queues empty) and before each theory final check (not yet entered the theory). Neither interrupts the solver mid-mutation. The SIGSEGV should be gone, and NIA performance should improve because long theory final checks (where NIA burns most time) are now preemptable before they start. * fix new inconsistent theory bug: The problem is returning FC_GIVEUP from inside final_check() after some theories have already run final_check_eh() and pushed propagations into the queue. Those pending propagations reference context state that gets invalidated on the next check() call → SIGSEGV. The fix: check m_lease_canceled before entering final_check() in bounded_search(), never from inside it. That way the context is always in a clean pre-final-check state when we bail out. This is safe: decide() returned false (all variables assigned, no pending propagations), theories haven't been touched yet, context is in a fully consistent state. For NIA, this is still a meaningful win — we avoid entering expensive arithmetic final checks entirely when the lease is already canceled. * ablate lease cancel check in ctx final theory check due to crash (??) * gate bb-specific code behind param * try some possible bugfixes for the sigsev * ablate some bugfixes * remove second lease cancel check in smt_context, not sure it's safe. only check where we do the max conflicts check * restore exception handling logic to master branch * restore reslimit cancels since the bug appears to be latent * add bookkeeping for race condition of multiple lease cancels on a single node (messes with reslimit) * restore unrelated code to master * restore local bb experiment * ablate restore local bb phase/activity after search * undo local bb ablation about resetting phase/activities, and reinstate the shared lemmas of length 2 and 3 experiment * re-ablate restore local bb phase/activity after search, due to positive experimental signal on smt comp LIA * change split policy from lightweight proof skeleton to VSIDS. NOTE: enabling local bb will mess with this since we aren't restoring activities right now * backtrack more aggressively in search tree: close matching external targets (i.e. repeat literals on other branches) * find_shallowest_timed_out_leaf_depth is now shallowest_unsolved_leaf_depth and is based on num activations > 0, not effort > 0 * fix soundness bug about closing external targets with nontrivial cores * epoch is no longer needed, just cancel epoch. remove epoch * core minimize draft, and fix bug in tree expansion policy about shallowest leaf depth needing to be timed out * core minimization thread (remove search tree worker core min since it was blocking) * collect shared clauses in core min thread * bugfixes in core min algorithm * fix more bugs in core min algorithm * more core min bugfixes based on feedback and increase m_core_minimize_conflict_budget to 5000 (might need to increase it more for harder SMT COMP problems) * fix bug in backtrack_unlocked * fix compiler error * more core min bugfix from nikolaj * clean up * failed literal probe collects shared clauses * core min thread shares units * failed literal thread now tests the top 500 global bb cands each round, instead of scanning everything. on QF_LIA/Sz128_2823.smt2 this got us from 51->75 discovered backbones * remove core minimizer unit sharing (experimentally showed no effect) * core minimization thread candidate cores are ranked first by depth (deepest->shallowest) then by size (largest->smallest). also, the core's node is set to the deepest node in the core which is not necessarily the search node (slightly semantically stronger). finally, clean up bb/failed literal params * failed literal probe runs continuously * fix a lot of things about the FL thread and how bb cands are being processed. also re-add the local bb experiment for ablations * ablate continuous run on FL thread (up to the max BM examples * ablate m_max_failed_literal_prioritized_size back to 100 * redesign FL probe again * ablate FL continuous probe * reinstate continuous FL probe after positive NIA signal, but also re-add the BM maintaining 1000 bb cands and these are used a s backups instead of just looping over the top 100 all the time * change FL thread scheduling to attempt to do less duplicate checks * restore some old FL behavior * batch manager dedups global bb cands by atoms, not literals. if we have 2 of the same atom, the polarity with higher rank is kept for the stored bb candidate literal. * ablations * reinstate FL check for new batch with epochs, before merge, this is a temp branch * undo comment out cv call * restore old changes * bb batch mode is continuous, with checks for new candidates after the first round * separate FL probe into 2 threads for pos and neg mode * attempt to add unit-based bb detection in chunking mode * add bb detection via workers' units. also rename some variables * modify the fallback policies for bb detection in batch mode but also in FL mode * ablate continuous checking for batch bb mode * major refactor for bb code. we share units and collect them as pruning bb's in all threads now (including core min and bb threads). we always check for units in batch mode now. finally, the batch mode fallback is now FL probing * bb candidates are atoms, not literals, since we currently test both polarities in parallel. batch mode retry terminates if we made zero progress after a retry round to avoid resource stress fix bug about bb ranking being backwards for how we process them * fix polarity bug for FL mode dedup * restore polarity-sensitive bb candidate ranking via lits * ablate sharing non-worker units * ablate share unit as bb * ablate incomplete-theory give-up paths * restore unit sharing as bb collection on workers * restore incomplete-theory give-up paths * clean up code * clean up code * clean up code --------- Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> Co-authored-by: Ilana Shapiro <ilanashapiro@Ilanas-MacBook-Pro.local> Co-authored-by: Ilana Shapiro <ilanashapiro@Ilanas-MBP.lan1> Co-authored-by: Nikolaj Bjorner <nbjorner@microsoft.com> Co-authored-by: Ilana Shapiro <ilanashapiro@Mac.localdomain> Co-authored-by: Ilana Shapiro <ilanashapiro@Ilanas-MBP.localdomain> Co-authored-by: Ilana Shapiro <ilanashapiro@Mac.lan1> * add ablate_backtracking experiment --------- Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> Co-authored-by: Ilana Shapiro <ilanashapiro@Ilanas-MacBook-Pro.local> Co-authored-by: Ilana Shapiro <ilanashapiro@Ilanas-MBP.lan1> Co-authored-by: Nikolaj Bjorner <nbjorner@microsoft.com> Co-authored-by: Ilana Shapiro <ilanashapiro@Mac.localdomain> Co-authored-by: Ilana Shapiro <ilanashapiro@Ilanas-MBP.localdomain> Co-authored-by: Ilana Shapiro <ilanashapiro@Mac.lan1> |
||
|---|---|---|
| .. | ||
| approx_nat.cpp | ||
| approx_nat.h | ||
| approx_set.cpp | ||
| approx_set.h | ||
| array.h | ||
| array_map.h | ||
| backtrackable_set.h | ||
| basic_interval.h | ||
| bit_util.cpp | ||
| bit_util.h | ||
| bit_vector.cpp | ||
| bit_vector.h | ||
| buffer.h | ||
| cancel_eh.h | ||
| chashtable.h | ||
| checked_int64.h | ||
| CMakeLists.txt | ||
| cmd_context_types.cpp | ||
| cmd_context_types.h | ||
| common_msgs.cpp | ||
| common_msgs.h | ||
| container_util.h | ||
| debug.cpp | ||
| debug.h | ||
| dec_ref_util.h | ||
| dependency.h | ||
| dictionary.h | ||
| distribution.h | ||
| dlist.h | ||
| double_manager.h | ||
| ema.h | ||
| env_params.cpp | ||
| env_params.h | ||
| error_codes.h | ||
| event_handler.h | ||
| ext_gcd.h | ||
| ext_numeral.h | ||
| f2n.h | ||
| file_path.h | ||
| fixed_bit_vector.cpp | ||
| fixed_bit_vector.h | ||
| gparams.cpp | ||
| gparams.h | ||
| hash.cpp | ||
| hash.h | ||
| hashtable.h | ||
| heap.h | ||
| hwf.cpp | ||
| hwf.h | ||
| id_gen.h | ||
| id_var_list.h | ||
| inf_eps_rational.h | ||
| inf_int_rational.cpp | ||
| inf_int_rational.h | ||
| inf_rational.cpp | ||
| inf_rational.h | ||
| inf_s_integer.cpp | ||
| inf_s_integer.h | ||
| lbool.cpp | ||
| lbool.h | ||
| lim_vector.h | ||
| list.h | ||
| luby.cpp | ||
| luby.h | ||
| machine.h | ||
| map.h | ||
| max_cliques.h | ||
| memory_manager.cpp | ||
| memory_manager.h | ||
| min_cut.cpp | ||
| min_cut.h | ||
| mpbq.cpp | ||
| mpbq.h | ||
| mpbqi.h | ||
| mpf.cpp | ||
| mpf.h | ||
| mpff.cpp | ||
| mpff.h | ||
| mpfx.cpp | ||
| mpfx.h | ||
| mpn.cpp | ||
| mpn.h | ||
| mpq.cpp | ||
| mpq.h | ||
| mpq_inf.cpp | ||
| mpq_inf.h | ||
| mpz.cpp | ||
| mpz.h | ||
| mpzzp.h | ||
| mutex.h | ||
| nat_set.h | ||
| numeral_buffer.h | ||
| obj_hashtable.h | ||
| obj_mark.h | ||
| obj_pair_hashtable.h | ||
| obj_pair_set.h | ||
| obj_ref.h | ||
| obj_ref_hashtable.h | ||
| obj_triple_hashtable.h | ||
| object_allocator.h | ||
| page.cpp | ||
| page.h | ||
| params.cpp | ||
| params.h | ||
| parray.h | ||
| permutation.cpp | ||
| permutation.h | ||
| plugin_manager.h | ||
| pool.h | ||
| prime_generator.cpp | ||
| prime_generator.h | ||
| ptr_scoped_buffer.h | ||
| queue.h | ||
| rational.cpp | ||
| rational.h | ||
| ref.h | ||
| ref_buffer.h | ||
| ref_pair_vector.h | ||
| ref_util.h | ||
| ref_vector.h | ||
| region.cpp | ||
| region.h | ||
| rlimit.cpp | ||
| rlimit.h | ||
| s_integer.cpp | ||
| s_integer.h | ||
| sat_literal.h | ||
| sat_sls.h | ||
| scoped_ctrl_c.cpp | ||
| scoped_ctrl_c.h | ||
| scoped_limit_trail.h | ||
| scoped_numeral.h | ||
| scoped_numeral_buffer.h | ||
| scoped_numeral_vector.h | ||
| scoped_ptr_vector.h | ||
| scoped_timer.cpp | ||
| scoped_timer.h | ||
| scoped_vector.h | ||
| search_tree.h | ||
| sexpr.cpp | ||
| sexpr.h | ||
| sign.h | ||
| small_object_allocator.cpp | ||
| small_object_allocator.h | ||
| smt2_util.cpp | ||
| smt2_util.h | ||
| sorting_network.h | ||
| stack.cpp | ||
| stack.h | ||
| stacked_value.h | ||
| state_graph.cpp | ||
| state_graph.h | ||
| statistics.cpp | ||
| statistics.h | ||
| stats.h | ||
| stopwatch.h | ||
| str_hashtable.h | ||
| stream_buffer.h | ||
| string_buffer.h | ||
| symbol.cpp | ||
| symbol.h | ||
| symbol_table.h | ||
| tbv.cpp | ||
| tbv.h | ||
| timeit.cpp | ||
| timeit.h | ||
| timeout.cpp | ||
| timeout.h | ||
| timer.h | ||
| top_sort.h | ||
| total_order.h | ||
| tptr.h | ||
| trace.cpp | ||
| trace.h | ||
| trace_tags.def | ||
| trace_tags.h | ||
| trail.h | ||
| uint_map.h | ||
| uint_set.h | ||
| union_find.h | ||
| util.cpp | ||
| util.h | ||
| var_queue.h | ||
| vector.h | ||
| visit_helper.h | ||
| warning.cpp | ||
| warning.h | ||
| z3_exception.cpp | ||
| z3_exception.h | ||
| z3_version.h.cmake.in | ||
| z3_version.h.in | ||
| zstring.cpp | ||
| zstring.h | ||