simon/sidekick
1
0
Fork 0
mirror of https://github.com/c-cube/sidekick.git synced 2025-12-06 03:05:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

better tracing

Browse source
This commit is contained in:
Simon Cruanes 2022-08-13 13:55:01 -04:00
parent 6ccabc70aa
commit 517a5d2e5f
No known key found for this signature in database
GPG key ID: EBFFF6F283F3A2B4
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/sat/solver.ml
View file

@ -1621,6 +1621,7 @@ let pick_branch_lit ~full self : bool =
(* do some amount of search, until the number of conflicts or clause learnt
reaches the given parameters *)
let search (self : t) ~on_progress ~(max_conflicts : int) : unit =
let@ () = Profile.with_ "sat.search" in
Log.debugf 3 (fun k ->
k "(@[sat.search@ :max-conflicts %d@ :max-learnt %d@])" max_conflicts
!(self.max_clauses_learnt));
@ -1645,6 +1646,7 @@ let search (self : t) ~on_progress ~(max_conflicts : int) : unit =
assert (self.elt_head = AVec.size self.trail);
assert (self.elt_head = self.th_head);
if max_conflicts > 0 && !n_conflicts >= max_conflicts then (
Profile.instant "sat.restart";
Log.debug 1 "(sat.restarting)";
cancel_until self 0;
Stat.incr self.n_restarts;
@ -1682,6 +1684,7 @@ let[@inline] eval st lit = fst @@ eval_level st lit
(* fixpoint of propagation and decisions until a model is found, or a
conflict is reached *)
let solve_ ~on_progress (self : t) : unit =
let@ () = Profile.with_ "sat.solve" in
Log.debugf 5 (fun k ->
k "(@[sat.solve :assms %d@])" (AVec.size self.assumptions));
check_unsat_ self;
@ -1724,6 +1727,8 @@ let solve_ ~on_progress (self : t) : unit =
check_is_conflict_ self c;
Clause.iter self.store c ~f:(fun a ->
insert_var_order self (Atom.var a));
Profile.instant "sat.th-conflict";
Log.debugf 5 (fun k ->
k "(@[sat.theory-conflict-clause@ %a@])" (Clause.debug self.store)
c);

4
src/smt/solver_internal.ml
View file

@ -73,10 +73,6 @@ let[@inline] cc (self : t) = self.cc
let[@inline] tst self = self.tst
let[@inline] proof self = self.proof
let stats self = self.stat
let[@inline] has_delayed_actions self =
not (Queue.is_empty self.delayed_actions)
let registry self = self.registry
let simplifier self = self.simp
let simplify_t self (t : Term.t) : _ option = Simplify.normalize self.simp t

6
src/smtlib/Process.ml
View file

@ -170,9 +170,9 @@ let solve ?gc:_ ?restarts:_ ?proof_file ?(pp_model = false) ?(check = false)
in
let res =
Profile.with_ "solve" (fun () ->
Solver.solve ~assumptions ?on_progress ?should_stop s
(* ?gc ?restarts ?time ?memory ?progress *))
let@ () = Profile.with_ "process.solve" in
Solver.solve ~assumptions ?on_progress ?should_stop s
(* ?gc ?restarts ?time ?memory ?progress *)
in
let t2 = Sys.time () in
Printf.printf "\r";