[TESTS] Included tags in tests and traces

diff --git a/examples/smpi/replay/actions0.txt b/examples/smpi/replay/actions0.txt
index 3e499e2..8510a3f 100644 (file)
--- a/examples/smpi/replay/actions0.txt
+++ b/examples/smpi/replay/actions0.txt
@@ -1,5 +1,5 @@
 0 init
-0 send 1 1e6
-0 recv 1 1e6
-0 send 1 1e6
+0 send 1 0 1e6
+0 recv 1 1 1e6
+0 send 1 2 1e6
 0 finalize

diff --git a/examples/smpi/replay/actions1.txt b/examples/smpi/replay/actions1.txt
index 572645f..9e34cc4 100644 (file)
--- a/examples/smpi/replay/actions1.txt
+++ b/examples/smpi/replay/actions1.txt
@@ -1,7 +1,7 @@
 1 init
-1 recv 0 1e6
+1 recv 0 0 1e6
 1 compute 1e9
-1 Isend 0 1e6
-1 Irecv 0 1e6
-1 wait
+1 Isend 0 1 1e6
+1 Irecv 0 2 1e6
+1 wait 0 1 2
 1 finalize

diff --git a/examples/smpi/replay/actions_barrier.txt b/examples/smpi/replay/actions_barrier.txt
index 55a9a62..8395969 100644 (file)
--- a/examples/smpi/replay/actions_barrier.txt
+++ b/examples/smpi/replay/actions_barrier.txt
@@ -1,11 +1,11 @@
 0 init
-0 send 1 1e7
+0 send 1 0 1e7
 0 barrier
 0 compute 98095000
 0 finalize
 
 1 init
-1 recv 0 1e7
+1 recv 0 0 1e7
 1 barrier
 1 compute 76296000
 1 finalize

diff --git a/examples/smpi/replay/actions_waitall.txt b/examples/smpi/replay/actions_waitall.txt
index d7e3799..9f69b9e 100644 (file)
--- a/examples/smpi/replay/actions_waitall.txt
+++ b/examples/smpi/replay/actions_waitall.txt
@@ -2,13 +2,13 @@
 1 init
 2 init
 
-0 Irecv 1 2000
-1 Isend 0 2000
-2 Irecv 1 3000
+0 Irecv 1 0 2000
+1 Isend 0 0 2000
+2 Irecv 1 1 3000
 
-0 Irecv 2 3000
-1 Isend 2 3000
-2 Isend 0 3000
+0 Irecv 2 2 3000
+1 Isend 2 1 3000
+2 Isend 0 2 3000
 
 0 waitAll
 1 waitAll

diff --git a/examples/smpi/replay/actions_with_isend.txt b/examples/smpi/replay/actions_with_isend.txt
index fd5ea51..0a7922a 100644 (file)
--- a/examples/smpi/replay/actions_with_isend.txt
+++ b/examples/smpi/replay/actions_with_isend.txt
@@ -3,27 +3,26 @@
 2 init
 
 0 compute 1e9
-0 send 1 1e6
+0 send 1 0 1e6
 0 compute 1e9
-0 recv 2 1e6
+0 recv 2 2 1e6
 
-1 Irecv 0 1e6
+1 Irecv 0 0 1e6
 1 compute 5e8
-1 test
+1 test 0 1 0
 1 compute 5e8
-1 wait
-1 send 2 1e6
+1 wait 0 1 0
+1 send 2 1 1e6
 
 2 compute 2e9
-2 Irecv 1 1e6
+2 Irecv 1 1 1e6
 2 compute 2.5e8
-2 test
+2 test 1 2 1
 2 compute 2.5e8
-2 wait
-2 Isend 0 1e6
+2 wait 1 2 1
+2 Isend 0 2 1e6
 2 compute 5e8
 
 0 finalize
 1 finalize
 2 finalize
-

diff --git a/examples/smpi/replay/replay.tesh b/examples/smpi/replay/replay.tesh
index 51050cd..b4871fc 100644 (file)
--- a/examples/smpi/replay/replay.tesh
+++ b/examples/smpi/replay/replay.tesh
@@ -213,14 +213,14 @@ p Another test of trace replay with SMPI (one trace per process)
 $ mkfile ./split_traces_tesh
 
 $ ../../smpi_script/bin/smpirun -no-privatize -ext smpi_replay --log=smpi_replay.thresh:verbose --log=no_loc --cfg=smpi/simulate-computation:no -np 2 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile ./replay/smpi_replay ./split_traces_tesh --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning
