more profilers

[helm.git] / helm / software / lambda-delta / toplevel / metaOutput.ml

diff --git a/helm/software/lambda-delta/toplevel/metaOutput.ml b/helm/software/lambda-delta/toplevel/metaOutput.ml
index 04e15e4db58d664bade80518a177fdd3730e2c17..4cec084b69c1241e544e151799aaad3ef4cecd38 100644 (file)
--- a/helm/software/lambda-delta/toplevel/metaOutput.ml
+++ b/helm/software/lambda-delta/toplevel/metaOutput.ml
@@ -9,8 +9,10 @@
      \ /   This software is distributed as is, NO WARRANTY.              
       V_______________________________________________________________ *)
 
+module P = Printf
 module F = Format
 module U = NUri
+module L = Log
 module M = Meta
 
 type counters = {
@@ -23,42 +25,54 @@ type counters = {
    pappls: int;
    tappls: int;
    tabsts: int;
+   uris  : U.uri list;
+   nodes : int;
+   xnodes: int
 }
 
 let initial_counters = {
    eabsts = 0; eabbrs = 0; pabsts = 0; pappls = 0;
-   tsorts = 0; tlrefs = 0; tgrefs = 0; tappls = 0; tabsts = 0
+   tsorts = 0; tlrefs = 0; tgrefs = 0; tappls = 0; tabsts = 0;
+   uris = []; nodes = 0; xnodes = 0
 }
 
 let rec count_term f c = function
    | M.Sort _          -> 
-      f {c with tsorts = succ c.tsorts}
+      f {c with tsorts = succ c.tsorts; nodes = succ c.nodes}
    | M.LRef _          -> 
-      f {c with tlrefs = succ c.tlrefs}
-   | M.GRef (_, _, ts) -> 
+      f {c with tlrefs = succ c.tlrefs; nodes = succ c.nodes}
+   | M.GRef (_, u, ts) -> 
       let c = {c with tgrefs = succ c.tgrefs} in
       let c = {c with pappls = c.pappls + List.length ts} in
+      let c = {c with nodes = c.nodes + List.length ts} in
+      let c =    
+        if Cps.list_mem ~eq:U.eq u c.uris
+        then {c with nodes = succ c.nodes}
+        else {c with xnodes = succ c.xnodes}
+      in
       Cps.list_fold_left f count_term c ts
    | M.Appl (v, t)     -> 
-      let c = {c with tappls = succ c.tappls} in
+      let c = {c with tappls = succ c.tappls; nodes = succ c.nodes} in
       let f c = count_term f c t in
       count_term f c v
    | M.Abst (_, w, t)  -> 
-      let c = {c with tabsts = succ c.tabsts} in
+      let c = {c with tabsts = succ c.tabsts; nodes = succ c.nodes} in
       let f c = count_term f c t in
       count_term f c w
 
 let count_par f c (_, w) = count_term f c w
 
 let count_entry f c = function
-   | _, pars, _, w, None        ->
+   | _, pars, u, w, None        ->
       let c = {c with eabsts = succ c.eabsts} in
       let c = {c with pabsts = c.pabsts + List.length pars} in
+      let c = {c with uris = u :: c.uris; nodes = succ c.nodes + List.length pars} in
       let f c = count_term f c w in
       Cps.list_fold_left f count_par c pars   
    | _, pars, _, w, Some (_, v) ->
-      let c = {c with eabbrs = succ c.eabbrs} in
+      let c = {c with eabbrs = succ c.eabbrs; xnodes = succ c.xnodes} in
       let c = {c with pabsts = c.pabsts + List.length pars} in
+      let c = {c with nodes = c.nodes + List.length pars} in
       let f c = count_term f c v in
       let f c = count_term f c w in
       Cps.list_fold_left f count_par c pars
@@ -68,23 +82,26 @@ let count_item f c = function
    | None   -> f c
 
 let print_counters f c =
-   let terms = c.tsorts + c.tgrefs + c.tgrefs + c.tappls + c.tabsts in
+   let terms = c.tsorts + c.tlrefs + c.tgrefs + c.tappls + c.tabsts in
    let pars = c.pabsts + c.pappls in
    let items = c.eabsts + c.eabbrs in
-   Printf.printf "  Intermediate representation summary\n";
-   Printf.printf "    Total entry items:        %6u\n" items;
-   Printf.printf "      Declaration items:      %6u\n" c.eabsts;
-   Printf.printf "      Definition items:       %6u\n" c.eabbrs;
-   Printf.printf "    Total parameter items:    %6u\n" pars;
-   Printf.printf "      Application items:      %6u\n" c.pappls;
-   Printf.printf "      Abstraction items:      %6u\n" c.pabsts;
-   Printf.printf "    Total term items:         %6u\n" terms;
-   Printf.printf "      Sort items:             %6u\n" c.tsorts;
-   Printf.printf "      Local reference items:  %6u\n" c.tlrefs;
-   Printf.printf "      Global reference items: %6u\n" c.tgrefs;
-   Printf.printf "      Application items:      %6u\n" c.tappls;
-   Printf.printf "      Abstraction items:      %6u\n" c.tabsts;
-   flush stdout; f ()
+   let nodes = c.nodes + c.xnodes in
+   L.warn (P.sprintf "  Intermediate representation summary");
+   L.warn (P.sprintf "    Total entry items:        %7u" items);
+   L.warn (P.sprintf "      Declaration items:      %7u" c.eabsts);
+   L.warn (P.sprintf "      Definition items:       %7u" c.eabbrs);
+   L.warn (P.sprintf "    Total parameter items:    %7u" pars);
+   L.warn (P.sprintf "      Application items:      %7u" c.pappls);
+   L.warn (P.sprintf "      Abstraction items:      %7u" c.pabsts);
+   L.warn (P.sprintf "    Total term items:         %7u" terms);
+   L.warn (P.sprintf "      Sort items:             %7u" c.tsorts);
+   L.warn (P.sprintf "      Local reference items:  %7u" c.tlrefs);
+   L.warn (P.sprintf "      Global reference items: %7u" c.tgrefs);
+   L.warn (P.sprintf "      Application items:      %7u" c.tappls);
+   L.warn (P.sprintf "      Abstraction items:      %7u" c.tabsts);
+   L.warn (P.sprintf "    Global Int. Complexity:   %7u" c.nodes);
+   L.warn (P.sprintf "      + Abbreviation nodes:   %7u" nodes);
+   f ()
 
 let string_of_sort = function
    | true -> "Type"
@@ -102,6 +119,9 @@ let pp_list pp opend sep closed frm l =
    in
    if l = [] then () else F.fprintf frm "%s%a%s" opend aux l closed
 
+let pp_rev_list pp opend sep closed frm l =
+   pp_list pp opend sep closed frm (List.rev l)
+
 let rec pp_args frm args = pp_list pp_term "(" "," ")" frm args
 
 and pp_term frm = function
@@ -119,7 +139,7 @@ and pp_term frm = function
 let pp_par frm (id, w) =
     F.fprintf frm "%s:%a" id pp_term w
 
-let pp_pars = pp_list pp_par "[" "," "]"
+let pp_pars = pp_rev_list pp_par "[" "," "]"
 
 let pp_body frm = function
    | None            -> ()