X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=src%2Fruntime.ml;h=3bc3256de571eac5839753a5ef40f9ad94ab78ff;hb=dc9e9ba2f50ce881c3a77743663829d661363d51;hp=0be30a75a825492b2c30f5f6508336c0552ff323;hpb=0578813dc7114276daf382d47661f027c973eb35;p=SXSI%2Fxpathcomp.git diff --git a/src/runtime.ml b/src/runtime.ml index 0be30a7..3bc3256 100644 --- a/src/runtime.ml +++ b/src/runtime.ml @@ -8,7 +8,7 @@ module type S = sig type result_set val top_down_run : Ata.t -> Tree.t -> Tree.node -> result_set val bottom_up_run : Ata.t -> Tree.t -> Compile.text_query * string -> result_set - val grammar_run : Ata.t -> Grammar.t -> unit -> result_set + val grammar_run : Ata.t -> Grammar2.t -> unit -> result_set end @@ -124,7 +124,7 @@ module Make (U : ResJIT.S) : S with type result_set = U.NS.t = in let ns1 = StateSet.inter s1 orig_s1 and ns2 = StateSet.inter s2 orig_s2 in - let res, ops, todo = eval_trans auto s1 s2 trl in + let res, ops, todo = eval_trans auto ns1 ns2 trl in let code, not_marking = ResJIT.compile ops in let todo_code, todo_notmarking = List.fold_left (fun (l, b) (p, q, o) -> let c, b' = ResJIT.compile o in @@ -299,24 +299,24 @@ DEFINE LOOP_TAG (t, states, tag, ctx) = ( | L2JIT.TAGGED_SUBTREE(s, tag) -> let count = U.NS.subtree_tags tree t tag in - if count != U.NS.empty then - let r = Array.copy empty_slot in - r.(auto.last) <- count; - s,r - else - s,empty_slot + if count != U.NS.empty then + let r = Array.copy empty_slot in + r.(auto.last) <- count; + s,r + else + s,empty_slot | L2JIT.ELEMENT_SUBTREE(s) -> - let count = U.NS.subtree_elements tree t in - if count != U.NS.empty then - let r = Array.copy empty_slot in - r.(auto.last) <- count; - s,r - else - s,empty_slot + let count = U.NS.subtree_elements tree t in + if count != U.NS.empty then + let r = Array.copy empty_slot in + r.(auto.last) <- count; + s,r + else + s,empty_slot - in + in let r = LOOP (root, states, ctx) in (*L3JIT.stats err_formatter cache3; *) r @@ -425,24 +425,29 @@ DEFINE LOOP_TAG (t, states, tag, ctx) = ( (* Grammar run *) - module ArrayPool = - struct - let pool = Queue.create () - let create dummy = - if Queue.is_empty pool then - Array.create 16 dummy - else - Queue.take pool - let create dummy = Array.create 16 dummy - let free p = Queue.add p pool - end + external is_young : 'a array -> bool = "caml_custom_is_young" "noalloc" + external blit : 'a array -> int -> 'a array -> int -> int -> unit = "caml_custom_array_blit" + module M = Map.Make(struct type t = Grammar.n_symbol let compare = compare end) + let log = ref M.empty + let log_symbol s = + let c = try M.find s !log with _ -> 0 in + log:= M.add s (c+1) !log + ;; + let () = at_exit (fun () -> M.iter (fun i j -> + if j > 0 then + Printf.eprintf "%i->%i\n%!" + (Grammar.symbol i) j) !log ) + ;; + let blit a1 o1 a2 o2 l = if l != 0 then + for i = 0 to l - 1 do + a2.(o2 + i) <- a1.(o1 + i); + done - let grammar_run auto g () = - let start_symbol = (Node.of_int 0) in - let dummy_leaf = Grammar.Leaf (Node.nil) in + let grammar_run auto g () = + let dummy_leaf = Grammar2.Leaf (Node.nil) in let res_len = (StateSet.max_elt auto.states) + 1 in let empty_slot = Array.create res_len U.NS.empty in let nil_res = auto.bottom_states, empty_slot in @@ -450,8 +455,10 @@ DEFINE LOOP_TAG (t, states, tag, ctx) = ( let cache3 = L3JIT.create () in let dummy2 = (StateSet.empty, StateSet.empty, Translist.nil) in let cache2 = Cache.Lvl2.create 512 dummy2 in - let tmp1 = Array.create 16 dummy_leaf in - let tmp2 = Array.create 16 dummy_leaf in + let rule_counter = ref 0 in + let start_counter = ref 0 in + let () = at_exit (fun () -> Printf.eprintf "start_couter=%i, rule_counter=%i\n%!" + !start_counter !rule_counter) in let get_trans tag states = let c = Cache.Lvl2.find cache2 tag (Uid.to_int states.StateSet.Node.id) in if c == dummy2 then @@ -476,104 +483,94 @@ DEFINE LOOP_TAG (t, states, tag, ctx) = ( else c in let rec start_loop idx states = + incr (start_counter); TRACE("grammar", 2, __ "Node %i\n%!" (Node.to_int idx)); if idx < Node.null then nil_res else if StateSet.is_empty states then empty_res else begin - let symbol = Grammar.get_symbol_at g start_symbol idx in - if Grammar.is_terminal symbol then - let symbol = Grammar.terminal symbol in - let tag = Grammar.tag symbol in - let lst, rst, trans = get_trans tag states in - let fs = Grammar.first_child g start_symbol idx in - let s1, slot1 = start_loop fs lst in - let s2, slot2 = start_loop (Grammar.next_sibling g start_symbol fs) rst in - let opcode = L3JIT.find cache3 trans s1 s2 in - if opcode == L3JIT.dummy then (L3JIT.cache_apply cache3 auto trans s1 s2) empty_slot slot1 slot2 (Obj.magic ()) (Obj.magic ()) - else opcode empty_slot slot1 slot2 (Obj.magic ()) (Obj.magic()) + let symbol = Grammar2.start_tag g idx in + if Grammar2.is_terminal g symbol then + let symbol = Grammar2.terminal symbol in + if symbol == Grammar2.nil_symbol then nil_res else + let tag = Grammar2.tag symbol in + let lst, rst, trans = get_trans tag states in + let fs = Grammar2.start_first_child g idx in + let s1, slot1 = start_loop fs lst in + let s2, slot2 = start_loop (Grammar2.start_next_sibling g fs) rst in + let opcode = L3JIT.find cache3 trans s1 s2 in + if opcode == L3JIT.dummy then + (L3JIT.cache_apply cache3 auto trans s1 s2) empty_slot slot1 slot2 (Obj.magic ()) (Obj.magic ()) + else opcode empty_slot slot1 slot2 (Obj.magic ()) (Obj.magic()) else - let tn = Grammar.non_terminal symbol in - let nparam = Grammar.num_params tn in - let a_param = tmp1 (*ArrayPool.create dummy_leaf*) in - let child = ref (Grammar.first_child g start_symbol idx) in - for i = 0 to nparam - 1 do - let c = !child in - a_param.(i) <- Grammar.Leaf c; - child := Grammar.next_sibling g start_symbol c; - done; - (*let a_param = Array.init nparam - (fun _ -> let c = !child in - child := Grammar.next_sibling g start_symbol c; - Grammar.Leaf c) - in *) - rule_loop tn a_param states - + let nt = Grammar2.non_terminal symbol in + let rhs = Grammar2.get_rule g nt in + let nparam = Grammar2.get_rank rhs in + match nparam with + | 0 -> rule_loop nt states 0 dummy_leaf dummy_leaf + | 1 -> rule_loop nt states 1 (Grammar2.Leaf(Grammar2.start_first_child g idx)) dummy_leaf + | 2 -> + let fc = Grammar2.start_first_child g idx in + let ns = Grammar2.start_next_sibling g fc in + rule_loop nt states 2 (Grammar2.Leaf fc) (Grammar2.Leaf ns) + | _ -> assert false end - and counter = ref 0 - and rule_loop (t : Grammar.n_symbol) a_param states = - - incr counter; - if !counter land 8191 == 0 then Gc.minor(); - - let id1 = Grammar.get_id1 g t in - let id2 = Grammar.get_id2 g t in - let param_pos = Grammar.get_param_pos g t in - let nparam1 = Grammar.num_children id1 in - let nparam2 = - if Grammar.is_terminal id2 && Grammar.is_nil g (Grammar.terminal id2) then 0 - else Grammar.num_children id2 - in - let a_param1 = (*ArrayPool.create dummy_leaf*) tmp2 (* Array.create nparam1 dummy_leaf *) in - let a_param2 = Array.create nparam2 dummy_leaf (* Array.create nparam2 dummy_leaf *) in - let i = param_pos - 2 in - (*Array.blit a_param 0 a_param1 0 (i+1); (* Pass parameters before id2 *) *) - (* Array.blit is too slow *) - for k = 0 to i do - a_param1.(k) <- a_param.(k); - done; - a_param1.(i+1) <- Grammar.Node(id2, a_param2); (* id2( ... ) *) - (*Array.blit a_param (i + nparam2 + 1) a_param1 (i+2) (nparam1 - i - 2); (* Pass parameters after id2 *) *) - for k = 0 to nparam1 - i -3 do - a_param1.(i+2+k) <- a_param.(i + nparam2 + 1 + k); - done; - (*Array.blit a_param (i + 1) a_param2 0 nparam2; (* parameters below id2 *) *) - for k = 0 to nparam2 - 1 do - a_param2.(k) <- a_param.(i+1+k) - done; - for i = 0 to nparam1 do - a_param.(i) <- a_param1.(i) - done; - if Grammar.is_non_terminal id1 then - let id1 = Grammar.non_terminal id1 in - rule_loop id1 a_param states + and rule_loop (t : Grammar2.n_symbol) states rank y0 y1 = + incr rule_counter; + if !rule_counter land (65535) == 0 then begin Gc.minor() end; + let rhs = Grammar2.get_rule g t in + let id1 = Grammar2.get_id1 rhs in + let id2 = Grammar2.get_id2 rhs in + let conf = Grammar2.get_conf rhs in + if Grammar2.is_non_terminal g id1 then + let id1 = Grammar2.non_terminal id1 in + match conf with + | Grammar2.C0 -> rule_loop id1 states 1 (Grammar2.Node0 id2) dummy_leaf + | Grammar2.C1 -> rule_loop id1 states 1 (Grammar2.Node1(id2,y0)) dummy_leaf + | Grammar2.C2 -> rule_loop id1 states 2 (Grammar2.Node0 id2) y0 + | Grammar2.C3 -> rule_loop id1 states 2 y0 (Grammar2.Node0 id2) + | Grammar2.C4 -> rule_loop id1 states 1 (Grammar2.Node2(id2, y0, y1)) dummy_leaf + | Grammar2.C5 -> rule_loop id1 states 2 (Grammar2.Node1(id2, y0)) y1 + | Grammar2.C6 -> rule_loop id1 states 2 y0 (Grammar2.Node1(id2, y1)) else - let id1 = Grammar.terminal id1 in - terminal_loop id1 a_param states - - and terminal_loop (symbol : Grammar.t_symbol) a_param states = - if Grammar.is_nil g symbol then nil_res else begin + let id1 = Grammar2.terminal id1 in + match conf with + | Grammar2.C0 | Grammar2.C1 -> assert false + | Grammar2.C2 -> terminal_loop id1 states (Grammar2.Node0 id2) y0 + | Grammar2.C3 -> terminal_loop id1 states y0 (Grammar2.Node0 id2) + | Grammar2.C4 -> assert false + | Grammar2.C5 -> terminal_loop id1 states (Grammar2.Node1(id2, y0)) y1 + | Grammar2.C6 -> terminal_loop id1 states y0 (Grammar2.Node1(id2, y1)) + + and terminal_loop (symbol : Grammar2.t_symbol) states y0 y1 = + if symbol == Grammar2.nil_symbol then nil_res else begin (* todo factor in from start_loop *) - let tag = Grammar.tag symbol in + let tag = Grammar2.tag symbol in let lst, rst, trans = get_trans tag states in - let s1, slot1 = partial_loop a_param.(0) lst in - let s2, slot2 = partial_loop a_param.(1) rst in + let s1, slot1 = partial_loop y0 lst in + let s2, slot2 = partial_loop y1 rst in let opcode = L3JIT.find cache3 trans s1 s2 in - if opcode == L3JIT.dummy then (L3JIT.cache_apply cache3 auto trans s1 s2) empty_slot slot1 slot2 (Obj.magic ()) (Obj.magic ()) + if opcode == L3JIT.dummy then + (L3JIT.cache_apply cache3 auto trans s1 s2) empty_slot slot1 slot2 (Obj.magic ()) (Obj.magic ()) else opcode empty_slot slot1 slot2 (Obj.magic()) (Obj.magic()) - - (* End: TODO refactor *) - end and partial_loop l states = match l with - | Grammar.Leaf id -> start_loop id states - | Grammar.Node (id, a_param) -> - if Grammar.is_terminal id then terminal_loop (Grammar.terminal id) a_param states - else rule_loop (Grammar.non_terminal id) a_param states + | Grammar2.Leaf id -> start_loop id states + | Grammar2.Node0 id -> + if (Grammar2.terminal id) == Grammar2.nil_symbol then nil_res + else + rule_loop (Grammar2.non_terminal id) states 0 dummy_leaf dummy_leaf + | Grammar2.Node1 (id, y0) -> + rule_loop (Grammar2.non_terminal id) states 1 y0 dummy_leaf + | Grammar2.Node2 (id, y0, y1) -> + if Grammar2.is_terminal g id then + terminal_loop (Grammar2.terminal id) states y0 y1 + else + rule_loop (Grammar2.non_terminal id) states 1 y0 y1 in - (*L3JIT.stats err_formatter cache3; *) + let _, slot = start_loop (Node.null) auto.init in slot.(StateSet.min_elt auto.topdown_marking_states) ;;