requalify soome tesh files

diff --git a/examples/smpi/replay/smpi_replay.tesh b/examples/smpi/replay/smpi_replay.tesh
index bf350fd..008fe23 100644 (file)
--- a/examples/smpi/replay/smpi_replay.tesh
+++ b/examples/smpi/replay/smpi_replay.tesh
@@ -14,21 +14,21 @@ $ ../../smpi_script/bin/smpirun -ext smpi_replay --log=replay.thresh:critical --
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu_threshold' to '-1'
 > [Tremblay:0:(1) 0.000000] [smpi_replay/VERBOSE] 0 bcast 5e4 0.000000
-> [Fafard:2:(3) 0.124241] [smpi_replay/VERBOSE] 2 bcast 5e4 0.124241
-> [Jupiter:1:(2) 0.124241] [smpi_replay/VERBOSE] 1 bcast 5e4 0.124241
-> [Jupiter:1:(2) 2.745611] [smpi_replay/VERBOSE] 1 compute 2e8 2.621369
+> [Jupiter:1:(2) 0.015036] [smpi_replay/VERBOSE] 1 bcast 5e4 0.015036
+> [Fafard:2:(3) 0.015676] [smpi_replay/VERBOSE] 2 bcast 5e4 0.015676
+> [Jupiter:1:(2) 2.636405] [smpi_replay/VERBOSE] 1 compute 2e8 2.621369
 > [Tremblay:0:(1) 5.097100] [smpi_replay/VERBOSE] 0 compute 5e8 5.097100
 > [Tremblay:0:(1) 5.097100] [smpi_replay/VERBOSE] 0 bcast 5e4 0.000000
-> [Fafard:2:(3) 6.677665] [smpi_replay/VERBOSE] 2 compute 5e8 6.553424
-> [Fafard:2:(3) 6.801906] [smpi_replay/VERBOSE] 2 bcast 5e4 0.124241
-> [Jupiter:1:(2) 6.801906] [smpi_replay/VERBOSE] 1 bcast 5e4 4.056296
-> [Jupiter:1:(2) 9.423276] [smpi_replay/VERBOSE] 1 compute 2e8 2.621369
+> [Jupiter:1:(2) 5.112136] [smpi_replay/VERBOSE] 1 bcast 5e4 2.475730
+> [Fafard:2:(3) 6.569099] [smpi_replay/VERBOSE] 2 compute 5e8 6.553424
+> [Fafard:2:(3) 6.584775] [smpi_replay/VERBOSE] 2 bcast 5e4 0.015676
+> [Jupiter:1:(2) 7.733505] [smpi_replay/VERBOSE] 1 compute 2e8 2.621369
 > [Tremblay:0:(1) 10.194200] [smpi_replay/VERBOSE] 0 compute 5e8 5.097100
-> [Fafard:2:(3) 13.355330] [smpi_replay/VERBOSE] 2 compute 5e8 6.553424
-> [Jupiter:1:(2) 15.976699] [smpi_replay/VERBOSE] 1 reduce 5e4 5e8 6.553424
-> [Tremblay:0:(1) 18.468105] [smpi_replay/VERBOSE] 0 reduce 5e4 5e8 8.273906
-> [Fafard:2:(3) 19.908753] [smpi_replay/VERBOSE] 2 reduce 5e4 5e8 6.553424
-> [Fafard:2:(3) 19.908753] [smpi_replay/INFO] Simulation time 19.908753
+> [Fafard:2:(3) 13.138198] [smpi_replay/VERBOSE] 2 compute 5e8 6.553424
+> [Jupiter:1:(2) 14.286929] [smpi_replay/VERBOSE] 1 reduce 5e4 5e8 6.553424
+> [Tremblay:0:(1) 18.250974] [smpi_replay/VERBOSE] 0 reduce 5e4 5e8 8.056774
+> [Fafard:2:(3) 19.691622] [smpi_replay/VERBOSE] 2 reduce 5e4 5e8 6.553424
+> [Fafard:2:(3) 19.691622] [smpi_replay/INFO] Simulation time 19.691622
 
 
 $ rm -f replay/one_trace
@@ -46,7 +46,7 @@ $ ../../smpi_script/bin/smpirun -ext smpi_replay --log=replay.thresh:critical --
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi/computing' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu_threshold' to '-1'
-> [Fafard:2:(3) 19.908753] [smpi_replay/INFO] Simulation time 19.908753
+> [Fafard:2:(3) 19.691622] [smpi_replay/INFO] Simulation time 19.691622
 
 
 $ rm -f replay/one_trace
