use tuned barrier here if provided

diff --git a/src/smpi/colls/alltoall-pair-mpi-barrier.c b/src/smpi/colls/alltoall-pair-mpi-barrier.c
index ef36248..20dd573 100644 (file)
--- a/src/smpi/colls/alltoall-pair-mpi-barrier.c
+++ b/src/smpi/colls/alltoall-pair-mpi-barrier.c
@@ -44,7 +44,7 @@ smpi_coll_tuned_alltoall_pair_mpi_barrier(void *send_buff, int send_count,
 
   for (i = 0; i < num_procs; i++) {
     src = dst = rank ^ i;
 
   for (i = 0; i < num_procs; i++) {
     src = dst = rank ^ i;

-    smpi_mpi_barrier(comm);
+    mpi_coll_barrier_fun(comm);

     smpi_mpi_sendrecv(send_ptr + dst * send_chunk, send_count, send_type, dst,
                  tag, recv_ptr + src * recv_chunk, recv_count, recv_type,
                  src, tag, comm, &s);
     smpi_mpi_sendrecv(send_ptr + dst * send_chunk, send_count, send_type, dst,
                  tag, recv_ptr + src * recv_chunk, recv_count, recv_type,
                  src, tag, comm, &s);

diff --git a/src/smpi/colls/alltoall-pair-one-barrier.c b/src/smpi/colls/alltoall-pair-one-barrier.c
index 0d14d28..209fa81 100644 (file)
--- a/src/smpi/colls/alltoall-pair-one-barrier.c
+++ b/src/smpi/colls/alltoall-pair-one-barrier.c
@@ -43,7 +43,7 @@ smpi_coll_tuned_alltoall_pair_one_barrier(void *send_buff, int send_count,
   send_chunk *= send_count;
   recv_chunk *= recv_count;
 
   send_chunk *= send_count;
   recv_chunk *= recv_count;
 

-  smpi_mpi_barrier(comm);
+  mpi_coll_barrier_fun(comm);

   for (i = 0; i < num_procs; i++) {
     src = dst = rank ^ i;
     smpi_mpi_sendrecv(send_ptr + dst * send_chunk, send_count, send_type, dst,
   for (i = 0; i < num_procs; i++) {
     src = dst = rank ^ i;
     smpi_mpi_sendrecv(send_ptr + dst * send_chunk, send_count, send_type, dst,

diff --git a/src/smpi/colls/alltoall-ring-mpi-barrier.c b/src/smpi/colls/alltoall-ring-mpi-barrier.c
index 7b84edb..469127a 100644 (file)
--- a/src/smpi/colls/alltoall-ring-mpi-barrier.c
+++ b/src/smpi/colls/alltoall-ring-mpi-barrier.c
@@ -46,7 +46,7 @@ smpi_coll_tuned_alltoall_ring_mpi_barrier(void *send_buff, int send_count,
     src = (rank - i + num_procs) % num_procs;
     dst = (rank + i) % num_procs;
 
     src = (rank - i + num_procs) % num_procs;
     dst = (rank + i) % num_procs;
 

-    smpi_mpi_barrier(comm);
+    mpi_coll_barrier_fun(comm);

     smpi_mpi_sendrecv(send_ptr + dst * send_chunk, send_count, send_type, dst,
                  tag, recv_ptr + src * recv_chunk, recv_count, recv_type,
                  src, tag, comm, &s);
     smpi_mpi_sendrecv(send_ptr + dst * send_chunk, send_count, send_type, dst,
                  tag, recv_ptr + src * recv_chunk, recv_count, recv_type,
                  src, tag, comm, &s);

diff --git a/src/smpi/colls/alltoall-ring-one-barrier.c b/src/smpi/colls/alltoall-ring-one-barrier.c
index 30583fb..677008c 100644 (file)
--- a/src/smpi/colls/alltoall-ring-one-barrier.c
+++ b/src/smpi/colls/alltoall-ring-one-barrier.c
@@ -41,7 +41,7 @@ smpi_coll_tuned_alltoall_ring_one_barrier(void *send_buff, int send_count,
   send_chunk *= send_count;
   recv_chunk *= recv_count;
 
   send_chunk *= send_count;
   recv_chunk *= recv_count;
 

-  smpi_mpi_barrier(comm);
+  mpi_coll_barrier_fun(comm);

   for (i = 0; i < num_procs; i++) {
     src = (rank - i + num_procs) % num_procs;
     dst = (rank + i) % num_procs;
   for (i = 0; i < num_procs; i++) {
     src = (rank - i + num_procs) % num_procs;
     dst = (rank + i) % num_procs;