X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c5fec1387eeba572795dbc12a341f8350325abc9..aa3eb5361b83bca1d676b3252d8d1eda3186394f:/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 7459567693..e5a7089ab2 100644 --- a/src/smpi/bindings/smpi_pmpi_coll.cpp +++ b/src/smpi/bindings/smpi_pmpi_coll.cpp @@ -3,16 +3,15 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "private.h" -#include "smpi_comm.hpp" +#include "private.hpp" #include "smpi_coll.hpp" +#include "smpi_comm.hpp" #include "smpi_datatype_derived.hpp" #include "smpi_op.hpp" #include "smpi_process.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smpi_pmpi); - /* PMPI User level calls */ extern "C" { // Obviously, the C MPI interface should use the C linkage @@ -27,24 +26,20 @@ int PMPI_Bcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm c } else if (not datatype->is_valid()) { retval = MPI_ERR_ARG; } else { - int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1; + int rank = smpi_process()->index(); int root_traced = comm->group()->index(root); instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1); extra->type = TRACING_BCAST; extra->root = root_traced; - int known = 0; - extra->datatype1 = encode_datatype(datatype, &known); - int dt_size_send = 1; - if (known == 0) - dt_size_send = datatype->size(); - extra->send_size = count * dt_size_send; - TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__, extra); + extra->datatype1 = encode_datatype(datatype); + extra->send_size = datatype->is_basic() ? count : count * datatype->size(); + TRACE_smpi_collective_in(rank, __FUNCTION__, extra); if (comm->size() > 1) simgrid::smpi::Colls::bcast(buf, count, datatype, root, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); + TRACE_smpi_collective_out(rank); } smpi_bench_begin(); return retval; @@ -59,10 +54,10 @@ int PMPI_Barrier(MPI_Comm comm) if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else { - int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1; + int rank = smpi_process()->index(); instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1); extra->type = TRACING_BARRIER; - TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra); + TRACE_smpi_collective_in(rank, __FUNCTION__, extra); simgrid::smpi::Colls::barrier(comm); @@ -71,7 +66,7 @@ int PMPI_Barrier(MPI_Comm comm) retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank); } smpi_bench_begin(); @@ -101,29 +96,23 @@ int PMPI_Gather(void *sendbuf, int sendcount, MPI_Datatype sendtype,void *recvbu sendtmpcount=0; sendtmptype=recvtype; } - int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1; + int rank = smpi_process()->index(); int root_traced = comm->group()->index(root); instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1); extra->type = TRACING_GATHER; extra->root = root_traced; - int known = 0; - extra->datatype1 = encode_datatype(sendtmptype, &known); - int dt_size_send = 1; - if (known == 0) - dt_size_send = sendtmptype->size(); - extra->send_size = sendtmpcount * dt_size_send; - extra->datatype2 = encode_datatype(recvtype, &known); - int dt_size_recv = 1; - if ((comm->rank() == root) && known == 0) - dt_size_recv = recvtype->size(); - extra->recv_size = recvcount * dt_size_recv; - - TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__, extra); + + extra->datatype1 = encode_datatype(sendtmptype); + extra->send_size = sendtmptype->is_basic() ? sendtmpcount : sendtmpcount * sendtmptype->size(); + extra->datatype2 = encode_datatype(recvtype); + extra->recv_size = (comm->rank() != root || recvtype->is_basic()) ? recvcount : recvcount * recvtype->size(); + + TRACE_smpi_collective_in(rank, __FUNCTION__, extra); simgrid::smpi::Colls::gather(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcount, recvtype, root, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); + TRACE_smpi_collective_out(rank); } smpi_bench_begin(); @@ -155,32 +144,26 @@ int PMPI_Gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recv sendtmptype=recvtype; } - int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1; - int root_traced = comm->group()->index(root); - int size = comm->size(); + int rank = smpi_process()->index(); instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1); extra->type = TRACING_GATHERV; - extra->num_processes = size; - extra->root = root_traced; - int known = 0; - extra->datatype1 = encode_datatype(sendtmptype, &known); - int dt_size_send = 1; - if (known == 0) - dt_size_send = sendtype->size(); - extra->send_size = sendtmpcount * dt_size_send; - extra->datatype2 = encode_datatype(recvtype, &known); - int dt_size_recv = 1; - if (known == 0) - dt_size_recv = recvtype->size(); + extra->num_processes = comm->size(); + extra->root = comm->group()->index(root); + + extra->datatype1 = encode_datatype(sendtmptype); + extra->send_size = sendtmptype->is_basic() ? sendtmpcount : sendtmpcount * sendtmptype->size(); + extra->datatype2 = encode_datatype(recvtype); + int dt_size_recv = recvtype->is_basic() ? 1 : recvtype->size(); + if (comm->rank() == root) { - extra->recvcounts = xbt_new(int, size); - for (int i = 0; i < size; i++) // copy data to avoid bad free + extra->recvcounts = new int[extra->num_processes]; + for (int i = 0; i < extra->num_processes; i++) // copy data to avoid bad free extra->recvcounts[i] = recvcounts[i] * dt_size_recv; } - TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__, extra); + TRACE_smpi_collective_in(rank, __FUNCTION__, extra); retval = simgrid::smpi::Colls::gatherv(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcounts, displs, recvtype, root, comm); - TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); + TRACE_smpi_collective_out(rank); } smpi_bench_begin(); @@ -208,26 +191,20 @@ int PMPI_Allgather(void *sendbuf, int sendcount, MPI_Datatype sendtype, sendcount=recvcount; sendtype=recvtype; } - int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1; + int rank = smpi_process()->index(); instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1); extra->type = TRACING_ALLGATHER; - int known = 0; - extra->datatype1 = encode_datatype(sendtype, &known); - int dt_size_send = 1; - if (known == 0) - dt_size_send = sendtype->size(); - extra->send_size = sendcount * dt_size_send; - extra->datatype2 = encode_datatype(recvtype, &known); - int dt_size_recv = 1; - if (known == 0) - dt_size_recv = recvtype->size(); - extra->recv_size = recvcount * dt_size_recv; - - TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra); + + extra->datatype1 = encode_datatype(sendtype); + extra->send_size = sendtype->is_basic() ? sendcount : sendcount * sendtype->size(); + extra->datatype2 = encode_datatype(recvtype); + extra->recv_size = recvtype->is_basic() ? recvcount : recvcount * recvtype->size(); + + TRACE_smpi_collective_in(rank, __FUNCTION__, extra); simgrid::smpi::Colls::allgather(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank); } smpi_bench_begin(); return retval; @@ -255,31 +232,24 @@ int PMPI_Allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, sendcount=recvcounts[comm->rank()]; sendtype=recvtype; } - int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1; - int i = 0; - int size = comm->size(); + int rank = smpi_process()->index(); instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1); extra->type = TRACING_ALLGATHERV; - extra->num_processes = size; - int known = 0; - extra->datatype1 = encode_datatype(sendtype, &known); - int dt_size_send = 1; - if (known == 0) - dt_size_send = sendtype->size(); - extra->send_size = sendcount * dt_size_send; - extra->datatype2 = encode_datatype(recvtype, &known); - int dt_size_recv = 1; - if (known == 0) - dt_size_recv = recvtype->size(); - extra->recvcounts = xbt_new(int, size); - for (i = 0; i < size; i++) // copy data to avoid bad free + extra->num_processes = comm->size(); + extra->datatype1 = encode_datatype(sendtype); + extra->send_size = sendtype->is_basic() ? sendcount : sendcount * sendtype->size(); + extra->datatype2 = encode_datatype(recvtype); + int dt_size_recv = recvtype->is_basic() ? 1 : recvtype->size(); + + extra->recvcounts = new int[extra->num_processes]; + for (int i = 0; i < extra->num_processes; i++) // copy data to avoid bad free extra->recvcounts[i] = recvcounts[i] * dt_size_recv; - TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra); + TRACE_smpi_collective_in(rank, __FUNCTION__, extra); simgrid::smpi::Colls::allgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank); } smpi_bench_begin(); @@ -307,27 +277,22 @@ int PMPI_Scatter(void *sendbuf, int sendcount, MPI_Datatype sendtype, recvtype = sendtype; recvcount = sendcount; } - int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1; + int rank = smpi_process()->index(); int root_traced = comm->group()->index(root); instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1); extra->type = TRACING_SCATTER; extra->root = root_traced; - int known = 0; - extra->datatype1 = encode_datatype(sendtype, &known); - int dt_size_send = 1; - if ((comm->rank() == root) && known == 0) - dt_size_send = sendtype->size(); - extra->send_size = sendcount * dt_size_send; - extra->datatype2 = encode_datatype(recvtype, &known); - int dt_size_recv = 1; - if (known == 0) - dt_size_recv = recvtype->size(); - extra->recv_size = recvcount * dt_size_recv; - TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__, extra); + + extra->datatype1 = encode_datatype(sendtype); + extra->send_size = (comm->rank() != root || sendtype->is_basic()) ? sendcount : sendcount * sendtype->size(); + extra->datatype2 = encode_datatype(recvtype); + extra->recv_size = recvtype->is_basic() ? recvcount : recvcount * recvtype->size(); + + TRACE_smpi_collective_in(rank, __FUNCTION__, extra); simgrid::smpi::Colls::scatter(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); + TRACE_smpi_collective_out(rank); } smpi_bench_begin(); @@ -353,33 +318,26 @@ int PMPI_Scatterv(void *sendbuf, int *sendcounts, int *displs, recvtype = sendtype; recvcount = sendcounts[comm->rank()]; } - int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1; - int root_traced = comm->group()->index(root); - int size = comm->size(); + int rank = smpi_process()->index(); instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1); extra->type = TRACING_SCATTERV; - extra->num_processes = size; - extra->root = root_traced; - int known = 0; - extra->datatype1 = encode_datatype(sendtype, &known); - int dt_size_send = 1; - if (known == 0) - dt_size_send = sendtype->size(); + extra->num_processes = comm->size(); + extra->root = comm->group()->index(root); + extra->datatype1 = encode_datatype(sendtype); + extra->datatype2 = encode_datatype(recvtype); + int dt_size_send = sendtype->is_basic() ? 1 : sendtype->size(); + extra->recv_size = recvtype->is_basic() ? recvcount : recvcount * recvtype->size(); if (comm->rank() == root) { - extra->sendcounts = xbt_new(int, size); - for (int i = 0; i < size; i++) // copy data to avoid bad free + extra->sendcounts = new int[extra->num_processes]; + for (int i = 0; i < extra->num_processes; i++) // copy data to avoid bad free extra->sendcounts[i] = sendcounts[i] * dt_size_send; } - extra->datatype2 = encode_datatype(recvtype, &known); - int dt_size_recv = 1; - if (known == 0) - dt_size_recv = recvtype->size(); - extra->recv_size = recvcount * dt_size_recv; - TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__, extra); + + TRACE_smpi_collective_in(rank, __FUNCTION__, extra); retval = simgrid::smpi::Colls::scatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, recvcount, recvtype, root, comm); - TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); + TRACE_smpi_collective_out(rank); } smpi_bench_begin(); @@ -397,24 +355,20 @@ int PMPI_Reduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, } else if (not datatype->is_valid() || op == MPI_OP_NULL) { retval = MPI_ERR_ARG; } else { - int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1; - int root_traced = comm->group()->index(root); + int rank = smpi_process()->index(); + instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1); + extra->root = comm->group()->index(root); extra->type = TRACING_REDUCE; - int known = 0; - extra->datatype1 = encode_datatype(datatype, &known); - int dt_size_send = 1; - if (known == 0) - dt_size_send = datatype->size(); - extra->send_size = count * dt_size_send; - extra->root = root_traced; + extra->datatype1 = encode_datatype(datatype); + extra->send_size = datatype->is_basic() ? count : count * datatype->size(); - TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__, extra); + TRACE_smpi_collective_in(rank, __FUNCTION__, extra); simgrid::smpi::Colls::reduce(sendbuf, recvbuf, count, datatype, op, root, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); + TRACE_smpi_collective_out(rank); } smpi_bench_begin(); @@ -454,17 +408,14 @@ int PMPI_Allreduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatyp sendtmpbuf = static_cast(xbt_malloc(count*datatype->get_extent())); simgrid::smpi::Datatype::copy(recvbuf, count, datatype,sendtmpbuf, count, datatype); } - int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1; + int rank = smpi_process()->index(); instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1); extra->type = TRACING_ALLREDUCE; - int known = 0; - extra->datatype1 = encode_datatype(datatype, &known); - int dt_size_send = 1; - if (known == 0) - dt_size_send = datatype->size(); - extra->send_size = count * dt_size_send; - TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra); + extra->datatype1 = encode_datatype(datatype); + extra->send_size = datatype->is_basic() ? count : count * datatype->size(); + + TRACE_smpi_collective_in(rank, __FUNCTION__, extra); simgrid::smpi::Colls::allreduce(sendtmpbuf, recvbuf, count, datatype, op, comm); @@ -472,7 +423,7 @@ int PMPI_Allreduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatyp xbt_free(sendtmpbuf); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank); } smpi_bench_begin(); @@ -492,21 +443,18 @@ int PMPI_Scan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MP } else if (op == MPI_OP_NULL) { retval = MPI_ERR_OP; } else { - int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1; + int rank = smpi_process()->index(); instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1); extra->type = TRACING_SCAN; - int known = 0; - extra->datatype1 = encode_datatype(datatype, &known); - int dt_size_send = 1; - if (known == 0) - dt_size_send = datatype->size(); - extra->send_size = count * dt_size_send; - TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra); + extra->datatype1 = encode_datatype(datatype); + extra->send_size = datatype->is_basic() ? count : count * datatype->size(); + + TRACE_smpi_collective_in(rank, __FUNCTION__, extra); retval = simgrid::smpi::Colls::scan(sendbuf, recvbuf, count, datatype, op, comm); - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank); } smpi_bench_begin(); @@ -525,25 +473,21 @@ int PMPI_Exscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, } else if (op == MPI_OP_NULL) { retval = MPI_ERR_OP; } else { - int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1; + int rank = smpi_process()->index(); instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1); extra->type = TRACING_EXSCAN; - int known = 0; - extra->datatype1 = encode_datatype(datatype, &known); - int dt_size_send = 1; - if (known == 0) - dt_size_send = datatype->size(); - extra->send_size = count * dt_size_send; + extra->datatype1 = encode_datatype(datatype); + extra->send_size = datatype->is_basic() ? count : count * datatype->size(); void* sendtmpbuf = sendbuf; if (sendbuf == MPI_IN_PLACE) { sendtmpbuf = static_cast(xbt_malloc(count * datatype->size())); memcpy(sendtmpbuf, recvbuf, count * datatype->size()); } - TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra); + TRACE_smpi_collective_in(rank, __FUNCTION__, extra); retval = simgrid::smpi::Colls::exscan(sendtmpbuf, recvbuf, count, datatype, op, comm); - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank); if (sendbuf == MPI_IN_PLACE) xbt_free(sendtmpbuf); } @@ -566,22 +510,19 @@ int PMPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, MPI_Datat } else if (recvcounts == nullptr) { retval = MPI_ERR_ARG; } else { - int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1; - int i = 0; - int size = comm->size(); + int rank = smpi_process()->index(); instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1); extra->type = TRACING_REDUCE_SCATTER; - extra->num_processes = size; - int known = 0; - extra->datatype1 = encode_datatype(datatype, &known); - int dt_size_send = 1; - if (known == 0) - dt_size_send = datatype->size(); - extra->send_size = 0; - extra->recvcounts = xbt_new(int, size); + extra->num_processes = comm->size(); + ; + extra->type = TRACING_EXSCAN; + extra->datatype1 = encode_datatype(datatype); + extra->send_size = datatype->is_basic() ? 1 : datatype->size(); + + extra->recvcounts = new int[extra->num_processes]; int totalcount = 0; - for (i = 0; i < size; i++) { // copy data to avoid bad free - extra->recvcounts[i] = recvcounts[i] * dt_size_send; + for (int i = 0; i < extra->num_processes; i++) { // copy data to avoid bad free + extra->recvcounts[i] = recvcounts[i] * extra->send_size; totalcount += recvcounts[i]; } void* sendtmpbuf = sendbuf; @@ -590,11 +531,11 @@ int PMPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, MPI_Datat memcpy(sendtmpbuf, recvbuf, totalcount * datatype->size()); } - TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra); + TRACE_smpi_collective_in(rank, __FUNCTION__, extra); simgrid::smpi::Colls::reduce_scatter(sendtmpbuf, recvbuf, recvcounts, datatype, op, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank); if (sendbuf == MPI_IN_PLACE) xbt_free(sendtmpbuf); @@ -621,18 +562,15 @@ int PMPI_Reduce_scatter_block(void *sendbuf, void *recvbuf, int recvcount, } else { int count = comm->size(); - int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1; + int rank = smpi_process()->index(); instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1); extra->type = TRACING_REDUCE_SCATTER; extra->num_processes = count; - int known = 0; - extra->datatype1 = encode_datatype(datatype, &known); - int dt_size_send = 1; - if (known == 0) - dt_size_send = datatype->size(); - extra->send_size = 0; - extra->recvcounts = xbt_new(int, count); - for (int i = 0; i < count; i++) // copy data to avoid bad free + extra->datatype1 = encode_datatype(datatype); + int dt_size_send = datatype->is_basic() ? 1 : datatype->size(); + extra->send_size = 0; + extra->recvcounts = new int[extra->num_processes]; + for (int i = 0; i < extra->num_processes; i++) // copy data to avoid bad free extra->recvcounts[i] = recvcount * dt_size_send; void* sendtmpbuf = sendbuf; if (sendbuf == MPI_IN_PLACE) { @@ -640,16 +578,16 @@ int PMPI_Reduce_scatter_block(void *sendbuf, void *recvbuf, int recvcount, memcpy(sendtmpbuf, recvbuf, recvcount * count * datatype->size()); } - TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra); + TRACE_smpi_collective_in(rank, __FUNCTION__, extra); - int* recvcounts = static_cast(xbt_malloc(count * sizeof(int))); + int* recvcounts = new int[count]; for (int i = 0; i < count; i++) recvcounts[i] = recvcount; simgrid::smpi::Colls::reduce_scatter(sendtmpbuf, recvbuf, recvcounts, datatype, op, comm); - xbt_free(recvcounts); + delete[] recvcounts; retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank); if (sendbuf == MPI_IN_PLACE) xbt_free(sendtmpbuf); @@ -670,7 +608,7 @@ int PMPI_Alltoall(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* rec } else if ((sendbuf != MPI_IN_PLACE && sendtype == MPI_DATATYPE_NULL) || recvtype == MPI_DATATYPE_NULL) { retval = MPI_ERR_TYPE; } else { - int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1; + int rank = smpi_process()->index(); instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1); extra->type = TRACING_ALLTOALL; @@ -684,23 +622,16 @@ int PMPI_Alltoall(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* rec sendtmptype = recvtype; } - int known = 0; - extra->datatype1 = encode_datatype(sendtmptype, &known); - if (known == 0) - extra->send_size = sendtmpcount * sendtmptype->size(); - else - extra->send_size = sendtmpcount; - extra->datatype2 = encode_datatype(recvtype, &known); - if (known == 0) - extra->recv_size = recvcount * recvtype->size(); - else - extra->recv_size = recvcount; + extra->datatype1 = encode_datatype(sendtmptype); + extra->send_size = sendtmptype->is_basic() ? sendtmpcount : sendtmpcount * sendtmptype->size(); + extra->datatype2 = encode_datatype(recvtype); + extra->recv_size = recvtype->is_basic() ? recvcount : recvcount * recvtype->size(); - TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra); + TRACE_smpi_collective_in(rank, __FUNCTION__, extra); retval = simgrid::smpi::Colls::alltoall(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcount, recvtype, comm); - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank); if (sendbuf == MPI_IN_PLACE) xbt_free(sendtmpbuf); @@ -725,17 +656,16 @@ int PMPI_Alltoallv(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype recvdisps == nullptr) { retval = MPI_ERR_ARG; } else { - int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1; + int rank = smpi_process()->index(); int i = 0; int size = comm->size(); instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1); extra->type = TRACING_ALLTOALLV; extra->send_size = 0; extra->recv_size = 0; - extra->recvcounts = xbt_new(int, size); - extra->sendcounts = xbt_new(int, size); - int known = 0; - extra->datatype2 = encode_datatype(recvtype, &known); + extra->recvcounts = new int[size]; + extra->sendcounts = new int[size]; + extra->datatype2 = encode_datatype(recvtype); int dt_size_recv = recvtype->size(); void* sendtmpbuf = static_cast(sendbuf); @@ -760,7 +690,7 @@ int PMPI_Alltoallv(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype sendtmptype = recvtype; } - extra->datatype1 = encode_datatype(sendtmptype, &known); + extra->datatype1 = encode_datatype(sendtmptype); int dt_size_send = sendtmptype->size(); for (i = 0; i < size; i++) { // copy data to avoid bad free @@ -768,10 +698,10 @@ int PMPI_Alltoallv(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype extra->sendcounts[i] = sendtmpcounts[i] * dt_size_send; } extra->num_processes = size; - TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra); + TRACE_smpi_collective_in(rank, __FUNCTION__, extra); retval = simgrid::smpi::Colls::alltoallv(sendtmpbuf, sendtmpcounts, sendtmpdisps, sendtmptype, recvbuf, recvcounts, recvdisps, recvtype, comm); - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank); if (sendbuf == MPI_IN_PLACE) { xbt_free(sendtmpbuf);