@@ -184,42 +184,42 @@ $ tail -n +3 ./simgrid.trace
 > 12 0 2 2 6
 > 13 0 2 1
 > 12 0 2 1 4
-> 13 0.124241 2 3
-> 12 0.124241 2 3 4
-> 13 0.124241 2 2
-> 12 0.124241 2 2 4
-> 13 2.745611 2 2
-> 12 2.745611 2 2 6
+> 13 0.015036 2 2
+> 12 0.015036 2 2 4
+> 13 0.015676 2 3
+> 12 0.015676 2 3 4
+> 13 2.636405 2 2
+> 12 2.636405 2 2 6
 > 13 5.097100 2 1
 > 12 5.097100 2 1 6
 > 13 5.097100 2 1
 > 12 5.097100 2 1 4
 > 5 7 2 action_reduce "0 1 0"
-> 13 6.677665 2 3
-> 12 6.677665 2 3 6
-> 13 6.801906 2 3
-> 12 6.801906 2 3 4
-> 13 6.801906 2 2
-> 12 6.801906 2 2 4
-> 13 9.423276 2 2
-> 12 9.423276 2 2 7
+> 13 5.112136 2 2
+> 12 5.112136 2 2 4
+> 13 6.569099 2 3
+> 12 6.569099 2 3 6
+> 13 6.584775 2 3
+> 12 6.584775 2 3 4
+> 13 7.733505 2 2
+> 12 7.733505 2 2 7
 > 13 10.194200 2 1
 > 12 10.194200 2 1 7
-> 13 13.355330 2 3
-> 12 13.355330 2 3 7
+> 13 13.138198 2 3
+> 12 13.138198 2 3 7
 > 5 8 2 smpi_replay_run_finalize "0 1 0"
-> 13 15.976699 2 2
-> 12 15.976699 2 2 8
-> 13 18.468105 2 1
-> 12 18.468105 2 1 8
-> 13 19.908753 2 3
-> 12 19.908753 2 3 8
-> 13 19.908753 2 3
-> 7 19.908753 1 3
-> 13 19.908753 2 2
-> 7 19.908753 1 2
-> 13 19.908753 2 1
-> 7 19.908753 1 1
+> 13 14.286929 2 2
+> 12 14.286929 2 2 8
+> 13 18.250974 2 1
+> 12 18.250974 2 1 8
+> 13 19.691622 2 3
+> 12 19.691622 2 3 8
+> 13 19.691622 2 3
+> 7 19.691622 1 3
+> 13 19.691622 2 2
+> 7 19.691622 1 2
+> 13 19.691622 2 1
+> 7 19.691622 1 1
 
 
 
@@ -262,13 +262,13 @@ $ ../../smpi_script/bin/smpirun -ext smpi_replay --log=replay.thresh:critical --
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu_threshold' to '-1'
 > [Tremblay:0:(1) 1.491472] [smpi_replay/VERBOSE] 0 send 1 1e7 1.491472
 > [Jupiter:1:(2) 1.491472] [smpi_replay/VERBOSE] 1 recv 0 1e7 1.491472
-> [Tremblay:0:(1) 1.494910] [smpi_replay/VERBOSE] 0 barrier 0.003438
-> [Fafard:2:(3) 1.496886] [smpi_replay/VERBOSE] 2 barrier 1.496886
-> [Jupiter:1:(2) 1.498347] [smpi_replay/VERBOSE] 1 barrier 0.006875
-> [Tremblay:0:(1) 2.494910] [smpi_replay/VERBOSE] 0 compute 98095000 1.000000
-> [Fafard:2:(3) 2.496886] [smpi_replay/VERBOSE] 2 compute 76296000 1.000000
-> [Jupiter:1:(2) 2.498347] [smpi_replay/VERBOSE] 1 compute 76296000 1.000000
-> [Jupiter:1:(2) 2.498347] [smpi_replay/INFO] Simulation time 2.498347
+> [Tremblay:0:(1) 1.493448] [smpi_replay/VERBOSE] 0 barrier 0.001976
+> [Jupiter:1:(2) 1.494910] [smpi_replay/VERBOSE] 1 barrier 0.003438
+> [Fafard:2:(3) 1.495424] [smpi_replay/VERBOSE] 2 barrier 1.495424
+> [Tremblay:0:(1) 2.493448] [smpi_replay/VERBOSE] 0 compute 98095000 1.000000
+> [Jupiter:1:(2) 2.494910] [smpi_replay/VERBOSE] 1 compute 76296000 1.000000
+> [Fafard:2:(3) 2.495424] [smpi_replay/VERBOSE] 2 compute 76296000 1.000000
+> [Fafard:2:(3) 2.495424] [smpi_replay/INFO] Simulation time 2.495424
 
 $ rm -f replay/one_trace
 
