Commit 6e874a34 authored by Victor Allombert's avatar Victor Allombert

Up runtime.

parent 22f6143b
......@@ -5,7 +5,8 @@ open Mpi
external init_archi : int -> int -> int -> int -> int -> unit = "ocaml_mpi_init_archi";;
let architecture = Parameters_in_file.architecture_array
let architecture = Parameters_in_file.architecture
(*let print_architecture = Parameters_in_file.print_architecture (Parameters_in_file.architecture_to_array architecture)*)
(*let _ = if pid () = 0 then Parameters_in_file.print_architecture architecture *)
let color_s = Parameters_in_file.get_children_color (pid())
......@@ -317,9 +318,10 @@ let generated_finally ~up ~keep k =
(*Counters for closures*)
let nb_closures = ref 0
let total_closures_size = ref 0.0
let total_mashal_time = ref 0.0
let get_closures_info () =
(!nb_closures,!total_closures_size)
(!nb_closures,(!total_closures_size,!total_mashal_time))
(* let bench_marshal v = *)
(* incr nb_closures; *)
......@@ -327,25 +329,23 @@ let get_closures_info () =
(* total_closures_size := !total_closures_size +. float_of_int (Marshal.total_size m 0); *)
(* m *)
(*warning !! si fonction du genre (fun i -> i ) ====> fun _ _ i -> i et pas l'inverse ;)*)
let generated_replicate f ar =
let _tmp = replicate (f) in
(*For comm bench only*)
let start = Unix.gettimeofday () in
let mf = (Marshal.to_bytes f [Marshal.Closures]) in
total_closures_size := !total_closures_size +. float_of_int (Marshal.total_size mf 0);
incr nb_closures;
let stop1 = Unix.gettimeofday () in
total_mashal_time := !total_mashal_time +. (stop1-.start);
total_closures_size := !total_closures_size +. (float_of_int (nb_children())) *. (float_of_int (Marshal.total_size mf 0));
nb_closures := !nb_closures + (nb_children());
(*EOF*)
mpi_send_mfun_to_children (Marshal.to_bytes ar [Marshal.Closures]) ;
_tmp
let generated_mkpar f =
let _tmp = mkpar (f) in
(*For comm bench only*)
let mf = (Marshal.to_bytes f [Marshal.Closures]) in
total_closures_size := !total_closures_size +. float_of_int (Marshal.total_size mf 0);
incr nb_closures;
(*EOF*)
mpi_send_mfun_to_children (Marshal.to_bytes [||] [Marshal.Closures]);
_tmp
......
let architecture : (int * string * int * int * int * int) tree =
Node ((0,"D",0,1,0,1),[
(**********************************)
(*Mirev31*)
Node ((1,"S",1,2,1,2) , [
(*Core0*)
Node ((5,"S",2,6,2,3) ,
(*Threads*)
[ Leaf((13,"S",3,0,6,7));
Leaf((14,"S",3,0,6,7));
Leaf((15,"S",3,0,6,7));
Leaf((16,"S",3,0,6,7));
Leaf((17,"S",3,0,6,7));
Leaf((18,"S",3,0,6,7));
Leaf((19,"S",3,0,6,7));
Leaf((20,"S",3,0,6,7));
Leaf((21,"S",3,0,6,7));
Leaf((22,"S",3,0,6,7));
Leaf((23,"S",3,0,6,7));
Leaf((24,"S",3,0,6,7));
Leaf((25,"S",3,0,6,7));
Leaf((26,"S",3,0,6,7));
Leaf((27,"S",3,0,6,7));
Leaf((28,"S",3,0,6,7));
])
;
(*Core1*)
Node ((6,"S",2,7,2,3) ,
(*Threads*)
[Leaf((29,"S",3,0,7,8));
Leaf((30,"S",3,0,7,8));
Leaf((31,"S",3,0,7,8));
Leaf((32,"S",3,0,7,8));
Leaf((33,"S",3,0,7,8));
Leaf((34,"S",3,0,7,8));
Leaf((35,"S",3,0,7,8));
Leaf((36,"S",3,0,7,8));
Leaf((37,"S",3,0,7,8));
Leaf((38,"S",3,0,7,8));
Leaf((39,"S",3,0,7,8));
Leaf((40,"S",3,0,7,8));
Leaf((41,"S",3,0,7,8));
Leaf((42,"S",3,0,7,8));
Leaf((43,"S",3,0,7,8));
Leaf((44,"S",3,0,7,8));
])
])
;
(**********************************)
(*Mirev32*)
Node ((2,"S",1,3,1,2) , [
(*Core0*)
Node ((7,"S",2,8,3,4) ,
(*Threads*)
[ Leaf((45,"S",3,0,8,9));
Leaf((46,"S",3,0,8,9));
Leaf((47,"S",3,0,8,9));
Leaf((48,"S",3,0,8,9));
Leaf((49,"S",3,0,8,9));
Leaf((50,"S",3,0,8,9));
Leaf((51,"S",3,0,8,9));
Leaf((52,"S",3,0,8,9));
Leaf((53,"S",3,0,8,9));
Leaf((54,"S",3,0,8,9));
Leaf((55,"S",3,0,8,9));
Leaf((56,"S",3,0,8,9));
Leaf((57,"S",3,0,8,9));
Leaf((58,"S",3,0,8,9));
Leaf((59,"S",3,0,8,9));
Leaf((60,"S",3,0,8,9));
])
;
(*Core1*)
Node ((8,"S",2,9,3,4) ,
(*Threads*)
[Leaf((61,"S",3,0,9,10));
Leaf((62,"S",3,0,9,10));
Leaf((63,"S",3,0,9,10));
Leaf((64,"S",3,0,9,10));
Leaf((65,"S",3,0,9,10));
Leaf((66,"S",3,0,9,10));
Leaf((67,"S",3,0,9,10));
Leaf((68,"S",3,0,9,10));
Leaf((69,"S",3,0,9,10));
Leaf((70,"S",3,0,9,10));
Leaf((71,"S",3,0,9,10));
Leaf((72,"S",3,0,9,10));
Leaf((73,"S",3,0,9,10));
Leaf((74,"S",3,0,9,10));
Leaf((75,"S",3,0,9,10));
Leaf((76,"S",3,0,9,10));
])
])
;
(**********************************)
(*Mirev33*)
Node ((3,"S",1,4,1,2) , [
(*Core0*)
Node ((9,"S",2,10,4,5) ,
(*Threads*)
[ Leaf((77,"S",3,0,10,11));
Leaf((78,"S",3,0,10,11));
Leaf((79,"S",3,0,10,11));
Leaf((80,"S",3,0,10,11));
Leaf((81,"S",3,0,10,11));
Leaf((82,"S",3,0,10,11));
Leaf((83,"S",3,0,10,11));
Leaf((84,"S",3,0,10,11));
Leaf((85,"S",3,0,10,11));
Leaf((86,"S",3,0,10,11));
Leaf((87,"S",3,0,10,11));
Leaf((88,"S",3,0,10,11));
Leaf((89,"S",3,0,10,11));
Leaf((90,"S",3,0,10,11));
Leaf((91,"S",3,0,10,11));
Leaf((92,"S",3,0,10,11));
])
;
(*Core1*)
Node ((10,"S",2,11,4,5) ,
(*Threads*)
[Leaf((93,"S",3,0,11,12));
Leaf((94,"S",3,0,11,12));
Leaf((95,"S",3,0,11,12));
Leaf((96,"S",3,0,11,12));
Leaf((97,"S",3,0,11,12));
Leaf((98,"S",3,0,11,12));
Leaf((99,"S",3,0,11,12));
Leaf((100,"S",3,0,11,12));
Leaf((101,"S",3,0,11,12));
Leaf((102,"S",3,0,11,12));
Leaf((103,"S",3,0,11,12));
Leaf((104,"S",3,0,11,12));
Leaf((105,"S",3,0,11,12));
Leaf((106,"S",3,0,11,12));
Leaf((107,"S",3,0,11,12));
Leaf((108,"S",3,0,11,12));
])
])
;
(**********************************)
(*Mirev34*)
Node ((4,"S",1,5,1,2) , [
(*Core0*)
Node ((11,"S",2,12,5,6) ,
(*Threads*)
[ Leaf((109,"S",3,0,12,13));
Leaf((110,"S",3,0,12,13));
Leaf((111,"S",3,0,12,13));
Leaf((112,"S",3,0,12,13));
Leaf((113,"S",3,0,12,13));
Leaf((114,"S",3,0,12,13));
Leaf((115,"S",3,0,12,13));
Leaf((116,"S",3,0,12,13));
Leaf((117,"S",3,0,12,13));
Leaf((118,"S",3,0,12,13));
Leaf((119,"S",3,0,12,13));
Leaf((120,"S",3,0,12,13));
Leaf((121,"S",3,0,12,13));
Leaf((122,"S",3,0,12,13));
Leaf((123,"S",3,0,12,13));
Leaf((124,"S",3,0,12,13));
])
;
(*Core1*)
Node ((12,"S",2,13,5,6) ,
(*Threads*)
[Leaf((125,"S",3,0,13,14));
Leaf((126,"S",3,0,13,14));
Leaf((127,"S",3,0,13,14));
Leaf((128,"S",3,0,13,14));
Leaf((129,"S",3,0,13,14));
Leaf((130,"S",3,0,13,14));
Leaf((131,"S",3,0,13,14));
Leaf((132,"S",3,0,13,14));
Leaf((133,"S",3,0,13,14));
Leaf((134,"S",3,0,13,14));
Leaf((135,"S",3,0,13,14));
Leaf((136,"S",3,0,13,14));
Leaf((137,"S",3,0,13,14));
Leaf((138,"S",3,0,13,14));
Leaf((139,"S",3,0,13,14));
Leaf((140,"S",3,0,13,14));
])
])
])
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment