From 1cf83d8b6d8f117236c74b8218a13a2e7e9769d6 Mon Sep 17 00:00:00 2001 From: pini Date: Fri, 19 Mar 2010 12:30:20 +0000 Subject: [PATCH] Fix bugs in SMPE. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7275 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/smpi/private.h | 4 +- src/smpi/smpi_bench.c | 10 +- src/smpi/smpi_mpi.c | 287 ++++++++++++++++++++++++------------------ 3 files changed, 171 insertions(+), 130 deletions(-) diff --git a/src/smpi/private.h b/src/smpi/private.h index f90d3ae5f6..fd22172117 100644 --- a/src/smpi/private.h +++ b/src/smpi/private.h @@ -92,7 +92,7 @@ int smpi_coll_tuned_alltoall_pairwise(void* sendbuf, int sendcount, MPI_Datatype int smpi_coll_basic_alltoallv(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype sendtype, void* recvbuf, int *recvcounts, int* recvdisps, MPI_Datatype recvtype, MPI_Comm comm); // utilities -void smpi_bench_begin(MPI_Comm comm, const char* mpi_call); -void smpi_bench_end(MPI_Comm comm, const char* mpi_call); +void smpi_bench_begin(int rank, const char* mpi_call); +void smpi_bench_end(int rank, const char* mpi_call); #endif diff --git a/src/smpi/smpi_bench.c b/src/smpi/smpi_bench.c index bec96dfcf0..1ff5814f76 100644 --- a/src/smpi/smpi_bench.c +++ b/src/smpi/smpi_bench.c @@ -32,24 +32,22 @@ static void smpi_execute(double duration) { } } -void smpi_bench_begin(MPI_Comm comm, const char* mpi_call) { +void smpi_bench_begin(int rank, const char* mpi_call) { double now = SIMIX_get_clock(); - int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1; - if(mpi_call && xbt_cfg_get_int(_surf_cfg_set, "SMPE")) { + if(mpi_call && rank > 0 && xbt_cfg_get_int(_surf_cfg_set, "SMPE")) { INFO3("SMPE: ts=%f rank=%d type=end et=%s", now, rank, mpi_call); } xbt_os_timer_start(smpi_process_timer()); } -void smpi_bench_end(MPI_Comm comm, const char* mpi_call) { +void smpi_bench_end(int rank, const char* mpi_call) { xbt_os_timer_t timer = smpi_process_timer(); double now = SIMIX_get_clock(); - int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1; xbt_os_timer_stop(timer); smpi_execute(xbt_os_timer_elapsed(timer)); - if(mpi_call && xbt_cfg_get_int(_surf_cfg_set, "SMPE")) { + if(mpi_call && rank > 0 && xbt_cfg_get_int(_surf_cfg_set, "SMPE")) { INFO3("SMPE: ts=%f rank=%d type=begin et=%s", now, rank, mpi_call); } } diff --git a/src/smpi/smpi_mpi.c b/src/smpi/smpi_mpi.c index f85caeed2f..ecead73cb7 100644 --- a/src/smpi/smpi_mpi.c +++ b/src/smpi/smpi_mpi.c @@ -11,12 +11,12 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_mpi, smpi, int MPI_Init(int* argc, char*** argv) { smpi_process_init(argc, argv); - smpi_bench_begin(MPI_COMM_NULL, NULL); + smpi_bench_begin(-1, NULL); return MPI_SUCCESS; } int MPI_Finalize(void) { - smpi_bench_end(MPI_COMM_NULL, NULL); + smpi_bench_end(-1, NULL); smpi_process_destroy(); return MPI_SUCCESS; } @@ -31,33 +31,33 @@ int MPI_Init_thread(int* argc, char*** argv, int required, int* provided) { int MPI_Query_thread(int* provided) { int retval; - smpi_bench_end(MPI_COMM_NULL, NULL); + smpi_bench_end(-1, NULL); if(provided == NULL) { retval = MPI_ERR_ARG; } else { *provided = MPI_THREAD_MULTIPLE; retval = MPI_SUCCESS; } - smpi_bench_begin(MPI_COMM_NULL, NULL); + smpi_bench_begin(-1, NULL); return retval; } int MPI_Is_thread_main(int* flag) { int retval; - smpi_bench_end(MPI_COMM_NULL, NULL); + smpi_bench_end(-1, NULL); if(flag == NULL) { retval = MPI_ERR_ARG; } else { *flag = smpi_process_index() == 0; retval = MPI_SUCCESS; } - smpi_bench_begin(MPI_COMM_NULL, NULL); + smpi_bench_begin(-1, NULL); return retval; } int MPI_Abort(MPI_Comm comm, int errorcode) { - smpi_bench_end(comm, NULL); + smpi_bench_end(-1, NULL); smpi_process_destroy(); // FIXME: should kill all processes in comm instead SIMIX_process_kill(SIMIX_process_self()); @@ -67,16 +67,16 @@ int MPI_Abort(MPI_Comm comm, int errorcode) { double MPI_Wtime(void) { double time; - smpi_bench_end(MPI_COMM_NULL, NULL); + smpi_bench_end(-1, NULL); time = SIMIX_get_clock(); - smpi_bench_begin(MPI_COMM_NULL, NULL); + smpi_bench_begin(-1, NULL); return time; } int MPI_Type_size(MPI_Datatype datatype, size_t* size) { int retval; - smpi_bench_end(MPI_COMM_NULL, NULL); + smpi_bench_end(-1, NULL); if(datatype == MPI_DATATYPE_NULL) { retval = MPI_ERR_TYPE; } else if(size == NULL) { @@ -85,14 +85,14 @@ int MPI_Type_size(MPI_Datatype datatype, size_t* size) { *size = smpi_datatype_size(datatype); retval = MPI_SUCCESS; } - smpi_bench_begin(MPI_COMM_NULL, NULL); + smpi_bench_begin(-1, NULL); return retval; } int MPI_Type_get_extent(MPI_Datatype datatype, MPI_Aint* lb, MPI_Aint* extent) { int retval; - smpi_bench_end(MPI_COMM_NULL, NULL); + smpi_bench_end(-1, NULL); if(datatype == MPI_DATATYPE_NULL) { retval = MPI_ERR_TYPE; } else if(lb == NULL || extent == NULL) { @@ -100,14 +100,14 @@ int MPI_Type_get_extent(MPI_Datatype datatype, MPI_Aint* lb, MPI_Aint* extent) { } else { retval = smpi_datatype_extent(datatype, lb, extent); } - smpi_bench_begin(MPI_COMM_NULL, NULL); + smpi_bench_begin(-1, NULL); return retval; } int MPI_Type_lb(MPI_Datatype datatype, MPI_Aint* disp) { int retval; - smpi_bench_end(MPI_COMM_NULL, NULL); + smpi_bench_end(-1, NULL); if(datatype == MPI_DATATYPE_NULL) { retval = MPI_ERR_TYPE; } else if(disp == NULL) { @@ -116,14 +116,14 @@ int MPI_Type_lb(MPI_Datatype datatype, MPI_Aint* disp) { *disp = smpi_datatype_lb(datatype); retval = MPI_SUCCESS; } - smpi_bench_begin(MPI_COMM_NULL, NULL); + smpi_bench_begin(-1, NULL); return retval; } int MPI_Type_ub(MPI_Datatype datatype, MPI_Aint* disp) { int retval; - smpi_bench_end(MPI_COMM_NULL, NULL); + smpi_bench_end(-1, NULL); if(datatype == MPI_DATATYPE_NULL) { retval = MPI_ERR_TYPE; } else if(disp == NULL) { @@ -132,28 +132,28 @@ int MPI_Type_ub(MPI_Datatype datatype, MPI_Aint* disp) { *disp = smpi_datatype_ub(datatype); retval = MPI_SUCCESS; } - smpi_bench_begin(MPI_COMM_NULL, NULL); + smpi_bench_begin(-1, NULL); return retval; } int MPI_Op_create(MPI_User_function* function, int commute, MPI_Op* op) { int retval; - smpi_bench_end(MPI_COMM_NULL, NULL); + smpi_bench_end(-1, NULL); if(function == NULL || op == NULL) { retval = MPI_ERR_ARG; } else { *op = smpi_op_new(function, commute); retval = MPI_SUCCESS; } - smpi_bench_begin(MPI_COMM_NULL, NULL); + smpi_bench_begin(-1, NULL); return retval; } int MPI_Op_free(MPI_Op* op) { int retval; - smpi_bench_end(MPI_COMM_NULL, NULL); + smpi_bench_end(-1, NULL); if(op == NULL) { retval = MPI_ERR_ARG; } else if(*op == MPI_OP_NULL) { @@ -163,14 +163,14 @@ int MPI_Op_free(MPI_Op* op) { *op = MPI_OP_NULL; retval = MPI_SUCCESS; } - smpi_bench_begin(MPI_COMM_NULL, NULL); + smpi_bench_begin(-1, NULL); return retval; } int MPI_Group_free(MPI_Group *group) { int retval; - smpi_bench_end(MPI_COMM_NULL, NULL); + smpi_bench_end(-1, NULL); if(group == NULL) { retval = MPI_ERR_ARG; } else { @@ -178,14 +178,14 @@ int MPI_Group_free(MPI_Group *group) { *group = MPI_GROUP_NULL; retval = MPI_SUCCESS; } - smpi_bench_begin(MPI_COMM_NULL, NULL); + smpi_bench_begin(-1, NULL); return retval; } int MPI_Group_size(MPI_Group group, int* size) { int retval; - smpi_bench_end(MPI_COMM_NULL, NULL); + smpi_bench_end(-1, NULL); if(group == MPI_GROUP_NULL) { retval = MPI_ERR_GROUP; } else if(size == NULL) { @@ -194,14 +194,14 @@ int MPI_Group_size(MPI_Group group, int* size) { *size = smpi_group_size(group); retval = MPI_SUCCESS; } - smpi_bench_begin(MPI_COMM_NULL, NULL); + smpi_bench_begin(-1, NULL); return retval; } int MPI_Group_rank(MPI_Group group, int* rank) { int retval; - smpi_bench_end(MPI_COMM_NULL, NULL); + smpi_bench_end(-1, NULL); if(group == MPI_GROUP_NULL) { retval = MPI_ERR_GROUP; } else if(rank == NULL) { @@ -210,14 +210,14 @@ int MPI_Group_rank(MPI_Group group, int* rank) { *rank = smpi_group_rank(group, smpi_process_index()); retval = MPI_SUCCESS; } - smpi_bench_begin(MPI_COMM_NULL, NULL); + smpi_bench_begin(-1, NULL); return retval; } int MPI_Group_translate_ranks (MPI_Group group1, int n, int* ranks1, MPI_Group group2, int* ranks2) { int retval, i, index; - smpi_bench_end(MPI_COMM_NULL, NULL); + smpi_bench_end(-1, NULL); if(group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) { retval = MPI_ERR_GROUP; } else { @@ -227,14 +227,14 @@ int MPI_Group_translate_ranks (MPI_Group group1, int n, int* ranks1, MPI_Group g } retval = MPI_SUCCESS; } - smpi_bench_begin(MPI_COMM_NULL, NULL); + smpi_bench_begin(-1, NULL); return retval; } int MPI_Group_compare(MPI_Group group1, MPI_Group group2, int* result) { int retval; - smpi_bench_end(MPI_COMM_NULL, NULL); + smpi_bench_end(-1, NULL); if(group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) { retval = MPI_ERR_GROUP; } else if(result == NULL) { @@ -243,14 +243,14 @@ int MPI_Group_compare(MPI_Group group1, MPI_Group group2, int* result) { *result = smpi_group_compare(group1, group2); retval = MPI_SUCCESS; } - smpi_bench_begin(MPI_COMM_NULL, NULL); + smpi_bench_begin(-1, NULL); return retval; } int MPI_Group_union(MPI_Group group1, MPI_Group group2, MPI_Group* newgroup) { int retval, i, proc1, proc2, size, size2; - smpi_bench_end(MPI_COMM_NULL, NULL); + smpi_bench_end(-1, NULL); if(group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) { retval = MPI_ERR_GROUP; } else if(newgroup == NULL) { @@ -282,14 +282,14 @@ int MPI_Group_union(MPI_Group group1, MPI_Group group2, MPI_Group* newgroup) { smpi_group_use(*newgroup); retval = MPI_SUCCESS; } - smpi_bench_begin(MPI_COMM_NULL, NULL); + smpi_bench_begin(-1, NULL); return retval; } int MPI_Group_intersection(MPI_Group group1, MPI_Group group2, MPI_Group* newgroup) { int retval, i, proc1, proc2, size, size2; - smpi_bench_end(MPI_COMM_NULL, NULL); + smpi_bench_end(-1, NULL); if(group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) { retval = MPI_ERR_GROUP; } else if(newgroup == NULL) { @@ -320,14 +320,14 @@ int MPI_Group_intersection(MPI_Group group1, MPI_Group group2, MPI_Group* newgro smpi_group_use(*newgroup); retval = MPI_SUCCESS; } - smpi_bench_begin(MPI_COMM_NULL, NULL); + smpi_bench_begin(-1, NULL); return retval; } int MPI_Group_difference(MPI_Group group1, MPI_Group group2, MPI_Group* newgroup) { int retval, i, proc1, proc2, size, size2; - smpi_bench_end(MPI_COMM_NULL, NULL); + smpi_bench_end(-1, NULL); if(group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) { retval = MPI_ERR_GROUP; } else if(newgroup == NULL) { @@ -356,14 +356,14 @@ int MPI_Group_difference(MPI_Group group1, MPI_Group group2, MPI_Group* newgroup smpi_group_use(*newgroup); retval = MPI_SUCCESS; } - smpi_bench_begin(MPI_COMM_NULL, NULL); + smpi_bench_begin(-1, NULL); return retval; } int MPI_Group_incl(MPI_Group group, int n, int* ranks, MPI_Group* newgroup) { int retval, i, index; - smpi_bench_end(MPI_COMM_NULL, NULL); + smpi_bench_end(-1, NULL); if(group == MPI_GROUP_NULL) { retval = MPI_ERR_GROUP; } else if(newgroup == NULL) { @@ -383,14 +383,14 @@ int MPI_Group_incl(MPI_Group group, int n, int* ranks, MPI_Group* newgroup) { smpi_group_use(*newgroup); retval = MPI_SUCCESS; } - smpi_bench_begin(MPI_COMM_NULL, NULL); + smpi_bench_begin(-1, NULL); return retval; } int MPI_Group_excl(MPI_Group group, int n, int* ranks, MPI_Group* newgroup) { int retval, i, size, rank, index; - smpi_bench_end(MPI_COMM_NULL, NULL); + smpi_bench_end(-1, NULL); if(group == MPI_GROUP_NULL) { retval = MPI_ERR_GROUP; } else if(newgroup == NULL) { @@ -420,14 +420,14 @@ int MPI_Group_excl(MPI_Group group, int n, int* ranks, MPI_Group* newgroup) { smpi_group_use(*newgroup); retval = MPI_SUCCESS; } - smpi_bench_begin(MPI_COMM_NULL, NULL); + smpi_bench_begin(-1, NULL); return retval; } int MPI_Group_range_incl(MPI_Group group, int n, int ranges[][3], MPI_Group* newgroup) { int retval, i, j, rank, size, index; - smpi_bench_end(MPI_COMM_NULL, NULL); + smpi_bench_end(-1, NULL); if(group == MPI_GROUP_NULL) { retval = MPI_ERR_GROUP; } else if(newgroup == NULL) { @@ -463,14 +463,14 @@ int MPI_Group_range_incl(MPI_Group group, int n, int ranges[][3], MPI_Group* new smpi_group_use(*newgroup); retval = MPI_SUCCESS; } - smpi_bench_begin(MPI_COMM_NULL, NULL); + smpi_bench_begin(-1, NULL); return retval; } int MPI_Group_range_excl(MPI_Group group, int n, int ranges[][3], MPI_Group* newgroup) { int retval, i, newrank, rank, size, index, add; - smpi_bench_end(MPI_COMM_NULL, NULL); + smpi_bench_end(-1, NULL); if(group == MPI_GROUP_NULL) { retval = MPI_ERR_GROUP; } else if(newgroup == NULL) { @@ -514,28 +514,28 @@ int MPI_Group_range_excl(MPI_Group group, int n, int ranges[][3], MPI_Group* new smpi_group_use(*newgroup); retval = MPI_SUCCESS; } - smpi_bench_begin(MPI_COMM_NULL, NULL); + smpi_bench_begin(-1, NULL); return retval; } int MPI_Comm_rank(MPI_Comm comm, int* rank) { int retval; - smpi_bench_end(comm, "Comm_rank"); + smpi_bench_end(-1, NULL); if(comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else { *rank = smpi_comm_rank(comm); retval = MPI_SUCCESS; } - smpi_bench_begin(comm, "Comm_rank"); + smpi_bench_begin(-1, NULL); return retval; } int MPI_Comm_size(MPI_Comm comm, int* size) { int retval; - smpi_bench_end(comm, "Comm_size"); + smpi_bench_end(-1, NULL); if(comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if(size == NULL) { @@ -544,14 +544,14 @@ int MPI_Comm_size(MPI_Comm comm, int* size) { *size = smpi_comm_size(comm); retval = MPI_SUCCESS; } - smpi_bench_begin(comm, "Comm_size"); + smpi_bench_begin(-1, NULL); return retval; } int MPI_Comm_group(MPI_Comm comm, MPI_Group* group) { int retval; - smpi_bench_end(comm, "Comm_group"); + smpi_bench_end(-1, NULL); if(comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if(group == NULL) { @@ -560,14 +560,14 @@ int MPI_Comm_group(MPI_Comm comm, MPI_Group* group) { *group = smpi_comm_group(comm); retval = MPI_SUCCESS; } - smpi_bench_begin(comm, "Comm_group"); + smpi_bench_begin(-1, NULL); return retval; } int MPI_Comm_compare(MPI_Comm comm1, MPI_Comm comm2, int* result) { int retval; - smpi_bench_end(MPI_COMM_NULL, NULL); + smpi_bench_end(-1, NULL); if(comm1 == MPI_COMM_NULL || comm2 == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if(result == NULL) { @@ -583,14 +583,14 @@ int MPI_Comm_compare(MPI_Comm comm1, MPI_Comm comm2, int* result) { } retval = MPI_SUCCESS; } - smpi_bench_begin(MPI_COMM_NULL, NULL); + smpi_bench_begin(-1, NULL); return retval; } int MPI_Comm_dup(MPI_Comm comm, MPI_Comm* newcomm) { int retval; - smpi_bench_end(comm, "Comm_dup"); + smpi_bench_end(-1, NULL); if(comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if(newcomm == NULL) { @@ -599,14 +599,14 @@ int MPI_Comm_dup(MPI_Comm comm, MPI_Comm* newcomm) { *newcomm = smpi_comm_new(smpi_comm_group(comm)); retval = MPI_SUCCESS; } - smpi_bench_begin(comm, "Comm_dup"); + smpi_bench_begin(-1, NULL); return retval; } int MPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm* newcomm) { int retval; - smpi_bench_end(comm, "Comm_create"); + smpi_bench_end(-1, NULL); if(comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if(group == MPI_GROUP_NULL) { @@ -617,14 +617,14 @@ int MPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm* newcomm) { *newcomm = smpi_comm_new(group); retval = MPI_SUCCESS; } - smpi_bench_begin(comm, "Comm_create"); + smpi_bench_begin(-1, NULL); return retval; } int MPI_Comm_free(MPI_Comm* comm) { int retval; - smpi_bench_end(*comm, "Comm_free"); + smpi_bench_end(-1, NULL); if(comm == NULL) { retval = MPI_ERR_ARG; } else if(*comm == MPI_COMM_NULL) { @@ -634,57 +634,89 @@ int MPI_Comm_free(MPI_Comm* comm) { *comm = MPI_COMM_NULL; retval = MPI_SUCCESS; } - smpi_bench_begin(MPI_COMM_NULL, NULL); + smpi_bench_begin(-1, NULL); return retval; } int MPI_Irecv(void* buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Request* request) { int retval; + int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1; - smpi_bench_end(comm, "Irecv"); + smpi_bench_end(rank, "Irecv"); if(request == NULL) { retval = MPI_ERR_ARG; + } else if (comm == MPI_COMM_NULL) { + retval = MPI_ERR_COMM; } else { *request = smpi_mpi_irecv(buf, count, datatype, src, tag, comm); retval = MPI_SUCCESS; } - smpi_bench_begin(comm, "Irecv"); + smpi_bench_begin(rank, "Irecv"); return retval; } int MPI_Isend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, MPI_Request* request) { int retval; + int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1; - smpi_bench_end(comm, "Isend"); + smpi_bench_end(rank, "Isend"); if(request == NULL) { retval = MPI_ERR_ARG; + } else if (comm == MPI_COMM_NULL) { + retval = MPI_ERR_COMM; } else { *request = smpi_mpi_isend(buf, count, datatype, dst, tag, comm); retval = MPI_SUCCESS; } - smpi_bench_begin(comm, "Isend"); + smpi_bench_begin(rank, "Isend"); return retval; } int MPI_Recv(void* buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Status* status) { - smpi_bench_end(comm, "Recv"); - smpi_mpi_recv(buf, count, datatype, src, tag, comm, status); - smpi_bench_begin(comm, "Recv"); - return MPI_SUCCESS; + int retval; + int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1; + + smpi_bench_end(rank, "Recv"); + if (comm == MPI_COMM_NULL) { + retval = MPI_ERR_COMM; + } else { + smpi_mpi_recv(buf, count, datatype, src, tag, comm, status); + retval = MPI_SUCCESS; + } + smpi_bench_begin(rank, "Recv"); + return retval; } int MPI_Send(void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { - smpi_bench_end(comm, "Send"); - smpi_mpi_send(buf, count, datatype, dst, tag, comm); - smpi_bench_begin(comm, "Send"); - return MPI_SUCCESS; + int retval; + int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1; + + smpi_bench_end(rank, "Send"); + if (comm == MPI_COMM_NULL) { + retval = MPI_ERR_COMM; + } else { + smpi_mpi_send(buf, count, datatype, dst, tag, comm); + retval = MPI_SUCCESS; + } + smpi_bench_begin(rank, "Send"); + return retval; } int MPI_Sendrecv(void* sendbuf, int sendcount, MPI_Datatype sendtype, int dst, int sendtag, void* recvbuf, int recvcount, MPI_Datatype recvtype, int src, int recvtag, MPI_Comm comm, MPI_Status* status) { - smpi_bench_end(comm, "Sendrecv"); - smpi_mpi_sendrecv(sendbuf, sendcount, sendtype, dst, sendtag, recvbuf, recvcount, recvtype, src, recvtag, comm, status); - smpi_bench_begin(comm, "Sendrecv"); - return MPI_SUCCESS; + int retval; + int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1; + + smpi_bench_end(rank, "Sendrecv"); + if (comm == MPI_COMM_NULL) { + retval = MPI_ERR_COMM; + } else if (sendtype == MPI_DATATYPE_NULL || recvtype == MPI_DATATYPE_NULL) { + retval = MPI_ERR_TYPE; + } else { + smpi_mpi_sendrecv(sendbuf, sendcount, sendtype, dst, sendtag, recvbuf, recvcount, recvtype, src, recvtag, comm, status); + retval = MPI_SUCCESS; + } + smpi_bench_begin(rank, "Sendrecv"); + return retval; } int MPI_Sendrecv_replace(void* buf, int count, MPI_Datatype datatype, int dst, int sendtag, int src, int recvtag, MPI_Comm comm, MPI_Status* status) { @@ -702,8 +734,11 @@ int MPI_Sendrecv_replace(void* buf, int count, MPI_Datatype datatype, int dst, i int MPI_Test(MPI_Request* request, int* flag, MPI_Status* status) { int retval; + int rank = request && (*request)->comm != MPI_COMM_NULL + ? smpi_comm_rank((*request)->comm) + : -1; - smpi_bench_end((*request)->comm, "Test"); + smpi_bench_end(rank, "Test"); if(request == NULL || flag == NULL) { retval = MPI_ERR_ARG; } else if(*request == MPI_REQUEST_NULL) { @@ -712,28 +747,31 @@ int MPI_Test(MPI_Request* request, int* flag, MPI_Status* status) { *flag = smpi_mpi_test(request, status); retval = MPI_SUCCESS; } - smpi_bench_begin((*request)->comm, "Test"); + smpi_bench_begin(rank, "Test"); return retval; } int MPI_Testany(int count, MPI_Request requests[], int* index, int* flag, MPI_Status* status) { int retval; - smpi_bench_end(MPI_COMM_NULL, "Testany"); //FIXME + smpi_bench_end(-1, NULL); //FIXME if(index == NULL || flag == NULL) { retval = MPI_ERR_ARG; } else { *flag = smpi_mpi_testany(count, requests, index, status); retval = MPI_SUCCESS; } - smpi_bench_begin(*flag ? requests[*index]->comm : MPI_COMM_NULL, "Testany"); + smpi_bench_begin(-1, NULL); return retval; } int MPI_Wait(MPI_Request* request, MPI_Status* status) { int retval; + int rank = request && (*request)->comm != MPI_COMM_NULL + ? smpi_comm_rank((*request)->comm) + : -1; - smpi_bench_end((*request)->comm, "Wait"); + smpi_bench_end(rank, "Wait"); if(request == NULL) { retval = MPI_ERR_ARG; } else if(*request == MPI_REQUEST_NULL) { @@ -742,77 +780,80 @@ int MPI_Wait(MPI_Request* request, MPI_Status* status) { smpi_mpi_wait(request, status); retval = MPI_SUCCESS; } - smpi_bench_begin((*request)->comm, "Wait"); + smpi_bench_begin(rank, "Wait"); return retval; } int MPI_Waitany(int count, MPI_Request requests[], int* index, MPI_Status* status) { int retval; - smpi_bench_end(MPI_COMM_NULL, "Waitany"); //FIXME + smpi_bench_end(-1, NULL); //FIXME if(index == NULL) { retval = MPI_ERR_ARG; } else { *index = smpi_mpi_waitany(count, requests, status); retval = MPI_SUCCESS; } - smpi_bench_begin(*index > 0 ? requests[*index]->comm : MPI_COMM_NULL, "Waitany"); + smpi_bench_begin(-1, NULL); return retval; } int MPI_Waitall(int count, MPI_Request requests[], MPI_Status status[]) { - smpi_bench_end(MPI_COMM_NULL, "Waitall"); //FIXME + smpi_bench_end(-1, NULL); //FIXME smpi_mpi_waitall(count, requests, status); - smpi_bench_begin(MPI_COMM_NULL, "Waitall"); //FIXME + smpi_bench_begin(-1, NULL); return MPI_SUCCESS; } int MPI_Waitsome(int incount, MPI_Request requests[], int* outcount, int* indices, MPI_Status status[]) { int retval; - smpi_bench_end(MPI_COMM_NULL, "Waitsome"); //FIXME + smpi_bench_end(-1, NULL); //FIXME if(outcount == NULL || indices == NULL) { retval = MPI_ERR_ARG; } else { *outcount = smpi_mpi_waitsome(incount, requests, indices, status); retval = MPI_SUCCESS; } - smpi_bench_begin(MPI_COMM_NULL, "Waitsome"); //FIXME + smpi_bench_begin(-1, NULL); return retval; } int MPI_Bcast(void* buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm) { int retval; + int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1; - smpi_bench_end(comm, "Bcast"); + smpi_bench_end(rank, "Bcast"); if(comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else { smpi_mpi_bcast(buf, count, datatype, root, comm); retval = MPI_SUCCESS; } - smpi_bench_begin(comm, "Bcast"); + smpi_bench_begin(rank, "Bcast"); return retval; } int MPI_Barrier(MPI_Comm comm) { int retval; + int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1; - smpi_bench_end(comm, "Barrier"); + smpi_bench_end(rank, "Barrier"); if(comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else { smpi_mpi_barrier(comm); retval = MPI_SUCCESS; } - smpi_bench_begin(comm, "Barrier"); + smpi_bench_begin(rank, "Barrier"); return retval; } int MPI_Gather(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm) { int retval; + int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1; - smpi_bench_end(comm, "Gather"); + smpi_bench_end(rank, "Gather"); if(comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if(sendtype == MPI_DATATYPE_NULL || recvtype == MPI_DATATYPE_NULL) { @@ -821,14 +862,15 @@ int MPI_Gather(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbu smpi_mpi_gather(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm); retval = MPI_SUCCESS; } - smpi_bench_begin(comm, "Gather"); + smpi_bench_begin(rank, "Gather"); return retval; } int MPI_Gatherv(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int* recvcounts, int* displs, MPI_Datatype recvtype, int root, MPI_Comm comm) { int retval; + int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1; - smpi_bench_end(comm, "Gatherv"); + smpi_bench_end(rank, "Gatherv"); if(comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if(sendtype == MPI_DATATYPE_NULL || recvtype == MPI_DATATYPE_NULL) { @@ -839,14 +881,15 @@ int MPI_Gatherv(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvb smpi_mpi_gatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, root, comm); retval = MPI_SUCCESS; } - smpi_bench_begin(comm, "Gatherv"); + smpi_bench_begin(rank, "Gatherv"); return retval; } int MPI_Allgather(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm) { int retval; + int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1; - smpi_bench_end(comm, "Allgather"); + smpi_bench_end(rank, "Allgather"); if(comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if(sendtype == MPI_DATATYPE_NULL || recvtype == MPI_DATATYPE_NULL) { @@ -855,14 +898,15 @@ int MPI_Allgather(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* rec smpi_mpi_allgather(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm); retval = MPI_SUCCESS; } - smpi_bench_begin(comm, "Allgather"); + smpi_bench_begin(rank, "Allgather"); return retval; } int MPI_Allgatherv(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int* recvcounts, int* displs, MPI_Datatype recvtype, MPI_Comm comm) { int retval; + int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1; - smpi_bench_end(comm, "Allgatherv"); + smpi_bench_end(rank, "Allgatherv"); if(comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if(sendtype == MPI_DATATYPE_NULL || recvtype == MPI_DATATYPE_NULL) { @@ -873,14 +917,15 @@ int MPI_Allgatherv(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* re smpi_mpi_allgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm); retval = MPI_SUCCESS; } - smpi_bench_begin(comm, "Allgatherv"); + smpi_bench_begin(rank, "Allgatherv"); return retval; } int MPI_Scatter(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm) { int retval; + int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1; - smpi_bench_end(comm, "Scatter"); + smpi_bench_end(rank, "Scatter"); if(comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if(sendtype == MPI_DATATYPE_NULL || recvtype == MPI_DATATYPE_NULL) { @@ -889,14 +934,15 @@ int MPI_Scatter(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvb smpi_mpi_scatter(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm); retval = MPI_SUCCESS; } - smpi_bench_begin(comm, "Scatter"); + smpi_bench_begin(rank, "Scatter"); return retval; } int MPI_Scatterv(void* sendbuf, int* sendcounts, int* displs, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm) { int retval; + int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1; - smpi_bench_end(comm, "Scatterv"); + smpi_bench_end(rank, "Scatterv"); if(comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if(sendtype == MPI_DATATYPE_NULL || recvtype == MPI_DATATYPE_NULL) { @@ -907,14 +953,15 @@ int MPI_Scatterv(void* sendbuf, int* sendcounts, int* displs, MPI_Datatype sendt smpi_mpi_scatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, recvcount, recvtype, root, comm); retval = MPI_SUCCESS; } - smpi_bench_begin(comm, "Scatterv"); + smpi_bench_begin(rank, "Scatterv"); return retval; } int MPI_Reduce(void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm) { int retval; + int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1; - smpi_bench_end(comm, "Reduce"); + smpi_bench_end(rank, "Reduce"); if(comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if(datatype == MPI_DATATYPE_NULL || op == MPI_OP_NULL) { @@ -923,14 +970,15 @@ int MPI_Reduce(void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, M smpi_mpi_reduce(sendbuf, recvbuf, count, datatype, op, root, comm); retval = MPI_SUCCESS; } - smpi_bench_begin(comm, "Reduce"); + smpi_bench_begin(rank, "Reduce"); return retval; } int MPI_Allreduce(void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) { int retval; + int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1; - smpi_bench_end(comm, "Allreduce"); + smpi_bench_end(rank, "Allreduce"); if(comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if(datatype == MPI_DATATYPE_NULL) { @@ -941,15 +989,16 @@ int MPI_Allreduce(void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype smpi_mpi_allreduce(sendbuf, recvbuf, count, datatype, op, comm); retval = MPI_SUCCESS; } - smpi_bench_begin(comm, "Allreduce"); + smpi_bench_begin(rank, "Allreduce"); return retval; } int MPI_Reduce_scatter(void* sendbuf, void* recvbuf, int* recvcounts, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) { - int retval, i, rank, size, count; + int retval, i, size, count; int* displs; + int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1; - smpi_bench_end(comm, "Reduce_scatter"); + smpi_bench_end(rank, "Reduce_scatter"); if(comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if(datatype == MPI_DATATYPE_NULL) { @@ -961,7 +1010,6 @@ int MPI_Reduce_scatter(void* sendbuf, void* recvbuf, int* recvcounts, MPI_Dataty } else { /* arbitrarily choose root as rank 0 */ /* TODO: faster direct implementation ? */ - rank = smpi_comm_rank(comm); size = smpi_comm_size(comm); count = 0; displs = xbt_new(int, size); @@ -974,21 +1022,15 @@ int MPI_Reduce_scatter(void* sendbuf, void* recvbuf, int* recvcounts, MPI_Dataty xbt_free(displs); retval = MPI_SUCCESS; } - smpi_bench_begin(comm, "Reduce_scatter"); + smpi_bench_begin(rank, "Reduce_scatter"); return retval; } -/** - * MPI_Alltoall user entry point - * - * Uses the logic of OpenMPI (upto 1.2.7 or greater) for the optimizations - * ompi/mca/coll/tuned/coll_tuned_module.c - **/ - int MPI_Alltoall(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm) { int retval, size, sendsize; + int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1; - smpi_bench_end(comm, "Alltoall"); + smpi_bench_end(rank, "Alltoall"); if(comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if(sendtype == MPI_DATATYPE_NULL || recvtype == MPI_DATATYPE_NULL) { @@ -1004,14 +1046,15 @@ int MPI_Alltoall(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recv retval = smpi_coll_tuned_alltoall_pairwise(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm); } } - smpi_bench_begin(comm, "Alltoall"); + smpi_bench_begin(rank, "Alltoall"); return retval; } int MPI_Alltoallv(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype sendtype, void* recvbuf, int *recvcounts, int* recvdisps, MPI_Datatype recvtype, MPI_Comm comm) { int retval; + int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1; - smpi_bench_end(comm, "Alltoallv"); + smpi_bench_end(rank, "Alltoallv"); if(comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if(sendtype == MPI_DATATYPE_NULL || recvtype == MPI_DATATYPE_NULL) { @@ -1021,6 +1064,6 @@ int MPI_Alltoallv(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype s } else { retval = smpi_coll_basic_alltoallv(sendbuf, sendcounts, senddisps, sendtype, recvbuf, recvcounts, recvdisps, recvtype, comm); } - smpi_bench_begin(comm, "Alltoallv"); + smpi_bench_begin(rank, "Alltoallv"); return retval; } -- 2.20.1