X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=src%2FresJIT.ml;h=8f6f92e19ccfb4f711edaf4e7780f60b08d51363;hb=107df590ff69de765445e22caffd416ef13288d3;hp=df08d9c3b2daaaefbf371ae9720d4b0ca2a19849;hpb=013ac87b16485acbe56f07d99a810d6364242a9e;p=SXSI%2Fxpathcomp.git diff --git a/src/resJIT.ml b/src/resJIT.ml index df08d9c..8f6f92e 100644 --- a/src/resJIT.ml +++ b/src/resJIT.ml @@ -1,6 +1,6 @@ INCLUDE "debug.ml" INCLUDE "utils.ml" -INCLUDE "trace.ml" +INCLUDE "log.ml" open Format @@ -197,6 +197,12 @@ let () = at_exit (fun () -> Printf.eprintf "Dummy affectations %i/%i\n%!" !_empt DEFINE SET(a, b) = (a) <- (b) +DEFINE PRINT_TEMPLATE(ns) = + let pr fmt (state, count) = + fprintf fmt "%a: %i" State.print state (ns.length count) + in + Pretty.print_array ~sep:", " pr fmt (Array.mapi (fun x y -> (x,y)) s) + DEFINE EXEC_INSTR_TEMPLATE(ns) = fun slot1 slot2 t inst acc -> match inst with | SELF _ -> ns.snoc acc t @@ -232,30 +238,41 @@ DEFINE EXEC_CODE_TEMPLATE(ns) = fun slot slot1 slot2 t dst code -> SET (slot.(dst) , ns.concat4 slot1.(src1) slot1.(src2) slot2.(src3) slot2.(src4)) | OP_SELF _ -> - slot.(dst) <- ns.singleton t + LOG(__ "res-jit" 1 "Putting Node %i in the result set@\n" (Node.to_int t)); + slot.(dst) <- ns.singleton t - | OP_SELF_LEFT1 src -> slot.(dst) <- ns.cons t slot1.(src) + | OP_SELF_LEFT1 src -> + LOG(__ "res-jit" 1 "Putting Node %i in the result set@\n" (Node.to_int t)); + slot.(dst) <- ns.cons t slot1.(src) | OP_SELF_LEFT2 (src1, src2) -> - slot.(dst) <- ns.conscat t slot1.(src1) slot1.(src2) + LOG(__ "res-jit" 1 "Putting Node %i in the result set@\n" (Node.to_int t)); + slot.(dst) <- ns.conscat t slot1.(src1) slot1.(src2) - | OP_SELF_RIGHT1 src -> slot.(dst) <- ns.cons t slot2.(src) + | OP_SELF_RIGHT1 src -> + LOG(__ "res-jit" 1 "Putting Node %i in the result set@\n" (Node.to_int t)); + slot.(dst) <- ns.cons t slot2.(src) | OP_SELF_RIGHT2 (src1, src2) -> - slot.(dst) <- ns.conscat t slot2.(src1) slot2.(src2) + LOG(__ "res-jit" 1 "Putting Node %i in the result set@\n" (Node.to_int t)); + slot.(dst) <- ns.conscat t slot2.(src1) slot2.(src2) | OP_SELF_LEFT1_RIGHT1 (src1, src2) -> - slot.(dst) <- ns.conscat t slot1.(src1) slot2.(src2) + LOG(__ "res-jit" 1 "Putting Node %i in the result set@\n" (Node.to_int t)); + slot.(dst) <- ns.conscat t slot1.(src1) slot2.(src2) | OP_SELF_LEFT2_RIGHT1 (src1, src2, src3) -> - slot.(dst) <- ns.conscat3 t slot1.(src1) slot1.(src2) slot2.(src3) + LOG(__ "res-jit" 1 "Putting Node %i in the result set@\n" (Node.to_int t)); + slot.(dst) <- ns.conscat3 t slot1.(src1) slot1.(src2) slot2.(src3) | OP_SELF_LEFT1_RIGHT2 (src1, src2, src3) -> - slot.(dst) <- ns.conscat3 t slot1.(src1) slot2.(src2) slot2.(src3) + LOG(__ "res-jit" 1 "Putting Node %i in the result set@\n" (Node.to_int t)); + slot.(dst) <- ns.conscat3 t slot1.(src1) slot2.(src2) slot2.(src3) | OP_SELF_LEFT2_RIGHT2 (src1, src2, src3, src4) -> - slot.(dst) <- - ns.conscat4 t slot1.(src1) slot1.(src2) slot2.(src3) slot2.(src4) + LOG(__ "res-jit" 1 "Putting Node %i in the result set@\n" (Node.to_int t)); + slot.(dst) <- + ns.conscat4 t slot1.(src1) slot1.(src2) slot2.(src3) slot2.(src4) | OP_OTHER line -> let acc = ref ns.empty in let len = Array.length line - 1 in @@ -265,6 +282,34 @@ DEFINE EXEC_CODE_TEMPLATE(ns) = fun slot slot1 slot2 t dst code -> slot.(dst) <- !acc +DEFINE EXEC_REC_TEMPLATE = + (match code with + | Nil -> () + | Cons(dst, opcode, code1) -> + LOG(__ "res-jit" 3 " %a := %a" + State.print dst print_opcode opcode; + ); + exec_code slot slot1 slot2 t dst opcode; + begin + match code1 with + | Nil -> () + | Cons(dst, opcode, code1) -> + LOG(__ "res-jit" 3 " %a := %a" + State.print dst print_opcode opcode; + ); + exec_code slot slot1 slot2 t dst opcode; + exec slot slot1 slot2 t code1 + + end) + +DEFINE EXEC_TEMPLATE = + (LOG(__ "res-jit" 3 "Node %i:@\nLEFT : %a@\nRIGHT : %a" + (Node.to_int t) print slot1 print slot2 + ); + exec slot slot1 slot2 t code; + LOG(__ "res-jit" 3 "RES : %a" print slot)) + + module type S = sig module NS : NodeSet.S @@ -276,51 +321,16 @@ module type S = val is_open : t -> bool end - - module Count = struct module NS = NodeSet.Count type t = NodeSet.Count.t array - let print fmt s = - let pr fmt (state, count) = - fprintf fmt "%a: %i" State.print state (NS.length count) - in - Pretty.print_array ~sep:", " pr fmt (Array.mapi (fun x y -> (x,y)) s) - + let print fmt s = PRINT_TEMPLATE(NS) let exec_instr = EXEC_INSTR_TEMPLATE(NodeSet.Count) let exec_code = EXEC_CODE_TEMPLATE(NodeSet.Count) - (* inline by hand for efficiency reason *) - let rec exec slot slot1 slot2 t code = - match code with - | Nil -> () - | Cons(dst, opcode, code1) -> - TRACE("res-jit", 3, __ " %a := %a\n%!" - State.print dst print_opcode opcode; - ); - exec_code slot slot1 slot2 t dst opcode; - begin - match code1 with - | Nil -> () - | Cons(dst, opcode, code1) -> - TRACE("res-jit", 3, __ " %a := %a\n%!" - State.print dst print_opcode opcode; - ); - exec_code slot slot1 slot2 t dst opcode; - exec slot slot1 slot2 t code1 - end - - let exec slot slot1 slot2 t code = - TRACE("res-jit", 3, __ "Node %i:\n" (Node.to_int t)); - TRACE("res-jit", 3, __ " LEFT : %a\n" pr_slot slot1); - TRACE("res-jit", 3, __ " RIGHT : %a\n" pr_slot slot2); - exec slot slot1 slot2 t code; - TRACE("res-jit", 3, __ " RES : %a\n\n%!" pr_slot slot) - - + let rec exec slot slot1 slot2 t code = EXEC_REC_TEMPLATE let var _ x = x let close _ x = x - let is_open _ = false end @@ -328,28 +338,10 @@ module Mat = struct module NS = NodeSet.Mat type t = NodeSet.Mat.t array - let print fmt s = - let pr fmt (state, count) = - fprintf fmt "%a: %i" State.print state (NS.length count) - in - Pretty.print_array ~sep:", " pr fmt (Array.mapi (fun x y -> (x,y)) s) - + let print fmt s = PRINT_TEMPLATE(NS) let exec_instr = EXEC_INSTR_TEMPLATE(NodeSet.Mat) let exec_code = EXEC_CODE_TEMPLATE(NodeSet.Mat) - (* inline by hand for efficiency reason *) - let rec exec slot slot1 slot2 t code = - match code with - | Nil -> () - | Cons(dst, code, code1) -> - exec_code slot slot1 slot2 t dst code; - begin - match code1 with - | Nil -> () - | Cons(dst', code', code1') -> - exec_code slot slot1 slot2 t dst' code'; - exec slot slot1 slot2 t code1' - end - + let rec exec slot slot1 slot2 t code = EXEC_REC_TEMPLATE let var _ x = x let close _ x = x let is_open _ = false @@ -361,42 +353,11 @@ module Make(U : NodeSet.S) = struct module NS = U type t = U.t array - let print fmt s = - let pr fmt (state, count) = - fprintf fmt "%a: %i" State.print state (NS.length count) - in - Pretty.print_array ~sep:", " pr fmt (Array.mapi (fun x y -> (x,y)) s) - + let print fmt s = PRINT_TEMPLATE(NS) let exec_instr = EXEC_INSTR_TEMPLATE(U) let exec_code = EXEC_CODE_TEMPLATE(U) - (* inline by hand for efficiency reason *) - let rec exec slot slot1 slot2 t code = - match code with - | Nil -> () - | Cons(dst, opcode, code1) -> - TRACE("res-jit", 3, __ " %a := %a\n%!" - State.print dst print_opcode opcode; - ); - exec_code slot slot1 slot2 t dst opcode; - begin - match code1 with - | Nil -> () - | Cons(dst, opcode, code1) -> - TRACE("res-jit", 3, __ " %a := %a\n%!" - State.print dst print_opcode opcode; - ); - exec_code slot slot1 slot2 t dst opcode; - exec slot slot1 slot2 t code1 - end - - let exec slot slot1 slot2 t code = - TRACE("res-jit", 3, __ "Node %i:\n" (Node.to_int t)); - TRACE("res-jit", 3, __ " LEFT : %a\n" pr_slot slot1); - TRACE("res-jit", 3, __ " RIGHT : %a\n" pr_slot slot2); - exec slot slot1 slot2 t code; - TRACE("res-jit", 3, __ " RES : %a\n\n%!" pr_slot slot) - - + let rec exec slot slot1 slot2 t code = EXEC_REC_TEMPLATE + let exec slot slot1 slot2 t code = EXEC_TEMPLATE let var i t = Array.mapi (fun j _ -> NS.var (i,j)) t let close h t =