-> [Tremblay:0:(1) 0.167158] [smpi_replay/VERBOSE] 0 send 1 1e6 0.167158
-> [Jupiter:1:(2) 0.167158] [smpi_replay/VERBOSE] 1 recv 0 1e6 0.167158
+> [Tremblay:0:(1) 0.167158] [smpi_replay/VERBOSE] 0 send 0 1 1e6 0.167158
+> [Jupiter:1:(2) 0.167158] [smpi_replay/VERBOSE] 1 recv 0 0 1e6 0.167158
 > [Jupiter:1:(2) 13.274005] [smpi_replay/VERBOSE] 1 compute 1e9 13.106847
-> [Jupiter:1:(2) 13.274005] [smpi_replay/VERBOSE] 1 Isend 0 1e6 0.000000
-> [Jupiter:1:(2) 13.274005] [smpi_replay/VERBOSE] 1 Irecv 0 1e6 0.000000
-> [Tremblay:0:(1) 13.441162] [smpi_replay/VERBOSE] 0 recv 1 1e6 13.274005
-> [Jupiter:1:(2) 13.608320] [smpi_replay/VERBOSE] 1 wait 0.334315
-> [Tremblay:0:(1) 13.608320] [smpi_replay/VERBOSE] 0 send 1 1e6 0.167158
+> [Jupiter:1:(2) 13.274005] [smpi_replay/VERBOSE] 1 Isend 0 1 1e6 0.000000
+> [Jupiter:1:(2) 13.274005] [smpi_replay/VERBOSE] 1 Irecv 0 2 1e6 0.000000
+> [Tremblay:0:(1) 13.441162] [smpi_replay/VERBOSE] 0 recv 1 1 1e6 13.274005
+> [Jupiter:1:(2) 13.608320] [smpi_replay/VERBOSE] 1 wait 0 1 2 0.334315
+> [Tremblay:0:(1) 13.608320] [smpi_replay/VERBOSE] 0 send 1 2 1e6 0.167158
 > [Jupiter:1:(2) 13.608320] [smpi_replay/INFO] Simulation time 13.608320
 
 $ rm -f ./split_traces_tesh
@@ -231,8 +231,8 @@ p Test of barrier replay with SMPI (one trace for all processes)
 $ mkfile replay/one_trace
 
 $ ../../smpi_script/bin/smpirun -no-privatize -ext smpi_replay --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc --cfg=smpi/simulate-computation:no -np 3 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile ./replay/smpi_replay replay/one_trace --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning
-> [Tremblay:0:(1) 1.518421] [smpi_replay/VERBOSE] 0 send 1 1e7 1.518421
-> [Jupiter:1:(2) 1.518421] [smpi_replay/VERBOSE] 1 recv 0 1e7 1.518421
+> [Tremblay:0:(1) 1.518421] [smpi_replay/VERBOSE] 0 send 1 0 1e7 1.518421
+> [Jupiter:1:(2) 1.518421] [smpi_replay/VERBOSE] 1 recv 0 0 1e7 1.518421
 > [Tremblay:0:(1) 1.520397] [smpi_replay/VERBOSE] 0 barrier 0.001976
 > [Jupiter:1:(2) 1.521858] [smpi_replay/VERBOSE] 1 barrier 0.003438
 > [Fafard:2:(3) 1.522373] [smpi_replay/VERBOSE] 2 barrier 1.522373
@@ -249,23 +249,23 @@ p Test of Isend replay with SMPI (one trace for all processes)
 $ mkfile replay/one_trace
 
 $ ../../smpi_script/bin/smpirun -no-privatize -ext smpi_replay --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc --cfg=smpi/simulate-computation:no -np 3 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile ./replay/smpi_replay replay/one_trace --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning
-> [Jupiter:1:(2) 0.000000] [smpi_replay/VERBOSE] 1 Irecv 0 1e6 0.000000
+> [Jupiter:1:(2) 0.000000] [smpi_replay/VERBOSE] 1 Irecv 0 0 1e6 0.000000
 > [Jupiter:1:(2) 6.553424] [smpi_replay/VERBOSE] 1 compute 5e8 6.553424