@@ -315,12 +315,12 @@ $ ../../smpi_script/bin/smpirun -ext smpi_replay --log=replay.thresh:critical --
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu_threshold' to '-1'
 > [Tremblay:0:(1) 5.112775] [smpi_replay/VERBOSE] 0 allReduce 5e4 5e8 5.112775
-> [Jupiter:1:(2) 6.693341] [smpi_replay/VERBOSE] 1 allReduce 5e4 5e8 6.693341
-> [Fafard:2:(3) 6.693341] [smpi_replay/VERBOSE] 2 allReduce 5e4 5e8 6.693341
+> [Jupiter:1:(2) 6.584135] [smpi_replay/VERBOSE] 1 allReduce 5e4 5e8 6.584135
+> [Fafard:2:(3) 6.584775] [smpi_replay/VERBOSE] 2 allReduce 5e4 5e8 6.584775
 > [Tremblay:0:(1) 10.209875] [smpi_replay/VERBOSE] 0 compute 5e8 5.097100
-> [Fafard:2:(3) 13.246764] [smpi_replay/VERBOSE] 2 compute 5e8 6.553424
-> [Jupiter:1:(2) 13.246764] [smpi_replay/VERBOSE] 1 compute 5e8 6.553424
-> [Jupiter:1:(2) 13.246764] [smpi_replay/INFO] Simulation time 13.246764
+> [Jupiter:1:(2) 13.137559] [smpi_replay/VERBOSE] 1 compute 5e8 6.553424
+> [Fafard:2:(3) 13.138198] [smpi_replay/VERBOSE] 2 compute 5e8 6.553424
+> [Fafard:2:(3) 13.138198] [smpi_replay/INFO] Simulation time 13.138198
 
 $ rm -f replay/one_trace
 

diff --git a/examples/smpi/replay_multiple/replay_multiple.tesh b/examples/smpi/replay_multiple/replay_multiple.tesh
index b7119a5..b552fc2 100644 (file)
--- a/examples/smpi/replay_multiple/replay_multiple.tesh
+++ b/examples/smpi/replay_multiple/replay_multiple.tesh
@@ -8,8 +8,8 @@ $ ./replay_multiple description_file ${srcdir:=.}/../../platforms/small_platform
 > [0.000000] [msg_test/INFO] Initializing instance 1 of size 32
 > [0.000000] [msg_test/INFO] Initializing instance 2 of size 32
 > [0.000000] [smpi_kernel/INFO] You did not set the power of the host running the simulation.  The timings will certainly not be accurate.  Use the option "--cfg=smpi/running_power:<flops>" to set its value.Check http://simgrid.org/simgrid/latest/doc/options.html#options_smpi_bench for more information.
-> [Jupiter:2:(37) 1140967.175977] [smpi_replay/INFO] Simulation time 1124649.823301
-> [1140967.175977] [msg_test/INFO] Simulation time 1.14097e+06
+> [Jupiter:2:(52) 1140964.174009] [smpi_replay/INFO] Simulation time 1124646.821338
+> [1140964.174009] [msg_test/INFO] Simulation time 1.14096e+06
 
 
 $ rm -f deployment.xml

diff --git a/examples/smpi/tracing/smpi_traced.tesh b/examples/smpi/tracing/smpi_traced.tesh
index 1c77272..4a1974b 100644 (file)
--- a/examples/smpi/tracing/smpi_traced.tesh
+++ b/examples/smpi/tracing/smpi_traced.tesh
@@ -62,7 +62,7 @@ $ ../../smpi_script/bin/smpirun -trace -trace-resource -trace-viva -trace-file s
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu_threshold' to '-1'
-> [0.006875] [instr_config/INFO] No categories declared, ignoring generation of viva graph configuration
+> [0.003952] [instr_config/INFO] No categories declared, ignoring generation of viva graph configuration
 
 p Testing with parameters but without activating them with the safe switch (-trace)
 $ ../../smpi_script/bin/smpirun -trace-resource -trace-viva -trace-file smpi_traced.trace -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../platforms/small_platform.xml --cfg=path:${srcdir:=.}/../msg -np 3 ./smpi_traced_simple --log=smpi_kernel.thres:warning