X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1fc042e8bc9c51f9267fa1936deaebe59ae01ee7..6d18625ebd53e7e4218e8892aea37a64449f1f27:/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 b642343b49..21b287c18b 100644 --- a/src/smpi/bindings/smpi_pmpi_coll.cpp +++ b/src/smpi/bindings/smpi_pmpi_coll.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -12,9 +12,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smpi_pmpi); - /* PMPI User level calls */ -extern "C" { // Obviously, the C MPI interface should use the C linkage int PMPI_Bcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm) { @@ -27,24 +25,16 @@ 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 = 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, __FUNCTION__, extra); + int rank = simgrid::s4u::this_actor::get_pid(); + TRACE_smpi_comm_in(rank, __func__, + new simgrid::instr::CollTIData("bcast", root, -1.0, + datatype->is_replayable() ? count : count * datatype->size(), -1, + simgrid::smpi::Datatype::encode(datatype), "")); if (comm->size() > 1) simgrid::smpi::Colls::bcast(buf, count, datatype, root, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, __FUNCTION__); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); return retval; @@ -59,10 +49,8 @@ int PMPI_Barrier(MPI_Comm comm) if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else { - 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, __FUNCTION__, extra); + int rank = simgrid::s4u::this_actor::get_pid(); + TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::NoOpTIData("barrier")); simgrid::smpi::Colls::barrier(comm); @@ -71,7 +59,7 @@ int PMPI_Barrier(MPI_Comm comm) retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, __FUNCTION__); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); @@ -101,29 +89,19 @@ int PMPI_Gather(void *sendbuf, int sendcount, MPI_Datatype sendtype,void *recvbu sendtmpcount=0; sendtmptype=recvtype; } - 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, __FUNCTION__, extra); + int rank = simgrid::s4u::this_actor::get_pid(); + + TRACE_smpi_comm_in( + rank, __func__, + new simgrid::instr::CollTIData( + "gather", root, -1.0, sendtmptype->is_replayable() ? sendtmpcount : sendtmpcount * sendtmptype->size(), + (comm->rank() != root || recvtype->is_replayable()) ? recvcount : recvcount * recvtype->size(), + simgrid::smpi::Datatype::encode(sendtmptype), simgrid::smpi::Datatype::encode(recvtype))); simgrid::smpi::Colls::gather(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcount, recvtype, root, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, __FUNCTION__); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); @@ -144,7 +122,7 @@ int PMPI_Gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recv retval = MPI_ERR_TYPE; } else if (( sendbuf != MPI_IN_PLACE) && (sendcount <0)){ retval = MPI_ERR_COUNT; - } else if (recvcounts == nullptr || displs == nullptr) { + } else if ((comm->rank() == root) && (recvcounts == nullptr || displs == nullptr)) { retval = MPI_ERR_ARG; } else { char* sendtmpbuf = static_cast(sendbuf); @@ -155,32 +133,24 @@ int PMPI_Gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recv sendtmptype=recvtype; } - int rank = smpi_process()->index(); - int root_traced = comm->group()->index(root); - int size = comm->size(); - 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(); + int rank = simgrid::s4u::this_actor::get_pid(); + int dt_size_recv = recvtype->is_replayable() ? 1 : recvtype->size(); + + std::vector* trace_recvcounts = new std::vector; 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[i] = recvcounts[i] * dt_size_recv; + for (int i = 0; i < comm->size(); i++) // copy data to avoid bad free + trace_recvcounts->push_back(recvcounts[i] * dt_size_recv); } - TRACE_smpi_collective_in(rank, __FUNCTION__, extra); + + TRACE_smpi_comm_in(rank, __func__, + new simgrid::instr::VarCollTIData( + "gatherV", root, + sendtmptype->is_replayable() ? sendtmpcount : sendtmpcount * sendtmptype->size(), nullptr, + dt_size_recv, trace_recvcounts, simgrid::smpi::Datatype::encode(sendtmptype), + simgrid::smpi::Datatype::encode(recvtype))); retval = simgrid::smpi::Colls::gatherv(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcounts, displs, recvtype, root, comm); - TRACE_smpi_collective_out(rank, __FUNCTION__); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); @@ -190,7 +160,7 @@ int PMPI_Gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recv int PMPI_Allgather(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm) { - int retval = 0; + int retval = MPI_SUCCESS; smpi_bench_end(); @@ -208,26 +178,16 @@ int PMPI_Allgather(void *sendbuf, int sendcount, MPI_Datatype sendtype, sendcount=recvcount; sendtype=recvtype; } - 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, __FUNCTION__, extra); + int rank = simgrid::s4u::this_actor::get_pid(); + + TRACE_smpi_comm_in(rank, __func__, + new simgrid::instr::CollTIData( + "allGather", -1, -1.0, sendtype->is_replayable() ? sendcount : sendcount * sendtype->size(), + recvtype->is_replayable() ? recvcount : recvcount * recvtype->size(), + simgrid::smpi::Datatype::encode(sendtype), simgrid::smpi::Datatype::encode(recvtype))); simgrid::smpi::Colls::allgather(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm); - retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, __FUNCTION__); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); return retval; @@ -255,31 +215,22 @@ int PMPI_Allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, sendcount=recvcounts[comm->rank()]; sendtype=recvtype; } - 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_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->recvcounts[i] = recvcounts[i] * dt_size_recv; - - TRACE_smpi_collective_in(rank, __FUNCTION__, extra); + int rank = simgrid::s4u::this_actor::get_pid(); + int dt_size_recv = recvtype->is_replayable() ? 1 : recvtype->size(); + + std::vector* trace_recvcounts = new std::vector; + for (int i = 0; i < comm->size(); i++) // copy data to avoid bad free + trace_recvcounts->push_back(recvcounts[i] * dt_size_recv); + + TRACE_smpi_comm_in(rank, __func__, + new simgrid::instr::VarCollTIData( + "allgatherv", -1, sendtype->is_replayable() ? sendcount : sendcount * sendtype->size(), + nullptr, dt_size_recv, trace_recvcounts, simgrid::smpi::Datatype::encode(sendtype), + simgrid::smpi::Datatype::encode(recvtype))); simgrid::smpi::Colls::allgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, __FUNCTION__); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); @@ -307,27 +258,19 @@ int PMPI_Scatter(void *sendbuf, int sendcount, MPI_Datatype sendtype, recvtype = sendtype; recvcount = sendcount; } - 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, __FUNCTION__, extra); + int rank = simgrid::s4u::this_actor::get_pid(); + + TRACE_smpi_comm_in( + rank, __func__, + new simgrid::instr::CollTIData( + "scatter", root, -1.0, + (comm->rank() != root || sendtype->is_replayable()) ? sendcount : sendcount * sendtype->size(), + recvtype->is_replayable() ? recvcount : recvcount * recvtype->size(), + simgrid::smpi::Datatype::encode(sendtype), simgrid::smpi::Datatype::encode(recvtype))); simgrid::smpi::Colls::scatter(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, __FUNCTION__); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); @@ -353,33 +296,24 @@ int PMPI_Scatterv(void *sendbuf, int *sendcounts, int *displs, recvtype = sendtype; recvcount = sendcounts[comm->rank()]; } - int rank = smpi_process()->index(); - int root_traced = comm->group()->index(root); - int size = comm->size(); - 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(); + int rank = simgrid::s4u::this_actor::get_pid(); + int dt_size_send = sendtype->is_replayable() ? 1 : sendtype->size(); + + std::vector* trace_sendcounts = new std::vector; 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[i] = sendcounts[i] * dt_size_send; + for (int i = 0; i < comm->size(); i++) // copy data to avoid bad free + trace_sendcounts->push_back(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, __FUNCTION__, extra); + + TRACE_smpi_comm_in(rank, __func__, + new simgrid::instr::VarCollTIData( + "scatterV", root, dt_size_send, trace_sendcounts, + recvtype->is_replayable() ? recvcount : recvcount * recvtype->size(), nullptr, + simgrid::smpi::Datatype::encode(sendtype), simgrid::smpi::Datatype::encode(recvtype))); retval = simgrid::smpi::Colls::scatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, recvcount, recvtype, root, comm); - TRACE_smpi_collective_out(rank, __FUNCTION__); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); @@ -397,24 +331,17 @@ 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 = 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_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; - - TRACE_smpi_collective_in(rank, __FUNCTION__, extra); + int rank = simgrid::s4u::this_actor::get_pid(); + + TRACE_smpi_comm_in(rank, __func__, + new simgrid::instr::CollTIData("reduce", root, 0, + datatype->is_replayable() ? count : count * datatype->size(), -1, + simgrid::smpi::Datatype::encode(datatype), "")); simgrid::smpi::Colls::reduce(sendbuf, recvbuf, count, datatype, op, root, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, __FUNCTION__); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); @@ -454,17 +381,12 @@ 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 = 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, __FUNCTION__, extra); + int rank = simgrid::s4u::this_actor::get_pid(); + + TRACE_smpi_comm_in(rank, __func__, + new simgrid::instr::CollTIData("allreduce", -1, 0, + datatype->is_replayable() ? count : count * datatype->size(), -1, + simgrid::smpi::Datatype::encode(datatype), "")); simgrid::smpi::Colls::allreduce(sendtmpbuf, recvbuf, count, datatype, op, comm); @@ -472,7 +394,7 @@ int PMPI_Allreduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatyp xbt_free(sendtmpbuf); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, __FUNCTION__); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); @@ -492,21 +414,21 @@ 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 = 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, __FUNCTION__, extra); + 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()); + } + TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::Pt2PtTIData( + "scan", -1, datatype->is_replayable() ? count : count * datatype->size(), + simgrid::smpi::Datatype::encode(datatype))); - retval = simgrid::smpi::Colls::scan(sendbuf, recvbuf, count, datatype, op, comm); + retval = simgrid::smpi::Colls::scan(sendtmpbuf, recvbuf, count, datatype, op, comm); - TRACE_smpi_collective_out(rank, __FUNCTION__); + TRACE_smpi_comm_out(rank); + if (sendbuf == MPI_IN_PLACE) + xbt_free(sendtmpbuf); } smpi_bench_begin(); @@ -525,25 +447,20 @@ 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 = 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; + 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()); } - TRACE_smpi_collective_in(rank, __FUNCTION__, extra); + + TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::Pt2PtTIData( + "exscan", -1, datatype->is_replayable() ? count : count * datatype->size(), + simgrid::smpi::Datatype::encode(datatype))); retval = simgrid::smpi::Colls::exscan(sendtmpbuf, recvbuf, count, datatype, op, comm); - TRACE_smpi_collective_out(rank, __FUNCTION__); + TRACE_smpi_comm_out(rank); if (sendbuf == MPI_IN_PLACE) xbt_free(sendtmpbuf); } @@ -566,35 +483,29 @@ int PMPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, MPI_Datat } else if (recvcounts == nullptr) { retval = MPI_ERR_ARG; } else { - 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_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); + int rank = simgrid::s4u::this_actor::get_pid(); + std::vector* trace_recvcounts = new std::vector; + int dt_send_size = datatype->is_replayable() ? 1 : datatype->size(); 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 < comm->size(); i++) { // copy data to avoid bad free + 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()); } - TRACE_smpi_collective_in(rank, __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::VarCollTIData( + "reduceScatter", -1, dt_send_size, nullptr, -1, trace_recvcounts, + simgrid::smpi::Datatype::encode(datatype), "")); simgrid::smpi::Colls::reduce_scatter(sendtmpbuf, recvbuf, recvcounts, datatype, op, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, __FUNCTION__); + TRACE_smpi_comm_out(rank); if (sendbuf == MPI_IN_PLACE) xbt_free(sendtmpbuf); @@ -621,35 +532,28 @@ int PMPI_Reduce_scatter_block(void *sendbuf, void *recvbuf, int recvcount, } else { int count = 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 = 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->recvcounts[i] = recvcount * dt_size_send; + 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()); } - TRACE_smpi_collective_in(rank, __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __func__, + new simgrid::instr::VarCollTIData("reduceScatter", -1, 0, nullptr, -1, trace_recvcounts, + simgrid::smpi::Datatype::encode(datatype), "")); - 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, __FUNCTION__); + TRACE_smpi_comm_out(rank); if (sendbuf == MPI_IN_PLACE) xbt_free(sendtmpbuf); @@ -670,10 +574,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 = smpi_process()->index(); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1); - extra->type = TRACING_ALLTOALL; - + int rank = simgrid::s4u::this_actor::get_pid(); void* sendtmpbuf = static_cast(sendbuf); int sendtmpcount = sendcount; MPI_Datatype sendtmptype = sendtype; @@ -684,23 +585,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; - - TRACE_smpi_collective_in(rank, __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __func__, + new simgrid::instr::CollTIData( + "allToAll", -1, -1.0, + sendtmptype->is_replayable() ? sendtmpcount : sendtmpcount * sendtmptype->size(), + recvtype->is_replayable() ? recvcount : recvcount * recvtype->size(), + simgrid::smpi::Datatype::encode(sendtmptype), simgrid::smpi::Datatype::encode(recvtype))); retval = simgrid::smpi::Colls::alltoall(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcount, recvtype, comm); - TRACE_smpi_collective_out(rank, __FUNCTION__); + TRACE_smpi_comm_out(rank); if (sendbuf == MPI_IN_PLACE) xbt_free(sendtmpbuf); @@ -725,17 +619,12 @@ int PMPI_Alltoallv(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype recvdisps == nullptr) { retval = MPI_ERR_ARG; } else { - int rank = smpi_process()->index(); - int i = 0; + int rank = simgrid::s4u::this_actor::get_pid(); 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); + int send_size = 0; + int recv_size = 0; + std::vector* trace_sendcounts = new std::vector; + std::vector* trace_recvcounts = new std::vector; int dt_size_recv = recvtype->size(); void* sendtmpbuf = static_cast(sendbuf); @@ -743,9 +632,9 @@ int PMPI_Alltoallv(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype int* sendtmpdisps = senddisps; MPI_Datatype sendtmptype = sendtype; int maxsize = 0; - for (i = 0; i < size; i++) { // copy data to avoid bad free - extra->recv_size += recvcounts[i] * dt_size_recv; - extra->recvcounts[i] = recvcounts[i] * dt_size_recv; + for (int i = 0; i < size; i++) { // copy data to avoid bad free + recv_size += recvcounts[i] * dt_size_recv; + trace_recvcounts->push_back(recvcounts[i] * dt_size_recv); if (((recvdisps[i] + recvcounts[i]) * dt_size_recv) > maxsize) maxsize = (recvdisps[i] + recvcounts[i]) * dt_size_recv; } @@ -760,18 +649,21 @@ int PMPI_Alltoallv(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype sendtmptype = recvtype; } - extra->datatype1 = encode_datatype(sendtmptype, &known); int dt_size_send = sendtmptype->size(); - for (i = 0; i < size; i++) { // copy data to avoid bad free - extra->send_size += sendtmpcounts[i] * dt_size_send; - extra->sendcounts[i] = sendtmpcounts[i] * dt_size_send; + 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); } - extra->num_processes = size; - TRACE_smpi_collective_in(rank, __FUNCTION__, extra); + + TRACE_smpi_comm_in(rank, __func__, + new simgrid::instr::VarCollTIData("allToAllV", -1, send_size, trace_sendcounts, recv_size, + trace_recvcounts, simgrid::smpi::Datatype::encode(sendtype), + simgrid::smpi::Datatype::encode(recvtype))); + retval = simgrid::smpi::Colls::alltoallv(sendtmpbuf, sendtmpcounts, sendtmpdisps, sendtmptype, recvbuf, recvcounts, recvdisps, recvtype, comm); - TRACE_smpi_collective_out(rank, __FUNCTION__); + TRACE_smpi_comm_out(rank); if (sendbuf == MPI_IN_PLACE) { xbt_free(sendtmpbuf); @@ -783,5 +675,3 @@ int PMPI_Alltoallv(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype smpi_bench_begin(); return retval; } - -}