X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a8f0008b377d7e1c7e7cb3bce1f57c97606d8054..fbcf6ab31cae1988be858f9f894dafe529c575d7:/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..e000a88f9f 100644 --- a/src/smpi/bindings/smpi_pmpi_coll.cpp +++ b/src/smpi/bindings/smpi_pmpi_coll.cpp @@ -85,12 +85,12 @@ 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) @@ -108,25 +108,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 +134,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 +164,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,27 +184,27 @@ 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) @@ -242,12 +242,12 @@ int PMPI_Iallgather(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* r 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) @@ -299,12 +299,12 @@ 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) @@ -345,12 +345,12 @@ int PMPI_Iscatter(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* rec 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) @@ -407,12 +407,12 @@ 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; @@ -446,7 +446,7 @@ int PMPI_Ireduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, 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 +461,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,10 +482,12 @@ int PMPI_Iallreduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype dataty return MPI_ERR_ARG; smpi_bench_end(); - char* sendtmpbuf = static_cast(sendbuf); + const void* real_sendbuf = sendbuf; + std::unique_ptr tmp_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); + tmp_sendbuf.reset(new unsigned char[count * datatype->get_extent()]); + simgrid::smpi::Datatype::copy(recvbuf, count, datatype, tmp_sendbuf.get(), count, datatype); + real_sendbuf = tmp_sendbuf.get(); } int rank = simgrid::s4u::this_actor::get_pid(); @@ -495,24 +497,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,10 +528,11 @@ 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; + const void* real_sendbuf = sendbuf; + std::unique_ptr tmp_sendbuf; if (sendbuf == MPI_IN_PLACE) { - sendtmpbuf = static_cast(xbt_malloc(count * datatype->size())); - memcpy(sendtmpbuf, recvbuf, count * datatype->size()); + tmp_sendbuf.reset(new unsigned char[count * datatype->size()]); + real_sendbuf = memcpy(tmp_sendbuf.get(), recvbuf, count * datatype->size()); } TRACE_smpi_comm_in(rank, request == MPI_REQUEST_IGNORED ? "PMPI_Scan" : "PMPI_Iscan", new simgrid::instr::Pt2PtTIData(request == MPI_REQUEST_IGNORED ? "scan" : "iscan", -1, @@ -541,23 +541,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,10 +571,11 @@ 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; + const void* real_sendbuf = sendbuf; + std::unique_ptr tmp_sendbuf; if (sendbuf == MPI_IN_PLACE) { - sendtmpbuf = static_cast(xbt_malloc(count * datatype->size())); - memcpy(sendtmpbuf, recvbuf, count * datatype->size()); + tmp_sendbuf.reset(new unsigned char[count * datatype->size()]); + real_sendbuf = memcpy(tmp_sendbuf.get(), recvbuf, count * datatype->size()); } TRACE_smpi_comm_in(rank, request == MPI_REQUEST_IGNORED ? "PMPI_Exscan" : "PMPI_Iexscan", @@ -586,23 +585,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; @@ -633,10 +630,11 @@ int PMPI_Ireduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, MPI_Data totalcount += recvcounts[i]; } - void* sendtmpbuf = sendbuf; + const void* real_sendbuf = sendbuf; + std::unique_ptr tmp_sendbuf; if (sendbuf == MPI_IN_PLACE) { - sendtmpbuf = static_cast(xbt_malloc(totalcount * datatype->size())); - memcpy(sendtmpbuf, recvbuf, totalcount * datatype->size()); + tmp_sendbuf.reset(new unsigned char[totalcount * datatype->size()]); + real_sendbuf = memcpy(tmp_sendbuf.get(), recvbuf, totalcount * datatype->size()); } TRACE_smpi_comm_in(rank, request == MPI_REQUEST_IGNORED ? "PMPI_Reduce_scatter" : "PMPI_Ireduce_scatter", @@ -645,24 +643,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) @@ -683,10 +679,11 @@ int PMPI_Ireduce_scatter_block(void* sendbuf, void* recvbuf, int recvcount, MPI_ 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; + const void* real_sendbuf = sendbuf; + std::unique_ptr tmp_sendbuf; if (sendbuf == MPI_IN_PLACE) { - sendtmpbuf = static_cast(xbt_malloc(recvcount * count * datatype->size())); - memcpy(sendtmpbuf, recvbuf, recvcount * count * datatype->size()); + tmp_sendbuf.reset(new unsigned char[recvcount * count * datatype->size()]); + real_sendbuf = memcpy(tmp_sendbuf.get(), recvbuf, recvcount * count * datatype->size()); } TRACE_smpi_comm_in( @@ -698,24 +695,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 +726,47 @@ 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; + const void* real_sendbuf = sendbuf; + int real_sendcount = sendcount; + MPI_Datatype real_sendtype = sendtype; + std::unique_ptr tmp_sendbuf; if (sendbuf == MPI_IN_PLACE) { - sendtmpbuf = static_cast(xbt_malloc(recvcount * comm->size() * recvtype->size())); + tmp_sendbuf.reset(new unsigned char[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; + memcpy(tmp_sendbuf.get(), recvbuf, recvcount * comm->size() * recvtype->size()); + real_sendbuf = tmp_sendbuf.get(); + 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 +794,10 @@ 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 void* real_sendbuf = sendbuf; + 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 +806,55 @@ 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; 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_sendbuf.reset(new unsigned char[maxsize]); + real_sendbuf = memcpy(tmp_sendbuf.get(), recvbuf, maxsize); + 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; @@ -884,10 +880,10 @@ 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 void* real_sendbuf = sendbuf; + 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 +897,44 @@ 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; 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_sendbuf.reset(new unsigned char[maxsize]); + real_sendbuf = memcpy(tmp_sendbuf.get(), recvbuf, maxsize); + 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; }