-> [Jupiter:1:(2) 6.553524] [smpi_replay/VERBOSE] 1 test 0.000100
+> [Jupiter:1:(2) 6.553524] [smpi_replay/VERBOSE] 1 test 0 1 0 0.000100
 > [Tremblay:0:(1) 10.194200] [smpi_replay/VERBOSE] 0 compute 1e9 10.194200
-> [Tremblay:0:(1) 10.361357] [smpi_replay/VERBOSE] 0 send 1 1e6 0.167158
+> [Tremblay:0:(1) 10.361357] [smpi_replay/VERBOSE] 0 send 1 0 1e6 0.167158
 > [Jupiter:1:(2) 13.106947] [smpi_replay/VERBOSE] 1 compute 5e8 6.553424
-> [Jupiter:1:(2) 13.106947] [smpi_replay/VERBOSE] 1 wait 0.000000
+> [Jupiter:1:(2) 13.106947] [smpi_replay/VERBOSE] 1 wait 0 1 0 0.000000
 > [Tremblay:0:(1) 20.555557] [smpi_replay/VERBOSE] 0 compute 1e9 10.194200
 > [Fafard:2:(3) 26.213694] [smpi_replay/VERBOSE] 2 compute 2e9 26.213694
-> [Fafard:2:(3) 26.213694] [smpi_replay/VERBOSE] 2 Irecv 1 1e6 0.000000
-> [Jupiter:1:(2) 26.403860] [smpi_replay/VERBOSE] 1 send 2 1e6 13.296913
+> [Fafard:2:(3) 26.213694] [smpi_replay/VERBOSE] 2 Irecv 1 1 1e6 0.000000
+> [Jupiter:1:(2) 26.403860] [smpi_replay/VERBOSE] 1 send 2 1 1e6 13.296913
 > [Fafard:2:(3) 29.490406] [smpi_replay/VERBOSE] 2 compute 2.5e8 3.276712
-> [Fafard:2:(3) 29.490606] [smpi_replay/VERBOSE] 2 test 0.000200
+> [Fafard:2:(3) 29.490606] [smpi_replay/VERBOSE] 2 test 1 2 1 0.000200
 > [Fafard:2:(3) 32.767318] [smpi_replay/VERBOSE] 2 compute 2.5e8 3.276712
-> [Fafard:2:(3) 32.767318] [smpi_replay/VERBOSE] 2 wait 0.000000
-> [Fafard:2:(3) 32.767318] [smpi_replay/VERBOSE] 2 Isend 0 1e6 0.000000
-> [Tremblay:0:(1) 32.923014] [smpi_replay/VERBOSE] 0 recv 2 1e6 12.367458
+> [Fafard:2:(3) 32.767318] [smpi_replay/VERBOSE] 2 wait 1 2 1 0.000000
+> [Fafard:2:(3) 32.767318] [smpi_replay/VERBOSE] 2 Isend 0 2 1e6 0.000000
+> [Tremblay:0:(1) 32.923014] [smpi_replay/VERBOSE] 0 recv 2 2 1e6 12.367458
 > [Fafard:2:(3) 39.320741] [smpi_replay/VERBOSE] 2 compute 5e8 6.553424
 > [Fafard:2:(3) 39.320741] [smpi_replay/INFO] Simulation time 39.320741
 
@@ -336,13 +336,13 @@ $ mkfile replay/one_trace
 
 ! output sort 19
 $ ../../smpi_script/bin/smpirun -no-privatize -ext smpi_replay --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc --cfg=smpi/simulate-computation:no -np 3 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile ./replay/smpi_replay replay/one_trace --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning
-> [Fafard:2:(3) 0.000000] [smpi_replay/VERBOSE] 2 Irecv 1 3000 0.000000
-> [Fafard:2:(3) 0.000000] [smpi_replay/VERBOSE] 2 Isend 0 3000 0.000000
-> [Jupiter:1:(2) 0.000000] [smpi_replay/VERBOSE] 1 Isend 0 2000 0.000000
-> [Jupiter:1:(2) 0.000000] [smpi_replay/VERBOSE] 1 Isend 2 3000 0.000000
+> [Fafard:2:(3) 0.000000] [smpi_replay/VERBOSE] 2 Irecv 1 1 3000 0.000000
+> [Fafard:2:(3) 0.000000] [smpi_replay/VERBOSE] 2 Isend 0 2 3000 0.000000
+> [Jupiter:1:(2) 0.000000] [smpi_replay/VERBOSE] 1 Isend 0 0 2000 0.000000
+> [Jupiter:1:(2) 0.000000] [smpi_replay/VERBOSE] 1 Isend 2 1 3000 0.000000
 > [Jupiter:1:(2) 0.000000] [smpi_replay/VERBOSE] 1 waitAll 0.000000
