From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Tue, 23 Oct 2012 11:28:17 +0000 (+0200)
Subject: Set smpi/cpu_threshold to 1 for smpi-replay, and hope to have deterministic test... 
X-Git-Tag: v3_8~24^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/76b46b4ad5ed02cd82851812da9965e7d9f6ae45?hp=baa92d18417cb91e2df78445d20c581999af0763

Set smpi/cpu_threshold to 1 for smpi-replay, and hope to have deterministic test results now.
---

diff --git a/examples/smpi/replay/smpi_replay.tesh b/examples/smpi/replay/smpi_replay.tesh
index 62fa116b00..11bdb096af 100644
--- a/examples/smpi/replay/smpi_replay.tesh
+++ b/examples/smpi/replay/smpi_replay.tesh
@@ -2,10 +2,11 @@
 # (since we want to pass it to the child, it has to be redefined before each command)
 # Go for the first test
 p Test of trace replay with SMPI (one trace for all processes)
-$ ../../bin/smpirun -ext smpi_replay --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc -np 3 -platform ${srcdir:=.}/replay/replay_platform.xml -hostfile ${srcdir:=.}/hostfile ./smpi_replay ${srcdir:=.}/replay/one_trace
+$ ../../bin/smpirun -ext smpi_replay --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc --cfg=smpi/cpu_threshold:1 -np 3 -platform ${srcdir:=.}/replay/replay_platform.xml -hostfile ${srcdir:=.}/hostfile ./smpi_replay ${srcdir:=.}/replay/one_trace
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '1e-9'
 > [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.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
 > [Tremblay:0:(0) 0.000000] [smpi_replay/VERBOSE] 0 comm_size 3 0.000000
 > [Fafard:2:(0) 65.176535] [smpi_replay/VERBOSE] 2 bcast 5e8 65.176535
@@ -14,28 +15,29 @@ $ ../../bin/smpirun -ext smpi_replay --log=replay.thresh:critical --log=smpi_rep
 > [Tremblay:0:(0) 73.739750] [smpi_replay/VERBOSE] 0 bcast 5e8 73.739750
 > [Jupiter:1:(0) 76.361119] [smpi_replay/VERBOSE] 1 compute 2e8 2.621369
 > [Tremblay:0:(0) 78.836850] [smpi_replay/VERBOSE] 0 compute 5e8 5.097100
-> [Fafard:2:(0) 144.013395] [smpi_replay/VERBOSE] 2 bcast 5e8 72.283436
-> [Fafard:2:(0) 150.566818] [smpi_replay/VERBOSE] 2 compute 5e8 6.553424
-> [Jupiter:1:(0) 152.576610] [smpi_replay/VERBOSE] 1 bcast 5e8 76.215490
-> [Tremblay:0:(0) 152.576610] [smpi_replay/VERBOSE] 0 bcast 5e8 73.739760
-> [Jupiter:1:(0) 155.197979] [smpi_replay/VERBOSE] 1 compute 2e8 2.621369
-> [Tremblay:0:(0) 157.673709] [smpi_replay/VERBOSE] 0 compute 5e8 5.097100
-> [Fafard:2:(0) 222.850244] [smpi_replay/VERBOSE] 2 reduce 5e8 5e8 72.283426
-> [Jupiter:1:(0) 231.413469] [smpi_replay/VERBOSE] 1 reduce 5e8 5e8 76.215490
-> [Tremblay:0:(0) 231.413469] [smpi_replay/VERBOSE] 0 reduce 5e8 5e8 73.739760
-> [Tremblay:0:(0) 231.413469] [smpi_replay/INFO] Simulation time 231.413
+> [Fafard:2:(0) 144.013385] [smpi_replay/VERBOSE] 2 bcast 5e8 72.283426
+> [Fafard:2:(0) 150.566808] [smpi_replay/VERBOSE] 2 compute 5e8 6.553424
+> [Jupiter:1:(0) 152.576600] [smpi_replay/VERBOSE] 1 bcast 5e8 76.215480
+> [Tremblay:0:(0) 152.576600] [smpi_replay/VERBOSE] 0 bcast 5e8 73.739750
+> [Jupiter:1:(0) 155.197969] [smpi_replay/VERBOSE] 1 compute 2e8 2.621369
+> [Tremblay:0:(0) 157.673699] [smpi_replay/VERBOSE] 0 compute 5e8 5.097100
+> [Fafard:2:(0) 222.850234] [smpi_replay/VERBOSE] 2 reduce 5e8 5e8 72.283426
+> [Jupiter:1:(0) 231.413449] [smpi_replay/VERBOSE] 1 reduce 5e8 5e8 76.215480
+> [Tremblay:0:(0) 231.413449] [smpi_replay/VERBOSE] 0 reduce 5e8 5e8 73.739750
+> [Tremblay:0:(0) 231.413449] [smpi_replay/INFO] Simulation time 231.413
 
 
 p The same with tracing activated
-$ ../../bin/smpirun -ext smpi_replay --log=replay.thresh:critical --log=no_loc  --cfg=tracing:1 --cfg=tracing/smpi:1 --cfg=tracing/smpi/computing:1 -np 3 -platform ${srcdir:=.}/replay/replay_platform.xml -hostfile ${srcdir:=.}/hostfile ./smpi_replay ${srcdir:=.}/replay/one_trace
+$ ../../bin/smpirun -ext smpi_replay --log=replay.thresh:critical --log=no_loc  --cfg=tracing:1 --cfg=tracing/smpi:1 --cfg=tracing/smpi/computing:1 --cfg=smpi/cpu_threshold:1 -np 3 -platform ${srcdir:=.}/replay/replay_platform.xml -hostfile ${srcdir:=.}/hostfile ./smpi_replay ${srcdir:=.}/replay/one_trace
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '1e-9'
 > [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 'tracing' to '1'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi' to '1'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi/computing' to '1'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu_threshold' to '1'
 > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
-> [Tremblay:0:(0) 231.413469] [smpi_replay/INFO] Simulation time 231.413
+> [Tremblay:0:(0) 231.413449] [smpi_replay/INFO] Simulation time 231.413
 
 
 $ tail -n +3 ./simgrid.trace
@@ -177,45 +179,46 @@ $ tail -n +3 ./simgrid.trace
 > 12 76.361119 2 2 5
 > 13 78.836850 2 1
 > 12 78.836850 2 1 5
-> 13 144.013395 2 3
-> 12 144.013395 2 3 4
-> 13 150.566818 2 3
-> 12 150.566818 2 3 6
-> 13 152.576610 2 2
-> 12 152.576610 2 2 4
-> 13 152.576610 2 1
-> 12 152.576610 2 1 4
-> 13 155.197979 2 2
-> 12 155.197979 2 2 6
-> 13 157.673709 2 1
-> 12 157.673709 2 1 6
-> 13 222.850244 2 3
-> 12 222.850244 2 3 4
-> 13 222.850245 2 3
-> 7 222.850245 1 3
-> 13 231.413469 2 2
-> 12 231.413469 2 2 4
-> 13 231.413469 2 1
-> 12 231.413469 2 1 4
-> 13 231.413470 2 1
-> 7 231.413470 1 1
-> 13 231.413470 2 2
-> 7 231.413470 1 2
+> 13 144.013385 2 3
+> 12 144.013385 2 3 4
+> 13 150.566808 2 3
+> 12 150.566808 2 3 6
+> 13 152.576600 2 2
+> 12 152.576600 2 2 4
+> 13 152.576600 2 1
+> 12 152.576600 2 1 4
+> 13 155.197969 2 2
+> 12 155.197969 2 2 6
+> 13 157.673699 2 1
+> 12 157.673699 2 1 6
+> 13 222.850234 2 3
+> 12 222.850234 2 3 4
+> 13 222.850234 2 3
+> 7 222.850234 1 3
+> 13 231.413449 2 2
+> 12 231.413449 2 2 4
+> 13 231.413449 2 2
+> 7 231.413449 1 2
+> 13 231.413449 2 1
+> 12 231.413449 2 1 4
+> 13 231.413449 2 1
+> 7 231.413449 1 1
 
 $ rm -f ./simgrid.trace
 
 p Another test of trace replay with SMPI (one trace per process)
-$ ../../bin/smpirun -ext smpi_replay --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc -np 2 -platform ${srcdir:=.}/replay/replay_platform.xml -hostfile ${srcdir:=.}/hostfile ./smpi_replay ${srcdir:=.}/replay/split_traces
+$ ../../bin/smpirun -ext smpi_replay --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc --cfg=smpi/cpu_threshold:1 -np 2 -platform ${srcdir:=.}/replay/replay_platform.xml -hostfile ${srcdir:=.}/hostfile ./smpi_replay ${srcdir:=.}/replay/split_traces
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '1e-9'
 > [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.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
 > [Tremblay:0:(0) 0.164463] [smpi_replay/VERBOSE] 0 send 1 1e6 0.164463
 > [Jupiter:1:(0) 0.164463] [smpi_replay/VERBOSE] 1 recv 0 1e6 0.164463
 > [Jupiter:1:(0) 13.271310] [smpi_replay/VERBOSE] 1 compute 1e9 13.106847
 > [Jupiter:1:(0) 13.271310] [smpi_replay/VERBOSE] 1 Isend 0 1e6 0.000000
 > [Jupiter:1:(0) 13.271310] [smpi_replay/VERBOSE] 1 Irecv 0 1e6 0.000000
-> [Tremblay:0:(0) 13.574474] [smpi_replay/VERBOSE] 0 recv 1 1e6 13.410011
-> [Jupiter:1:(0) 13.877637] [smpi_replay/VERBOSE] 1 wait 0.606328
-> [Tremblay:0:(0) 13.877637] [smpi_replay/VERBOSE] 0 send 1 1e6 0.303164
-> [Tremblay:0:(0) 13.877637] [smpi_replay/INFO] Simulation time 13.8776
+> [Tremblay:0:(0) 13.435773] [smpi_replay/VERBOSE] 0 recv 1 1e6 13.271310
+> [Jupiter:1:(0) 13.600235] [smpi_replay/VERBOSE] 1 wait 0.328926
+> [Tremblay:0:(0) 13.600235] [smpi_replay/VERBOSE] 0 send 1 1e6 0.164463
+> [Tremblay:0:(0) 13.600235] [smpi_replay/INFO] Simulation time 13.6002