X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0580f707c37e0fc2d5a89b0e39ed7bdda8873c4a..bb3635460cc4c986b3057dbda4e735c25ae3a4a9:/src/smpi/internals/smpi_replay.cpp diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp index c05410b64f..db6dd8309a 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -3,7 +3,7 @@ /* 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 "private.hpp" #include "smpi_coll.hpp" #include "smpi_comm.hpp" #include "smpi_datatype.hpp" @@ -12,24 +12,25 @@ #include "smpi_request.hpp" #include "xbt/replay.hpp" +#include #include #include -#define KEY_SIZE (sizeof(int) * 2 + 1) +using simgrid::s4u::Actor; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_replay,smpi,"Trace Replay with SMPI"); -int communicator_size = 0; -static int active_processes = 0; -std::unordered_map*> reqq; +static int communicator_size = 0; +static int active_processes = 0; +static std::unordered_map*> reqq; -MPI_Datatype MPI_DEFAULT_TYPE; -MPI_Datatype MPI_CURRENT_TYPE; +static MPI_Datatype MPI_DEFAULT_TYPE; +static MPI_Datatype MPI_CURRENT_TYPE; -static int sendbuffer_size=0; -char* sendbuffer=nullptr; -static int recvbuffer_size=0; -char* recvbuffer=nullptr; +static int sendbuffer_size = 0; +static char* sendbuffer = nullptr; +static int recvbuffer_size = 0; +static char* recvbuffer = nullptr; static void log_timed_action (const char *const *action, double clock){ if (XBT_LOG_ISENABLED(smpi_replay, xbt_log_priority_verbose)){ @@ -41,12 +42,12 @@ static void log_timed_action (const char *const *action, double clock){ static std::vector* get_reqq_self() { - return reqq.at(smpi_process()->index()); + return reqq.at(Actor::self()->getPid()); } static void set_reqq_self(std::vector *mpi_request) { - reqq.insert({smpi_process()->index(), mpi_request}); + reqq.insert({Actor::self()->getPid(), mpi_request}); } //allocate a single buffer for all sends, growing it if needed @@ -87,43 +88,40 @@ static double parse_double(const char *string) return value; } + +//TODO: this logic should be moved inside the datatype class, to support all predefined types and get rid of is_replayable. static MPI_Datatype decode_datatype(const char *const action) { switch(atoi(action)) { case 0: - MPI_CURRENT_TYPE=MPI_DOUBLE; + return MPI_DOUBLE; break; case 1: - MPI_CURRENT_TYPE=MPI_INT; + return MPI_INT; break; case 2: - MPI_CURRENT_TYPE=MPI_CHAR; + return MPI_CHAR; break; case 3: - MPI_CURRENT_TYPE=MPI_SHORT; + return MPI_SHORT; break; case 4: - MPI_CURRENT_TYPE=MPI_LONG; + return MPI_LONG; break; case 5: - MPI_CURRENT_TYPE=MPI_FLOAT; + return MPI_FLOAT; break; case 6: - MPI_CURRENT_TYPE=MPI_BYTE; + return MPI_BYTE; break; default: - MPI_CURRENT_TYPE=MPI_DEFAULT_TYPE; + return MPI_DEFAULT_TYPE; break; } - return MPI_CURRENT_TYPE; } -const char* encode_datatype(MPI_Datatype datatype, int* known) +const char* encode_datatype(MPI_Datatype datatype) { - //default type for output is set to MPI_BYTE - // MPI_DEFAULT_TYPE is not set for output, use directly MPI_BYTE - if(known!=nullptr) - *known=1; if (datatype==MPI_BYTE) return ""; if(datatype==MPI_DOUBLE) @@ -138,9 +136,6 @@ const char* encode_datatype(MPI_Datatype datatype, int* known) return "4"; if(datatype==MPI_FLOAT) return "5"; - //tell that the datatype is not handled by replay, and that its size should be measured and replayed as size*MPI_BYTE - if(known!=nullptr) - *known=0; // default - not implemented. // do not warn here as we pass in this function even for other trace formats return "-1"; @@ -165,8 +160,9 @@ static void action_init(const char *const *action) XBT_DEBUG("Initialize the counters"); CHECK_ACTION_PARAMS(action, 0, 1) if(action[2]) - MPI_DEFAULT_TYPE=MPI_DOUBLE; // default MPE dataype - else MPI_DEFAULT_TYPE= MPI_BYTE; // default TAU datatype + MPI_DEFAULT_TYPE = MPI_DOUBLE; // default MPE datatype + else + MPI_DEFAULT_TYPE = MPI_BYTE; // default TAU datatype /* start a simulated timer */ smpi_process()->simulated_start(); @@ -202,15 +198,12 @@ static void action_compute(const char *const *action) CHECK_ACTION_PARAMS(action, 1, 0) double clock = smpi_process()->simulated_elapsed(); double flops= parse_double(action[2]); - int rank = smpi_process()->index(); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type=TRACING_COMPUTING; - extra->comp_size=flops; - TRACE_smpi_computing_in(rank, extra); + int my_proc_id = Actor::self()->getPid(); + TRACE_smpi_computing_in(my_proc_id, flops); smpi_execute_flops(flops); + TRACE_smpi_computing_out(my_proc_id); - TRACE_smpi_computing_out(rank); log_timed_action (action, clock); } @@ -221,29 +214,21 @@ static void action_send(const char *const *action) double size=parse_double(action[3]); double clock = smpi_process()->simulated_elapsed(); - if(action[4]) - MPI_CURRENT_TYPE=decode_datatype(action[4]); - else - MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE; - - int rank = smpi_process()->index(); - - int dst_traced = MPI_COMM_WORLD->group()->rank(to); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_SEND; - extra->send_size = size; - extra->src = rank; - extra->dst = dst_traced; - extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr); - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); + MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE; + + int my_proc_id = Actor::self()->getPid(); + int dst_traced = MPI_COMM_WORLD->group()->actor(to)->getPid(); + + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::Pt2PtTIData("send", to, size, encode_datatype(MPI_CURRENT_TYPE))); if (not TRACE_smpi_view_internals()) - TRACE_smpi_send(rank, rank, dst_traced, 0, size*MPI_CURRENT_TYPE->size()); + TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, 0, size * MPI_CURRENT_TYPE->size()); Request::send(nullptr, size, MPI_CURRENT_TYPE, to , 0, MPI_COMM_WORLD); - log_timed_action (action, clock); + TRACE_smpi_comm_out(my_proc_id); - TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__); + log_timed_action(action, clock); } static void action_Isend(const char *const *action) @@ -253,26 +238,18 @@ static void action_Isend(const char *const *action) double size=parse_double(action[3]); double clock = smpi_process()->simulated_elapsed(); - if(action[4]) - MPI_CURRENT_TYPE=decode_datatype(action[4]); - else - MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE; - - int rank = smpi_process()->index(); - int dst_traced = MPI_COMM_WORLD->group()->rank(to); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_ISEND; - extra->send_size = size; - extra->src = rank; - extra->dst = dst_traced; - extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr); - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); + MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE; + + int my_proc_id = Actor::self()->getPid(); + int dst_traced = MPI_COMM_WORLD->group()->actor(to)->getPid(); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::Pt2PtTIData("Isend", to, size, encode_datatype(MPI_CURRENT_TYPE))); if (not TRACE_smpi_view_internals()) - TRACE_smpi_send(rank, rank, dst_traced, 0, size*MPI_CURRENT_TYPE->size()); + TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, 0, size * MPI_CURRENT_TYPE->size()); - MPI_Request request = Request::isend(nullptr, size, MPI_CURRENT_TYPE, to, 0,MPI_COMM_WORLD); + MPI_Request request = Request::isend(nullptr, size, MPI_CURRENT_TYPE, to, 0, MPI_COMM_WORLD); - TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__); + TRACE_smpi_comm_out(my_proc_id); get_reqq_self()->push_back(request); @@ -286,33 +263,25 @@ static void action_recv(const char *const *action) { double clock = smpi_process()->simulated_elapsed(); MPI_Status status; - if(action[4]) - MPI_CURRENT_TYPE=decode_datatype(action[4]); - else - MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE; + MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE; - int rank = smpi_process()->index(); - int src_traced = MPI_COMM_WORLD->group()->rank(from); + int my_proc_id = Actor::self()->getPid(); + int src_traced = MPI_COMM_WORLD->group()->actor(from)->getPid(); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_RECV; - extra->send_size = size; - extra->src = src_traced; - extra->dst = rank; - extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr); - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::Pt2PtTIData("recv", from, size, encode_datatype(MPI_CURRENT_TYPE))); //unknown size from the receiver point of view - if(size<=0.0){ + if (size <= 0.0) { Request::probe(from, 0, MPI_COMM_WORLD, &status); size=status.count; } Request::recv(nullptr, size, MPI_CURRENT_TYPE, from, 0, MPI_COMM_WORLD, &status); - TRACE_smpi_ptp_out(rank, rank, __FUNCTION__); + TRACE_smpi_comm_out(my_proc_id); if (not TRACE_smpi_view_internals()) { - TRACE_smpi_recv(rank, src_traced, rank, 0); + TRACE_smpi_recv(src_traced, my_proc_id, 0); } log_timed_action (action, clock); @@ -325,36 +294,28 @@ static void action_Irecv(const char *const *action) double size=parse_double(action[3]); double clock = smpi_process()->simulated_elapsed(); - if(action[4]) - MPI_CURRENT_TYPE=decode_datatype(action[4]); - else - MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE; - - int rank = smpi_process()->index(); - int src_traced = MPI_COMM_WORLD->group()->rank(from); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_IRECV; - extra->send_size = size; - extra->src = src_traced; - extra->dst = rank; - extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr); - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); + MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE; + + int my_proc_id = Actor::self()->getPid(); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::Pt2PtTIData("Irecv", from, size, encode_datatype(MPI_CURRENT_TYPE))); MPI_Status status; //unknow size from the receiver pov - if(size<=0.0){ - Request::probe(from, 0, MPI_COMM_WORLD, &status); - size=status.count; + if (size <= 0.0) { + Request::probe(from, 0, MPI_COMM_WORLD, &status); + size = status.count; } MPI_Request request = Request::irecv(nullptr, size, MPI_CURRENT_TYPE, from, 0, MPI_COMM_WORLD); - TRACE_smpi_ptp_out(rank, rank, __FUNCTION__); + TRACE_smpi_comm_out(my_proc_id); get_reqq_self()->push_back(request); log_timed_action (action, clock); } -static void action_test(const char *const *action){ +static void action_test(const char* const* action) +{ CHECK_ACTION_PARAMS(action, 0, 0) double clock = smpi_process()->simulated_elapsed(); MPI_Status status; @@ -365,10 +326,8 @@ static void action_test(const char *const *action){ //Different times in traced application and replayed version may lead to this //In this case, ignore the extra calls. if(request!=nullptr){ - int rank = smpi_process()->index(); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type=TRACING_TEST; - TRACE_smpi_testing_in(rank, extra); + int my_proc_id = Actor::self()->getPid(); + TRACE_smpi_testing_in(my_proc_id); int flag = Request::test(&request, &status); @@ -376,7 +335,7 @@ static void action_test(const char *const *action){ /* push back request in vector to be caught by a subsequent wait. if the test did succeed, the request is now nullptr.*/ get_reqq_self()->push_back(request); - TRACE_smpi_testing_out(rank); + TRACE_smpi_testing_out(my_proc_id); } log_timed_action (action, clock); } @@ -402,63 +361,56 @@ static void action_wait(const char *const *action){ int src_traced = group->rank(request->src()); int dst_traced = group->rank(request->dst()); 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__, new simgrid::instr::NoOpTIData("wait")); Request::wait(&request, &status); - TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__); + TRACE_smpi_comm_out(rank); if (is_wait_for_receive) - TRACE_smpi_recv(rank, src_traced, dst_traced, 0); + TRACE_smpi_recv(src_traced, dst_traced, 0); log_timed_action (action, clock); } static void action_waitall(const char *const *action){ CHECK_ACTION_PARAMS(action, 0, 0) double clock = smpi_process()->simulated_elapsed(); - unsigned int count_requests=get_reqq_self()->size(); + const unsigned int count_requests = get_reqq_self()->size(); if (count_requests>0) { MPI_Status status[count_requests]; - int rank_traced = smpi_process()->index(); - 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); - int recvs_snd[count_requests]; - int recvs_rcv[count_requests]; - unsigned int i=0; - for (auto req : *(get_reqq_self())){ - if (req && (req->flags () & RECV)){ - recvs_snd[i]=req->src(); - recvs_rcv[i]=req->dst(); - }else - recvs_snd[i]=-100; - i++; + int my_proc_id_traced = Actor::self()->getPid(); + TRACE_smpi_comm_in(my_proc_id_traced, __FUNCTION__, + new simgrid::instr::Pt2PtTIData("waitAll", -1, count_requests, "")); + int recvs_snd[count_requests]; + int recvs_rcv[count_requests]; + for (unsigned int i = 0; i < count_requests; i++) { + const auto& req = (*get_reqq_self())[i]; + if (req && (req->flags() & RECV)) { + recvs_snd[i] = req->src(); + recvs_rcv[i] = req->dst(); + } else + recvs_snd[i] = -100; } Request::waitall(count_requests, &(*get_reqq_self())[0], status); - for (i=0; isimulated_elapsed(); - 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 my_proc_id = Actor::self()->getPid(); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::NoOpTIData("barrier")); Colls::barrier(MPI_COMM_WORLD); - TRACE_smpi_collective_out(rank, __FUNCTION__); + TRACE_smpi_comm_out(my_proc_id); log_timed_action (action, clock); } @@ -467,30 +419,20 @@ static void action_bcast(const char *const *action) CHECK_ACTION_PARAMS(action, 1, 2) double size = parse_double(action[2]); double clock = smpi_process()->simulated_elapsed(); - int root=0; + int root = (action[3]) ? atoi(action[3]) : 0; /* Initialize MPI_CURRENT_TYPE in order to decrease the number of the checks */ - MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE; - - if(action[3]) { - root= atoi(action[3]); - if(action[4]) - MPI_CURRENT_TYPE=decode_datatype(action[4]); - } + MPI_CURRENT_TYPE = (action[3] && action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE; - int rank = smpi_process()->index(); - int root_traced = MPI_COMM_WORLD->group()->index(root); + int my_proc_id = Actor::self()->getPid(); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::CollTIData("bcast", MPI_COMM_WORLD->group()->actor(root)->getPid(), -1.0, size, + -1, encode_datatype(MPI_CURRENT_TYPE), "")); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_BCAST; - extra->send_size = size; - extra->root = root_traced; - extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr); - TRACE_smpi_collective_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, __FUNCTION__); + TRACE_smpi_comm_out(my_proc_id); log_timed_action (action, clock); } @@ -500,32 +442,21 @@ static void action_reduce(const char *const *action) double comm_size = parse_double(action[2]); double comp_size = parse_double(action[3]); double clock = smpi_process()->simulated_elapsed(); - int root=0; - MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE; + int root = (action[4]) ? atoi(action[4]) : 0; - if(action[4]) { - root= atoi(action[4]); - if(action[5]) - MPI_CURRENT_TYPE=decode_datatype(action[5]); - } - - int rank = smpi_process()->index(); - int root_traced = MPI_COMM_WORLD->group()->rank(root); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_REDUCE; - extra->send_size = comm_size; - extra->comp_size = comp_size; - extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr); - extra->root = root_traced; + MPI_CURRENT_TYPE = (action[4] && action[5]) ? decode_datatype(action[5]) : MPI_DEFAULT_TYPE; - TRACE_smpi_collective_in(rank, __FUNCTION__,extra); + int my_proc_id = Actor::self()->getPid(); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::CollTIData("reduce", MPI_COMM_WORLD->group()->actor(root)->getPid(), comp_size, + comm_size, -1, encode_datatype(MPI_CURRENT_TYPE), "")); 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, __FUNCTION__); + TRACE_smpi_comm_out(my_proc_id); log_timed_action (action, clock); } @@ -534,26 +465,19 @@ static void action_allReduce(const char *const *action) { double comm_size = parse_double(action[2]); double comp_size = parse_double(action[3]); - if(action[4]) - MPI_CURRENT_TYPE=decode_datatype(action[4]); - else - MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE; + MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE; double clock = smpi_process()->simulated_elapsed(); - int rank = smpi_process()->index(); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_ALLREDUCE; - extra->send_size = comm_size; - extra->comp_size = comp_size; - extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr); - TRACE_smpi_collective_in(rank, __FUNCTION__,extra); + int my_proc_id = Actor::self()->getPid(); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::CollTIData("allReduce", -1, comp_size, comm_size, -1, + encode_datatype(MPI_CURRENT_TYPE), "")); 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, __FUNCTION__); + TRACE_smpi_comm_out(my_proc_id); log_timed_action (action, clock); } @@ -563,31 +487,21 @@ static void action_allToAll(const char *const *action) { int comm_size = MPI_COMM_WORLD->size(); int send_size = parse_double(action[2]); int recv_size = parse_double(action[3]); - MPI_Datatype MPI_CURRENT_TYPE2 = MPI_DEFAULT_TYPE; - - if(action[4] && action[5]) { - MPI_CURRENT_TYPE=decode_datatype(action[4]); - MPI_CURRENT_TYPE2=decode_datatype(action[5]); - } - else - MPI_CURRENT_TYPE=MPI_DEFAULT_TYPE; + MPI_CURRENT_TYPE = (action[4] && action[5]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE; + MPI_Datatype MPI_CURRENT_TYPE2{(action[4] && action[5]) ? decode_datatype(action[5]) : MPI_DEFAULT_TYPE}; void *send = smpi_get_tmp_sendbuffer(send_size*comm_size* MPI_CURRENT_TYPE->size()); void *recv = smpi_get_tmp_recvbuffer(recv_size*comm_size* MPI_CURRENT_TYPE2->size()); - int rank = smpi_process()->index(); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_ALLTOALL; - extra->send_size = send_size; - extra->recv_size = recv_size; - extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr); - extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2, nullptr); - - TRACE_smpi_collective_in(rank, __FUNCTION__,extra); + int my_proc_id = Actor::self()->getPid(); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::CollTIData("allToAll", -1, -1.0, send_size, recv_size, + encode_datatype(MPI_CURRENT_TYPE), + encode_datatype(MPI_CURRENT_TYPE2))); Colls::alltoall(send, send_size, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, MPI_COMM_WORLD); - TRACE_smpi_collective_out(rank, __FUNCTION__); + TRACE_smpi_comm_out(my_proc_id); log_timed_action (action, clock); } @@ -606,39 +520,64 @@ static void action_gather(const char *const *action) { int comm_size = MPI_COMM_WORLD->size(); int send_size = parse_double(action[2]); int recv_size = parse_double(action[3]); - MPI_Datatype MPI_CURRENT_TYPE2 = MPI_DEFAULT_TYPE; - if(action[4] && action[5]) { - MPI_CURRENT_TYPE=decode_datatype(action[5]); - MPI_CURRENT_TYPE2=decode_datatype(action[6]); - } else { - MPI_CURRENT_TYPE=MPI_DEFAULT_TYPE; - } + MPI_CURRENT_TYPE = (action[5] && action[6]) ? decode_datatype(action[5]) : MPI_DEFAULT_TYPE; + MPI_Datatype MPI_CURRENT_TYPE2{(action[5] && action[6]) ? decode_datatype(action[6]) : MPI_DEFAULT_TYPE}; + void *send = smpi_get_tmp_sendbuffer(send_size* MPI_CURRENT_TYPE->size()); void *recv = nullptr; - int root=0; - if(action[4]) - root=atoi(action[4]); + int root = (action[4]) ? atoi(action[4]) : 0; int rank = MPI_COMM_WORLD->rank(); if(rank==root) recv = smpi_get_tmp_recvbuffer(recv_size*comm_size* MPI_CURRENT_TYPE2->size()); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_GATHER; - extra->send_size = send_size; - extra->recv_size = recv_size; - extra->root = root; - extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr); - extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2, nullptr); - - TRACE_smpi_collective_in(smpi_process()->index(), __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::CollTIData("gather", root, -1.0, send_size, recv_size, + encode_datatype(MPI_CURRENT_TYPE), + encode_datatype(MPI_CURRENT_TYPE2))); 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(), __FUNCTION__); + TRACE_smpi_comm_out(Actor::self()->getPid()); log_timed_action (action, clock); } +static void action_scatter(const char* const* action) +{ + /* The structure of the scatter action for the rank 0 (total 4 processes) is the following: + 0 gather 68 68 0 0 0 + where: + 1) 68 is the sendcounts + 2) 68 is the recvcounts + 3) 0 is the root node + 4) 0 is the send datatype id, see decode_datatype() + 5) 0 is the recv datatype id, see decode_datatype() + */ + CHECK_ACTION_PARAMS(action, 2, 3) + double clock = smpi_process()->simulated_elapsed(); + int comm_size = MPI_COMM_WORLD->size(); + int send_size = parse_double(action[2]); + int recv_size = parse_double(action[3]); + MPI_CURRENT_TYPE = (action[5] && action[6]) ? decode_datatype(action[5]) : MPI_DEFAULT_TYPE; + MPI_Datatype MPI_CURRENT_TYPE2{(action[5] && action[6]) ? decode_datatype(action[6]) : MPI_DEFAULT_TYPE}; + + void* send = smpi_get_tmp_sendbuffer(send_size * MPI_CURRENT_TYPE->size()); + void* recv = nullptr; + int root = (action[4]) ? atoi(action[4]) : 0; + int rank = MPI_COMM_WORLD->rank(); + + if (rank == root) + recv = smpi_get_tmp_recvbuffer(recv_size * comm_size * MPI_CURRENT_TYPE2->size()); + + TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::CollTIData("gather", root, -1.0, send_size, recv_size, + encode_datatype(MPI_CURRENT_TYPE), + encode_datatype(MPI_CURRENT_TYPE2))); + + Colls::scatter(send, send_size, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, root, MPI_COMM_WORLD); + + TRACE_smpi_comm_out(Actor::self()->getPid()); + log_timed_action(action, clock); +} + static void action_gatherv(const char *const *action) { /* The structure of the gatherv action for the rank 0 (total 4 processes) is the following: 0 gather 68 68 10 10 10 0 0 0 @@ -657,12 +596,10 @@ static void action_gatherv(const char *const *action) { int recvcounts[comm_size]; int recv_sum=0; - MPI_Datatype MPI_CURRENT_TYPE2 = MPI_DEFAULT_TYPE; - if(action[4+comm_size] && action[5+comm_size]) { - MPI_CURRENT_TYPE=decode_datatype(action[4+comm_size]); - MPI_CURRENT_TYPE2=decode_datatype(action[5+comm_size]); - } else - MPI_CURRENT_TYPE=MPI_DEFAULT_TYPE; + MPI_CURRENT_TYPE = + (action[4 + comm_size] && action[5 + comm_size]) ? decode_datatype(action[4 + comm_size]) : MPI_DEFAULT_TYPE; + MPI_Datatype MPI_CURRENT_TYPE2{ + (action[4 + comm_size] && action[5 + comm_size]) ? decode_datatype(action[5 + comm_size]) : MPI_DEFAULT_TYPE}; void *send = smpi_get_tmp_sendbuffer(send_size* MPI_CURRENT_TYPE->size()); void *recv = nullptr; @@ -672,31 +609,74 @@ static void action_gatherv(const char *const *action) { disps[i]=0; } - int root=atoi(action[3+comm_size]); + int root = (action[3 + comm_size]) ? atoi(action[3 + comm_size]) : 0; int rank = MPI_COMM_WORLD->rank(); if(rank==root) recv = smpi_get_tmp_recvbuffer(recv_sum* MPI_CURRENT_TYPE2->size()); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_GATHERV; - extra->send_size = send_size; - extra->recvcounts= xbt_new(int,comm_size); - for(int i=0; i< comm_size; i++)//copy data to avoid bad free - extra->recvcounts[i] = recvcounts[i]; - extra->root = root; - extra->num_processes = comm_size; - extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr); - extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2, nullptr); + std::vector* trace_recvcounts = new std::vector(recvcounts, recvcounts + comm_size); - TRACE_smpi_collective_in(smpi_process()->index(), __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::VarCollTIData( + "gatherV", root, send_size, nullptr, -1, trace_recvcounts, + encode_datatype(MPI_CURRENT_TYPE), encode_datatype(MPI_CURRENT_TYPE2))); 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(), __FUNCTION__); + TRACE_smpi_comm_out(Actor::self()->getPid()); log_timed_action (action, clock); } +static void action_scatterv(const char* const* action) +{ + /* The structure of the scatterv action for the rank 0 (total 4 processes) is the following: + 0 gather 68 10 10 10 68 0 0 0 + where: + 1) 68 10 10 10 is the sendcounts + 2) 68 is the recvcount + 3) 0 is the root node + 4) 0 is the send datatype id, see decode_datatype() + 5) 0 is the recv datatype id, see decode_datatype() + */ + double clock = smpi_process()->simulated_elapsed(); + int comm_size = MPI_COMM_WORLD->size(); + CHECK_ACTION_PARAMS(action, comm_size + 1, 2) + int recv_size = parse_double(action[2 + comm_size]); + int disps[comm_size]; + int sendcounts[comm_size]; + int send_sum = 0; + + MPI_CURRENT_TYPE = + (action[4 + comm_size] && action[5 + comm_size]) ? decode_datatype(action[4 + comm_size]) : MPI_DEFAULT_TYPE; + MPI_Datatype MPI_CURRENT_TYPE2{ + (action[4 + comm_size] && action[5 + comm_size]) ? decode_datatype(action[5 + comm_size]) : MPI_DEFAULT_TYPE}; + + void* send = nullptr; + void* recv = smpi_get_tmp_recvbuffer(recv_size * MPI_CURRENT_TYPE->size()); + for (int i = 0; i < comm_size; i++) { + sendcounts[i] = atoi(action[i + 2]); + send_sum += sendcounts[i]; + disps[i] = 0; + } + + int root = (action[3 + comm_size]) ? atoi(action[3 + comm_size]) : 0; + int rank = MPI_COMM_WORLD->rank(); + + if (rank == root) + send = smpi_get_tmp_sendbuffer(send_sum * MPI_CURRENT_TYPE2->size()); + + std::vector* trace_sendcounts = new std::vector(sendcounts, sendcounts + comm_size); + + TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::VarCollTIData( + "gatherV", root, -1, trace_sendcounts, recv_size, nullptr, + encode_datatype(MPI_CURRENT_TYPE), encode_datatype(MPI_CURRENT_TYPE2))); + + Colls::scatterv(send, sendcounts, disps, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, root, MPI_COMM_WORLD); + + TRACE_smpi_comm_out(Actor::self()->getPid()); + log_timed_action(action, clock); +} + static void action_reducescatter(const char *const *action) { /* The structure of the reducescatter action for the rank 0 (total 4 processes) is the following: 0 reduceScatter 275427 275427 275427 204020 11346849 0 @@ -709,38 +689,27 @@ static void action_reducescatter(const char *const *action) { int comm_size = MPI_COMM_WORLD->size(); CHECK_ACTION_PARAMS(action, comm_size+1, 1) int comp_size = parse_double(action[2+comm_size]); - int recvcounts[comm_size]; - int rank = smpi_process()->index(); - int size = 0; - if(action[3+comm_size]) - MPI_CURRENT_TYPE=decode_datatype(action[3+comm_size]); - else - MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE; + int my_proc_id = Actor::self()->getPid(); + std::vector* trace_recvcounts = new std::vector; + MPI_CURRENT_TYPE = (action[3 + comm_size]) ? decode_datatype(action[3 + comm_size]) : MPI_DEFAULT_TYPE; for(int i=0;ipush_back(atoi(action[i + 2])); } + int size{std::accumulate(trace_recvcounts->begin(), trace_recvcounts->end(), 0)}; - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_REDUCE_SCATTER; - extra->send_size = 0; - extra->recvcounts= xbt_new(int, comm_size); - for(int i=0; i< comm_size; i++)//copy data to avoid bad free - extra->recvcounts[i] = recvcounts[i]; - extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr); - extra->comp_size = comp_size; - extra->num_processes = comm_size; - - TRACE_smpi_collective_in(rank, __FUNCTION__,extra); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::VarCollTIData("reduceScatter", -1, 0, nullptr, -1, trace_recvcounts, + std::to_string(comp_size), /* ugly hack to print comp_size */ + encode_datatype(MPI_CURRENT_TYPE))); void *sendbuf = smpi_get_tmp_sendbuffer(size* MPI_CURRENT_TYPE->size()); void *recvbuf = smpi_get_tmp_recvbuffer(size* MPI_CURRENT_TYPE->size()); - Colls::reduce_scatter(sendbuf, recvbuf, recvcounts, MPI_CURRENT_TYPE, MPI_OP_NULL, MPI_COMM_WORLD); + Colls::reduce_scatter(sendbuf, recvbuf, trace_recvcounts->data(), MPI_CURRENT_TYPE, MPI_OP_NULL, MPI_COMM_WORLD); smpi_execute_flops(comp_size); - TRACE_smpi_collective_out(rank, __FUNCTION__); + TRACE_smpi_comm_out(my_proc_id); log_timed_action (action, clock); } @@ -758,31 +727,22 @@ static void action_allgather(const char *const *action) { int sendcount=atoi(action[2]); int recvcount=atoi(action[3]); - MPI_Datatype MPI_CURRENT_TYPE2 = MPI_DEFAULT_TYPE; - - if(action[4] && action[5]) { - MPI_CURRENT_TYPE = decode_datatype(action[4]); - MPI_CURRENT_TYPE2 = decode_datatype(action[5]); - } else - MPI_CURRENT_TYPE = MPI_DEFAULT_TYPE; + MPI_CURRENT_TYPE = (action[4] && action[5]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE; + MPI_Datatype MPI_CURRENT_TYPE2{(action[4] && action[5]) ? decode_datatype(action[5]) : MPI_DEFAULT_TYPE}; void *sendbuf = smpi_get_tmp_sendbuffer(sendcount* MPI_CURRENT_TYPE->size()); void *recvbuf = smpi_get_tmp_recvbuffer(recvcount* MPI_CURRENT_TYPE2->size()); - int rank = smpi_process()->index(); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_ALLGATHER; - extra->send_size = sendcount; - extra->recv_size= recvcount; - extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr); - extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2, nullptr); - extra->num_processes = MPI_COMM_WORLD->size(); + int my_proc_id = Actor::self()->getPid(); - TRACE_smpi_collective_in(rank, __FUNCTION__,extra); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::CollTIData("allGather", -1, -1.0, sendcount, recvcount, + encode_datatype(MPI_CURRENT_TYPE), + encode_datatype(MPI_CURRENT_TYPE2))); Colls::allgather(sendbuf, sendcount, MPI_CURRENT_TYPE, recvbuf, recvcount, MPI_CURRENT_TYPE2, MPI_COMM_WORLD); - TRACE_smpi_collective_out(rank, __FUNCTION__); + TRACE_smpi_comm_out(my_proc_id); log_timed_action (action, clock); } @@ -802,13 +762,11 @@ static void action_allgatherv(const char *const *action) { int recvcounts[comm_size]; int disps[comm_size]; int recv_sum=0; - MPI_Datatype MPI_CURRENT_TYPE2 = MPI_DEFAULT_TYPE; - if(action[3+comm_size] && action[4+comm_size]) { - MPI_CURRENT_TYPE = decode_datatype(action[3+comm_size]); - MPI_CURRENT_TYPE2 = decode_datatype(action[4+comm_size]); - } else - MPI_CURRENT_TYPE = MPI_DEFAULT_TYPE; + MPI_CURRENT_TYPE = + (action[3 + comm_size] && action[4 + comm_size]) ? decode_datatype(action[3 + comm_size]) : MPI_DEFAULT_TYPE; + MPI_Datatype MPI_CURRENT_TYPE2{ + (action[3 + comm_size] && action[4 + comm_size]) ? decode_datatype(action[4 + comm_size]) : MPI_DEFAULT_TYPE}; void *sendbuf = smpi_get_tmp_sendbuffer(sendcount* MPI_CURRENT_TYPE->size()); @@ -819,23 +777,19 @@ static void action_allgatherv(const char *const *action) { } void *recvbuf = smpi_get_tmp_recvbuffer(recv_sum* MPI_CURRENT_TYPE2->size()); - int rank = smpi_process()->index(); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_ALLGATHERV; - extra->send_size = sendcount; - extra->recvcounts= xbt_new(int, comm_size); - for(int i=0; i< comm_size; i++)//copy data to avoid bad free - extra->recvcounts[i] = recvcounts[i]; - extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr); - extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2, nullptr); - extra->num_processes = comm_size; + int my_proc_id = Actor::self()->getPid(); - TRACE_smpi_collective_in(rank, __FUNCTION__,extra); + std::vector* trace_recvcounts = new std::vector(recvcounts, recvcounts + comm_size); + + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::VarCollTIData("allGatherV", -1, sendcount, nullptr, -1, trace_recvcounts, + encode_datatype(MPI_CURRENT_TYPE), + encode_datatype(MPI_CURRENT_TYPE2))); Colls::allgatherv(sendbuf, sendcount, MPI_CURRENT_TYPE, recvbuf, recvcounts, disps, MPI_CURRENT_TYPE2, MPI_COMM_WORLD); - TRACE_smpi_collective_out(rank, __FUNCTION__); + TRACE_smpi_comm_out(my_proc_id); log_timed_action (action, clock); } @@ -852,54 +806,48 @@ static void action_allToAllv(const char *const *action) { int comm_size = MPI_COMM_WORLD->size(); CHECK_ACTION_PARAMS(action, 2*comm_size+2, 2) + int send_size = 0; + int recv_size = 0; int sendcounts[comm_size]; + std::vector* trace_sendcounts = new std::vector; int recvcounts[comm_size]; + std::vector* trace_recvcounts = new std::vector; int senddisps[comm_size]; int recvdisps[comm_size]; - MPI_Datatype MPI_CURRENT_TYPE2 = MPI_DEFAULT_TYPE; + MPI_CURRENT_TYPE = (action[4 + 2 * comm_size] && action[5 + 2 * comm_size]) + ? decode_datatype(action[4 + 2 * comm_size]) + : MPI_DEFAULT_TYPE; + MPI_Datatype MPI_CURRENT_TYPE2{(action[4 + 2 * comm_size] && action[5 + 2 * comm_size]) + ? decode_datatype(action[5 + 2 * comm_size]) + : MPI_DEFAULT_TYPE}; int send_buf_size=parse_double(action[2]); int recv_buf_size=parse_double(action[3+comm_size]); - if(action[4+2*comm_size] && action[5+2*comm_size]) { - MPI_CURRENT_TYPE=decode_datatype(action[4+2*comm_size]); - MPI_CURRENT_TYPE2=decode_datatype(action[5+2*comm_size]); - } - else - MPI_CURRENT_TYPE=MPI_DEFAULT_TYPE; - + int my_proc_id = Actor::self()->getPid(); void *sendbuf = smpi_get_tmp_sendbuffer(send_buf_size* MPI_CURRENT_TYPE->size()); void *recvbuf = smpi_get_tmp_recvbuffer(recv_buf_size* MPI_CURRENT_TYPE2->size()); for(int i=0;ipush_back(sendcounts[i]); + send_size += sendcounts[i]; recvcounts[i] = atoi(action[i+4+comm_size]); + trace_recvcounts->push_back(recvcounts[i]); + recv_size += recvcounts[i]; senddisps[i] = 0; recvdisps[i] = 0; } - int rank = smpi_process()->index(); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_ALLTOALLV; - extra->recvcounts= xbt_new(int, comm_size); - extra->sendcounts= xbt_new(int, comm_size); - extra->num_processes = comm_size; - - for(int i=0; i< comm_size; i++){//copy data to avoid bad free - extra->send_size += sendcounts[i]; - extra->sendcounts[i] = sendcounts[i]; - extra->recv_size += recvcounts[i]; - extra->recvcounts[i] = recvcounts[i]; - } - extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr); - extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2, nullptr); - - TRACE_smpi_collective_in(rank, __FUNCTION__,extra); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::VarCollTIData("allToAllV", -1, send_size, trace_sendcounts, recv_size, + trace_recvcounts, encode_datatype(MPI_CURRENT_TYPE), + encode_datatype(MPI_CURRENT_TYPE2))); Colls::alltoallv(sendbuf, sendcounts, senddisps, MPI_CURRENT_TYPE,recvbuf, recvcounts, recvdisps, MPI_CURRENT_TYPE, MPI_COMM_WORLD); - TRACE_smpi_collective_out(rank, __FUNCTION__); + TRACE_smpi_comm_out(my_proc_id); log_timed_action (action, clock); } @@ -912,13 +860,11 @@ void smpi_replay_init(int* argc, char*** argv) smpi_process()->mark_as_initialized(); smpi_process()->set_replaying(true); - int rank = smpi_process()->index(); - TRACE_smpi_init(rank); - 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, "smpi_replay_run_init"); + int my_proc_id = Actor::self()->getPid(); + TRACE_smpi_init(my_proc_id); + TRACE_smpi_computing_init(my_proc_id); + TRACE_smpi_comm_in(my_proc_id, "smpi_replay_run_init", new simgrid::instr::NoOpTIData("init")); + TRACE_smpi_comm_out(my_proc_id); 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); @@ -938,7 +884,9 @@ void smpi_replay_init(int* argc, char*** argv) xbt_replay_action_register("allToAll", simgrid::smpi::action_allToAll); xbt_replay_action_register("allToAllV", simgrid::smpi::action_allToAllv); xbt_replay_action_register("gather", simgrid::smpi::action_gather); + xbt_replay_action_register("scatter", simgrid::smpi::action_scatter); xbt_replay_action_register("gatherV", simgrid::smpi::action_gatherv); + xbt_replay_action_register("scatterV", simgrid::smpi::action_scatterv); xbt_replay_action_register("allGather", simgrid::smpi::action_allgather); xbt_replay_action_register("allGatherV", simgrid::smpi::action_allgatherv); xbt_replay_action_register("reduceScatter", simgrid::smpi::action_reducescatter); @@ -970,7 +918,7 @@ void smpi_replay_main(int* argc, char*** argv) MPI_Status status[count_requests]; unsigned int i=0; - for (auto req: *get_reqq_self()){ + for (auto const& req : *get_reqq_self()) { requests[i] = req; i++; } @@ -986,14 +934,12 @@ void smpi_replay_main(int* argc, char*** argv) xbt_free(recvbuffer); } - 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(Actor::self()->getPid(), "smpi_replay_run_finalize", new simgrid::instr::NoOpTIData("finalize")); smpi_process()->finalize(); - TRACE_smpi_collective_out(smpi_process()->index(), "smpi_replay_run_finalize"); - TRACE_smpi_finalize(smpi_process()->index()); + TRACE_smpi_comm_out(Actor::self()->getPid()); + TRACE_smpi_finalize(Actor::self()->getPid()); } /** @brief chain a replay initialization and a replay start */