projects
/
tatoo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Print detailed statisticts of the run.
[tatoo.git]
/
src
/
run.ml
diff --git
a/src/run.ml
b/src/run.ml
index
fb13084
..
8a9bf9e
100644
(file)
--- a/
src/run.ml
+++ b/
src/run.ml
@@
-17,6
+17,25
@@
INCLUDE "utils.ml"
open Format
open Misc
open Format
open Misc
+type stats = { run : int;
+ tree_size : int;
+ cache2_access : int;
+ cache2_hit : int;
+ cache5_access : int;
+ cache5_hit : int;
+ }
+
+let cache2_hit = ref 0
+let cache2_access = ref 0
+let cache5_hit = ref 0
+let cache5_access = ref 0
+let reset_stat_counters () =
+ cache2_hit := 0;
+ cache2_access := 0;
+ cache5_hit := 0;
+ cache5_access := 0
+
+
module Make (T : Tree.S) =
struct
module Make (T : Tree.S) =
struct
@@
-145,19
+164,18
@@
module Make (T : Tree.S) =
IFDEF HTMLTRACE
THEN
IFDEF HTMLTRACE
THEN
-DEFINE TRACE(e) = (e)
+DEFINE
IF
TRACE(e) = (e)
ELSE
ELSE
-DEFINE TRACE(e) = ()
+DEFINE
IF
TRACE(e) = ()
END
let html tree node i config msg =
let config = config.NodeStatus.node in
END
let html tree node i config msg =
let config = config.NodeStatus.node in
- Html.trace (T.preorder tree node) i
- "node: %i<br/>%s<br/>sat: %a<br/>todo: %a<br/>_______________________<br/>"
- (T.preorder tree node)
- msg
- StateSet.print config.sat
- StateSet.print config.todo
+ Html.trace ~msg:msg
+ (T.preorder tree node) i
+ config.todo
+ config.sat
+
let debug msg tree node i config =
let debug msg tree node i config =
@@
-172,6
+190,7
@@
END
let get_form cache2 auto tag q =
let phi =
let get_form cache2 auto tag q =
let phi =
+ incr cache2_access;
Cache.N2.find cache2 (tag.QName.id :> int) (q :> int)
in
if phi == dummy_form then
Cache.N2.find cache2 (tag.QName.id :> int) (q :> int)
in
if phi == dummy_form then
@@
-182,7
+201,10
@@
END
(tag.QName.id :> int)
(q :> int) phi
in phi
(tag.QName.id :> int)
(q :> int) phi
in phi
- else phi
+ else begin
+ incr cache2_hit;
+ phi
+ end
type trivalent = False | True | Unknown
let of_bool = function false -> False | true -> True
type trivalent = False | True | Unknown
let of_bool = function false -> False | true -> True
@@
-200,14
+222,12
@@
END
(* Define as macros to get lazyness *)
DEFINE OR_(t1,t2) =
(* Define as macros to get lazyness *)
DEFINE OR_(t1,t2) =
- let __t1 = (t1) in
match t1 with
False -> (t2)
| True -> True
| Unknown -> if (t2) == True then True else Unknown
DEFINE AND_(t1,t2) =
match t1 with
False -> (t2)
| True -> True
| Unknown -> if (t2) == True then True else Unknown
DEFINE AND_(t1,t2) =
- let __t1 = (t1) in
match t1 with
False -> False
| True -> (t2)
match t1 with
False -> False
| True -> (t2)
@@
-284,7
+304,8
@@
DEFINE AND_(t1,t2) =
let ssid = (ss.NodeStatus.id :> int) in
let tagid = (tag.QName.id :> int) in
let res = Cache.N5.find cache5 tagid ssid fcsid nssid psid in
let ssid = (ss.NodeStatus.id :> int) in
let tagid = (tag.QName.id :> int) in
let res = Cache.N5.find cache5 tagid ssid fcsid nssid psid in
- if res != dummy_status then res
+ incr cache5_access;
+ if res != dummy_status then begin incr cache5_hit; res end
else let new_status = loop ss in
Cache.N5.add cache5 tagid ssid fcsid nssid psid new_status;
new_status
else let new_status = loop ss in
Cache.N5.add cache5 tagid ssid fcsid nssid psid new_status;
new_status
@@
-327,7
+348,7
@@
DEFINE AND_(t1,t2) =
}
else c
in
}
else c
in
- TRACE(html tree node _i status0 "Entering node");
+
IF
TRACE(html tree node _i status0 "Entering node");
(* get the node_statuses for the first child, next sibling and parent *)
let ps = unsafe_get_status status (T.preorder tree parent) in
(* get the node_statuses for the first child, next sibling and parent *)
let ps = unsafe_get_status status (T.preorder tree parent) in
@@
-336,7
+357,7
@@
DEFINE AND_(t1,t2) =
(* evaluate the transitions with all this statuses *)
let status1 = if status0.NodeStatus.node.todo == StateSet.empty then status0 else begin
let status1 = eval_trans auto cache2 cache5 tag fcs nss ps status0 in
(* evaluate the transitions with all this statuses *)
let status1 = if status0.NodeStatus.node.todo == StateSet.empty then status0 else begin
let status1 = eval_trans auto cache2 cache5 tag fcs nss ps status0 in
- TRACE(html tree node _i status1 "Updating transitions");
+
IF
TRACE(html tree node _i status1 "Updating transitions");
(* update the cache if the status of the node changed *)
if status1 != status0 then status.(node_id) <- status1;
status1
(* update the cache if the status of the node changed *)
if status1 != status0 then status.(node_id) <- status1;
status1
@@
-350,7
+371,7
@@
DEFINE AND_(t1,t2) =
(* update the status *)
let status2 = if status1.NodeStatus.node.todo == StateSet.empty then status1 else begin
let status2 = eval_trans auto cache2 cache5 tag fcs1 nss ps status1 in
(* update the status *)
let status2 = if status1.NodeStatus.node.todo == StateSet.empty then status1 else begin
let status2 = eval_trans auto cache2 cache5 tag fcs1 nss ps status1 in
- TRACE(html tree node _i status2 "Updating transitions (after first-child)");
+
IF
TRACE(html tree node _i status2 "Updating transitions (after first-child)");
if status2 != status1 then status.(node_id) <- status2;
status2
end
if status2 != status1 then status.(node_id) <- status2;
status2
end
@@
-359,7
+380,7
@@
DEFINE AND_(t1,t2) =
let nss1 = unsafe_get_status status ns_id in
let status3 = if status2.NodeStatus.node.todo == StateSet.empty then status2 else begin
let status3 = eval_trans auto cache2 cache5 tag fcs1 nss1 ps status2 in
let nss1 = unsafe_get_status status ns_id in
let status3 = if status2.NodeStatus.node.todo == StateSet.empty then status2 else begin
let status3 = eval_trans auto cache2 cache5 tag fcs1 nss1 ps status2 in
- TRACE(html tree node _i status3 "Updating transitions (after next-sibling)");
+
IF
TRACE(html tree node _i status3 "Updating transitions (after next-sibling)");
if status3 != status2 then status.(node_id) <- status3;
status3
end
if status3 != status2 then status.(node_id) <- status3;
status3
end
@@
-372,7
+393,7
@@
DEFINE AND_(t1,t2) =
|| StateSet.empty != status3.NodeStatus.node.todo
in
Bitvector.unsafe_set unstable node_id unstable_self;
|| StateSet.empty != status3.NodeStatus.node.todo
in
Bitvector.unsafe_set unstable node_id unstable_self;
- TRACE((if not unstable_self then
+
IF
TRACE((if not unstable_self then
Html.finalize_node
node_id
_i
Html.finalize_node
node_id
_i
@@
-462,14
+483,19
@@
DEFINE AND_(t1,t2) =
let node_id = T.preorder tree node in
status.(node_id) <- status0) list
let node_id = T.preorder tree node in
status.(node_id) <- status0) list
-
+ let tree_size = ref 0
+ let pass = ref 0
let compute_run auto tree nodes =
let compute_run auto tree nodes =
+ pass := 0;
+ tree_size := T.size tree;
let run = make auto tree in
prepare_run run nodes;
while run.redo do
top_down run
done;
let run = make auto tree in
prepare_run run nodes;
while run.redo do
top_down run
done;
- TRACE(Html.gen_trace auto (module T : Tree.S with type t = T.t) tree);
+ pass := run.pass;
+ IFTRACE(Html.gen_trace auto (module T : Tree.S with type t = T.t) tree);
+
run
let full_eval auto tree nodes =
run
let full_eval auto tree nodes =
@@
-480,4
+506,13
@@
DEFINE AND_(t1,t2) =
let r = compute_run auto tree nodes in
get_results r
let r = compute_run auto tree nodes in
get_results r
+ let stats () = {
+ tree_size = !tree_size;
+ run = !pass;
+ cache2_access = !cache2_access;
+ cache2_hit = !cache2_hit;
+ cache5_access = !cache5_access;
+ cache5_hit = !cache5_hit;
+ }
+
end
end