INCLUDE "debug.ml"
+INCLUDE "trace.ml"
INCLUDE "utils.ml"
open Format
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 -> Grammar2.t -> unit -> result_set
+
end
module Make (U : ResJIT.S) : S with type result_set = U.NS.t =
in
let lvl3 = Array.fold_left
(fun acc a ->
- Array.fold_left (fun acc2 a2 ->
- Array.fold_left
- (fun acc3 a3 -> if a3 == dummy then acc3 else acc3+1) acc2 a2)
- acc a) 0 d
- in
+ Array.fold_left (fun acc2 a2 ->
+ Array.fold_left
+ (fun acc3 a3 -> if a3 != dummy then acc3+1 else acc3)
+ acc2 a2)
+ acc a) 0 d
+ in
fprintf fmt "L3JIT Statistics:
\t%i entries
\t%i used L1 lines
Translist.fold (fun t (a1, a2) ->
let _, _, _, f = Transition.node t in
let (_, _, fs1), (_, _, fs2) = Formula.st f in
- (StateSet.union s1 fs1, StateSet.union s2 fs2)
+ (StateSet.union a1 fs1, StateSet.union a2 fs2)
) trl (StateSet.empty, StateSet.empty)
in
let ns1 = StateSet.inter s1 orig_s1
let cache_apply cache auto tlist s1 s2 =
let f = gen_code auto tlist s1 s2 in
+ TRACE("grammar", 2, __ "Inserting: %i, %a, %a\n%!"
+ (Uid.to_int tlist.Translist.Node.id) StateSet.print s1 StateSet.print s2);
add cache tlist s1 s2 f; f
end
DEFINE LOOP (t, states, ctx) = (
let _t = (t) in
+ TRACE("top-down-run", 3,
+ __ "Entering node %i with loop (tag %s, context %i) with states %a\n%!"
+ (Node.to_int _t)
+ (Tag.to_string (Tree.tag tree _t))
+ (Node.to_int (ctx))
+ (StateSet.print) (states));
if _t == Tree.nil then nil_res
else
let tag = Tree.tag tree _t in
DEFINE LOOP_TAG (t, states, tag, ctx) = (
let _t = (t) in (* to avoid duplicating expression t *)
+ TRACE("top-down-run", 3,
+ __ "Entering node %i with loop_tag (tag %s, context %i) with states %a\n%!"
+ (Node.to_int _t)
+ (Tag.to_string (tag))
+ (Node.to_int (ctx))
+ (StateSet.print) (states));
if _t == Tree.nil then nil_res
else
l2jit_dispatch
| L2JIT.NOP () -> nil_res
| L2JIT.FIRST_CHILD s -> LOOP ((Tree.first_child tree t), s, ctx)
| L2JIT.NEXT_SIBLING s -> LOOP ((Tree.next_sibling tree t), s, ctx)
+(* | L2JIT.NEXT_SIBLING s -> LOOP ((Tree.next_node_before tree t ctx), s, ctx) *)
| L2JIT.FIRST_ELEMENT s -> LOOP ((Tree.first_element tree t), s, ctx)
| L2JIT.NEXT_ELEMENT s -> LOOP ((Tree.next_element tree t), s, ctx)
+(* | L2JIT.NEXT_ELEMENT s -> LOOP ((Tree.next_node_before tree t ctx), s, ctx) *)
| L2JIT.TAGGED_DESCENDANT (s, tag) ->
LOOP_TAG ((Tree.tagged_descendant tree t tag), s, 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
- LOOP (root, states, ctx)
+ in
+ let r = LOOP (root, states, ctx) in
+ (*L3JIT.stats err_formatter cache3; *)
+ r
let full_top_down_run auto states tree root =
(*Ata.init (); *)
let top_down_run auto tree root =
(*Ata.init (); *)
let res, slot = full_top_down_run auto auto.init tree root in
+
slot.(StateSet.min_elt auto.topdown_marking_states)
slot.(StateSet.min_elt auto.topdown_marking_states)
+(* Grammar run *)
+
+ 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 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
+ let empty_res = StateSet.empty, empty_slot in
+ let cache3 = L3JIT.create () in
+ let dummy2 = (StateSet.empty, StateSet.empty, Translist.nil) in
+ let cache2 = Cache.Lvl2.create 512 dummy2 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
+ let c =
+ StateSet.fold (fun q tr_acc ->
+ List.fold_left
+ (fun ((lstates, rstates, tacc) as acc) (ts, trs) ->
+ if TagSet.mem (Tag.translate tag) ts then
+ let _, _, _, phi = Transition.node trs in
+ let (_,_,l),(_,_,r) = Formula.st phi in
+ (StateSet.union l lstates,
+ StateSet.union r rstates,
+ Translist.cons trs tacc)
+ else acc)
+ tr_acc (Hashtbl.find auto.trans q)
+ ) states (StateSet.empty, StateSet.empty, Translist.nil)
+ in
+ begin
+ Cache.Lvl2.add cache2 tag (Uid.to_int states.StateSet.Node.id) c;
+ c
+ end
+ 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 = 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 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 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 = 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 = Grammar2.tag symbol in
+ let lst, rst, trans = get_trans tag states 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 ())
+ else
+ opcode empty_slot slot1 slot2 (Obj.magic()) (Obj.magic())
+ end
+
+ and partial_loop l states =
+ match l with
+ | 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
+
+ let _, slot = start_loop (Node.null) auto.init in
+ slot.(StateSet.min_elt auto.topdown_marking_states)
+ ;;
+
+
+
+
+
+
+
end