Fast closure branch

[SXSI/xpathcomp.git] / main.ml

diff --git a/main.ml b/main.ml
index 342bb2f..5a7f120 100644 (file)
--- a/main.ml
+++ b/main.ml
@@ -54,6 +54,34 @@ let test_loop2 tree tag =
   Hashtbl.add f (hash 101) `Foo;
   g t' Tree.root
 
+let test_text doc = 
+  let _ = Printf.eprintf "Contains(bree)" in
+  let _ = time (Tree.test_contains doc) "bree" in
+  let _ = Printf.eprintf "Contains(brain)" in
+  let _ = time (Tree.test_contains doc) "brain" in
+  let _ = Printf.eprintf "Contains(brain)" in
+  let i = time (Tree.test_contains doc) "brain" in
+  let _ = Printf.eprintf "%i\nContains(Australia)" i in
+  let i = time (Tree.test_contains doc) "AUSTRALIA" in
+  let _ = Printf.eprintf "%i\n Contains(1930)" i in
+  let i = time (Tree.test_contains doc) "1930" in
+  let _ = Printf.eprintf "%i\n startswith(bar)" i in
+  let i = time (Tree.test_prefix doc) "bar" in
+  let _ = Printf.eprintf "%i\n endswith(LAND)" i in
+  let i = time (Tree.test_suffix doc) "LAND" in
+  let _ = Printf.eprintf "%i\n =(2001)" i in
+  let i = time (Tree.test_equals doc) "2001" in
+  let _ = Printf.eprintf "%i\n =(Nguyen)" i in
+  let i = time (Tree.test_equals doc) "Nguyen" in
+  Printf.eprintf "%i\n" i ;
+  ()
+
+type pointers
+external build_pointers : Tree.t -> pointers = "caml_build_pointers"
+external iter_pointers : pointers -> int = "caml_iter_pointers"
+external free_pointers : pointers -> unit = "caml_free_pointers"
+
+
 let main v query_string output =
  
     let _ = Tag.init (Tree.tag_pool v) in
@@ -65,11 +93,20 @@ let main v query_string output =
          Ulexer.Loc.Exc_located ((x,y),e) -> Printf.eprintf "character %i-%i %s\n" x y (Printexc.to_string e);exit 1
       in
       let _ = Printf.eprintf "Number of nodes %i\n%!" (Tree.size v) in
+(*      let _ = test_text v in *)
+(*      let _ = Tree.stats v in *)
       let _ = Printf.eprintf "Timing first_child/next_sibling %!" in
-      let _ = time (Tree.benchmark_fsns)  v in
+      let _ = time ~count:0 (Tree.benchmark_fcns)  v in (*
+      let _ = Printf.eprintf "Timing last_child/prev_sibling %!" in
+      let _ = time (Tree.benchmark_lcps)  v in
       let _ = Printf.eprintf "Timing jump to a %!" in
-      let _ = time (Tree.benchmark_jump v) (Tag.tag "a")  in
-      
+      let _ = time (Tree.benchmark_jump v) (Tag.tag "a")  in      
+      let _ = Printf.eprintf "Timing pointer allocation %!" in
+      let pointers = time (build_pointers) v  in
+      let _ = Printf.eprintf "Timing pointer iteration %!" in
+      let i = time (iter_pointers) pointers  in
+      let _ = Printf.eprintf "Traversed %i pointers\n\nTiming pointer deallocation %!" i in
+      let _  = time (free_pointers) pointers  in *)
 (*      let _ = Printf.eprintf "Timing //keyword :" in
       let r = time (test_loop v) (Tag.tag "keyword") in
       let _ = Printf.eprintf "Count is %i\n%!" r in 
@@ -128,7 +165,7 @@ let main v query_string output =
          begin
            let _ = Gc.full_major();Gc.compact() in
            let _ = Printf.eprintf "%!" in
-(*         let _ = Gc.set (disabled_gc) in *)
+           let _ = Gc.set (disabled_gc) in 
              if !Options.backward && ((snd test_list) != `NOTHING )then 
                if !Options.count_only then
                let r = time_mem (bottom_up_count auto v )(snd test_list)  in
@@ -158,7 +195,7 @@ let main v query_string output =
                  if !Options.backward then Printf.eprintf "WARNING: couldn't find a jumping point, running top-down\n" 
                in
                if !Options.count_only then
-                 let r = time_mem ( top_down_count auto ) v in 
+                 let r = time ~count:5 ( top_down_count auto ) v in 
                  let _ = Printf.eprintf "Number of nodes in the result set : %i\n%!" r
                  in ()
                else      
@@ -225,3 +262,5 @@ let v =
 in
   main v !Options.query !Options.output_file;;
 
+
+