From 6844beef9142975d1bf4a2b3fb72b93dfa3402dc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kim=20Nguy=E1=BB=85n?= Date: Tue, 21 Jan 2014 14:10:01 +0100 Subject: [PATCH] Cosmetic changes (whitespaces and indentation) --- src/ata.ml | 7 + src/ata.mli | 4 + src/run.ml | 494 ++++++++++++++++++++++++++-------------------------- 3 files changed, 257 insertions(+), 248 deletions(-) diff --git a/src/ata.ml b/src/ata.ml index 8a13705..190c4c7 100644 --- a/src/ata.ml +++ b/src/ata.ml @@ -445,6 +445,13 @@ let compute_dependencies auto = edges +let state_prerequisites dir auto q = + Hashtbl.fold (fun q' trans acc -> + List.fold_left (fun acc (_, phi) -> + let m_phi = Formula.get_states_by_move phi in + if StateSet.mem q (Move.get m_phi dir) + then StateSet.add q' acc else acc) + acc trans) auto.transitions StateSet.empty let compute_rank auto = let dependencies = compute_dependencies auto in diff --git a/src/ata.mli b/src/ata.mli index e1fdc4a..443bb0b 100644 --- a/src/ata.mli +++ b/src/ata.mli @@ -141,6 +141,10 @@ val get_form : t -> QNameSet.elt -> State.t -> Formula.t (** [get_form auto l q] returns a single formula for label [l] in state [q]. Takes time proportional to the number of transitions in the automaton. *) +val state_prerequisites : move -> t -> State.t -> StateSet.t +(** [state_prerequisites m auto q] returns the set of all states q' such + that [q', _ -> phi] and [m(q)] is in phi +*) val print : Format.formatter -> t -> unit (** Pretty printing of the automaton *) diff --git a/src/run.ml b/src/run.ml index bc6518a..be8bbeb 100644 --- a/src/run.ml +++ b/src/run.ml @@ -31,18 +31,18 @@ type stats = { mutable pass : int; module NodeSummary = struct - (* Pack into an integer the result of the is_* and has_ predicates - for a given node *) + (* Pack into an integer the result of the is_* and has_ predicates + for a given node *) type t = int let dummy = -1 - (* - ...44443210 - ...4444 -> kind - 3 -> has_right - 2 -> has_left - 1 -> is_right - 0 -> is_left - *) + (* + ...44443210 + ...4444 -> kind + 3 -> has_right + 2 -> has_left + 1 -> is_right + 0 -> is_left + *) let is_left (s : t) : bool = s land 1 != 0 @@ -53,7 +53,7 @@ struct s land 0b100 != 0 let has_right (s : t) : bool = - s land 0b1000 != 0 + s land 0b1000 != 0 let kind (s : t) : Tree.NodeKind.t = Obj.magic (s lsr 4) @@ -64,207 +64,207 @@ struct ((int_of_bool has_left) lsl 2) lor ((int_of_bool has_right) lsl 3) lor ((Obj.magic kind) lsl 4) - end +end - let dummy_set = StateSet.singleton State.dummy +let dummy_set = StateSet.singleton State.dummy -IFDEF HTMLTRACE -THEN - type sat_array = StateSet.t array list - DEFINE IFHTML(a,b) = (a) -ELSE - type sat_array = StateSet.t array - DEFINE IFHTML(a,b) = (b) -END + IFDEF HTMLTRACE + THEN +type sat_array = StateSet.t array list + DEFINE IFHTML(a,b) = (a) + ELSE +type sat_array = StateSet.t array + DEFINE IFHTML(a,b) = (b) + END - let unsafe_get a i = - if i < 0 then StateSet.empty else - Array.unsafe_get (IFHTML(List.hd a, a)) i +let unsafe_get a i = + if i < 0 then StateSet.empty else + Array.unsafe_get (IFHTML(List.hd a, a)) i - let unsafe_set a i v old_v = - if v != old_v then - Array.unsafe_set (IFHTML(List.hd a, a)) i v +let unsafe_set a i v old_v = + if v != old_v then + Array.unsafe_set (IFHTML(List.hd a, a)) i v - type 'a run = { - tree : 'a ; +type 'a run = { + tree : 'a ; (* The argument of the run *) - auto : Ata.t; + auto : Ata.t; (* The automaton to be run *) - mutable sat: sat_array; + mutable sat: sat_array; (* A mapping from node preorders to states satisfied at that node *) - mutable pass : int; + mutable pass : int; (* Number of run we have performed *) - mutable fetch_trans_cache : Ata.Formula.t Cache.N2.t; + mutable fetch_trans_cache : Ata.Formula.t Cache.N2.t; (* A cache from states * label to list of transitions *) - mutable td_cache : StateSet.t Cache.N6.t; - mutable bu_cache : StateSet.t Cache.N6.t; + mutable td_cache : StateSet.t Cache.N6.t; + mutable bu_cache : StateSet.t Cache.N6.t; (* Two 6-way caches used during the top-down and bottom-up phase label * self-set * fc-set * ns-set * parent-set * node-shape -> self-set *) - node_summaries: (int, int16_unsigned_elt, c_layout) Array1.t; - stats : stats; - } - - let dummy_form = Ata.Formula.stay State.dummy - - let get_form run tag q = - let auto = run.auto in - let fetch_trans_cache = run.fetch_trans_cache in - let stats = run.stats in - let phi = - stats.fetch_trans_cache_access <- stats.fetch_trans_cache_access + 1; - Cache.N2.find fetch_trans_cache (tag.QName.id :> int) (q :> int) - in - if phi == dummy_form then - let phi = Ata.get_form auto tag q in - let () = - Cache.N2.add - fetch_trans_cache - (tag.QName.id :> int) - (q :> int) phi - in phi - else begin - stats.fetch_trans_cache_hit <- stats.fetch_trans_cache_hit + 1; - phi - end - - - let eval_form phi fcs nss ps ss summary = - let open Ata in - let rec loop phi = - begin match Formula.expr phi with - | Boolean.False -> false - | Boolean.True -> true - | Boolean.Atom (a, b) -> - begin - let open NodeSummary in - match a.Atom.node with - | Move (m, q) -> - b && StateSet.mem q ( - match m with - `First_child -> fcs - | `Next_sibling -> nss - | `Parent | `Previous_sibling -> ps - | `Stay -> ss - ) - | Is_first_child -> b == is_left summary - | Is_next_sibling -> b == is_right summary - | Is k -> b == (k == kind summary) - | Has_first_child -> b == has_left summary - | Has_next_sibling -> b == has_right summary - end - | Boolean.And(phi1, phi2) -> loop phi1 && loop phi2 - | Boolean.Or (phi1, phi2) -> loop phi1 || loop phi2 - end - in - loop phi - - - let eval_trans_aux run tag summary fcs nss ps sat todo = - StateSet.fold (fun q (a_sat) -> - let phi = - get_form run tag q - in - if eval_form phi fcs nss ps a_sat summary then - StateSet.add q a_sat - else a_sat - ) todo sat - - - let rec eval_trans_fix run tag summary fcs nss ps sat todo = - let new_sat = - eval_trans_aux run tag summary fcs nss ps sat todo - in - if new_sat == sat then sat else - eval_trans_fix run tag summary fcs nss ps new_sat todo - - - let eval_trans run trans_cache tag summary fcs nss ps ss todo = - let stats = run.stats in - let fcsid = (fcs.StateSet.id :> int) in - let nssid = (nss.StateSet.id :> int) in - let psid = (ps.StateSet.id :> int) in - let ssid = (ss.StateSet.id :> int) in - let tagid = (tag.QName.id :> int) in - - let res = Cache.N6.find trans_cache tagid summary ssid fcsid nssid psid in - stats.eval_trans_cache_access <- 1 + stats.eval_trans_cache_access; - if res != dummy_set then begin - stats.eval_trans_cache_hit <- 1 + stats.eval_trans_cache_hit; - res - end else let new_sat = - eval_trans_fix run tag summary fcs nss ps ss todo - in - Cache.N6.add trans_cache tagid summary ssid fcsid nssid psid new_sat; - new_sat + node_summaries: (int, int16_unsigned_elt, c_layout) Array1.t; + stats : stats; +} + +let dummy_form = Ata.Formula.stay State.dummy + +let get_form run tag q = + let auto = run.auto in + let fetch_trans_cache = run.fetch_trans_cache in + let stats = run.stats in + let phi = + stats.fetch_trans_cache_access <- stats.fetch_trans_cache_access + 1; + Cache.N2.find fetch_trans_cache (tag.QName.id :> int) (q :> int) + in + if phi == dummy_form then + let phi = Ata.get_form auto tag q in + let () = + Cache.N2.add + fetch_trans_cache + (tag.QName.id :> int) + (q :> int) phi + in phi + else begin + stats.fetch_trans_cache_hit <- stats.fetch_trans_cache_hit + 1; + phi + end + + +let eval_form phi fcs nss ps ss summary = + let open Ata in + let rec loop phi = + begin match Formula.expr phi with + | Boolean.False -> false + | Boolean.True -> true + | Boolean.Atom (a, b) -> + begin + let open NodeSummary in + match a.Atom.node with + | Move (m, q) -> + b && StateSet.mem q ( + match m with + `First_child -> fcs + | `Next_sibling -> nss + | `Parent | `Previous_sibling -> ps + | `Stay -> ss + ) + | Is_first_child -> b == is_left summary + | Is_next_sibling -> b == is_right summary + | Is k -> b == (k == kind summary) + | Has_first_child -> b == has_left summary + | Has_next_sibling -> b == has_right summary + end + | Boolean.And(phi1, phi2) -> loop phi1 && loop phi2 + | Boolean.Or (phi1, phi2) -> loop phi1 || loop phi2 + end + in + loop phi + + +let eval_trans_aux run tag summary fcs nss ps sat todo = + StateSet.fold (fun q (a_sat) -> + let phi = + get_form run tag q + in + if eval_form phi fcs nss ps a_sat summary then + StateSet.add q a_sat + else a_sat + ) todo sat + + +let rec eval_trans_fix run tag summary fcs nss ps sat todo = + let new_sat = + eval_trans_aux run tag summary fcs nss ps sat todo + in + if new_sat == sat then sat else + eval_trans_fix run tag summary fcs nss ps new_sat todo + + +let eval_trans run trans_cache tag summary fcs nss ps ss todo = + let stats = run.stats in + let fcsid = (fcs.StateSet.id :> int) in + let nssid = (nss.StateSet.id :> int) in + let psid = (ps.StateSet.id :> int) in + let ssid = (ss.StateSet.id :> int) in + let tagid = (tag.QName.id :> int) in + + let res = Cache.N6.find trans_cache tagid summary ssid fcsid nssid psid in + stats.eval_trans_cache_access <- 1 + stats.eval_trans_cache_access; + if res != dummy_set then begin + stats.eval_trans_cache_hit <- 1 + stats.eval_trans_cache_hit; + res + end else let new_sat = + eval_trans_fix run tag summary fcs nss ps ss todo + in + Cache.N6.add trans_cache tagid summary ssid fcsid nssid psid new_sat; + new_sat module Make (T : Tree.S) (L : Node_list.S with type node = T.node) = - struct - - let make auto tree = - let len = T.size tree in - let ba = Array1.create int16_unsigned c_layout len in - Array1.fill ba 0; - { - tree = tree; - auto = auto; - sat = (let a = Array.create len StateSet.empty in +struct + + let make auto tree = + let len = T.size tree in + let ba = Array1.create int16_unsigned c_layout len in + Array1.fill ba 0; + { + tree = tree; + auto = auto; + sat = (let a = Array.create len StateSet.empty in IFHTML([a], a)); - pass = 0; - fetch_trans_cache = Cache.N2.create dummy_form; - td_cache = Cache.N6.create dummy_set; - bu_cache = Cache.N6.create dummy_set; - node_summaries = ba; - stats = { - pass = 0; - tree_size = len; - fetch_trans_cache_access = 0; - fetch_trans_cache_hit = 0; - eval_trans_cache_access = 0; - eval_trans_cache_hit = 0; - nodes_per_run = []; - } - } - - - let top_down run update_res = - let num_visited = ref 0 in - let i = run.pass in - let tree = run.tree in - let auto = run.auto in - let states_by_rank = Ata.get_states_by_rank auto in - let td_todo = states_by_rank.(i) in - let bu_todo = - if i == Array.length states_by_rank - 1 then StateSet.empty - else - states_by_rank.(i+1) - in - let last_run = i >= Array.length states_by_rank - 2 in - let rec loop_td_and_bu node parent parent_sat = - if node == T.nil then StateSet.empty - else begin - incr num_visited; - let tag = T.tag tree node in - let node_id = T.preorder tree node in - let fc = T.first_child tree node in - let ns = T.next_sibling tree node in + pass = 0; + fetch_trans_cache = Cache.N2.create dummy_form; + td_cache = Cache.N6.create dummy_set; + bu_cache = Cache.N6.create dummy_set; + node_summaries = ba; + stats = { + pass = 0; + tree_size = len; + fetch_trans_cache_access = 0; + fetch_trans_cache_hit = 0; + eval_trans_cache_access = 0; + eval_trans_cache_hit = 0; + nodes_per_run = []; + } + } + + + let top_down run update_res = + let num_visited = ref 0 in + let i = run.pass in + let tree = run.tree in + let auto = run.auto in + let states_by_rank = Ata.get_states_by_rank auto in + let td_todo = states_by_rank.(i) in + let bu_todo = + if i == Array.length states_by_rank - 1 then StateSet.empty + else + states_by_rank.(i+1) + in + let last_run = i >= Array.length states_by_rank - 2 in + let rec loop_td_and_bu node parent parent_sat = + if node == T.nil then StateSet.empty + else begin + incr num_visited; + let tag = T.tag tree node in + let node_id = T.preorder tree node in + let fc = T.first_child tree node in + let ns = T.next_sibling tree node in (* We enter the node from its parent *) - let summary = - let s = Array1.unsafe_get run.node_summaries node_id in - if s != 0 then s else - let s = + let summary = + let s = Array1.unsafe_get run.node_summaries node_id in + if s != 0 then s else + let s = NodeSummary.make (node == (T.first_child tree parent)) (*is_left *) - (node == (T.next_sibling tree parent))(*is_right *) + (node == (T.next_sibling tree parent)) (*is_right *) (fc != T.nil) (* has_left *) (ns != T.nil) (* has_right *) (T.kind tree node) (* kind *) - in - run.node_summaries.{node_id} <- s; s - in + in + run.node_summaries.{node_id} <- s; s + in let status0 = unsafe_get run.sat node_id in (* get the node_statuses for the first child, next sibling and parent *) (* evaluate the transitions with all this statuses *) @@ -277,37 +277,35 @@ module Make (T : Tree.S) (L : Node_list.S with type node = T.node) = parent_sat status0 td_todo in - if status1 == StateSet.empty && status0 != StateSet.empty - then StateSet.empty else (* update the cache if the status of the node changed unsafe_set run.sat node_id status1 status0;*) - if bu_todo == StateSet.empty then begin - unsafe_set run.sat node_id status1 status0; (* write the td_states *) - update_res false status1 node; - let _ = loop_td_and_bu fc node status1 in - loop_td_and_bu ns node status1 (* tail call *) - end else - let fcs1, nss1 = - if last_run then - let nss1 = loop_td_and_bu ns node status1 in - let fcs1 = loop_td_and_bu fc node status1 in - fcs1, nss1 - else - let fcs1 = loop_td_and_bu fc node status1 in - let nss1 = loop_td_and_bu ns node status1 in - fcs1, nss1 - in - let status2 = - eval_trans run run.bu_cache tag - summary fcs1 - nss1 - parent_sat - status1 bu_todo - in - unsafe_set run.sat node_id status2 status0; - if last_run && status2 != StateSet.empty then update_res true status2 node; - status2 - end + if bu_todo == StateSet.empty then begin + unsafe_set run.sat node_id status1 status0; (* write the td_states *) + update_res false status1 node; + let _ = loop_td_and_bu fc node status1 in + loop_td_and_bu ns node status1 (* tail call *) + end else + let fcs1, nss1 = + if last_run then + let nss1 = loop_td_and_bu ns node status1 in + let fcs1 = loop_td_and_bu fc node status1 in + fcs1, nss1 + else + let fcs1 = loop_td_and_bu fc node status1 in + let nss1 = loop_td_and_bu ns node status1 in + fcs1, nss1 + in + let status2 = + eval_trans run run.bu_cache tag + summary fcs1 + nss1 + parent_sat + status1 bu_todo + in + unsafe_set run.sat node_id status2 status0; + if last_run && status2 != StateSet.empty then update_res true status2 node; + status2 + end in let _ = loop_td_and_bu (T.root tree) T.nil dummy_set in run.pass <- run.pass + 2; @@ -316,38 +314,38 @@ module Make (T : Tree.S) (L : Node_list.S with type node = T.node) = - let mk_update_result auto = - let sel_states = Ata.get_selecting_states auto in - let res = L.create () in - (fun prepend sat node -> - if StateSet.intersect sel_states sat then begin - if prepend then L.push_front node res else - L.push_back node res - end), - (fun () -> res) - - - let mk_update_full_result auto = - let dummy = L.create () in - let res_mapper = Cache.N1.create dummy in - let () = - StateSet.iter - (fun q -> Cache.N1.add res_mapper (q :> int) (L.create())) - (Ata.get_selecting_states auto) - in - (fun prepend sat node -> - StateSet.iter - (fun q -> - let res = Cache.N1.find res_mapper (q :> int) in - if res != dummy then begin - if prepend then L.push_front node res - else L.push_back node res - end - ) sat), - (fun () -> - StateSet.fold_right - (fun q acc -> (q, Cache.N1.find res_mapper (q :> int))::acc) - (Ata.get_selecting_states auto) []) + let mk_update_result auto = + let sel_states = Ata.get_selecting_states auto in + let res = L.create () in + (fun prepend sat node -> + if StateSet.intersect sel_states sat then begin + if prepend then L.push_front node res else + L.push_back node res + end), + (fun () -> res) + + + let mk_update_full_result auto = + let dummy = L.create () in + let res_mapper = Cache.N1.create dummy in + let () = + StateSet.iter + (fun q -> Cache.N1.add res_mapper (q :> int) (L.create())) + (Ata.get_selecting_states auto) + in + (fun prepend sat node -> + StateSet.iter + (fun q -> + let res = Cache.N1.find res_mapper (q :> int) in + if res != dummy then begin + if prepend then L.push_front node res + else L.push_back node res + end + ) sat), + (fun () -> + StateSet.fold_right + (fun q acc -> (q, Cache.N1.find res_mapper (q :> int))::acc) + (Ata.get_selecting_states auto) []) let prepare_run run list = let tree = run.tree in -- 2.17.1