X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d20f024dba9ff1e9c8822237caaf963b9e913889..fbcf6ab31cae1988be858f9f894dafe529c575d7:/src/smpi/colls/smpi_mvapich2_selector_stampede.hpp diff --git a/src/smpi/colls/smpi_mvapich2_selector_stampede.hpp b/src/smpi/colls/smpi_mvapich2_selector_stampede.hpp index 7f69d1c550..9762cf2cdd 100644 --- a/src/smpi/colls/smpi_mvapich2_selector_stampede.hpp +++ b/src/smpi/colls/smpi_mvapich2_selector_stampede.hpp @@ -2,32 +2,37 @@ /* This is the tuning used by MVAPICH for Stampede platform based on (MV2_ARCH_INTEL_XEON_E5_2680_16, * MV2_HCA_MLX_CX_FDR) */ -/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2019. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ /************ Alltoall variables and initializers */ +#ifndef SMPI_MVAPICH2_SELECTOR_STAMPEDE_HPP +#define SMPI_MVAPICH2_SELECTOR_STAMPEDE_HPP + +#include + #define MV2_MAX_NB_THRESHOLDS 32 -XBT_PUBLIC(void) smpi_coll_cleanup_mvapich2(void); +XBT_PUBLIC void smpi_coll_cleanup_mvapich2(void); -typedef struct { +struct mv2_alltoall_tuning_element { int min; int max; - int (*MV2_pt_Alltoall_function)(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, + int (*MV2_pt_Alltoall_function)(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm_ptr); -} mv2_alltoall_tuning_element; +}; -typedef struct { +struct mv2_alltoall_tuning_table { int numproc; int size_table; mv2_alltoall_tuning_element algo_table[MV2_MAX_NB_THRESHOLDS]; mv2_alltoall_tuning_element in_place_algo_table[MV2_MAX_NB_THRESHOLDS]; -} mv2_alltoall_tuning_table; +}; -int (*MV2_Alltoall_function)(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, +int (*MV2_Alltoall_function)(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm_ptr) = NULL; /* Indicates number of processes per node */ @@ -45,18 +50,15 @@ mv2_alltoall_tuning_table** mv2_alltoall_thresholds_table = NULL; static void init_mv2_alltoall_tables_stampede() { - int i; int agg_table_sum = 0; mv2_alltoall_tuning_table** table_ptrs = NULL; mv2_alltoall_num_ppn_conf = 3; if (simgrid::smpi::Colls::smpi_coll_cleanup_callback == NULL) simgrid::smpi::Colls::smpi_coll_cleanup_callback = &smpi_coll_cleanup_mvapich2; - mv2_alltoall_thresholds_table = static_cast( - xbt_malloc(sizeof(mv2_alltoall_tuning_table*) * mv2_alltoall_num_ppn_conf)); - table_ptrs = static_cast( - xbt_malloc(sizeof(mv2_alltoall_tuning_table*) * mv2_alltoall_num_ppn_conf)); - mv2_size_alltoall_tuning_table = static_cast(xbt_malloc(sizeof(int) * mv2_alltoall_num_ppn_conf)); - mv2_alltoall_table_ppn_conf = static_cast(xbt_malloc(mv2_alltoall_num_ppn_conf * sizeof(int))); + mv2_alltoall_thresholds_table = new mv2_alltoall_tuning_table*[mv2_alltoall_num_ppn_conf]; + table_ptrs = new mv2_alltoall_tuning_table*[mv2_alltoall_num_ppn_conf]; + mv2_size_alltoall_tuning_table = new int[mv2_alltoall_num_ppn_conf]; + mv2_alltoall_table_ppn_conf = new int[mv2_alltoall_num_ppn_conf]; mv2_alltoall_table_ppn_conf[0] = 1; mv2_size_alltoall_tuning_table[0] = 6; mv2_alltoall_tuning_table mv2_tmp_alltoall_thresholds_table_1ppn[] = { @@ -314,38 +316,35 @@ static void init_mv2_alltoall_tables_stampede() }; table_ptrs[2] = mv2_tmp_alltoall_thresholds_table_16ppn; agg_table_sum = 0; - for (i = 0; i < mv2_alltoall_num_ppn_conf; i++) { + for (int i = 0; i < mv2_alltoall_num_ppn_conf; i++) { agg_table_sum += mv2_size_alltoall_tuning_table[i]; } - mv2_alltoall_thresholds_table[0] = - static_cast(xbt_malloc(agg_table_sum * sizeof(mv2_alltoall_tuning_table))); - memcpy(mv2_alltoall_thresholds_table[0], table_ptrs[0], - (sizeof(mv2_alltoall_tuning_table) * mv2_size_alltoall_tuning_table[0])); - for (i = 1; i < mv2_alltoall_num_ppn_conf; i++) { + mv2_alltoall_thresholds_table[0] = new mv2_alltoall_tuning_table[agg_table_sum]; + std::copy_n(table_ptrs[0], mv2_size_alltoall_tuning_table[0], mv2_alltoall_thresholds_table[0]); + for (int i = 1; i < mv2_alltoall_num_ppn_conf; i++) { mv2_alltoall_thresholds_table[i] = mv2_alltoall_thresholds_table[i - 1] + mv2_size_alltoall_tuning_table[i - 1]; - memcpy(mv2_alltoall_thresholds_table[i], table_ptrs[i], - (sizeof(mv2_alltoall_tuning_table) * mv2_size_alltoall_tuning_table[i])); + std::copy_n(table_ptrs[i], mv2_size_alltoall_tuning_table[i], mv2_alltoall_thresholds_table[i]); } - xbt_free(table_ptrs); + delete[] table_ptrs; } /************ Allgather variables and initializers */ -typedef struct { +struct mv2_allgather_tuning_element { int min; int max; - int (*MV2_pt_Allgatherction)(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, + int (*MV2_pt_Allgatherction)(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm_ptr); -} mv2_allgather_tuning_element; +}; -typedef struct { +struct mv2_allgather_tuning_table { int numproc; int two_level[MV2_MAX_NB_THRESHOLDS]; int size_inter_table; mv2_allgather_tuning_element inter_leader[MV2_MAX_NB_THRESHOLDS]; -} mv2_allgather_tuning_table; +}; -int (*MV2_Allgatherction)(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, +int (*MV2_Allgatherction)(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm); int* mv2_allgather_table_ppn_conf = NULL; @@ -353,7 +352,7 @@ int mv2_allgather_num_ppn_conf = 1; int* mv2_size_allgather_tuning_table = NULL; mv2_allgather_tuning_table** mv2_allgather_thresholds_table = NULL; -static int MPIR_Allgather_RD_Allgather_Comm_MV2(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, +static int MPIR_Allgather_RD_Allgather_Comm_MV2(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm_ptr) { return 0; @@ -366,19 +365,15 @@ static int MPIR_Allgather_RD_Allgather_Comm_MV2(void* sendbuf, int sendcount, MP static void init_mv2_allgather_tables_stampede() { - int i; int agg_table_sum = 0; if (simgrid::smpi::Colls::smpi_coll_cleanup_callback == NULL) simgrid::smpi::Colls::smpi_coll_cleanup_callback = &smpi_coll_cleanup_mvapich2; - mv2_allgather_tuning_table** table_ptrs = NULL; mv2_allgather_num_ppn_conf = 3; - mv2_allgather_thresholds_table = static_cast( - xbt_malloc(sizeof(mv2_allgather_tuning_table*) * mv2_allgather_num_ppn_conf)); - table_ptrs = static_cast( - xbt_malloc(sizeof(mv2_allgather_tuning_table*) * mv2_allgather_num_ppn_conf)); - mv2_size_allgather_tuning_table = static_cast(xbt_malloc(sizeof(int) * mv2_allgather_num_ppn_conf)); - mv2_allgather_table_ppn_conf = static_cast(xbt_malloc(mv2_allgather_num_ppn_conf * sizeof(int))); + mv2_allgather_thresholds_table = new mv2_allgather_tuning_table*[mv2_allgather_num_ppn_conf]; + mv2_allgather_tuning_table** table_ptrs = new mv2_allgather_tuning_table*[mv2_allgather_num_ppn_conf]; + mv2_size_allgather_tuning_table = new int[mv2_allgather_num_ppn_conf]; + mv2_allgather_table_ppn_conf = new int[mv2_allgather_num_ppn_conf]; mv2_allgather_table_ppn_conf[0] = 1; mv2_size_allgather_tuning_table[0] = 6; mv2_allgather_tuning_table mv2_tmp_allgather_thresholds_table_1ppn[] = { @@ -550,42 +545,39 @@ static void init_mv2_allgather_tables_stampede() }; table_ptrs[2] = mv2_tmp_allgather_thresholds_table_16ppn; agg_table_sum = 0; - for (i = 0; i < mv2_allgather_num_ppn_conf; i++) { + for (int i = 0; i < mv2_allgather_num_ppn_conf; i++) { agg_table_sum += mv2_size_allgather_tuning_table[i]; } - mv2_allgather_thresholds_table[0] = - static_cast(xbt_malloc(agg_table_sum * sizeof(mv2_allgather_tuning_table))); - memcpy(mv2_allgather_thresholds_table[0], table_ptrs[0], - (sizeof(mv2_allgather_tuning_table) * mv2_size_allgather_tuning_table[0])); - for (i = 1; i < mv2_allgather_num_ppn_conf; i++) { + mv2_allgather_thresholds_table[0] = new mv2_allgather_tuning_table[agg_table_sum]; + std::copy_n(table_ptrs[0], mv2_size_allgather_tuning_table[0], mv2_allgather_thresholds_table[0]); + for (int i = 1; i < mv2_allgather_num_ppn_conf; i++) { mv2_allgather_thresholds_table[i] = mv2_allgather_thresholds_table[i - 1] + mv2_size_allgather_tuning_table[i - 1]; - memcpy(mv2_allgather_thresholds_table[i], table_ptrs[i], - (sizeof(mv2_allgather_tuning_table) * mv2_size_allgather_tuning_table[i])); + std::copy_n(table_ptrs[i], mv2_size_allgather_tuning_table[i], mv2_allgather_thresholds_table[i]); } - xbt_free(table_ptrs); + delete[] table_ptrs; } /************ Gather variables and initializers */ -typedef struct { +struct mv2_gather_tuning_element { int min; int max; - int (*MV2_pt_Gather_function)(void* sendbuf, int sendcnt, MPI_Datatype sendtype, void* recvbuf, int recvcnt, + int (*MV2_pt_Gather_function)(const void* sendbuf, int sendcnt, MPI_Datatype sendtype, void* recvbuf, int recvcnt, MPI_Datatype recvtype, int root, MPI_Comm comm_ptr); -} mv2_gather_tuning_element; +}; -typedef struct { +struct mv2_gather_tuning_table { int numproc; int size_inter_table; mv2_gather_tuning_element inter_leader[MV2_MAX_NB_THRESHOLDS]; int size_intra_table; mv2_gather_tuning_element intra_node[MV2_MAX_NB_THRESHOLDS]; -} mv2_gather_tuning_table; +}; int mv2_size_gather_tuning_table = 7; mv2_gather_tuning_table* mv2_gather_thresholds_table = NULL; -typedef int (*MV2_Gather_function_ptr)(void* sendbuf, int sendcnt, MPI_Datatype sendtype, void* recvbuf, int recvcnt, +typedef int (*MV2_Gather_function_ptr)(const void* sendbuf, int sendcnt, MPI_Datatype sendtype, void* recvbuf, int recvcnt, MPI_Datatype recvtype, int root, MPI_Comm comm); MV2_Gather_function_ptr MV2_Gather_inter_leader_function = NULL; @@ -601,8 +593,7 @@ static void init_mv2_gather_tables_stampede() if (simgrid::smpi::Colls::smpi_coll_cleanup_callback == NULL) simgrid::smpi::Colls::smpi_coll_cleanup_callback = &smpi_coll_cleanup_mvapich2; mv2_size_gather_tuning_table = 7; - mv2_gather_thresholds_table = - static_cast(xbt_malloc(mv2_size_gather_tuning_table * sizeof(mv2_gather_tuning_table))); + mv2_gather_thresholds_table = new mv2_gather_tuning_table[mv2_size_gather_tuning_table]; mv2_gather_tuning_table mv2_tmp_gather_thresholds_table[] = { {16, 2, @@ -653,27 +644,26 @@ static void init_mv2_gather_tables_stampede() {{0, -1, &MPIR_Gather_intra}}}, }; - memcpy(mv2_gather_thresholds_table, mv2_tmp_gather_thresholds_table, - mv2_size_gather_tuning_table * sizeof(mv2_gather_tuning_table)); + std::copy_n(mv2_tmp_gather_thresholds_table, mv2_size_gather_tuning_table, mv2_gather_thresholds_table); } /************ Allgatherv variables and initializers */ -typedef struct { +struct mv2_allgatherv_tuning_element { int min; int max; - int (*MV2_pt_Allgatherv_function)(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int* recvcounts, - int* displs, MPI_Datatype recvtype, MPI_Comm commg); -} mv2_allgatherv_tuning_element; + int (*MV2_pt_Allgatherv_function)(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, const int* recvcounts, + const int* displs, MPI_Datatype recvtype, MPI_Comm commg); +}; -typedef struct { +struct mv2_allgatherv_tuning_table { int numproc; int size_inter_table; mv2_allgatherv_tuning_element inter_leader[MV2_MAX_NB_THRESHOLDS]; -} mv2_allgatherv_tuning_table; +}; -int (*MV2_Allgatherv_function)(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int* recvcounts, - int* displs, MPI_Datatype recvtype, MPI_Comm comm); +int (*MV2_Allgatherv_function)(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, const int* recvcounts, + const int* displs, MPI_Datatype recvtype, MPI_Comm comm); int mv2_size_allgatherv_tuning_table = 0; mv2_allgatherv_tuning_table* mv2_allgatherv_thresholds_table = NULL; @@ -687,8 +677,7 @@ static void init_mv2_allgatherv_tables_stampede() if (simgrid::smpi::Colls::smpi_coll_cleanup_callback == NULL) simgrid::smpi::Colls::smpi_coll_cleanup_callback = &smpi_coll_cleanup_mvapich2; mv2_size_allgatherv_tuning_table = 6; - mv2_allgatherv_thresholds_table = static_cast( - xbt_malloc(mv2_size_allgatherv_tuning_table * sizeof(mv2_allgatherv_tuning_table))); + mv2_allgatherv_thresholds_table = new mv2_allgatherv_tuning_table[mv2_size_allgatherv_tuning_table]; mv2_allgatherv_tuning_table mv2_tmp_allgatherv_thresholds_table[] = { { 16, @@ -734,20 +723,19 @@ static void init_mv2_allgatherv_tables_stampede() }, }; - memcpy(mv2_allgatherv_thresholds_table, mv2_tmp_allgatherv_thresholds_table, - mv2_size_allgatherv_tuning_table * sizeof(mv2_allgatherv_tuning_table)); + std::copy_n(mv2_tmp_allgatherv_thresholds_table, mv2_size_allgatherv_tuning_table, mv2_allgatherv_thresholds_table); } /************ Allreduce variables and initializers */ -typedef struct { +struct mv2_allreduce_tuning_element { int min; int max; - int (*MV2_pt_Allreducection)(void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, + int (*MV2_pt_Allreducection)(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm); -} mv2_allreduce_tuning_element; +}; -typedef struct { +struct mv2_allreduce_tuning_table { int numproc; int mcast_enabled; int is_two_level_allreduce[MV2_MAX_NB_THRESHOLDS]; @@ -755,37 +743,37 @@ typedef struct { mv2_allreduce_tuning_element inter_leader[MV2_MAX_NB_THRESHOLDS]; int size_intra_table; mv2_allreduce_tuning_element intra_node[MV2_MAX_NB_THRESHOLDS]; -} mv2_allreduce_tuning_table; +}; -int (*MV2_Allreducection)(void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, +int (*MV2_Allreducection)(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) = NULL; -int (*MV2_Allreduce_intra_function)(void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, +int (*MV2_Allreduce_intra_function)(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) = NULL; int mv2_size_allreduce_tuning_table = 0; mv2_allreduce_tuning_table* mv2_allreduce_thresholds_table = NULL; -static int MPIR_Allreduce_mcst_reduce_two_level_helper_MV2(void* sendbuf, void* recvbuf, int count, +static int MPIR_Allreduce_mcst_reduce_two_level_helper_MV2(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) { return 0; } -static int MPIR_Allreduce_mcst_reduce_redscat_gather_MV2(void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, +static int MPIR_Allreduce_mcst_reduce_redscat_gather_MV2(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) { return 0; } -static int MPIR_Allreduce_reduce_p2p_MV2(void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, +static int MPIR_Allreduce_reduce_p2p_MV2(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) { simgrid::smpi::Colls::reduce(sendbuf, recvbuf, count, datatype, op, 0, comm); return MPI_SUCCESS; } -static int MPIR_Allreduce_reduce_shmem_MV2(void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, +static int MPIR_Allreduce_reduce_shmem_MV2(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) { simgrid::smpi::Colls::reduce(sendbuf, recvbuf, count, datatype, op, 0, comm); @@ -801,8 +789,7 @@ static void init_mv2_allreduce_tables_stampede() if (simgrid::smpi::Colls::smpi_coll_cleanup_callback == NULL) simgrid::smpi::Colls::smpi_coll_cleanup_callback = &smpi_coll_cleanup_mvapich2; mv2_size_allreduce_tuning_table = 8; - mv2_allreduce_thresholds_table = static_cast( - xbt_malloc(mv2_size_allreduce_tuning_table * sizeof(mv2_allreduce_tuning_table))); + mv2_allreduce_thresholds_table = new mv2_allreduce_tuning_table[mv2_size_allreduce_tuning_table]; mv2_allreduce_tuning_table mv2_tmp_allreduce_thresholds_table[] = { { 16, @@ -927,18 +914,17 @@ static void init_mv2_allreduce_tables_stampede() }, }; - memcpy(mv2_allreduce_thresholds_table, mv2_tmp_allreduce_thresholds_table, - mv2_size_allreduce_tuning_table * sizeof(mv2_allreduce_tuning_table)); + std::copy_n(mv2_tmp_allreduce_thresholds_table, mv2_size_allreduce_tuning_table, mv2_allreduce_thresholds_table); } -typedef struct { +struct mv2_bcast_tuning_element { int min; int max; int (*MV2_pt_Bcast_function)(void* buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm_ptr); int zcpy_pipelined_knomial_factor; -} mv2_bcast_tuning_element; +}; -typedef struct { +struct mv2_bcast_tuning_table { int numproc; int bcast_segment_size; int intra_node_knomial_factor; @@ -948,7 +934,7 @@ typedef struct { mv2_bcast_tuning_element inter_leader[MV2_MAX_NB_THRESHOLDS]; int size_intra_table; mv2_bcast_tuning_element intra_node[MV2_MAX_NB_THRESHOLDS]; -} mv2_bcast_tuning_table; +}; int mv2_size_bcast_tuning_table = 0; mv2_bcast_tuning_table* mv2_bcast_thresholds_table = NULL; @@ -987,8 +973,7 @@ static void init_mv2_bcast_tables_stampede() if (simgrid::smpi::Colls::smpi_coll_cleanup_callback == NULL) simgrid::smpi::Colls::smpi_coll_cleanup_callback = &smpi_coll_cleanup_mvapich2; mv2_size_bcast_tuning_table = 8; - mv2_bcast_thresholds_table = - static_cast(xbt_malloc(mv2_size_bcast_tuning_table * sizeof(mv2_bcast_tuning_table))); + mv2_bcast_thresholds_table = new mv2_bcast_tuning_table[mv2_size_bcast_tuning_table]; mv2_bcast_tuning_table mv2_tmp_bcast_thresholds_table[] = { {16, @@ -1156,20 +1141,19 @@ static void init_mv2_bcast_tables_stampede() {32768, 524288, &MPIR_Shmem_Bcast_MV2, -1}, {524288, -1, &MPIR_Shmem_Bcast_MV2, -1}}}}; - memcpy(mv2_bcast_thresholds_table, mv2_tmp_bcast_thresholds_table, - mv2_size_bcast_tuning_table * sizeof(mv2_bcast_tuning_table)); + std::copy_n(mv2_tmp_bcast_thresholds_table, mv2_size_bcast_tuning_table, mv2_bcast_thresholds_table); } /************ Reduce variables and initializers */ -typedef struct { +struct mv2_reduce_tuning_element { int min; int max; - int (*MV2_pt_Reduce_function)(void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, + int (*MV2_pt_Reduce_function)(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm_ptr); -} mv2_reduce_tuning_element; +}; -typedef struct { +struct mv2_reduce_tuning_table { int numproc; int inter_k_degree; int intra_k_degree; @@ -1178,7 +1162,7 @@ typedef struct { mv2_reduce_tuning_element inter_leader[MV2_MAX_NB_THRESHOLDS]; int size_intra_table; mv2_reduce_tuning_element intra_node[MV2_MAX_NB_THRESHOLDS]; -} mv2_reduce_tuning_table; +}; int mv2_size_reduce_tuning_table = 0; mv2_reduce_tuning_table* mv2_reduce_thresholds_table = NULL; @@ -1186,10 +1170,10 @@ mv2_reduce_tuning_table* mv2_reduce_thresholds_table = NULL; int mv2_reduce_intra_knomial_factor = -1; int mv2_reduce_inter_knomial_factor = -1; -int (*MV2_Reduce_function)(void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, +int (*MV2_Reduce_function)(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm_ptr) = NULL; -int (*MV2_Reduce_intra_function)(void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, +int (*MV2_Reduce_intra_function)(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm_ptr) = NULL; #define MPIR_Reduce_inter_knomial_wrapper_MV2 simgrid::smpi::Coll_reduce_mvapich2_knomial::reduce @@ -1205,8 +1189,7 @@ static void init_mv2_reduce_tables_stampede() simgrid::smpi::Colls::smpi_coll_cleanup_callback = &smpi_coll_cleanup_mvapich2; /*Stampede*/ mv2_size_reduce_tuning_table = 8; - mv2_reduce_thresholds_table = - static_cast(xbt_malloc(mv2_size_reduce_tuning_table * sizeof(mv2_reduce_tuning_table))); + mv2_reduce_thresholds_table = new mv2_reduce_tuning_table[mv2_size_reduce_tuning_table]; mv2_reduce_tuning_table mv2_tmp_reduce_thresholds_table[] = { { 16, @@ -1390,32 +1373,31 @@ static void init_mv2_reduce_tables_stampede() }, }; - memcpy(mv2_reduce_thresholds_table, mv2_tmp_reduce_thresholds_table, - mv2_size_reduce_tuning_table * sizeof(mv2_reduce_tuning_table)); + std::copy_n(mv2_tmp_reduce_thresholds_table, mv2_size_reduce_tuning_table, mv2_reduce_thresholds_table); } /************ Reduce scatter variables and initializers */ -typedef struct { +struct mv2_red_scat_tuning_element { int min; int max; - int (*MV2_pt_Red_scat_function)(void* sendbuf, void* recvbuf, int* recvcnts, MPI_Datatype datatype, MPI_Op op, + int (*MV2_pt_Red_scat_function)(const void* sendbuf, void* recvbuf, const int* recvcnts, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm_ptr); -} mv2_red_scat_tuning_element; +}; -typedef struct { +struct mv2_red_scat_tuning_table { int numproc; int size_inter_table; mv2_red_scat_tuning_element inter_leader[MV2_MAX_NB_THRESHOLDS]; -} mv2_red_scat_tuning_table; +}; int mv2_size_red_scat_tuning_table = 0; mv2_red_scat_tuning_table* mv2_red_scat_thresholds_table = NULL; -int (*MV2_Red_scat_function)(void* sendbuf, void* recvbuf, int* recvcnts, MPI_Datatype datatype, MPI_Op op, +int (*MV2_Red_scat_function)(const void* sendbuf, void* recvbuf, const int* recvcnts, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm_ptr); -static int MPIR_Reduce_Scatter_Basic_MV2(void* sendbuf, void* recvbuf, int* recvcnts, MPI_Datatype datatype, MPI_Op op, +static int MPIR_Reduce_Scatter_Basic_MV2(const void* sendbuf, void* recvbuf, const int* recvcnts, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) { simgrid::smpi::Coll_reduce_scatter_default::reduce_scatter(sendbuf, recvbuf, recvcnts, datatype, op, comm); @@ -1431,8 +1413,7 @@ static void init_mv2_reduce_scatter_tables_stampede() if (simgrid::smpi::Colls::smpi_coll_cleanup_callback == NULL) simgrid::smpi::Colls::smpi_coll_cleanup_callback = &smpi_coll_cleanup_mvapich2; mv2_size_red_scat_tuning_table = 6; - mv2_red_scat_thresholds_table = static_cast( - xbt_malloc(mv2_size_red_scat_tuning_table * sizeof(mv2_red_scat_tuning_table))); + mv2_red_scat_thresholds_table = new mv2_red_scat_tuning_table[mv2_size_red_scat_tuning_table]; mv2_red_scat_tuning_table mv2_tmp_red_scat_thresholds_table[] = { { 16, @@ -1484,41 +1465,40 @@ static void init_mv2_reduce_scatter_tables_stampede() }, }; - memcpy(mv2_red_scat_thresholds_table, mv2_tmp_red_scat_thresholds_table, - mv2_size_red_scat_tuning_table * sizeof(mv2_red_scat_tuning_table)); + std::copy_n(mv2_tmp_red_scat_thresholds_table, mv2_size_red_scat_tuning_table, mv2_red_scat_thresholds_table); } /************ Scatter variables and initializers */ -typedef struct { +struct mv2_scatter_tuning_element { int min; int max; - int (*MV2_pt_Scatter_function)(void* sendbuf, int sendcnt, MPI_Datatype sendtype, void* recvbuf, int recvcnt, + int (*MV2_pt_Scatter_function)(const void* sendbuf, int sendcnt, MPI_Datatype sendtype, void* recvbuf, int recvcnt, MPI_Datatype recvtype, int root, MPI_Comm comm); -} mv2_scatter_tuning_element; +}; -typedef struct { +struct mv2_scatter_tuning_table { int numproc; int size_inter_table; mv2_scatter_tuning_element inter_leader[MV2_MAX_NB_THRESHOLDS]; int size_intra_table; mv2_scatter_tuning_element intra_node[MV2_MAX_NB_THRESHOLDS]; -} mv2_scatter_tuning_table; +}; int* mv2_scatter_table_ppn_conf = NULL; int mv2_scatter_num_ppn_conf = 1; int* mv2_size_scatter_tuning_table = NULL; mv2_scatter_tuning_table** mv2_scatter_thresholds_table = NULL; -int (*MV2_Scatter_function)(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, +int (*MV2_Scatter_function)(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm) = NULL; -int (*MV2_Scatter_intra_function)(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, +int (*MV2_Scatter_intra_function)(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm) = NULL; -int MPIR_Scatter_mcst_wrap_MV2(void* sendbuf, int sendcnt, MPI_Datatype sendtype, void* recvbuf, int recvcnt, +int MPIR_Scatter_mcst_wrap_MV2(const void* sendbuf, int sendcnt, MPI_Datatype sendtype, void* recvbuf, int recvcnt, MPI_Datatype recvtype, int root, MPI_Comm comm_ptr); -int MPIR_Scatter_mcst_wrap_MV2(void* sendbuf, int sendcnt, MPI_Datatype sendtype, void* recvbuf, int recvcnt, +int MPIR_Scatter_mcst_wrap_MV2(const void* sendbuf, int sendcnt, MPI_Datatype sendtype, void* recvbuf, int recvcnt, MPI_Datatype recvtype, int root, MPI_Comm comm_ptr) { return 0; @@ -1535,15 +1515,11 @@ static void init_mv2_scatter_tables_stampede() simgrid::smpi::Colls::smpi_coll_cleanup_callback = &smpi_coll_cleanup_mvapich2; int agg_table_sum = 0; - int i; - mv2_scatter_tuning_table** table_ptrs = NULL; mv2_scatter_num_ppn_conf = 3; - mv2_scatter_thresholds_table = - static_cast(xbt_malloc(sizeof(mv2_scatter_tuning_table*) * mv2_scatter_num_ppn_conf)); - table_ptrs = - static_cast(xbt_malloc(sizeof(mv2_scatter_tuning_table*) * mv2_scatter_num_ppn_conf)); - mv2_size_scatter_tuning_table = static_cast(xbt_malloc(sizeof(int) * mv2_scatter_num_ppn_conf)); - mv2_scatter_table_ppn_conf = static_cast(xbt_malloc(mv2_scatter_num_ppn_conf * sizeof(int))); + mv2_scatter_thresholds_table = new mv2_scatter_tuning_table*[mv2_scatter_num_ppn_conf]; + mv2_scatter_tuning_table** table_ptrs = new mv2_scatter_tuning_table*[mv2_scatter_num_ppn_conf]; + mv2_size_scatter_tuning_table = new int[mv2_scatter_num_ppn_conf]; + mv2_scatter_table_ppn_conf = new int[mv2_scatter_num_ppn_conf]; mv2_scatter_table_ppn_conf[0] = 1; mv2_size_scatter_tuning_table[0] = 6; mv2_scatter_tuning_table mv2_tmp_scatter_thresholds_table_1ppn[] = { @@ -1822,17 +1798,16 @@ static void init_mv2_scatter_tables_stampede() }; table_ptrs[2] = mv2_tmp_scatter_thresholds_table_16ppn; agg_table_sum = 0; - for (i = 0; i < mv2_scatter_num_ppn_conf; i++) { + for (int i = 0; i < mv2_scatter_num_ppn_conf; i++) { agg_table_sum += mv2_size_scatter_tuning_table[i]; } - mv2_scatter_thresholds_table[0] = - static_cast(xbt_malloc(agg_table_sum * sizeof(mv2_scatter_tuning_table))); - memcpy(mv2_scatter_thresholds_table[0], table_ptrs[0], - (sizeof(mv2_scatter_tuning_table) * mv2_size_scatter_tuning_table[0])); - for (i = 1; i < mv2_scatter_num_ppn_conf; i++) { + mv2_scatter_thresholds_table[0] = new mv2_scatter_tuning_table[agg_table_sum]; + std::copy_n(table_ptrs[0], mv2_size_scatter_tuning_table[0], mv2_scatter_thresholds_table[0]); + for (int i = 1; i < mv2_scatter_num_ppn_conf; i++) { mv2_scatter_thresholds_table[i] = mv2_scatter_thresholds_table[i - 1] + mv2_size_scatter_tuning_table[i - 1]; - memcpy(mv2_scatter_thresholds_table[i], table_ptrs[i], - (sizeof(mv2_scatter_tuning_table) * mv2_size_scatter_tuning_table[i])); + std::copy_n(table_ptrs[i], mv2_size_scatter_tuning_table[i], mv2_scatter_thresholds_table[i]); } - xbt_free(table_ptrs); + delete[] table_ptrs; } + +#endif