begin to add bcast MVAPICH collectives selector..

[simgrid.git] / src / smpi / colls / smpi_mvapich2_selector_stampede.h

diff --git a/src/smpi/colls/smpi_mvapich2_selector_stampede.h b/src/smpi/colls/smpi_mvapich2_selector_stampede.h
index 8e1c231..bf44fb7 100644 (file)
--- a/src/smpi/colls/smpi_mvapich2_selector_stampede.h
+++ b/src/smpi/colls/smpi_mvapich2_selector_stampede.h
@@ -10,6 +10,8 @@
 /************ Alltoall variables and initializers                        */
 
 #define MV2_MAX_NB_THRESHOLDS  32
+
+
 typedef struct {
   int min;
   int max;
@@ -331,7 +333,7 @@ static int MPIR_Allgather_RD_Allgather_Comm_MV2( void *sendbuf,
 #define MPIR_Allgather_Bruck_MV2 smpi_coll_tuned_allgather_bruck
 #define MPIR_Allgather_RD_MV2 smpi_coll_tuned_allgather_rdb
 #define MPIR_Allgather_Ring_MV2 smpi_coll_tuned_allgather_ring
-
+#define MPIR_2lvl_Allgather_MV2 smpi_coll_tuned_allgather_mvapich2_smp
 
 static void init_mv2_allgather_tables_stampede(){
   int i;
@@ -585,7 +587,7 @@ MV2_Gather_function_ptr MV2_Gather_intra_node_function = NULL;
 
 
 #define MPIR_Gather_MV2_Direct smpi_coll_tuned_gather_ompi_basic_linear
-#define MPIR_Gather_MV2_two_level_Direct smpi_coll_tuned_gather_ompi_basic_linear
+#define MPIR_Gather_MV2_two_level_Direct smpi_coll_tuned_gather_mvapich2_two_level
 #define MPIR_Gather_intra smpi_coll_tuned_gather_mpich
 
 
@@ -818,7 +820,7 @@ static  int MPIR_Allreduce_reduce_shmem_MV2( void *sendbuf,
 
 #define MPIR_Allreduce_pt2pt_rd_MV2 smpi_coll_tuned_allreduce_rdb
 #define MPIR_Allreduce_pt2pt_rs_MV2 smpi_coll_tuned_allreduce_mvapich2_rs
-
+#define MPIR_Allreduce_two_level_MV2 smpi_coll_tuned_allreduce_mvapich2_two_level
 
 
 static void init_mv2_allreduce_tables_stampede(){
@@ -963,8 +965,8 @@ static void init_mv2_allreduce_tables_stampede(){
 }
 
 
-/*
-Bcast deactivated for now, defaults to mpich one
+
+
 typedef struct {
     int min;
     int max;
@@ -995,11 +997,24 @@ int (*MV2_Bcast_function) (void *buffer, int count, MPI_Datatype datatype,
 int (*MV2_Bcast_intra_node_function) (void *buffer, int count, MPI_Datatype datatype,
                                       int root, MPI_Comm comm_ptr) = NULL;
 
+int zcpy_knomial_factor = 2;
+int mv2_pipelined_zcpy_knomial_factor = -1;
+int bcast_segment_size = 8192;
+int mv2_inter_node_knomial_factor = 4;
+int mv2_intra_node_knomial_factor = 4;
+#define INTRA_NODE_ROOT 0
+
+#define MPIR_Pipelined_Bcast_Zcpy_MV2 smpi_coll_tuned_bcast_mpich
+#define MPIR_Pipelined_Bcast_MV2 smpi_coll_tuned_bcast_mpich
+#define MPIR_Bcast_binomial_MV2 smpi_coll_tuned_bcast_mpich
+#define MPIR_Bcast_scatter_ring_allgather_shm_MV2 smpi_coll_tuned_bcast_mpich
+#define MPIR_Bcast_scatter_doubling_allgather_MV2 smpi_coll_tuned_bcast_mpich
+#define MPIR_Bcast_scatter_ring_allgather_MV2 smpi_coll_tuned_bcast_mpich
+#define MPIR_Shmem_Bcast_MV2 smpi_coll_tuned_bcast_mpich
+#define MPIR_Bcast_tune_inter_node_helper_MV2 smpi_coll_tuned_bcast_mpich
+#define MPIR_Knomial_Bcast_intra_node_MV2 smpi_coll_tuned_bcast_mpich
+#define MPIR_Bcast_intra_MV2 smpi_coll_tuned_bcast_mpich
 
- */
-
-
-/*
 static void init_mv2_bcast_tables_stampede(){
  //Stampede,
         mv2_size_bcast_tuning_table=8;
@@ -1207,7 +1222,7 @@ static void init_mv2_bcast_tables_stampede(){
 
         memcpy(mv2_bcast_thresholds_table, mv2_tmp_bcast_thresholds_table,
                     mv2_size_bcast_tuning_table * sizeof (mv2_bcast_tuning_table));
-}*/
+}
 
 
 /************ Reduce variables and initializers                        */
@@ -1264,7 +1279,7 @@ int (*MV2_Reduce_intra_function)( void *sendbuf,
 #define MPIR_Reduce_binomial_MV2 smpi_coll_tuned_reduce_binomial
 #define MPIR_Reduce_redscat_gather_MV2 smpi_coll_tuned_reduce_scatter_gather
 #define MPIR_Reduce_shmem_MV2 smpi_coll_tuned_reduce_ompi_basic_linear
-
+#define MPIR_Reduce_two_level_helper_MV2 smpi_coll_tuned_reduce_mvapich2_two_level
 
 
 static void init_mv2_reduce_tables_stampede(){
@@ -1627,8 +1642,8 @@ int MPIR_Scatter_mcst_wrap_MV2(void *sendbuf,
 
 #define MPIR_Scatter_MV2_Binomial smpi_coll_tuned_scatter_ompi_binomial
 #define MPIR_Scatter_MV2_Direct smpi_coll_tuned_scatter_ompi_basic_linear
-#define MPIR_Scatter_MV2_two_level_Binomial smpi_coll_tuned_scatter_ompi_binomial
-#define MPIR_Scatter_MV2_two_level_Direct smpi_coll_tuned_scatter_ompi_basic_linear
+#define MPIR_Scatter_MV2_two_level_Binomial smpi_coll_tuned_scatter_mvapich2_two_level_binomial
+#define MPIR_Scatter_MV2_two_level_Direct smpi_coll_tuned_scatter_mvapich2_two_level_direct