X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/978b7c25ce6b3670dee07a461a41e2df50d62438..edcc9cb3376f7b2b2f8143c5ccb5a9ebeafe3b86:/src/smpi/bindings/smpi_pmpi_coll.cpp diff --git a/src/smpi/bindings/smpi_pmpi_coll.cpp b/src/smpi/bindings/smpi_pmpi_coll.cpp index bd7205b115..6d57fefccf 100644 --- a/src/smpi/bindings/smpi_pmpi_coll.cpp +++ b/src/smpi/bindings/smpi_pmpi_coll.cpp @@ -13,6 +13,21 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smpi_pmpi); +#define CHECK_ARGS(test, errcode, ...) \ + if (test) { \ + XBT_WARN(__VA_ARGS__); \ + return (errcode); \ + } + + static const void* smpi_get_in_place_buf(const void* inplacebuf, const void* otherbuf,std::unique_ptr& tmp_sendbuf, int count, MPI_Datatype datatype){ + if (inplacebuf == MPI_IN_PLACE) { + tmp_sendbuf.reset(new unsigned char[count * datatype->get_extent()]); + simgrid::smpi::Datatype::copy(otherbuf, count, datatype, tmp_sendbuf.get(), count, datatype); + return tmp_sendbuf.get(); + }else{ + return inplacebuf; + } +} /* PMPI User level calls */ int PMPI_Barrier(MPI_Comm comm) @@ -32,11 +47,11 @@ int PMPI_Ibarrier(MPI_Comm comm, MPI_Request *request) TRACE_smpi_comm_in(rank, request == MPI_REQUEST_IGNORED ? "PMPI_Barrier" : "PMPI_Ibarrier", new simgrid::instr::NoOpTIData(request == MPI_REQUEST_IGNORED ? "barrier" : "ibarrier")); if (request == MPI_REQUEST_IGNORED) { - simgrid::smpi::Colls::barrier(comm); + simgrid::smpi::colls::barrier(comm); // Barrier can be used to synchronize RMA calls. Finish all requests from comm before. comm->finish_rma_calls(); } else - simgrid::smpi::Colls::ibarrier(comm, request); + simgrid::smpi::colls::ibarrier(comm, request); TRACE_smpi_comm_out(rank); smpi_bench_begin(); @@ -72,9 +87,9 @@ int PMPI_Ibcast(void *buf, int count, MPI_Datatype datatype, simgrid::smpi::Datatype::encode(datatype), "")); if (comm->size() > 1) { if (request == MPI_REQUEST_IGNORED) - simgrid::smpi::Colls::bcast(buf, count, datatype, root, comm); + simgrid::smpi::colls::bcast(buf, count, datatype, root, comm); else - simgrid::smpi::Colls::ibcast(buf, count, datatype, root, comm, request); + simgrid::smpi::colls::ibcast(buf, count, datatype, root, comm, request); } else { if (request != MPI_REQUEST_IGNORED) *request = MPI_REQUEST_NULL; @@ -85,17 +100,17 @@ int PMPI_Ibcast(void *buf, int count, MPI_Datatype datatype, return MPI_SUCCESS; } -int PMPI_Gather(void *sendbuf, int sendcount, MPI_Datatype sendtype,void *recvbuf, int recvcount, MPI_Datatype recvtype, +int PMPI_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype,void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm){ return PMPI_Igather(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm, MPI_REQUEST_IGNORED); } -int PMPI_Igather(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, +int PMPI_Igather(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm, MPI_Request* request) { if (comm == MPI_COMM_NULL) return MPI_ERR_COMM; - if ((sendbuf == nullptr) || ((comm->rank() == root) && recvbuf == nullptr)) + if ((sendbuf == nullptr && sendcount > 0) || ((comm->rank() == root) && recvbuf == nullptr && recvcount > 0)) return MPI_ERR_BUFFER; if (((sendbuf != MPI_IN_PLACE && sendcount > 0) && (sendtype == MPI_DATATYPE_NULL)) || ((comm->rank() == root) && (recvtype == MPI_DATATYPE_NULL))) @@ -108,25 +123,25 @@ int PMPI_Igather(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recv return MPI_ERR_ARG; smpi_bench_end(); - char* sendtmpbuf = static_cast(sendbuf); - int sendtmpcount = sendcount; - MPI_Datatype sendtmptype = sendtype; + const void* real_sendbuf = sendbuf; + int real_sendcount = sendcount; + MPI_Datatype real_sendtype = sendtype; if ((comm->rank() == root) && (sendbuf == MPI_IN_PLACE)) { - sendtmpcount = 0; - sendtmptype = recvtype; + real_sendcount = 0; + real_sendtype = recvtype; } int rank = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(rank, request == MPI_REQUEST_IGNORED ? "PMPI_Gather" : "PMPI_Igather", new simgrid::instr::CollTIData( request == MPI_REQUEST_IGNORED ? "gather" : "igather", root, -1.0, - sendtmptype->is_replayable() ? sendtmpcount : sendtmpcount * sendtmptype->size(), + real_sendtype->is_replayable() ? real_sendcount : real_sendcount * real_sendtype->size(), (comm->rank() != root || recvtype->is_replayable()) ? recvcount : recvcount * recvtype->size(), - simgrid::smpi::Datatype::encode(sendtmptype), simgrid::smpi::Datatype::encode(recvtype))); + simgrid::smpi::Datatype::encode(real_sendtype), simgrid::smpi::Datatype::encode(recvtype))); if (request == MPI_REQUEST_IGNORED) - simgrid::smpi::Colls::gather(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcount, recvtype, root, comm); + simgrid::smpi::colls::gather(real_sendbuf, real_sendcount, real_sendtype, recvbuf, recvcount, recvtype, root, comm); else - simgrid::smpi::Colls::igather(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcount, recvtype, root, comm, + simgrid::smpi::colls::igather(real_sendbuf, real_sendcount, real_sendtype, recvbuf, recvcount, recvtype, root, comm, request); TRACE_smpi_comm_out(rank); @@ -134,12 +149,12 @@ int PMPI_Igather(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recv return MPI_SUCCESS; } -int PMPI_Gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int *recvcounts, int *displs, +int PMPI_Gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, int root, MPI_Comm comm){ return PMPI_Igatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, root, comm, MPI_REQUEST_IGNORED); } -int PMPI_Igatherv(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int* recvcounts, int* displs, +int PMPI_Igatherv(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, const int* recvcounts, const int* displs, MPI_Datatype recvtype, int root, MPI_Comm comm, MPI_Request* request) { if (comm == MPI_COMM_NULL) @@ -164,12 +179,12 @@ int PMPI_Igatherv(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* rec } smpi_bench_end(); - char* sendtmpbuf = static_cast(sendbuf); - int sendtmpcount = sendcount; - MPI_Datatype sendtmptype = sendtype; + const void* real_sendbuf = sendbuf; + int real_sendcount = sendcount; + MPI_Datatype real_sendtype = sendtype; if ((comm->rank() == root) && (sendbuf == MPI_IN_PLACE)) { - sendtmpcount = 0; - sendtmptype = recvtype; + real_sendcount = 0; + real_sendtype = recvtype; } int rank = simgrid::s4u::this_actor::get_pid(); @@ -184,39 +199,45 @@ int PMPI_Igatherv(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* rec TRACE_smpi_comm_in(rank, request == MPI_REQUEST_IGNORED ? "PMPI_Gatherv" : "PMPI_Igatherv", new simgrid::instr::VarCollTIData( request == MPI_REQUEST_IGNORED ? "gatherv" : "igatherv", root, - sendtmptype->is_replayable() ? sendtmpcount : sendtmpcount * sendtmptype->size(), nullptr, - dt_size_recv, trace_recvcounts, simgrid::smpi::Datatype::encode(sendtmptype), + real_sendtype->is_replayable() ? real_sendcount : real_sendcount * real_sendtype->size(), + nullptr, dt_size_recv, trace_recvcounts, simgrid::smpi::Datatype::encode(real_sendtype), simgrid::smpi::Datatype::encode(recvtype))); if (request == MPI_REQUEST_IGNORED) - simgrid::smpi::Colls::gatherv(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcounts, displs, recvtype, root, - comm); + simgrid::smpi::colls::gatherv(real_sendbuf, real_sendcount, real_sendtype, recvbuf, recvcounts, displs, recvtype, + root, comm); else - simgrid::smpi::Colls::igatherv(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcounts, displs, recvtype, root, - comm, request); + simgrid::smpi::colls::igatherv(real_sendbuf, real_sendcount, real_sendtype, recvbuf, recvcounts, displs, recvtype, + root, comm, request); TRACE_smpi_comm_out(rank); smpi_bench_begin(); return MPI_SUCCESS; } -int PMPI_Allgather(void *sendbuf, int sendcount, MPI_Datatype sendtype, +int PMPI_Allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm){ return PMPI_Iallgather(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm, MPI_REQUEST_IGNORED); } -int PMPI_Iallgather(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, +int PMPI_Iallgather(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm, MPI_Request* request) { - if (comm == MPI_COMM_NULL) - return MPI_ERR_COMM; - if ((sendbuf == nullptr && sendcount > 0) || (recvbuf == nullptr)) - return MPI_ERR_BUFFER; - if (((sendbuf != MPI_IN_PLACE) && (sendtype == MPI_DATATYPE_NULL)) || (recvtype == MPI_DATATYPE_NULL)) - return MPI_ERR_TYPE; - if (((sendbuf != MPI_IN_PLACE) && (sendcount < 0)) || (recvcount < 0)) - return MPI_ERR_COUNT; - if (request == nullptr) - return MPI_ERR_ARG; + CHECK_ARGS(comm == MPI_COMM_NULL, MPI_ERR_COMM, + "(I)Allgather: the communicator cannot be MPI_COMM_NULL"); + CHECK_ARGS(recvbuf == nullptr && recvcount > 0, MPI_ERR_BUFFER, + "(I)Allgather: param 4 recvbuf cannot be NULL"); + CHECK_ARGS(sendbuf == nullptr && sendcount > 0, MPI_ERR_BUFFER, + "(I)Allgather: param 1 sendbuf cannot be NULL when sendcount > 0"); + CHECK_ARGS((sendbuf != MPI_IN_PLACE) && (sendtype == MPI_DATATYPE_NULL), MPI_ERR_TYPE, + "(I)Allgather: param 3 sendtype cannot be MPI_DATATYPE_NULL when sendbuff is not MPI_IN_PLACE"); + CHECK_ARGS(recvtype == MPI_DATATYPE_NULL, MPI_ERR_TYPE, + "(I)Allgather: param 6 recvtype cannot be MPI_DATATYPE_NULL"); + CHECK_ARGS(recvcount < 0, MPI_ERR_COUNT, + "(I)Allgather: param 5 recvcount cannot be negative"); + CHECK_ARGS((sendbuf != MPI_IN_PLACE) && (sendcount < 0), MPI_ERR_COUNT, + "(I)Allgather: param 2 sendcount cannot be negative when sendbuf is not MPI_IN_PLACE"); + CHECK_ARGS(request == nullptr, MPI_ERR_ARG, + "Iallgather: param 8 request cannot be NULL"); smpi_bench_end(); if (sendbuf == MPI_IN_PLACE) { @@ -233,39 +254,45 @@ int PMPI_Iallgather(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* r recvtype->is_replayable() ? recvcount : recvcount * recvtype->size(), simgrid::smpi::Datatype::encode(sendtype), simgrid::smpi::Datatype::encode(recvtype))); if (request == MPI_REQUEST_IGNORED) - simgrid::smpi::Colls::allgather(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm); + simgrid::smpi::colls::allgather(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm); else - simgrid::smpi::Colls::iallgather(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm, request); + simgrid::smpi::colls::iallgather(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm, request); TRACE_smpi_comm_out(rank); smpi_bench_begin(); return MPI_SUCCESS; } -int PMPI_Allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int *recvcounts, int *displs, MPI_Datatype recvtype, MPI_Comm comm){ +int PMPI_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, MPI_Comm comm){ return PMPI_Iallgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm, MPI_REQUEST_IGNORED); } -int PMPI_Iallgatherv(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int* recvcounts, int* displs, +int PMPI_Iallgatherv(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, const int* recvcounts, const int* displs, MPI_Datatype recvtype, MPI_Comm comm, MPI_Request* request) { - if (comm == MPI_COMM_NULL) - return MPI_ERR_COMM; - if ((sendbuf == nullptr && sendcount > 0) || (recvbuf == nullptr)) - return MPI_ERR_BUFFER; - if (((sendbuf != MPI_IN_PLACE) && (sendtype == MPI_DATATYPE_NULL)) || (recvtype == MPI_DATATYPE_NULL)) - return MPI_ERR_TYPE; - if ((sendbuf != MPI_IN_PLACE) && (sendcount < 0)) - return MPI_ERR_COUNT; - if (recvcounts == nullptr || displs == nullptr) - return MPI_ERR_ARG; - if (request == nullptr) - return MPI_ERR_ARG; + CHECK_ARGS(comm == MPI_COMM_NULL, MPI_ERR_COMM, + "(I)Allgatherv: the communicator cannot be MPI_COMM_NULL"); + CHECK_ARGS(sendbuf == nullptr && sendcount > 0, MPI_ERR_BUFFER, + "(I)Allgatherv: param 1 sendbuf cannot be NULL when sendcount > 0"); + CHECK_ARGS((sendbuf != MPI_IN_PLACE) && (sendtype == MPI_DATATYPE_NULL), MPI_ERR_TYPE, + "(I)Allgatherv: param 3 sendtype cannot be MPI_DATATYPE_NULL when sendbuff is not MPI_IN_PLACE"); + CHECK_ARGS(recvtype == MPI_DATATYPE_NULL, MPI_ERR_TYPE, + "(I)Allgatherv: param 7 recvtype cannot be MPI_DATATYPE_NULL"); + CHECK_ARGS(recvcounts == nullptr, MPI_ERR_COUNT, + "(I)Allgatherv: param 5 recvcounts cannot be null"); + CHECK_ARGS(displs == nullptr, MPI_ERR_ARG, + "(I)Allgatherv: param 6 displs cannot be null"); + CHECK_ARGS((sendbuf != MPI_IN_PLACE) && (sendcount < 0), MPI_ERR_COUNT, + "(I)Allgatherv: param 2 sendcount cannot be negative when sendbuf is not MPI_IN_PLACE"); + CHECK_ARGS(request == nullptr, MPI_ERR_ARG, + "Iallgatherv: param 9 request cannot be NULL"); - for (int i = 0; i < comm->size(); i++) { // copy data to avoid bad free + for (int i = 0; i < comm->size(); i++) { if (recvcounts[i] < 0) return MPI_ERR_COUNT; + else if (recvcounts[i] > 0 && recvbuf == nullptr) + return MPI_ERR_BUFFER; } smpi_bench_end(); @@ -289,9 +316,9 @@ int PMPI_Iallgatherv(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* dt_size_recv, trace_recvcounts, simgrid::smpi::Datatype::encode(sendtype), simgrid::smpi::Datatype::encode(recvtype))); if (request == MPI_REQUEST_IGNORED) - simgrid::smpi::Colls::allgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm); + simgrid::smpi::colls::allgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm); else - simgrid::smpi::Colls::iallgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm, + simgrid::smpi::colls::iallgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm, request); TRACE_smpi_comm_out(rank); @@ -299,28 +326,35 @@ int PMPI_Iallgatherv(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* return MPI_SUCCESS; } -int PMPI_Scatter(void *sendbuf, int sendcount, MPI_Datatype sendtype, +int PMPI_Scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm){ return PMPI_Iscatter(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm, MPI_REQUEST_IGNORED); } -int PMPI_Iscatter(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, +int PMPI_Iscatter(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm, MPI_Request* request) { - if (comm == MPI_COMM_NULL) - return MPI_ERR_COMM; - if (((comm->rank() == root) && (sendtype == MPI_DATATYPE_NULL || not sendtype->is_valid())) || - ((recvbuf != MPI_IN_PLACE) && (recvtype == MPI_DATATYPE_NULL || not recvtype->is_valid()))) - return MPI_ERR_TYPE; - if (((comm->rank() == root) && (sendcount < 0)) || ((recvbuf != MPI_IN_PLACE) && (recvcount < 0))) - return MPI_ERR_COUNT; - if ((sendbuf == recvbuf) || ((comm->rank() == root) && sendcount > 0 && (sendbuf == nullptr)) || - (recvcount > 0 && recvbuf == nullptr)) - return MPI_ERR_BUFFER; - if (root < 0 || root >= comm->size()) - return MPI_ERR_ROOT; - if (request == nullptr) - return MPI_ERR_ARG; + CHECK_ARGS(comm == MPI_COMM_NULL, MPI_ERR_COMM, + "(I)Scatter: the communicator cannot be MPI_COMM_NULL"); + CHECK_ARGS(recvbuf == nullptr && recvcount > 0, MPI_ERR_BUFFER, + "(I)Scatter: param 4 recvbuf cannot be NULL"); + CHECK_ARGS(((sendbuf == recvbuf) || ((comm->rank() == root) && sendcount > 0 && (sendbuf == nullptr))), MPI_ERR_BUFFER, + "(I)Scatter: param 1 sendbuf cannot be NULL when sendcount > 0"); + CHECK_ARGS(((comm->rank() == root) && (sendtype == MPI_DATATYPE_NULL || not sendtype->is_valid())), MPI_ERR_TYPE, + "(I)Scatter: param 3 sendtype cannot be MPI_DATATYPE_NULL or invalid on root"); + CHECK_ARGS(((recvbuf != MPI_IN_PLACE) && (recvtype == MPI_DATATYPE_NULL || not recvtype->is_valid())), MPI_ERR_TYPE, + "(I)Scatter: param 6 recvtype cannot be MPI_DATATYPE_NULL or invalid when recvbuf is not MPI_IN_PLACE"); + CHECK_ARGS(((comm->rank() == root) && (sendcount < 0)), MPI_ERR_COUNT, + "(I)Scatter: param 2 sendcount cannot be negative"); + CHECK_ARGS(((recvbuf != MPI_IN_PLACE) && (recvcount < 0)), MPI_ERR_COUNT, + "(I)Scatter: param 5 recvcount cannot be negative"); + CHECK_ARGS(root < 0, MPI_ERR_ROOT, + "(I)Scatter: root cannot be negative"); + CHECK_ARGS(root >= comm->size(), MPI_ERR_ROOT, + "(I)Scatter: root (=%d) is larger than communicator size (=%d)", root, + comm->size()); + CHECK_ARGS(request == nullptr, MPI_ERR_ARG, + "Iscatter: param 9 request cannot be NULL"); smpi_bench_end(); if (recvbuf == MPI_IN_PLACE) { @@ -336,46 +370,51 @@ int PMPI_Iscatter(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* rec recvtype->is_replayable() ? recvcount : recvcount * recvtype->size(), simgrid::smpi::Datatype::encode(sendtype), simgrid::smpi::Datatype::encode(recvtype))); if (request == MPI_REQUEST_IGNORED) - simgrid::smpi::Colls::scatter(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm); + simgrid::smpi::colls::scatter(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm); else - simgrid::smpi::Colls::iscatter(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm, request); + simgrid::smpi::colls::iscatter(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm, request); TRACE_smpi_comm_out(rank); smpi_bench_begin(); return MPI_SUCCESS; } -int PMPI_Scatterv(void *sendbuf, int *sendcounts, int *displs, +int PMPI_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm){ return PMPI_Iscatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, recvcount, recvtype, root, comm, MPI_REQUEST_IGNORED); } -int PMPI_Iscatterv(void* sendbuf, int* sendcounts, int* displs, MPI_Datatype sendtype, void* recvbuf, int recvcount, +int PMPI_Iscatterv(const void* sendbuf, const int* sendcounts, const int* displs, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm, MPI_Request* request) { - if (comm == MPI_COMM_NULL) - return MPI_ERR_COMM; - if (sendcounts == nullptr || displs == nullptr) - return MPI_ERR_ARG; - if (((comm->rank() == root) && (sendtype == MPI_DATATYPE_NULL)) || - ((recvbuf != MPI_IN_PLACE) && (recvtype == MPI_DATATYPE_NULL))) - return MPI_ERR_TYPE; - if (request == nullptr) - return MPI_ERR_ARG; - if (recvbuf != MPI_IN_PLACE && recvcount < 0) - return MPI_ERR_COUNT; - if (root < 0 || root >= comm->size()) - return MPI_ERR_ROOT; + CHECK_ARGS(comm == MPI_COMM_NULL, MPI_ERR_COMM, + "(I)Scatterv: the communicator cannot be MPI_COMM_NULL"); + CHECK_ARGS((comm->rank() == root) && (sendcounts == nullptr), MPI_ERR_ARG, + "(I)Scatterv: param 2 sendcounts cannot be NULL on the root rank"); + CHECK_ARGS((comm->rank() == root) && (displs == nullptr), MPI_ERR_ARG, + "(I)Scatterv: param 3 displs cannot be NULL on the root rank"); + CHECK_ARGS((comm->rank() == root) && (sendtype == MPI_DATATYPE_NULL), MPI_ERR_TYPE, + "(I)Scatterv: The sendtype cannot be NULL on the root rank"); + CHECK_ARGS((recvbuf != MPI_IN_PLACE) && (recvtype == MPI_DATATYPE_NULL), MPI_ERR_TYPE, + "(I)Scatterv: the recvtype cannot be NULL when not receiving in place"); + CHECK_ARGS(request == nullptr, MPI_ERR_ARG, + "Iscatterv: param 10 request cannot be NULL"); + CHECK_ARGS(recvbuf != MPI_IN_PLACE && recvcount < 0, MPI_ERR_COUNT, + "(I)Scatterv: When not receiving in place, the recvcount cannot be negative"); + CHECK_ARGS(root < 0, MPI_ERR_ROOT, + "(I)Scatterv: root cannot be negative"); + CHECK_ARGS(root >= comm->size(), MPI_ERR_ROOT, + "(I)Scatterv: root (=%d) is larger than communicator size (=%d)", root, + comm->size()); if (comm->rank() == root) { if (recvbuf == MPI_IN_PLACE) { recvtype = sendtype; recvcount = sendcounts[comm->rank()]; } - for (int i = 0; i < comm->size(); i++) { - if (sendcounts[i] < 0) - return MPI_ERR_COUNT; - } + for (int i = 0; i < comm->size(); i++) + CHECK_ARGS(sendcounts[i] < 0, MPI_ERR_COUNT, "Iscatterv: sendcounts[%d]=%d but this cannot be negative", i, + sendcounts[i]); } smpi_bench_end(); @@ -397,9 +436,9 @@ int PMPI_Iscatterv(void* sendbuf, int* sendcounts, int* displs, MPI_Datatype sen nullptr, simgrid::smpi::Datatype::encode(sendtype), simgrid::smpi::Datatype::encode(recvtype))); if (request == MPI_REQUEST_IGNORED) - simgrid::smpi::Colls::scatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, recvcount, recvtype, root, comm); + simgrid::smpi::colls::scatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, recvcount, recvtype, root, comm); else - simgrid::smpi::Colls::iscatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, recvcount, recvtype, root, comm, + simgrid::smpi::colls::iscatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, recvcount, recvtype, root, comm, request); TRACE_smpi_comm_out(rank); @@ -407,27 +446,32 @@ int PMPI_Iscatterv(void* sendbuf, int* sendcounts, int* displs, MPI_Datatype sen return MPI_SUCCESS; } -int PMPI_Reduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm) +int PMPI_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm) { return PMPI_Ireduce(sendbuf, recvbuf, count, datatype, op, root, comm, MPI_REQUEST_IGNORED); } -int PMPI_Ireduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm, MPI_Request* request) +int PMPI_Ireduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm, MPI_Request* request) { - if (comm == MPI_COMM_NULL) - return MPI_ERR_COMM; - if ((sendbuf == nullptr && count > 0) || ((comm->rank() == root) && recvbuf == nullptr)) - return MPI_ERR_BUFFER; - if (datatype == MPI_DATATYPE_NULL || not datatype->is_valid()) - return MPI_ERR_TYPE; - if (op == MPI_OP_NULL) - return MPI_ERR_OP; - if (request == nullptr) - return MPI_ERR_ARG; - if (root < 0 || root >= comm->size()) - return MPI_ERR_ROOT; - if (count < 0) - return MPI_ERR_COUNT; + CHECK_ARGS(comm == MPI_COMM_NULL, MPI_ERR_COMM, + "(I)Reduce: the communicator cannot be MPI_COMM_NULL"); + CHECK_ARGS(((comm->rank() == root) && recvbuf == nullptr), MPI_ERR_BUFFER, + "(I)Reduce: param 2 recvbuf cannot be NULL"); + CHECK_ARGS((sendbuf == nullptr && count > 0), MPI_ERR_BUFFER, + "(I)Reduce: param 1 sendbuf cannot be NULL when count > 0"); + CHECK_ARGS((datatype == MPI_DATATYPE_NULL || not datatype->is_valid()), MPI_ERR_TYPE, + "(I)Reduce: param 4 datatype cannot be MPI_DATATYPE_NULL or invalid"); + CHECK_ARGS(count < 0, MPI_ERR_COUNT, + "(I)Reduce: param 3 count cannot be negative"); + CHECK_ARGS(request == nullptr, MPI_ERR_ARG, + "Ireduce: param 8 request cannot be NULL"); + CHECK_ARGS(op == MPI_OP_NULL, MPI_ERR_OP, + "(I)Reduce: param 5 op cannot be MPI_OP_NULL"); + CHECK_ARGS(root < 0, MPI_ERR_ROOT, + "(I)Reduce: root cannot be negative"); + CHECK_ARGS(root >= comm->size(), MPI_ERR_ROOT, + "(I)Reduce: root (=%d) is larger than communicator size (=%d)", root, + comm->size()); smpi_bench_end(); int rank = simgrid::s4u::this_actor::get_pid(); @@ -437,16 +481,16 @@ int PMPI_Ireduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, datatype->is_replayable() ? count : count * datatype->size(), -1, simgrid::smpi::Datatype::encode(datatype), "")); if (request == MPI_REQUEST_IGNORED) - simgrid::smpi::Colls::reduce(sendbuf, recvbuf, count, datatype, op, root, comm); + simgrid::smpi::colls::reduce(sendbuf, recvbuf, count, datatype, op, root, comm); else - simgrid::smpi::Colls::ireduce(sendbuf, recvbuf, count, datatype, op, root, comm, request); + simgrid::smpi::colls::ireduce(sendbuf, recvbuf, count, datatype, op, root, comm, request); TRACE_smpi_comm_out(rank); smpi_bench_begin(); return MPI_SUCCESS; } -int PMPI_Reduce_local(void* inbuf, void* inoutbuf, int count, MPI_Datatype datatype, MPI_Op op) +int PMPI_Reduce_local(const void* inbuf, void* inoutbuf, int count, MPI_Datatype datatype, MPI_Op op) { if (datatype == MPI_DATATYPE_NULL || not datatype->is_valid()) return MPI_ERR_TYPE; @@ -461,12 +505,12 @@ int PMPI_Reduce_local(void* inbuf, void* inoutbuf, int count, MPI_Datatype datat return MPI_SUCCESS; } -int PMPI_Allreduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) +int PMPI_Allreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) { return PMPI_Iallreduce(sendbuf, recvbuf, count, datatype, op, comm, MPI_REQUEST_IGNORED); } -int PMPI_Iallreduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request *request) +int PMPI_Iallreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request *request) { if (comm == MPI_COMM_NULL) return MPI_ERR_COMM; @@ -482,11 +526,9 @@ int PMPI_Iallreduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype dataty return MPI_ERR_ARG; smpi_bench_end(); - char* sendtmpbuf = static_cast(sendbuf); - if (sendbuf == MPI_IN_PLACE) { - sendtmpbuf = static_cast(xbt_malloc(count * datatype->get_extent())); - simgrid::smpi::Datatype::copy(recvbuf, count, datatype, sendtmpbuf, count, datatype); - } + std::unique_ptr tmp_sendbuf; + const void* real_sendbuf = smpi_get_in_place_buf(sendbuf, recvbuf, tmp_sendbuf, count, datatype); + int rank = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(rank, request == MPI_REQUEST_IGNORED ? "PMPI_Allreduce" : "PMPI_Iallreduce", @@ -495,24 +537,21 @@ int PMPI_Iallreduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype dataty simgrid::smpi::Datatype::encode(datatype), "")); if (request == MPI_REQUEST_IGNORED) - simgrid::smpi::Colls::allreduce(sendtmpbuf, recvbuf, count, datatype, op, comm); + simgrid::smpi::colls::allreduce(real_sendbuf, recvbuf, count, datatype, op, comm); else - simgrid::smpi::Colls::iallreduce(sendtmpbuf, recvbuf, count, datatype, op, comm, request); - - if (sendbuf == MPI_IN_PLACE) - xbt_free(sendtmpbuf); + simgrid::smpi::colls::iallreduce(real_sendbuf, recvbuf, count, datatype, op, comm, request); TRACE_smpi_comm_out(rank); smpi_bench_begin(); return MPI_SUCCESS; } -int PMPI_Scan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) +int PMPI_Scan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) { return PMPI_Iscan(sendbuf, recvbuf, count, datatype, op, comm, MPI_REQUEST_IGNORED); } -int PMPI_Iscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request* request) +int PMPI_Iscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request* request) { if (comm == MPI_COMM_NULL) return MPI_ERR_COMM; @@ -529,11 +568,9 @@ int PMPI_Iscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, M smpi_bench_end(); int rank = simgrid::s4u::this_actor::get_pid(); - void* sendtmpbuf = sendbuf; - if (sendbuf == MPI_IN_PLACE) { - sendtmpbuf = static_cast(xbt_malloc(count * datatype->size())); - memcpy(sendtmpbuf, recvbuf, count * datatype->size()); - } + std::unique_ptr tmp_sendbuf; + const void* real_sendbuf = smpi_get_in_place_buf(sendbuf, recvbuf, tmp_sendbuf, count, datatype); + TRACE_smpi_comm_in(rank, request == MPI_REQUEST_IGNORED ? "PMPI_Scan" : "PMPI_Iscan", new simgrid::instr::Pt2PtTIData(request == MPI_REQUEST_IGNORED ? "scan" : "iscan", -1, datatype->is_replayable() ? count : count * datatype->size(), @@ -541,23 +578,21 @@ int PMPI_Iscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, M int retval; if (request == MPI_REQUEST_IGNORED) - retval = simgrid::smpi::Colls::scan(sendtmpbuf, recvbuf, count, datatype, op, comm); + retval = simgrid::smpi::colls::scan(real_sendbuf, recvbuf, count, datatype, op, comm); else - retval = simgrid::smpi::Colls::iscan(sendtmpbuf, recvbuf, count, datatype, op, comm, request); + retval = simgrid::smpi::colls::iscan(real_sendbuf, recvbuf, count, datatype, op, comm, request); TRACE_smpi_comm_out(rank); - if (sendbuf == MPI_IN_PLACE) - xbt_free(sendtmpbuf); smpi_bench_begin(); return retval; } -int PMPI_Exscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) +int PMPI_Exscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) { return PMPI_Iexscan(sendbuf, recvbuf, count, datatype, op, comm, MPI_REQUEST_IGNORED); } -int PMPI_Iexscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request* request){ +int PMPI_Iexscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request* request){ if (comm == MPI_COMM_NULL) return MPI_ERR_COMM; if (not datatype->is_valid()) @@ -573,11 +608,8 @@ int PMPI_Iexscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, smpi_bench_end(); int rank = simgrid::s4u::this_actor::get_pid(); - void* sendtmpbuf = sendbuf; - if (sendbuf == MPI_IN_PLACE) { - sendtmpbuf = static_cast(xbt_malloc(count * datatype->size())); - memcpy(sendtmpbuf, recvbuf, count * datatype->size()); - } + std::unique_ptr tmp_sendbuf; + const void* real_sendbuf = smpi_get_in_place_buf(sendbuf, recvbuf, tmp_sendbuf, count, datatype); TRACE_smpi_comm_in(rank, request == MPI_REQUEST_IGNORED ? "PMPI_Exscan" : "PMPI_Iexscan", new simgrid::instr::Pt2PtTIData(request == MPI_REQUEST_IGNORED ? "exscan" : "iexscan", -1, @@ -586,23 +618,21 @@ int PMPI_Iexscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, int retval; if (request == MPI_REQUEST_IGNORED) - retval = simgrid::smpi::Colls::exscan(sendtmpbuf, recvbuf, count, datatype, op, comm); + retval = simgrid::smpi::colls::exscan(real_sendbuf, recvbuf, count, datatype, op, comm); else - retval = simgrid::smpi::Colls::iexscan(sendtmpbuf, recvbuf, count, datatype, op, comm, request); + retval = simgrid::smpi::colls::iexscan(real_sendbuf, recvbuf, count, datatype, op, comm, request); TRACE_smpi_comm_out(rank); - if (sendbuf == MPI_IN_PLACE) - xbt_free(sendtmpbuf); smpi_bench_begin(); return retval; } -int PMPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) +int PMPI_Reduce_scatter(const void *sendbuf, void *recvbuf, const int *recvcounts, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) { return PMPI_Ireduce_scatter(sendbuf, recvbuf, recvcounts, datatype, op, comm, MPI_REQUEST_IGNORED); } -int PMPI_Ireduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request *request) +int PMPI_Ireduce_scatter(const void *sendbuf, void *recvbuf, const int *recvcounts, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request *request) { if (comm == MPI_COMM_NULL) return MPI_ERR_COMM; @@ -632,12 +662,8 @@ int PMPI_Ireduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, MPI_Data trace_recvcounts->push_back(recvcounts[i] * dt_send_size); totalcount += recvcounts[i]; } - - void* sendtmpbuf = sendbuf; - if (sendbuf == MPI_IN_PLACE) { - sendtmpbuf = static_cast(xbt_malloc(totalcount * datatype->size())); - memcpy(sendtmpbuf, recvbuf, totalcount * datatype->size()); - } + std::unique_ptr tmp_sendbuf; + const void* real_sendbuf = smpi_get_in_place_buf(sendbuf, recvbuf, tmp_sendbuf, totalcount, datatype); TRACE_smpi_comm_in(rank, request == MPI_REQUEST_IGNORED ? "PMPI_Reduce_scatter" : "PMPI_Ireduce_scatter", new simgrid::instr::VarCollTIData( @@ -645,24 +671,22 @@ int PMPI_Ireduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, MPI_Data -1, trace_recvcounts, simgrid::smpi::Datatype::encode(datatype), "")); if (request == MPI_REQUEST_IGNORED) - simgrid::smpi::Colls::reduce_scatter(sendtmpbuf, recvbuf, recvcounts, datatype, op, comm); + simgrid::smpi::colls::reduce_scatter(real_sendbuf, recvbuf, recvcounts, datatype, op, comm); else - simgrid::smpi::Colls::ireduce_scatter(sendtmpbuf, recvbuf, recvcounts, datatype, op, comm, request); + simgrid::smpi::colls::ireduce_scatter(real_sendbuf, recvbuf, recvcounts, datatype, op, comm, request); TRACE_smpi_comm_out(rank); - if (sendbuf == MPI_IN_PLACE) - xbt_free(sendtmpbuf); smpi_bench_begin(); return MPI_SUCCESS; } -int PMPI_Reduce_scatter_block(void *sendbuf, void *recvbuf, int recvcount, +int PMPI_Reduce_scatter_block(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) { return PMPI_Ireduce_scatter_block(sendbuf, recvbuf, recvcount, datatype, op, comm, MPI_REQUEST_IGNORED); } -int PMPI_Ireduce_scatter_block(void* sendbuf, void* recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, +int PMPI_Ireduce_scatter_block(const void* sendbuf, void* recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request* request) { if (comm == MPI_COMM_NULL) @@ -682,12 +706,8 @@ int PMPI_Ireduce_scatter_block(void* sendbuf, void* recvbuf, int recvcount, MPI_ int rank = simgrid::s4u::this_actor::get_pid(); int dt_send_size = datatype->is_replayable() ? 1 : datatype->size(); std::vector* trace_recvcounts = new std::vector(recvcount * dt_send_size); // copy data to avoid bad free - - void* sendtmpbuf = sendbuf; - if (sendbuf == MPI_IN_PLACE) { - sendtmpbuf = static_cast(xbt_malloc(recvcount * count * datatype->size())); - memcpy(sendtmpbuf, recvbuf, recvcount * count * datatype->size()); - } + std::unique_ptr tmp_sendbuf; + const void* real_sendbuf = smpi_get_in_place_buf(sendbuf, recvbuf, tmp_sendbuf, recvcount * count, datatype); TRACE_smpi_comm_in( rank, request == MPI_REQUEST_IGNORED ? "PMPI_Reduce_scatter_block" : "PMPI_Ireduce_scatter_block", @@ -698,24 +718,22 @@ int PMPI_Ireduce_scatter_block(void* sendbuf, void* recvbuf, int recvcount, MPI_ for (int i = 0; i < count; i++) recvcounts[i] = recvcount; if (request == MPI_REQUEST_IGNORED) - simgrid::smpi::Colls::reduce_scatter(sendtmpbuf, recvbuf, recvcounts, datatype, op, comm); + simgrid::smpi::colls::reduce_scatter(real_sendbuf, recvbuf, recvcounts, datatype, op, comm); else - simgrid::smpi::Colls::ireduce_scatter(sendtmpbuf, recvbuf, recvcounts, datatype, op, comm, request); + simgrid::smpi::colls::ireduce_scatter(real_sendbuf, recvbuf, recvcounts, datatype, op, comm, request); delete[] recvcounts; TRACE_smpi_comm_out(rank); - if (sendbuf == MPI_IN_PLACE) - xbt_free(sendtmpbuf); smpi_bench_begin(); return MPI_SUCCESS; } -int PMPI_Alltoall(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, +int PMPI_Alltoall(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm){ return PMPI_Ialltoall(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm, MPI_REQUEST_IGNORED); } -int PMPI_Ialltoall(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, +int PMPI_Ialltoall(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm, MPI_Request* request) { if (comm == MPI_COMM_NULL) @@ -731,46 +749,44 @@ int PMPI_Ialltoall(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* re smpi_bench_end(); int rank = simgrid::s4u::this_actor::get_pid(); - void* sendtmpbuf = static_cast(sendbuf); - int sendtmpcount = sendcount; - MPI_Datatype sendtmptype = sendtype; + int real_sendcount = sendcount; + MPI_Datatype real_sendtype = sendtype; + + std::unique_ptr tmp_sendbuf; + const void* real_sendbuf = smpi_get_in_place_buf(sendbuf, recvbuf, tmp_sendbuf, recvcount * comm->size(), recvtype); + if (sendbuf == MPI_IN_PLACE) { - sendtmpbuf = static_cast(xbt_malloc(recvcount * comm->size() * recvtype->size())); - // memcpy(??,nullptr,0) is actually undefined behavor, even if harmless. - if (recvbuf != nullptr) - memcpy(sendtmpbuf, recvbuf, recvcount * comm->size() * recvtype->size()); - sendtmpcount = recvcount; - sendtmptype = recvtype; + real_sendcount = recvcount; + real_sendtype = recvtype; } TRACE_smpi_comm_in(rank, request == MPI_REQUEST_IGNORED ? "PMPI_Alltoall" : "PMPI_Ialltoall", new simgrid::instr::CollTIData( request == MPI_REQUEST_IGNORED ? "alltoall" : "ialltoall", -1, -1.0, - sendtmptype->is_replayable() ? sendtmpcount : sendtmpcount * sendtmptype->size(), + real_sendtype->is_replayable() ? real_sendcount : real_sendcount * real_sendtype->size(), recvtype->is_replayable() ? recvcount : recvcount * recvtype->size(), - simgrid::smpi::Datatype::encode(sendtmptype), simgrid::smpi::Datatype::encode(recvtype))); + simgrid::smpi::Datatype::encode(real_sendtype), simgrid::smpi::Datatype::encode(recvtype))); int retval; if (request == MPI_REQUEST_IGNORED) - retval = simgrid::smpi::Colls::alltoall(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcount, recvtype, comm); + retval = + simgrid::smpi::colls::alltoall(real_sendbuf, real_sendcount, real_sendtype, recvbuf, recvcount, recvtype, comm); else - retval = simgrid::smpi::Colls::ialltoall(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcount, recvtype, comm, - request); + retval = simgrid::smpi::colls::ialltoall(real_sendbuf, real_sendcount, real_sendtype, recvbuf, recvcount, recvtype, + comm, request); TRACE_smpi_comm_out(rank); - if (sendbuf == MPI_IN_PLACE) - xbt_free(sendtmpbuf); smpi_bench_begin(); return retval; } -int PMPI_Alltoallv(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype sendtype, void* recvbuf, - int* recvcounts, int* recvdisps, MPI_Datatype recvtype, MPI_Comm comm) +int PMPI_Alltoallv(const void* sendbuf, const int* sendcounts, const int* senddisps, MPI_Datatype sendtype, void* recvbuf, + const int* recvcounts, const int* recvdisps, MPI_Datatype recvtype, MPI_Comm comm) { return PMPI_Ialltoallv(sendbuf, sendcounts, senddisps, sendtype, recvbuf, recvcounts, recvdisps, recvtype, comm, MPI_REQUEST_IGNORED); } -int PMPI_Ialltoallv(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype sendtype, void* recvbuf, - int* recvcounts, int* recvdisps, MPI_Datatype recvtype, MPI_Comm comm, MPI_Request* request) +int PMPI_Ialltoallv(const void* sendbuf, const int* sendcounts, const int* senddisps, MPI_Datatype sendtype, void* recvbuf, + const int* recvcounts, const int* recvdisps, MPI_Datatype recvtype, MPI_Comm comm, MPI_Request* request) { if (comm == MPI_COMM_NULL) return MPI_ERR_COMM; @@ -798,10 +814,9 @@ int PMPI_Ialltoallv(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype std::vector* trace_recvcounts = new std::vector; int dt_size_recv = recvtype->size(); - void* sendtmpbuf = static_cast(sendbuf); - int* sendtmpcounts = sendcounts; - int* sendtmpdisps = senddisps; - MPI_Datatype sendtmptype = sendtype; + const int* real_sendcounts = sendcounts; + const int* real_senddisps = senddisps; + MPI_Datatype real_sendtype = sendtype; int maxsize = 0; for (int i = 0; i < size; i++) { // copy data to avoid bad free recv_size += recvcounts[i] * dt_size_recv; @@ -810,55 +825,54 @@ int PMPI_Ialltoallv(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype maxsize = (recvdisps[i] + recvcounts[i]) * dt_size_recv; } + std::unique_ptr tmp_sendbuf; + std::unique_ptr tmp_sendcounts; + std::unique_ptr tmp_senddisps; + const void* real_sendbuf = smpi_get_in_place_buf(sendbuf, recvbuf, tmp_sendbuf, maxsize, MPI_CHAR); if (sendbuf == MPI_IN_PLACE) { - sendtmpbuf = static_cast(xbt_malloc(maxsize)); - memcpy(sendtmpbuf, recvbuf, maxsize); - sendtmpcounts = static_cast(xbt_malloc(size * sizeof(int))); - memcpy(sendtmpcounts, recvcounts, size * sizeof(int)); - sendtmpdisps = static_cast(xbt_malloc(size * sizeof(int))); - memcpy(sendtmpdisps, recvdisps, size * sizeof(int)); - sendtmptype = recvtype; + tmp_sendcounts.reset(new int[size]); + std::copy(recvcounts, recvcounts + size, tmp_sendcounts.get()); + real_sendcounts = tmp_sendcounts.get(); + tmp_senddisps.reset(new int[size]); + std::copy(recvdisps, recvdisps + size, tmp_senddisps.get()); + real_senddisps = tmp_senddisps.get(); + real_sendtype = recvtype; } - int dt_size_send = sendtmptype->size(); + int dt_size_send = real_sendtype->size(); for (int i = 0; i < size; i++) { // copy data to avoid bad free - send_size += sendtmpcounts[i] * dt_size_send; - trace_sendcounts->push_back(sendtmpcounts[i] * dt_size_send); + send_size += real_sendcounts[i] * dt_size_send; + trace_sendcounts->push_back(real_sendcounts[i] * dt_size_send); } TRACE_smpi_comm_in(rank, request == MPI_REQUEST_IGNORED ? "PMPI_Alltoallv" : "PMPI_Ialltoallv", new simgrid::instr::VarCollTIData(request == MPI_REQUEST_IGNORED ? "alltoallv" : "ialltoallv", -1, send_size, trace_sendcounts, recv_size, trace_recvcounts, - simgrid::smpi::Datatype::encode(sendtmptype), + simgrid::smpi::Datatype::encode(real_sendtype), simgrid::smpi::Datatype::encode(recvtype))); int retval; if (request == MPI_REQUEST_IGNORED) - retval = simgrid::smpi::Colls::alltoallv(sendtmpbuf, sendtmpcounts, sendtmpdisps, sendtmptype, recvbuf, recvcounts, - recvdisps, recvtype, comm); + retval = simgrid::smpi::colls::alltoallv(real_sendbuf, real_sendcounts, real_senddisps, real_sendtype, recvbuf, + recvcounts, recvdisps, recvtype, comm); else - retval = simgrid::smpi::Colls::ialltoallv(sendtmpbuf, sendtmpcounts, sendtmpdisps, sendtmptype, recvbuf, recvcounts, - recvdisps, recvtype, comm, request); + retval = simgrid::smpi::colls::ialltoallv(real_sendbuf, real_sendcounts, real_senddisps, real_sendtype, recvbuf, + recvcounts, recvdisps, recvtype, comm, request); TRACE_smpi_comm_out(rank); - if (sendbuf == MPI_IN_PLACE) { - xbt_free(sendtmpbuf); - xbt_free(sendtmpcounts); - xbt_free(sendtmpdisps); - } smpi_bench_begin(); return retval; } -int PMPI_Alltoallw(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype* sendtypes, void* recvbuf, - int* recvcounts, int* recvdisps, MPI_Datatype* recvtypes, MPI_Comm comm) +int PMPI_Alltoallw(const void* sendbuf, const int* sendcounts, const int* senddisps, const MPI_Datatype* sendtypes, void* recvbuf, + const int* recvcounts, const int* recvdisps, const MPI_Datatype* recvtypes, MPI_Comm comm) { return PMPI_Ialltoallw(sendbuf, sendcounts, senddisps, sendtypes, recvbuf, recvcounts, recvdisps, recvtypes, comm, MPI_REQUEST_IGNORED); } -int PMPI_Ialltoallw(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype* sendtypes, void* recvbuf, - int* recvcounts, int* recvdisps, MPI_Datatype* recvtypes, MPI_Comm comm, MPI_Request* request) +int PMPI_Ialltoallw(const void* sendbuf, const int* sendcounts, const int* senddisps, const MPI_Datatype* sendtypes, void* recvbuf, + const int* recvcounts, const int* recvdisps, const MPI_Datatype* recvtypes, MPI_Comm comm, MPI_Request* request) { if (comm == MPI_COMM_NULL) return MPI_ERR_COMM; @@ -875,7 +889,7 @@ int PMPI_Ialltoallw(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype smpi_bench_end(); int rank = simgrid::s4u::this_actor::get_pid(); int size = comm->size(); - for (int i = 0; i < size; i++) { // copy data to avoid bad free + for (int i = 0; i < size; i++) { if (recvcounts[i] < 0 || (sendbuf != MPI_IN_PLACE && sendcounts[i] < 0)) return MPI_ERR_COUNT; } @@ -884,10 +898,9 @@ int PMPI_Ialltoallw(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype std::vector* trace_sendcounts = new std::vector; std::vector* trace_recvcounts = new std::vector; - void* sendtmpbuf = static_cast(sendbuf); - int* sendtmpcounts = sendcounts; - int* sendtmpdisps = senddisps; - MPI_Datatype* sendtmptypes = sendtypes; + const int* real_sendcounts = sendcounts; + const int* real_senddisps = senddisps; + const MPI_Datatype* real_sendtypes = sendtypes; unsigned long maxsize = 0; for (int i = 0; i < size; i++) { // copy data to avoid bad free if (recvtypes[i] == MPI_DATATYPE_NULL) { @@ -901,43 +914,43 @@ int PMPI_Ialltoallw(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype maxsize = recvdisps[i] + (recvcounts[i] * recvtypes[i]->size()); } + std::unique_ptr tmp_sendbuf; + std::unique_ptr tmp_sendcounts; + std::unique_ptr tmp_senddisps; + std::unique_ptr tmp_sendtypes; + const void* real_sendbuf = smpi_get_in_place_buf(sendbuf, recvbuf, tmp_sendbuf, maxsize, MPI_CHAR); if (sendbuf == MPI_IN_PLACE) { - sendtmpbuf = static_cast(xbt_malloc(maxsize)); - memcpy(sendtmpbuf, recvbuf, maxsize); - sendtmpcounts = static_cast(xbt_malloc(size * sizeof(int))); - memcpy(sendtmpcounts, recvcounts, size * sizeof(int)); - sendtmpdisps = static_cast(xbt_malloc(size * sizeof(int))); - memcpy(sendtmpdisps, recvdisps, size * sizeof(int)); - sendtmptypes = static_cast(xbt_malloc(size * sizeof(MPI_Datatype))); - memcpy(sendtmptypes, recvtypes, size * sizeof(MPI_Datatype)); + tmp_sendcounts.reset(new int[size]); + std::copy(recvcounts, recvcounts + size, tmp_sendcounts.get()); + real_sendcounts = tmp_sendcounts.get(); + tmp_senddisps.reset(new int[size]); + std::copy(recvdisps, recvdisps + size, tmp_senddisps.get()); + real_senddisps = tmp_senddisps.get(); + tmp_sendtypes.reset(new MPI_Datatype[size]); + std::copy(recvtypes, recvtypes + size, tmp_sendtypes.get()); + real_sendtypes = tmp_sendtypes.get(); } for (int i = 0; i < size; i++) { // copy data to avoid bad free - send_size += sendtmpcounts[i] * sendtmptypes[i]->size(); - trace_sendcounts->push_back(sendtmpcounts[i] * sendtmptypes[i]->size()); + send_size += real_sendcounts[i] * real_sendtypes[i]->size(); + trace_sendcounts->push_back(real_sendcounts[i] * real_sendtypes[i]->size()); } TRACE_smpi_comm_in(rank, request == MPI_REQUEST_IGNORED ? "PMPI_Alltoallw" : "PMPI_Ialltoallw", new simgrid::instr::VarCollTIData(request == MPI_REQUEST_IGNORED ? "alltoallv" : "ialltoallv", -1, send_size, trace_sendcounts, recv_size, trace_recvcounts, - simgrid::smpi::Datatype::encode(sendtmptypes[0]), + simgrid::smpi::Datatype::encode(real_sendtypes[0]), simgrid::smpi::Datatype::encode(recvtypes[0]))); int retval; if (request == MPI_REQUEST_IGNORED) - retval = simgrid::smpi::Colls::alltoallw(sendtmpbuf, sendtmpcounts, sendtmpdisps, sendtmptypes, recvbuf, recvcounts, - recvdisps, recvtypes, comm); + retval = simgrid::smpi::colls::alltoallw(real_sendbuf, real_sendcounts, real_senddisps, real_sendtypes, recvbuf, + recvcounts, recvdisps, recvtypes, comm); else - retval = simgrid::smpi::Colls::ialltoallw(sendtmpbuf, sendtmpcounts, sendtmpdisps, sendtmptypes, recvbuf, + retval = simgrid::smpi::colls::ialltoallw(real_sendbuf, real_sendcounts, real_senddisps, real_sendtypes, recvbuf, recvcounts, recvdisps, recvtypes, comm, request); TRACE_smpi_comm_out(rank); - if (sendbuf == MPI_IN_PLACE) { - xbt_free(sendtmpbuf); - xbt_free(sendtmpcounts); - xbt_free(sendtmpdisps); - xbt_free(sendtmptypes); - } smpi_bench_begin(); return retval; }