-> [Tremblay:0:(1) 0.000000] [smpi_replay/VERBOSE] 0 Irecv 1 2000 0.000000
-> [Tremblay:0:(1) 0.000000] [smpi_replay/VERBOSE] 0 Irecv 2 3000 0.000000
+> [Tremblay:0:(1) 0.000000] [smpi_replay/VERBOSE] 0 Irecv 1 0 2000 0.000000
+> [Tremblay:0:(1) 0.000000] [smpi_replay/VERBOSE] 0 Irecv 2 2 3000 0.000000
 > [Tremblay:0:(1) 0.003787] [smpi_replay/VERBOSE] 0 waitAll 0.003787
 > [Fafard:2:(3) 0.006220] [smpi_replay/VERBOSE] 2 waitAll 0.006220
 > [Fafard:2:(3) 0.006220] [smpi_replay/INFO] Simulation time 0.006220

diff --git a/teshsuite/smpi/pt2pt-pingpong/TI_output.tesh b/teshsuite/smpi/pt2pt-pingpong/TI_output.tesh
index 8bc9e2a..d7b0e7c 100644 (file)
--- a/teshsuite/smpi/pt2pt-pingpong/TI_output.tesh
+++ b/teshsuite/smpi/pt2pt-pingpong/TI_output.tesh
@@ -44,47 +44,47 @@ $ ${bindir:=.}/../../../smpi_script/bin/smpirun -no-privatize -ext smpi_replay -
 ! output sort
 $ sh -c "cat ./out_ti.txt_files/*"
 > 0 init
-> 0 send 1 1 1
-> 0 recv 1 1 1
+> 0 send 1 42 1 1
+> 0 recv 1 43 1 1
 > 0 finalize
 > 1 init
-> 1 recv 0 1 1
-> 1 send 0 1 1
-> 1 send 2 1 1
-> 1 recv 2 1 1
+> 1 recv 0 42 1 1
+> 1 send 0 43 1 1
+> 1 send 2 42 1 1
+> 1 recv 2 43 1 1
 > 1 finalize
 > 2 init
-> 2 recv 1 1 1
-> 2 send 1 1 1
-> 2 send 3 1 1
-> 2 recv 3 1 1
+> 2 recv 1 42 1 1
+> 2 send 1 43 1 1
+> 2 send 3 42 1 1
+> 2 recv 3 43 1 1
 > 2 finalize
 > 3 init
-> 3 recv 2 1 1
-> 3 send 2 1 1
+> 3 recv 2 42 1 1
+> 3 send 2 43 1 1
 > 3 finalize
 
 ! output sort
 $ sh -c "cat ./out_in_ti.txt_files/*"
 > 0 init
-> 0 send 1 1 1
-> 0 recv 1 1 1
+> 0 send 1 42 1 1
+> 0 recv 1 43 1 1
 > 0 finalize
 > 1 init
-> 1 recv 0 1 1
-> 1 send 0 1 1
-> 1 send 2 1 1
-> 1 recv 2 1 1
+> 1 recv 0 42 1 1
+> 1 send 0 43 1 1
+> 1 send 2 42 1 1
+> 1 recv 2 43 1 1
 > 1 finalize
 > 2 init
-> 2 recv 1 1 1
-> 2 send 1 1 1
-> 2 send 3 1 1
-> 2 recv 3 1 1
+> 2 recv 1 42 1 1
+> 2 send 1 43 1 1
+> 2 send 3 42 1 1
+> 2 recv 3 43 1 1
 > 2 finalize
 > 3 init
-> 3 recv 2 1 1
-> 3 send 2 1 1
+> 3 recv 2 42 1 1
+> 3 send 2 43 1 1
 > 3 finalize
 
 $ rm -rf ./out_ti.txt_files