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

refactor(th-combine): simplify handling of theory conflicts

Browse source
This commit is contained in:
Simon Cruanes 2018-08-18 18:55:17 -05:00
parent dd58fa21ef
commit 400f2e02f1
1 changed files with 17 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/smt/Theory_combine.ml
View file

@ -31,8 +31,6 @@ type t = {
(** congruence closure *) (** congruence closure *)
mutable theories : Theory.state list; mutable theories : Theory.state list;
(** Set of theories *) (** Set of theories *)
mutable conflict: conflict option;
(** current conflict, if any *)
} }
let[@inline] cc t = Lazy.force t.cc let[@inline] cc t = Lazy.force t.cc
@ -56,54 +54,41 @@ let assume_lit (self:t) (lit:Lit.t) : unit =
theories self (fun (module Th) -> Th.on_assert Th.state lit); theories self (fun (module Th) -> Th.on_assert Th.state lit);
end end
(* return result to the SAT solver *) let with_conflict_catch f =
let cdcl_return_res (self:t) : _ Sat_solver.res = try
begin match self.conflict with f ();
| None -> Sat_solver.Sat
Sat_solver.Sat with Exn_conflict lit_set ->
| Some lit_set -> let conflict_clause = IArray.of_list_map Lit.neg lit_set in
let conflict_clause = IArray.of_list_map Lit.neg lit_set in Sat_solver.Log.debugf 3
Sat_solver.Log.debugf 3 (fun k->k "(@[<1>@{<yellow>th_combine.conflict@}@ :clause %a@])"
(fun k->k "(@[<1>@{<yellow>th_combine.conflict@}@ :clause %a@])" Theory.Clause.pp conflict_clause);
Theory.Clause.pp conflict_clause); Sat_solver.Unsat (IArray.to_list conflict_clause, Proof.default)
self.conflict <- None;
Sat_solver.Unsat (IArray.to_list conflict_clause, Proof.default)
end
let with_conflict_catch self f =
begin
try
f ()
with Exn_conflict c ->
assert (CCOpt.is_none self.conflict);
self.conflict <- Some c;
end;
cdcl_return_res self
(* propagation from the bool solver *) (* propagation from the bool solver *)
let assume_real (self:t) (slice:Lit.t Sat_solver.slice_actions) = let assume_real (self:t) (slice:Lit.t Sat_solver.slice_actions) =
(* TODO if Config.progress then print_progress(); *) (* TODO if Config.progress then print_progress(); *)
let (module SA) = slice in let (module SA) = slice in
Log.debugf 5 (fun k->k "(th_combine.assume :len %d)" (Sequence.length @@ SA.slice_iter)); Log.debugf 5 (fun k->k "(th_combine.assume :len %d)" (Sequence.length @@ SA.slice_iter));
with_conflict_catch self with_conflict_catch
(fun () -> SA.slice_iter (assume_lit self)) (fun () -> SA.slice_iter (assume_lit self))
let add_formula (self:t) (lit:Lit.t) = let add_formula (self:t) (lit:Lit.t) =
let t = Lit.view lit in let t = Lit.view lit in
let lazy cc = self.cc in let lazy cc = self.cc in
ignore (C_clos.add cc t : Equiv_class.t) let n = C_clos.add cc t in
Equiv_class.set_field Equiv_class.field_is_literal true n;
()
(* propagation from the bool solver *) (* propagation from the bool solver *)
let assume (self:t) (slice:_ Sat_solver.slice_actions) = let[@inline] assume (self:t) (slice:_ Sat_solver.slice_actions) =
match self.conflict with assume_real self slice
| Some _ -> cdcl_return_res self (* already in conflict! *)
| None -> assume_real self slice
(* perform final check of the model *) (* perform final check of the model *)
let if_sat (self:t) (slice:Lit.t Sat_solver.slice_actions) : _ Sat_solver.res = let if_sat (self:t) (slice:Lit.t Sat_solver.slice_actions) : _ Sat_solver.res =
(* all formulas in the SAT solver's trail *) (* all formulas in the SAT solver's trail *)
let (module SA) = slice in let (module SA) = slice in
with_conflict_catch self with_conflict_catch
(fun () -> (fun () ->
(* final check for CC + each theory *) (* final check for CC + each theory *)
C_clos.final_check (cc self); C_clos.final_check (cc self);
@ -162,7 +147,6 @@ let create (cdcl_acts:_ Sat_solver.actions) : t =
C_clos.create ~size:1024 ~actions self.tst; C_clos.create ~size:1024 ~actions self.tst;
); );
theories = []; theories = [];
conflict = None;
} in } in
ignore (Lazy.force @@ self.cc : C_clos.t); ignore (Lazy.force @@ self.cc : C_clos.t);
self self