From dd92246f876993d5196363d4f075231c25c87693 Mon Sep 17 00:00:00 2001
From: degomme <degomme@debian.localdomain>
Date: Thu, 13 Jun 2013 11:36:43 +0200
Subject: [PATCH] barrier tests

---
 buildtools/Cmake/AddTests.cmake  |  5 +++++
 teshsuite/smpi/CMakeLists.txt    |  5 ++++-
 teshsuite/smpi/barrier.c         |  8 +++-----
 teshsuite/smpi/barrier_coll.tesh | 26 ++++++++++++++++++++++++++
 4 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 teshsuite/smpi/barrier_coll.tesh

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index a6c809c3fa..a5af8aba24 100644
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -422,6 +422,11 @@ if(NOT enable_memcheck)
     FOREACH (SCATTER_COLL default  ompi ompi_basic_linear ompi_binomial)
         ADD_TEST(smpi-scatter-coll-${SCATTER_COLL} ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg smpi/scatter:${SCATTER_COLL} --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/scatter_coll.tesh)
     ENDFOREACH()
+
+    FOREACH (BARRIER_COLL default  ompi ompi_basic_linear ompi_tree ompi_bruck ompi_recursivedoubling ompi_doublering)
+        ADD_TEST(smpi-barrier-coll-${BARRIER_COLL} ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg smpi/barrier:${BARRIER_COLL} --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/barrier_coll.tesh)
+    ENDFOREACH()
+
   endif()
 
   # END TESH TESTS
diff --git a/teshsuite/smpi/CMakeLists.txt b/teshsuite/smpi/CMakeLists.txt
index c0d0ea3c33..3def58b1a1 100644
--- a/teshsuite/smpi/CMakeLists.txt
+++ b/teshsuite/smpi/CMakeLists.txt
@@ -20,7 +20,8 @@ if(enable_smpi)
   add_executable(allreduce allreduce.c)
   add_executable(allreduce_coll allreduce_coll.c)  
   add_executable(bcast bcast.c)
-  add_executable(bcast_coll bcast_coll.c)  
+  add_executable(bcast_coll bcast_coll.c) 
+  add_executable(barrier_coll barrier.c )
   add_executable(compute compute.c)
   add_executable(compute2 compute2.c)
   add_executable(compute3 compute3.c)
@@ -82,6 +83,8 @@ set(tesh_files
   ${CMAKE_CURRENT_SOURCE_DIR}/allreduce_coll.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/alltoall_coll.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/alltoallv_coll.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/scatter_coll.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/barrier_coll.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/bcast.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/bcast_coll.tesh  
   ${CMAKE_CURRENT_SOURCE_DIR}/compute.tesh
diff --git a/teshsuite/smpi/barrier.c b/teshsuite/smpi/barrier.c
index 568015ec72..7fb9a0c917 100644
--- a/teshsuite/smpi/barrier.c
+++ b/teshsuite/smpi/barrier.c
@@ -11,22 +11,20 @@
 int main(int argc, char **argv)
 {
   int size, rank;
-  int root = 0;
-  int value;
-  double start_timer;
+  //double start_timer;
 
   MPI_Init(&argc, &argv);
   MPI_Comm_size(MPI_COMM_WORLD, &size);
   MPI_Comm_rank(MPI_COMM_WORLD, &rank);
 
-  start_timer = MPI_Wtime();
+  //start_timer = MPI_Wtime();
 
   MPI_Barrier(MPI_COMM_WORLD);
 
   MPI_Barrier(MPI_COMM_WORLD);
   if (0 == rank) {
     printf("... Barrier ....\n");
-    printf("Elapsed=%lf s\n", MPI_Wtime() - start_timer);
+    //printf("Elapsed=%lf s\n", MPI_Wtime() - start_timer);
   }
 
   MPI_Finalize();
diff --git a/teshsuite/smpi/barrier_coll.tesh b/teshsuite/smpi/barrier_coll.tesh
new file mode 100644
index 0000000000..a65b0de18c
--- /dev/null
+++ b/teshsuite/smpi/barrier_coll.tesh
@@ -0,0 +1,26 @@
+# Smpi  scatter collectives tests
+! setenv LD_LIBRARY_PATH=../../lib
+! output sort
+
+p Test scatter
+$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ./barrier_coll
+> ... Barrier ....
+> You requested to use 16 processes, but there is only 5 processes in your hostfile...
+> [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
+> [rank 0] -> Tremblay
+> [rank 10] -> Tremblay
+> [rank 11] -> Jupiter
+> [rank 12] -> Fafard
+> [rank 13] -> Ginette
+> [rank 14] -> Bourassa
+> [rank 15] -> Tremblay
+> [rank 1] -> Jupiter
+> [rank 2] -> Fafard
+> [rank 3] -> Ginette
+> [rank 4] -> Bourassa
+> [rank 5] -> Tremblay
+> [rank 6] -> Jupiter
+> [rank 7] -> Fafard
+> [rank 8] -> Ginette
+> [rank 9] -> Bourassa
+
-- 
2.20.1