From 0e0330bec48d7c0855e18c247402473fad79222f Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Tue, 7 Nov 2017 19:13:04 +0100 Subject: [PATCH] merge identical functions --- src/instr/instr_smpi.hpp | 6 +- src/smpi/bindings/smpi_pmpi.cpp | 8 +-- src/smpi/bindings/smpi_pmpi_coll.cpp | 64 +++++++++--------- src/smpi/bindings/smpi_pmpi_request.cpp | 40 +++++------ src/smpi/bindings/smpi_pmpi_win.cpp | 88 ++++++++++++------------- src/smpi/internals/instr_smpi.cpp | 23 +------ src/smpi/internals/smpi_replay.cpp | 76 ++++++++++----------- 7 files changed, 142 insertions(+), 163 deletions(-) diff --git a/src/instr/instr_smpi.hpp b/src/instr/instr_smpi.hpp index cb43e4e631..55d33168c3 100644 --- a/src/instr/instr_smpi.hpp +++ b/src/instr/instr_smpi.hpp @@ -16,8 +16,6 @@ extern "C" { XBT_PRIVATE void TRACE_internal_smpi_set_category(const char* category); XBT_PRIVATE const char* TRACE_internal_smpi_get_category(); -XBT_PRIVATE void TRACE_smpi_collective_in(int rank, const char* operation, instr_extra_data extra); -XBT_PRIVATE void TRACE_smpi_collective_out(int rank); XBT_PRIVATE void TRACE_smpi_computing_init(int rank); XBT_PRIVATE void TRACE_smpi_computing_out(int rank); XBT_PRIVATE void TRACE_smpi_computing_in(int rank, instr_extra_data extra); @@ -28,8 +26,8 @@ XBT_PRIVATE void TRACE_smpi_testing_out(int rank); XBT_PRIVATE void TRACE_smpi_testing_in(int rank, instr_extra_data extra); XBT_PRIVATE void TRACE_smpi_alloc(); XBT_PRIVATE void TRACE_smpi_release(); -XBT_PRIVATE void TRACE_smpi_ptp_in(int rank, const char* operation, instr_extra_data extra); -XBT_PRIVATE void TRACE_smpi_ptp_out(int rank); +XBT_PRIVATE void TRACE_smpi_comm_in(int rank, const char* operation, instr_extra_data extra); +XBT_PRIVATE void TRACE_smpi_comm_out(int rank); XBT_PRIVATE void TRACE_smpi_send(int rank, int src, int dst, int tag, int size); XBT_PRIVATE void TRACE_smpi_recv(int src, int dst, int tag); XBT_PRIVATE void TRACE_smpi_init(int rank); diff --git a/src/smpi/bindings/smpi_pmpi.cpp b/src/smpi/bindings/smpi_pmpi.cpp index 51cb5926bd..52bb7c6ec7 100644 --- a/src/smpi/bindings/smpi_pmpi.cpp +++ b/src/smpi/bindings/smpi_pmpi.cpp @@ -42,8 +42,8 @@ int PMPI_Init(int *argc, char ***argv) TRACE_smpi_computing_init(rank); instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); extra->type = TRACING_INIT; - TRACE_smpi_collective_in(rank, __FUNCTION__, extra); - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); + TRACE_smpi_comm_out(rank); smpi_bench_begin(); } @@ -58,11 +58,11 @@ int PMPI_Finalize() int rank = smpi_process()->index(); instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); extra->type = TRACING_FINALIZE; - TRACE_smpi_collective_in(rank, __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); smpi_process()->finalize(); - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(rank); TRACE_smpi_finalize(smpi_process()->index()); return MPI_SUCCESS; } diff --git a/src/smpi/bindings/smpi_pmpi_coll.cpp b/src/smpi/bindings/smpi_pmpi_coll.cpp index e5a7089ab2..f71f6c6b4d 100644 --- a/src/smpi/bindings/smpi_pmpi_coll.cpp +++ b/src/smpi/bindings/smpi_pmpi_coll.cpp @@ -34,12 +34,12 @@ int PMPI_Bcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm c extra->root = root_traced; extra->datatype1 = encode_datatype(datatype); extra->send_size = datatype->is_basic() ? count : count * datatype->size(); - TRACE_smpi_collective_in(rank, __FUNCTION__, extra); + TRACE_smpi_comm_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); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); return retval; @@ -57,7 +57,7 @@ int PMPI_Barrier(MPI_Comm comm) 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); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); simgrid::smpi::Colls::barrier(comm); @@ -66,7 +66,7 @@ int PMPI_Barrier(MPI_Comm comm) retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); @@ -107,12 +107,12 @@ int PMPI_Gather(void *sendbuf, int sendcount, MPI_Datatype sendtype,void *recvbu 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); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); simgrid::smpi::Colls::gather(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcount, recvtype, root, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); @@ -161,9 +161,9 @@ int PMPI_Gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recv extra->recvcounts[i] = recvcounts[i] * dt_size_recv; } - TRACE_smpi_collective_in(rank, __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); retval = simgrid::smpi::Colls::gatherv(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcounts, displs, recvtype, root, comm); - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); @@ -200,11 +200,11 @@ int PMPI_Allgather(void *sendbuf, int sendcount, MPI_Datatype sendtype, extra->datatype2 = encode_datatype(recvtype); extra->recv_size = recvtype->is_basic() ? recvcount : recvcount * recvtype->size(); - TRACE_smpi_collective_in(rank, __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); simgrid::smpi::Colls::allgather(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); return retval; @@ -245,11 +245,11 @@ int PMPI_Allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, 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, __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); simgrid::smpi::Colls::allgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); @@ -288,11 +288,11 @@ int PMPI_Scatter(void *sendbuf, int sendcount, MPI_Datatype sendtype, extra->datatype2 = encode_datatype(recvtype); extra->recv_size = recvtype->is_basic() ? recvcount : recvcount * recvtype->size(); - TRACE_smpi_collective_in(rank, __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); simgrid::smpi::Colls::scatter(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); @@ -333,11 +333,11 @@ int PMPI_Scatterv(void *sendbuf, int *sendcounts, int *displs, extra->sendcounts[i] = sendcounts[i] * dt_size_send; } - TRACE_smpi_collective_in(rank, __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); retval = simgrid::smpi::Colls::scatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, recvcount, recvtype, root, comm); - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); @@ -363,12 +363,12 @@ int PMPI_Reduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, extra->datatype1 = encode_datatype(datatype); extra->send_size = datatype->is_basic() ? count : count * datatype->size(); - TRACE_smpi_collective_in(rank, __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); simgrid::smpi::Colls::reduce(sendbuf, recvbuf, count, datatype, op, root, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); @@ -415,7 +415,7 @@ int PMPI_Allreduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatyp extra->datatype1 = encode_datatype(datatype); extra->send_size = datatype->is_basic() ? count : count * datatype->size(); - TRACE_smpi_collective_in(rank, __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); simgrid::smpi::Colls::allreduce(sendtmpbuf, recvbuf, count, datatype, op, comm); @@ -423,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); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); @@ -450,11 +450,11 @@ int PMPI_Scan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MP extra->datatype1 = encode_datatype(datatype); extra->send_size = datatype->is_basic() ? count : count * datatype->size(); - TRACE_smpi_collective_in(rank, __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); retval = simgrid::smpi::Colls::scan(sendbuf, recvbuf, count, datatype, op, comm); - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); @@ -483,11 +483,11 @@ int PMPI_Exscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, 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, __FUNCTION__, extra); retval = simgrid::smpi::Colls::exscan(sendtmpbuf, recvbuf, count, datatype, op, comm); - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(rank); if (sendbuf == MPI_IN_PLACE) xbt_free(sendtmpbuf); } @@ -531,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, __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); simgrid::smpi::Colls::reduce_scatter(sendtmpbuf, recvbuf, recvcounts, datatype, op, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(rank); if (sendbuf == MPI_IN_PLACE) xbt_free(sendtmpbuf); @@ -578,7 +578,7 @@ int PMPI_Reduce_scatter_block(void *sendbuf, void *recvbuf, int recvcount, memcpy(sendtmpbuf, recvbuf, recvcount * count * datatype->size()); } - TRACE_smpi_collective_in(rank, __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); int* recvcounts = new int[count]; for (int i = 0; i < count; i++) @@ -587,7 +587,7 @@ int PMPI_Reduce_scatter_block(void *sendbuf, void *recvbuf, int recvcount, delete[] recvcounts; retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(rank); if (sendbuf == MPI_IN_PLACE) xbt_free(sendtmpbuf); @@ -627,11 +627,11 @@ int PMPI_Alltoall(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* rec extra->datatype2 = encode_datatype(recvtype); extra->recv_size = recvtype->is_basic() ? recvcount : recvcount * recvtype->size(); - TRACE_smpi_collective_in(rank, __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); retval = simgrid::smpi::Colls::alltoall(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcount, recvtype, comm); - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(rank); if (sendbuf == MPI_IN_PLACE) xbt_free(sendtmpbuf); @@ -698,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, __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); retval = simgrid::smpi::Colls::alltoallv(sendtmpbuf, sendtmpcounts, sendtmpdisps, sendtmptype, recvbuf, recvcounts, recvdisps, recvtype, comm); - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(rank); if (sendbuf == MPI_IN_PLACE) { xbt_free(sendtmpbuf); diff --git a/src/smpi/bindings/smpi_pmpi_request.cpp b/src/smpi/bindings/smpi_pmpi_request.cpp index 601646fe6b..0e85db402c 100644 --- a/src/smpi/bindings/smpi_pmpi_request.cpp +++ b/src/smpi/bindings/smpi_pmpi_request.cpp @@ -165,12 +165,12 @@ int PMPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MP extra->dst = rank; extra->datatype1 = encode_datatype(datatype); extra->send_size = datatype->is_basic() ? count : count * datatype->size(); - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); *request = simgrid::smpi::Request::irecv(buf, count, datatype, src, tag, comm); retval = MPI_SUCCESS; - TRACE_smpi_ptp_out(rank); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); @@ -209,13 +209,13 @@ int PMPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MP extra->dst = dst_traced; extra->datatype1 = encode_datatype(datatype); extra->send_size = datatype->is_basic() ? count : count * datatype->size(); - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); TRACE_smpi_send(rank, rank, dst_traced, tag, count*datatype->size()); *request = simgrid::smpi::Request::isend(buf, count, datatype, dst, tag, comm); retval = MPI_SUCCESS; - TRACE_smpi_ptp_out(rank); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); @@ -253,13 +253,13 @@ int PMPI_Issend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, M extra->dst = dst_traced; extra->datatype1 = encode_datatype(datatype); extra->send_size = datatype->is_basic() ? count : count * datatype->size(); - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); TRACE_smpi_send(rank, rank, dst_traced, tag, count*datatype->size()); *request = simgrid::smpi::Request::issend(buf, count, datatype, dst, tag, comm); retval = MPI_SUCCESS; - TRACE_smpi_ptp_out(rank); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); @@ -296,7 +296,7 @@ int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI extra->dst = rank; extra->datatype1 = encode_datatype(datatype); extra->send_size = datatype->is_basic() ? count : count * datatype->size(); - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); simgrid::smpi::Request::recv(buf, count, datatype, src, tag, comm, status); retval = MPI_SUCCESS; @@ -308,7 +308,7 @@ int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI TRACE_smpi_recv(src_traced, rank, tag); } } - TRACE_smpi_ptp_out(rank); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); @@ -342,7 +342,7 @@ int PMPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI extra->dst = dst_traced; extra->datatype1 = encode_datatype(datatype); extra->send_size = datatype->is_basic() ? count : count * datatype->size(); - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); if (not TRACE_smpi_view_internals()) { TRACE_smpi_send(rank, rank, dst_traced, tag,count*datatype->size()); } @@ -350,7 +350,7 @@ int PMPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI simgrid::smpi::Request::send(buf, count, datatype, dst, tag, comm); retval = MPI_SUCCESS; - TRACE_smpi_ptp_out(rank); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); @@ -384,13 +384,13 @@ int PMPI_Ssend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, MP extra->datatype1 = encode_datatype(datatype); extra->send_size = datatype->is_basic() ? count : count * datatype->size(); - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); TRACE_smpi_send(rank, rank, dst_traced, tag, count * datatype->size()); simgrid::smpi::Request::ssend(buf, count, datatype, dst, tag, comm); retval = MPI_SUCCESS; - TRACE_smpi_ptp_out(rank); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); @@ -433,14 +433,14 @@ int PMPI_Sendrecv(void* sendbuf, int sendcount, MPI_Datatype sendtype, int dst, extra->datatype2 = encode_datatype(recvtype); extra->recv_size = recvtype->is_basic() ? recvcount : recvcount * recvtype->size(); - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); TRACE_smpi_send(rank, rank, dst_traced, sendtag, sendcount * sendtype->size()); simgrid::smpi::Request::sendrecv(sendbuf, sendcount, sendtype, dst, sendtag, recvbuf, recvcount, recvtype, src, recvtag, comm, status); retval = MPI_SUCCESS; - TRACE_smpi_ptp_out(rank); + TRACE_smpi_comm_out(rank); TRACE_smpi_recv(src_traced, rank, recvtag); } @@ -588,13 +588,13 @@ int PMPI_Wait(MPI_Request * request, MPI_Status * status) int is_wait_for_receive = ((*request)->flags() & RECV); instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); extra->type = TRACING_WAIT; - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); simgrid::smpi::Request::wait(request, status); retval = MPI_SUCCESS; //the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE) - TRACE_smpi_ptp_out(rank); + TRACE_smpi_comm_out(rank); if (is_wait_for_receive) { if(src_traced==MPI_ANY_SOURCE) src_traced = (status != MPI_STATUS_IGNORE) ? comm->group()->rank(status->MPI_SOURCE) : src_traced; @@ -635,7 +635,7 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); extra->type = TRACING_WAITANY; extra->send_size=count; - TRACE_smpi_ptp_in(rank_traced, __FUNCTION__,extra); + TRACE_smpi_comm_in(rank_traced, __FUNCTION__, extra); *index = simgrid::smpi::Request::waitany(count, requests, status); @@ -650,7 +650,7 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta : savedvals[*index].src; TRACE_smpi_recv(src_traced, dst_traced, savedvals[*index].tag); } - TRACE_smpi_ptp_out(rank_traced); + TRACE_smpi_comm_out(rank_traced); } xbt_free(savedvals); @@ -684,7 +684,7 @@ int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[]) instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); extra->type = TRACING_WAITALL; extra->send_size=count; - TRACE_smpi_ptp_in(rank_traced, __FUNCTION__,extra); + TRACE_smpi_comm_in(rank_traced, __FUNCTION__, extra); int retval = simgrid::smpi::Request::waitall(count, requests, status); @@ -702,7 +702,7 @@ int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[]) } } } - TRACE_smpi_ptp_out(rank_traced); + TRACE_smpi_comm_out(rank_traced); xbt_free(savedvals); smpi_bench_begin(); diff --git a/src/smpi/bindings/smpi_pmpi_win.cpp b/src/smpi/bindings/smpi_pmpi_win.cpp index 4fa328dfc2..a17a944119 100644 --- a/src/smpi/bindings/smpi_pmpi_win.cpp +++ b/src/smpi/bindings/smpi_pmpi_win.cpp @@ -167,9 +167,9 @@ int PMPI_Win_fence( int assert, MPI_Win win){ retval = MPI_ERR_WIN; } else { int rank = smpi_process()->index(); - TRACE_smpi_collective_in(rank, __FUNCTION__, nullptr); + TRACE_smpi_comm_in(rank, __FUNCTION__, nullptr); retval = win->fence(assert); - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); return retval; @@ -198,12 +198,12 @@ int PMPI_Get( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int rank = smpi_process()->index(); MPI_Group group; win->get_group(&group); - TRACE_smpi_ptp_in(rank, __FUNCTION__, nullptr); + TRACE_smpi_comm_in(rank, __FUNCTION__, nullptr); retval = win->get( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype); - TRACE_smpi_ptp_out(rank); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); return retval; @@ -235,12 +235,12 @@ int PMPI_Rget( void *origin_addr, int origin_count, MPI_Datatype origin_datatype int rank = smpi_process()->index(); MPI_Group group; win->get_group(&group); - TRACE_smpi_ptp_in(rank, __FUNCTION__, nullptr); + TRACE_smpi_comm_in(rank, __FUNCTION__, nullptr); retval = win->get( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, request); - TRACE_smpi_ptp_out(rank); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); return retval; @@ -270,13 +270,13 @@ int PMPI_Put( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, MPI_Group group; win->get_group(&group); int dst_traced = group->index(target_rank); - TRACE_smpi_ptp_in(rank, __FUNCTION__, nullptr); + TRACE_smpi_comm_in(rank, __FUNCTION__, nullptr); TRACE_smpi_send(rank, rank, dst_traced, SMPI_RMA_TAG, origin_count*origin_datatype->size()); retval = win->put( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype); - TRACE_smpi_ptp_out(rank); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); return retval; @@ -309,13 +309,13 @@ int PMPI_Rput( void *origin_addr, int origin_count, MPI_Datatype origin_datatype MPI_Group group; win->get_group(&group); int dst_traced = group->index(target_rank); - TRACE_smpi_ptp_in(rank, __FUNCTION__, nullptr); + TRACE_smpi_comm_in(rank, __FUNCTION__, nullptr); TRACE_smpi_send(rank, rank, dst_traced, SMPI_RMA_TAG, origin_count*origin_datatype->size()); retval = win->put( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, request); - TRACE_smpi_ptp_out(rank); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); return retval; @@ -346,11 +346,11 @@ int PMPI_Accumulate( void *origin_addr, int origin_count, MPI_Datatype origin_da int rank = smpi_process()->index(); MPI_Group group; win->get_group(&group); - TRACE_smpi_ptp_in(rank, __FUNCTION__, nullptr); + TRACE_smpi_comm_in(rank, __FUNCTION__, nullptr); retval = win->accumulate( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, op); - TRACE_smpi_ptp_out(rank); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); return retval; @@ -384,12 +384,12 @@ int PMPI_Raccumulate( void *origin_addr, int origin_count, MPI_Datatype origin_d int rank = smpi_process()->index(); MPI_Group group; win->get_group(&group); - TRACE_smpi_ptp_in(rank, __FUNCTION__, nullptr); + TRACE_smpi_comm_in(rank, __FUNCTION__, nullptr); retval = win->accumulate( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, op, request); - TRACE_smpi_ptp_out(rank); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); return retval; @@ -422,13 +422,13 @@ MPI_Datatype target_datatype, MPI_Op op, MPI_Win win){ int rank = smpi_process()->index(); MPI_Group group; win->get_group(&group); - TRACE_smpi_ptp_in(rank, __FUNCTION__, nullptr); + TRACE_smpi_comm_in(rank, __FUNCTION__, nullptr); retval = win->get_accumulate( origin_addr, origin_count, origin_datatype, result_addr, result_count, result_datatype, target_rank, target_disp, target_count, target_datatype, op); - TRACE_smpi_ptp_out(rank); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); return retval; @@ -465,13 +465,13 @@ MPI_Datatype target_datatype, MPI_Op op, MPI_Win win, MPI_Request* request){ int rank = smpi_process()->index(); MPI_Group group; win->get_group(&group); - TRACE_smpi_ptp_in(rank, __FUNCTION__, nullptr); + TRACE_smpi_comm_in(rank, __FUNCTION__, nullptr); retval = win->get_accumulate( origin_addr, origin_count, origin_datatype, result_addr, result_count, result_datatype, target_rank, target_disp, target_count, target_datatype, op, request); - TRACE_smpi_ptp_out(rank); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); return retval; @@ -503,11 +503,11 @@ int PMPI_Compare_and_swap(void* origin_addr, void* compare_addr, void* result_ad int rank = smpi_process()->index(); MPI_Group group; win->get_group(&group); - TRACE_smpi_ptp_in(rank, __FUNCTION__, nullptr); + TRACE_smpi_comm_in(rank, __FUNCTION__, nullptr); retval = win->compare_and_swap(origin_addr, compare_addr, result_addr, datatype, target_rank, target_disp); - TRACE_smpi_ptp_out(rank); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); return retval; @@ -522,9 +522,9 @@ int PMPI_Win_post(MPI_Group group, int assert, MPI_Win win){ retval = MPI_ERR_GROUP; } else { int rank = smpi_process()->index(); - TRACE_smpi_collective_in(rank, __FUNCTION__, nullptr); + TRACE_smpi_comm_in(rank, __FUNCTION__, nullptr); retval = win->post(group,assert); - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); return retval; @@ -539,9 +539,9 @@ int PMPI_Win_start(MPI_Group group, int assert, MPI_Win win){ retval = MPI_ERR_GROUP; } else { int rank = smpi_process()->index(); - TRACE_smpi_collective_in(rank, __FUNCTION__, nullptr); + TRACE_smpi_comm_in(rank, __FUNCTION__, nullptr); retval = win->start(group,assert); - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); return retval; @@ -554,11 +554,11 @@ int PMPI_Win_complete(MPI_Win win){ retval = MPI_ERR_WIN; } else { int rank = smpi_process()->index(); - TRACE_smpi_collective_in(rank, __FUNCTION__, nullptr); + TRACE_smpi_comm_in(rank, __FUNCTION__, nullptr); retval = win->complete(); - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); return retval; @@ -571,11 +571,11 @@ int PMPI_Win_wait(MPI_Win win){ retval = MPI_ERR_WIN; } else { int rank = smpi_process()->index(); - TRACE_smpi_collective_in(rank, __FUNCTION__, nullptr); + TRACE_smpi_comm_in(rank, __FUNCTION__, nullptr); retval = win->wait(); - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); return retval; @@ -593,9 +593,9 @@ int PMPI_Win_lock(int lock_type, int rank, int assert, MPI_Win win){ retval = MPI_SUCCESS; } else { int myrank = smpi_process()->index(); - TRACE_smpi_collective_in(myrank, __FUNCTION__, nullptr); + TRACE_smpi_comm_in(myrank, __FUNCTION__, nullptr); retval = win->lock(lock_type,rank,assert); - TRACE_smpi_collective_out(myrank); + TRACE_smpi_comm_out(myrank); } smpi_bench_begin(); return retval; @@ -610,9 +610,9 @@ int PMPI_Win_unlock(int rank, MPI_Win win){ retval = MPI_SUCCESS; } else { int myrank = smpi_process()->index(); - TRACE_smpi_collective_in(myrank, __FUNCTION__, nullptr); + TRACE_smpi_comm_in(myrank, __FUNCTION__, nullptr); retval = win->unlock(rank); - TRACE_smpi_collective_out(myrank); + TRACE_smpi_comm_out(myrank); } smpi_bench_begin(); return retval; @@ -625,9 +625,9 @@ int PMPI_Win_lock_all(int assert, MPI_Win win){ retval = MPI_ERR_WIN; } else { int myrank = smpi_process()->index(); - TRACE_smpi_collective_in(myrank, __FUNCTION__, nullptr); + TRACE_smpi_comm_in(myrank, __FUNCTION__, nullptr); retval = win->lock_all(assert); - TRACE_smpi_collective_out(myrank); + TRACE_smpi_comm_out(myrank); } smpi_bench_begin(); return retval; @@ -640,9 +640,9 @@ int PMPI_Win_unlock_all(MPI_Win win){ retval = MPI_ERR_WIN; } else { int myrank = smpi_process()->index(); - TRACE_smpi_collective_in(myrank, __FUNCTION__, nullptr); + TRACE_smpi_comm_in(myrank, __FUNCTION__, nullptr); retval = win->unlock_all(); - TRACE_smpi_collective_out(myrank); + TRACE_smpi_comm_out(myrank); } smpi_bench_begin(); return retval; @@ -657,9 +657,9 @@ int PMPI_Win_flush(int rank, MPI_Win win){ retval = MPI_SUCCESS; } else { int myrank = smpi_process()->index(); - TRACE_smpi_collective_in(myrank, __FUNCTION__, nullptr); + TRACE_smpi_comm_in(myrank, __FUNCTION__, nullptr); retval = win->flush(rank); - TRACE_smpi_collective_out(myrank); + TRACE_smpi_comm_out(myrank); } smpi_bench_begin(); return retval; @@ -674,9 +674,9 @@ int PMPI_Win_flush_local(int rank, MPI_Win win){ retval = MPI_SUCCESS; } else { int myrank = smpi_process()->index(); - TRACE_smpi_collective_in(myrank, __FUNCTION__, nullptr); + TRACE_smpi_comm_in(myrank, __FUNCTION__, nullptr); retval = win->flush_local(rank); - TRACE_smpi_collective_out(myrank); + TRACE_smpi_comm_out(myrank); } smpi_bench_begin(); return retval; @@ -689,9 +689,9 @@ int PMPI_Win_flush_all(MPI_Win win){ retval = MPI_ERR_WIN; } else { int myrank = smpi_process()->index(); - TRACE_smpi_collective_in(myrank, __FUNCTION__, nullptr); + TRACE_smpi_comm_in(myrank, __FUNCTION__, nullptr); retval = win->flush_all(); - TRACE_smpi_collective_out(myrank); + TRACE_smpi_comm_out(myrank); } smpi_bench_begin(); return retval; @@ -704,9 +704,9 @@ int PMPI_Win_flush_local_all(MPI_Win win){ retval = MPI_ERR_WIN; } else { int myrank = smpi_process()->index(); - TRACE_smpi_collective_in(myrank, __FUNCTION__, nullptr); + TRACE_smpi_comm_in(myrank, __FUNCTION__, nullptr); retval = win->flush_local_all(); - TRACE_smpi_collective_out(myrank); + TRACE_smpi_comm_out(myrank); } smpi_bench_begin(); return retval; diff --git a/src/smpi/internals/instr_smpi.cpp b/src/smpi/internals/instr_smpi.cpp index 8589befad8..047b9add30 100644 --- a/src/smpi/internals/instr_smpi.cpp +++ b/src/smpi/internals/instr_smpi.cpp @@ -190,25 +190,6 @@ void TRACE_smpi_finalize(int rank) delete container; } -void TRACE_smpi_collective_in(int rank, const char *operation, instr_extra_data extra) -{ - if (not TRACE_smpi_is_enabled()) { - cleanup_extra_data(extra); - return; - } - - simgrid::instr::StateType* state = simgrid::instr::Container::byName(smpi_container(rank))->getState("MPI_STATE"); - const char *color = instr_find_color (operation); - state->addEntityValue(operation, color); - state->pushEvent(operation, static_cast(extra)); -} - -void TRACE_smpi_collective_out(int rank) -{ - if (TRACE_smpi_is_enabled()) - simgrid::instr::Container::byName(smpi_container(rank))->getState("MPI_STATE")->popEvent(); -} - void TRACE_smpi_computing_init(int rank) { //first use, initialize the color in the trace @@ -292,7 +273,7 @@ void TRACE_smpi_testing_out(int rank) simgrid::instr::Container::byName(smpi_container(rank))->getState("MPI_STATE")->popEvent(); } -void TRACE_smpi_ptp_in(int rank, const char *operation, instr_extra_data extra) +void TRACE_smpi_comm_in(int rank, const char* operation, instr_extra_data extra) { if (not TRACE_smpi_is_enabled()) { cleanup_extra_data(extra); @@ -304,7 +285,7 @@ void TRACE_smpi_ptp_in(int rank, const char *operation, instr_extra_data extra) state->pushEvent(operation, static_cast(extra)); } -void TRACE_smpi_ptp_out(int rank) +void TRACE_smpi_comm_out(int rank) { if (TRACE_smpi_is_enabled()) simgrid::instr::Container::byName(smpi_container(rank))->getState("MPI_STATE")->popEvent(); diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp index d4102d2c9f..63774890f3 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -229,7 +229,7 @@ static void action_send(const char *const *action) extra->src = rank; extra->dst = dst_traced; extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE); - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); if (not TRACE_smpi_view_internals()) TRACE_smpi_send(rank, rank, dst_traced, 0, size*MPI_CURRENT_TYPE->size()); @@ -237,7 +237,7 @@ static void action_send(const char *const *action) log_timed_action (action, clock); - TRACE_smpi_ptp_out(rank); + TRACE_smpi_comm_out(rank); } static void action_Isend(const char *const *action) @@ -260,13 +260,13 @@ static void action_Isend(const char *const *action) extra->src = rank; extra->dst = dst_traced; extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE); - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); if (not TRACE_smpi_view_internals()) TRACE_smpi_send(rank, rank, dst_traced, 0, size*MPI_CURRENT_TYPE->size()); MPI_Request request = Request::isend(nullptr, size, MPI_CURRENT_TYPE, to, 0, MPI_COMM_WORLD); - TRACE_smpi_ptp_out(rank); + TRACE_smpi_comm_out(rank); get_reqq_self()->push_back(request); @@ -294,7 +294,7 @@ static void action_recv(const char *const *action) { extra->src = src_traced; extra->dst = rank; extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE); - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); //unknown size from the receiver point of view if(size<=0.0){ @@ -304,7 +304,7 @@ static void action_recv(const char *const *action) { Request::recv(nullptr, size, MPI_CURRENT_TYPE, from, 0, MPI_COMM_WORLD, &status); - TRACE_smpi_ptp_out(rank); + TRACE_smpi_comm_out(rank); if (not TRACE_smpi_view_internals()) { TRACE_smpi_recv(src_traced, rank, 0); } @@ -332,7 +332,7 @@ static void action_Irecv(const char *const *action) extra->src = src_traced; extra->dst = rank; extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE); - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); MPI_Status status; //unknow size from the receiver pov if(size<=0.0){ @@ -342,7 +342,7 @@ static void action_Irecv(const char *const *action) MPI_Request request = Request::irecv(nullptr, size, MPI_CURRENT_TYPE, from, 0, MPI_COMM_WORLD); - TRACE_smpi_ptp_out(rank); + TRACE_smpi_comm_out(rank); get_reqq_self()->push_back(request); log_timed_action (action, clock); @@ -398,11 +398,11 @@ static void action_wait(const char *const *action){ int is_wait_for_receive = (request->flags() & RECV); instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); extra->type = TRACING_WAIT; - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); Request::wait(&request, &status); - TRACE_smpi_ptp_out(rank); + TRACE_smpi_comm_out(rank); if (is_wait_for_receive) TRACE_smpi_recv(src_traced, dst_traced, 0); log_timed_action (action, clock); @@ -420,7 +420,7 @@ static void action_waitall(const char *const *action){ instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); extra->type = TRACING_WAITALL; extra->send_size=count_requests; - TRACE_smpi_ptp_in(rank_traced, __FUNCTION__,extra); + TRACE_smpi_comm_in(rank_traced, __FUNCTION__, extra); int recvs_snd[count_requests]; int recvs_rcv[count_requests]; for (unsigned int i = 0; i < count_requests; i++) { @@ -437,7 +437,7 @@ static void action_waitall(const char *const *action){ if (recvs_snd[i]!=-100) TRACE_smpi_recv(recvs_snd[i], recvs_rcv[i],0); } - TRACE_smpi_ptp_out(rank_traced); + TRACE_smpi_comm_out(rank_traced); } log_timed_action (action, clock); } @@ -447,11 +447,11 @@ static void action_barrier(const char *const *action){ 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); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); Colls::barrier(MPI_COMM_WORLD); - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(rank); log_timed_action (action, clock); } @@ -478,12 +478,12 @@ static void action_bcast(const char *const *action) extra->send_size = size; extra->root = root_traced; extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE); - TRACE_smpi_collective_in(rank, __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); void *sendbuf = smpi_get_tmp_sendbuffer(size* MPI_CURRENT_TYPE->size()); Colls::bcast(sendbuf, size, MPI_CURRENT_TYPE, root, MPI_COMM_WORLD); - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(rank); log_timed_action (action, clock); } @@ -511,14 +511,14 @@ static void action_reduce(const char *const *action) extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE); extra->root = root_traced; - TRACE_smpi_collective_in(rank, __FUNCTION__,extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); void *recvbuf = smpi_get_tmp_sendbuffer(comm_size* MPI_CURRENT_TYPE->size()); void *sendbuf = smpi_get_tmp_sendbuffer(comm_size* MPI_CURRENT_TYPE->size()); Colls::reduce(sendbuf, recvbuf, comm_size, MPI_CURRENT_TYPE, MPI_OP_NULL, root, MPI_COMM_WORLD); smpi_execute_flops(comp_size); - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(rank); log_timed_action (action, clock); } @@ -539,14 +539,14 @@ static void action_allReduce(const char *const *action) { extra->send_size = comm_size; extra->comp_size = comp_size; extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE); - TRACE_smpi_collective_in(rank, __FUNCTION__,extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); void *recvbuf = smpi_get_tmp_sendbuffer(comm_size* MPI_CURRENT_TYPE->size()); void *sendbuf = smpi_get_tmp_sendbuffer(comm_size* MPI_CURRENT_TYPE->size()); Colls::allreduce(sendbuf, recvbuf, comm_size, MPI_CURRENT_TYPE, MPI_OP_NULL, MPI_COMM_WORLD); smpi_execute_flops(comp_size); - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(rank); log_timed_action (action, clock); } @@ -576,11 +576,11 @@ static void action_allToAll(const char *const *action) { extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE); extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2); - TRACE_smpi_collective_in(rank, __FUNCTION__,extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); Colls::alltoall(send, send_size, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, MPI_COMM_WORLD); - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(rank); log_timed_action (action, clock); } @@ -624,11 +624,11 @@ static void action_gather(const char *const *action) { extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE); extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2); - TRACE_smpi_collective_in(smpi_process()->index(), __FUNCTION__, extra); + TRACE_smpi_comm_in(smpi_process()->index(), __FUNCTION__, extra); Colls::gather(send, send_size, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, root, MPI_COMM_WORLD); - TRACE_smpi_collective_out(smpi_process()->index()); + TRACE_smpi_comm_out(smpi_process()->index()); log_timed_action (action, clock); } @@ -682,11 +682,11 @@ static void action_gatherv(const char *const *action) { extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE); extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2); - TRACE_smpi_collective_in(smpi_process()->index(), __FUNCTION__, extra); + TRACE_smpi_comm_in(smpi_process()->index(), __FUNCTION__, extra); Colls::gatherv(send, send_size, MPI_CURRENT_TYPE, recv, recvcounts, disps, MPI_CURRENT_TYPE2, root, MPI_COMM_WORLD); - TRACE_smpi_collective_out(smpi_process()->index()); + TRACE_smpi_comm_out(smpi_process()->index()); log_timed_action (action, clock); } @@ -725,7 +725,7 @@ static void action_reducescatter(const char *const *action) { extra->comp_size = comp_size; extra->num_processes = comm_size; - TRACE_smpi_collective_in(rank, __FUNCTION__,extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); void *sendbuf = smpi_get_tmp_sendbuffer(size* MPI_CURRENT_TYPE->size()); void *recvbuf = smpi_get_tmp_recvbuffer(size* MPI_CURRENT_TYPE->size()); @@ -733,7 +733,7 @@ static void action_reducescatter(const char *const *action) { Colls::reduce_scatter(sendbuf, recvbuf, recvcounts, MPI_CURRENT_TYPE, MPI_OP_NULL, MPI_COMM_WORLD); smpi_execute_flops(comp_size); - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(rank); log_timed_action (action, clock); } @@ -771,11 +771,11 @@ static void action_allgather(const char *const *action) { extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2); extra->num_processes = MPI_COMM_WORLD->size(); - TRACE_smpi_collective_in(rank, __FUNCTION__,extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); Colls::allgather(sendbuf, sendcount, MPI_CURRENT_TYPE, recvbuf, recvcount, MPI_CURRENT_TYPE2, MPI_COMM_WORLD); - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(rank); log_timed_action (action, clock); } @@ -823,12 +823,12 @@ static void action_allgatherv(const char *const *action) { extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2); extra->num_processes = comm_size; - TRACE_smpi_collective_in(rank, __FUNCTION__,extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); Colls::allgatherv(sendbuf, sendcount, MPI_CURRENT_TYPE, recvbuf, recvcounts, disps, MPI_CURRENT_TYPE2, MPI_COMM_WORLD); - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(rank); log_timed_action (action, clock); } @@ -887,12 +887,12 @@ static void action_allToAllv(const char *const *action) { extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE); extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2); - TRACE_smpi_collective_in(rank, __FUNCTION__,extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, extra); Colls::alltoallv(sendbuf, sendcounts, senddisps, MPI_CURRENT_TYPE,recvbuf, recvcounts, recvdisps, MPI_CURRENT_TYPE, MPI_COMM_WORLD); - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(rank); log_timed_action (action, clock); } @@ -910,8 +910,8 @@ void smpi_replay_init(int* argc, char*** argv) TRACE_smpi_computing_init(rank); instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); extra->type = TRACING_INIT; - TRACE_smpi_collective_in(rank, "smpi_replay_run_init", extra); - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_in(rank, "smpi_replay_run_init", extra); + TRACE_smpi_comm_out(rank); xbt_replay_action_register("init", simgrid::smpi::action_init); xbt_replay_action_register("finalize", simgrid::smpi::action_finalize); xbt_replay_action_register("comm_size", simgrid::smpi::action_comm_size); @@ -981,11 +981,11 @@ void smpi_replay_main(int* argc, char*** argv) instr_extra_data extra_fin = xbt_new0(s_instr_extra_data_t,1); extra_fin->type = TRACING_FINALIZE; - TRACE_smpi_collective_in(smpi_process()->index(), "smpi_replay_run_finalize", extra_fin); + TRACE_smpi_comm_in(smpi_process()->index(), "smpi_replay_run_finalize", extra_fin); smpi_process()->finalize(); - TRACE_smpi_collective_out(smpi_process()->index()); + TRACE_smpi_comm_out(smpi_process()->index()); TRACE_smpi_finalize(smpi_process()->index()); } -- 2.20.1