From: Lucca Hirschi Date: Mon, 16 Jul 2012 15:56:06 +0000 (+0200) Subject: Fst fixpoint is now hconsed. X-Git-Tag: Core+Extentions+Optim-hconsed_V1~5 X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=commitdiff_plain;h=47c422581d5abf820d950613a419c8fa3f97ca11 Fst fixpoint is now hconsed. --- diff --git a/bench_test b/bench_test index 82104b2..b3b7bb8 100755 --- a/bench_test +++ b/bench_test @@ -1,7 +1,7 @@ -echo \#\#\# DOC : -cat ./tests/docs/XPath-PT.xml -echo -for quer in ./tests/queries/XPath-PT/*.xpl ; do +#echo \#\#\# DOC : +#cat ./tests/docs/XPath-PT.xml +#echo +for quer in ./tests/queries/XPath-PT/A1.xpl ; do echo $quer: cat "$quer" ./solve.native ./tests/docs/XPath-PT.xml -f "$quer" diff --git a/res b/res new file mode 100644 index 0000000..19e73f9 --- /dev/null +++ b/res @@ -0,0 +1,10 @@ +## Without any hcons in Run: +real 0m17.668s +user 0m17.204s +sys 0m0.395s + +## With a hconsed fixpoint in BU_Oracle: +real 0m17.625s +user 0m17.202s +sys 0m0.395s + diff --git a/src/asta.ml b/src/asta.ml index 965486a..f96cd42 100644 --- a/src/asta.ml +++ b/src/asta.ml @@ -39,6 +39,7 @@ struct State.print st (QNameSet.to_string la) Formula.print f + end module SetT = diff --git a/src/run.ml b/src/run.ml index 62ec37a..8529d9b 100644 --- a/src/run.ml +++ b/src/run.ml @@ -13,6 +13,8 @@ (* *) (***********************************************************************) +INCLUDE "utils.ml" + module Node = struct type t = int @@ -31,11 +33,51 @@ exception Oracle_fail exception Over_max_fail exception Max_fail + +(* Hash Consign modules *) + +module type Oracle_fixpoint = +sig + type t = StateSet.t*StateSet.t*StateSet.t*((StateSet.elt*Formula.t) list)*QName.t + val equal : t -> t -> bool + val hash : t -> int +end + +type dStateS = StateSet.t*StateSet.t +module type Run_fixpoint = +sig + type t = dStateS*dStateS*dStateS*(State.t*Formula.t) list*QName.t + val equal : t -> t -> bool + val hash : t -> int +end + +module Oracle_fixpoint : Oracle_fixpoint = struct + type t = + StateSet.t*StateSet.t*StateSet.t*((StateSet.elt*Formula.t) list)*QName.t + let equal (s,l,r,list,t) (s',l',r',list',t') = StateSet.equal s s' && + StateSet.equal l l' && StateSet.equal r r' && QName.equal t t' + let hash (s,l,r,list,t) = + HASHINT4(StateSet.hash s, StateSet.hash l, StateSet.hash r, QName.hash t) +end + +let dequal (x,y) (x',y') = StateSet.equal x x' && StateSet.equal y y' +let dhash (x,y) = HASHINT2(StateSet.hash x, StateSet.hash y) +module Run_fixpoint : Run_fixpoint = struct + type t = dStateS*dStateS*dStateS*(State.t*Formula.t) list*QName.t + let equal (s,l,r,list,t) (s',l',r',list',t') = dequal s s' && + dequal l l' && dequal r r' && QName.equal t t' + let hash (s,l,r,list,t) = + HASHINT4(dhash s, dhash l, dhash r, QName.hash t) +end + +module HashOracle = Hashtbl.Make(Oracle_fixpoint) +module HashRun = Hashtbl.Make(Run_fixpoint) + (* Mapped sets for leaves *) let map_leaf asta = (Asta.bot_states_s asta, StateSet.empty) (* Build the Oracle *) -let rec bu_oracle asta run tree tnode = +let rec bu_oracle asta run tree tnode hashOracle= let node = Tree.preorder tree tnode in if Tree.is_leaf tree tnode then @@ -48,32 +90,39 @@ let rec bu_oracle asta run tree tnode = let fnode,nnode = (* their preorders *) (Tree.preorder tree tfnode, Tree.preorder tree tnnode) in begin - bu_oracle asta run tree tfnode; - bu_oracle asta run tree tnnode; - let q_rec n = (* compute the set for child/sibling *) - try NodeHash.find run n - with Not_found -> map_leaf asta in - let (_,qfr),(_,qnr) = q_rec fnode,q_rec nnode (* computed in rec call *) - and lab = Tree.tag tree tnode in - let _,list_tr = Asta.transitions_lab asta lab in (* only reco. tran.*) - let rec result set flag = function (* add states which satisfy a transition *) + bu_oracle asta run tree tfnode hashOracle; + bu_oracle asta run tree tnnode hashOracle; + (* add states which satisfy a transition *) + let rec result set qfr qnr flag = function | [] -> set,flag | (q,form) :: tl -> if Formula.eval_form (set,qfr,qnr) form (* evaluates the formula*) then if StateSet.mem q set - then result set 0 tl - else result (StateSet.add q set) 1 tl - else result set 0 tl in - let rec fix_point set_i = (* compute the fixed point of states of node *) - let set,flag = result set_i 0 list_tr in - if flag = 0 then set - else fix_point set in - NodeHash.add run node (StateSet.empty, fix_point StateSet.empty) + then result set qfr qnr 0 tl + else result (StateSet.add q set) qfr qnr 1 tl + else result set qfr qnr 0 tl in + (* compute the fixed point of states of node *) + let rec fix_point set_i qfr qnr list_tr t = + try HashOracle.find hashOracle (set_i, qfr, qnr, list_tr, t) + with _ -> + let set,flag = result set_i qfr qnr 0 list_tr in + HashOracle.add hashOracle (set_i,qfr,qnr,list_tr,t) (set); + if flag = 0 + then set + else fix_point set qfr qnr list_tr t in + let q_rec n = (* compute the set for child/sibling *) + try NodeHash.find run n + with Not_found -> map_leaf asta in + let (_,qfr),(_,qnr) = q_rec fnode,q_rec nnode (* computed in rec call *) + and lab = Tree.tag tree tnode in + let _,list_tr = Asta.transitions_lab asta lab in (*only reco. tran.*) + NodeHash.add run node (StateSet.empty, + fix_point StateSet.empty qfr qnr list_tr lab) end - + (* Build the over-approx. of the maximal run *) -let rec bu_over_max asta run tree tnode = +let rec bu_over_max asta run tree tnode hashRun = if (Tree.is_leaf tree tnode) (* BU_oracle has already created the map *) then () @@ -81,8 +130,8 @@ let rec bu_over_max asta run tree tnode = let tfnode = Tree.first_child_x tree tnode and tnnode = Tree.next_sibling tree tnode in begin - bu_over_max asta run tree tfnode; - bu_over_max asta run tree tnnode; + bu_over_max asta run tree tfnode hashRun; + bu_over_max asta run tree tnnode hashRun; let (fnode,nnode) = (Tree.preorder tree tfnode, Tree.preorder tree tnnode) and node = Tree.preorder tree tnode in @@ -109,7 +158,7 @@ let rec bu_over_max asta run tree tnode = (* Build the maximal run *) -let rec tp_max asta run tree tnode = +let rec tp_max asta run tree tnode hashRun = if (Tree.is_leaf tree tnode) (* BU_oracle has already created the map *) then () @@ -199,22 +248,28 @@ let rec tp_max asta run tree tnode = then () else NodeHash.replace run nnode (StateSet.inter qnq qr,qnr); (* indeed we delete all states from self transitions! *) - tp_max asta run tree tfnode; - tp_max asta run tree tnnode; + tp_max asta run tree tfnode hashRun; + tp_max asta run tree tnnode hashRun; end; end let compute tree asta = let flag = 2 in (* debug *) let size_tree = 10000 in (* todo (Tree.size ?) *) + let size_hcons_O = 1000 in (* todo size Hashtbl *) + let size_hcons_M = 1000 in (* todo size Hashtbl *) let map = NodeHash.create size_tree in - bu_oracle asta map tree (Tree.root tree); + let hashOracle = HashOracle.create(size_hcons_O) in + bu_oracle asta map tree (Tree.root tree) hashOracle; + HashOracle.clear hashOracle; if flag > 0 then begin - bu_over_max asta map tree (Tree.root tree); + let hashRun = HashRun.create(size_hcons_M) in + bu_over_max asta map tree (Tree.root tree) hashRun; if flag = 2 then - tp_max asta map tree (Tree.root tree) - else () + tp_max asta map tree (Tree.root tree) hashRun + else (); + HashRun.clear hashRun; end else (); map diff --git a/src/solve.ml b/src/solve.ml index 6e25db2..4ab1147 100644 --- a/src/solve.ml +++ b/src/solve.ml @@ -47,6 +47,10 @@ let compute_run doc query = let () = let flag = Array.length Sys.argv = 5 in + let flag2 = + if flag + then int_of_string Sys.argv.(4) = 1 + else false in Format.pp_set_margin err_formatter 80; let doc = doc () in let queries = query () in @@ -65,8 +69,10 @@ let () = fprintf err_formatter " ### Query: %a" XPath.Ast.print query else (); - fprintf err_formatter "@. ### Selected nodes: {%a}@." - print_selec selected_nodes; + if flag2 then + fprintf err_formatter "@. ### Selected nodes: {%a}@." + print_selec selected_nodes + else (); if flag then begin Asta.print err_formatter asta;