X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/77bbf3027c4240a2e833209a3a3f186589da8577..64a11402f73a49312abcc8cb324a3c662dce926e:/src/smpi/internals/smpi_replay.cpp diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp index 8e02386a1f..cab8ee5773 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -12,24 +12,29 @@ #include "smpi_request.hpp" #include "xbt/replay.hpp" +#include +#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 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; + +class ReplayActionArg { + ReplayActionArg() {} +}; static void log_timed_action (const char *const *action, double clock){ if (XBT_LOG_ISENABLED(smpi_replay, xbt_log_priority_verbose)){ @@ -41,12 +46,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,56 +92,19 @@ 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; - break; - case 1: - MPI_CURRENT_TYPE=MPI_INT; - break; - case 2: - MPI_CURRENT_TYPE=MPI_CHAR; - break; - case 3: - MPI_CURRENT_TYPE=MPI_SHORT; - break; - case 4: - MPI_CURRENT_TYPE=MPI_LONG; - break; - case 5: - MPI_CURRENT_TYPE=MPI_FLOAT; - break; - case 6: - MPI_CURRENT_TYPE=MPI_BYTE; - break; - default: - MPI_CURRENT_TYPE=MPI_DEFAULT_TYPE; - break; - } - return MPI_CURRENT_TYPE; + return simgrid::smpi::Datatype::decode(action); } const char* encode_datatype(MPI_Datatype datatype) { - if (datatype==MPI_BYTE) - return ""; - if(datatype==MPI_DOUBLE) - return "0"; - if(datatype==MPI_INT) - return "1"; - if(datatype==MPI_CHAR) - return "2"; - if(datatype==MPI_SHORT) - return "3"; - if(datatype==MPI_LONG) - return "4"; - if(datatype==MPI_FLOAT) - return "5"; - // default - not implemented. - // do not warn here as we pass in this function even for other trace formats - return "-1"; + if (datatype == nullptr) /* this actually does seem to be possible, had this in the scatter2 test */ + return "-1"; + + return datatype->encode(); } #define CHECK_ACTION_PARAMS(action, mandatory, optional) {\ @@ -196,11 +164,11 @@ 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(); + int my_proc_id = Actor::self()->getPid(); - TRACE_smpi_computing_in(rank, flops); + TRACE_smpi_computing_in(my_proc_id, flops); smpi_execute_flops(flops); - TRACE_smpi_computing_out(rank); + TRACE_smpi_computing_out(my_proc_id); log_timed_action (action, clock); } @@ -208,26 +176,23 @@ static void action_compute(const char *const *action) static void action_send(const char *const *action) { CHECK_ACTION_PARAMS(action, 2, 1) - int to = atoi(action[2]); + int to = std::stoi(action[2]); 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; + MPI_Datatype MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE; - int rank = smpi_process()->index(); - int dst_traced = MPI_COMM_WORLD->group()->rank(to); + int my_proc_id = Actor::self()->getPid(); + int dst_traced = MPI_COMM_WORLD->group()->actor(to)->getPid(); - TRACE_smpi_comm_in(rank, __FUNCTION__, - new simgrid::instr::Pt2PtTIData("send", dst_traced, size, encode_datatype(MPI_CURRENT_TYPE))); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::Pt2PtTIData("send", to, size, MPI_CURRENT_TYPE->encode())); 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); - TRACE_smpi_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); log_timed_action(action, clock); } @@ -235,25 +200,22 @@ static void action_send(const char *const *action) static void action_Isend(const char *const *action) { CHECK_ACTION_PARAMS(action, 2, 1) - int to = atoi(action[2]); + int to = std::stoi(action[2]); 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; + MPI_Datatype MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE; - int rank = smpi_process()->index(); - int dst_traced = MPI_COMM_WORLD->group()->rank(to); - TRACE_smpi_comm_in(rank, __FUNCTION__, - new simgrid::instr::Pt2PtTIData("Isend", dst_traced, size, encode_datatype(MPI_CURRENT_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, MPI_CURRENT_TYPE->encode())); 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); - TRACE_smpi_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); get_reqq_self()->push_back(request); @@ -262,21 +224,18 @@ static void action_Isend(const char *const *action) static void action_recv(const char *const *action) { CHECK_ACTION_PARAMS(action, 2, 1) - int from = atoi(action[2]); + int from = std::stoi(action[2]); double size=parse_double(action[3]); 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_Datatype 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(); - TRACE_smpi_comm_in(rank, __FUNCTION__, - new simgrid::instr::Pt2PtTIData("recv", src_traced, size, encode_datatype(MPI_CURRENT_TYPE))); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::Pt2PtTIData("recv", from, size, MPI_CURRENT_TYPE->encode())); //unknown size from the receiver point of view if (size <= 0.0) { @@ -286,9 +245,9 @@ static void action_recv(const char *const *action) { Request::recv(nullptr, size, MPI_CURRENT_TYPE, from, 0, MPI_COMM_WORLD, &status); - TRACE_smpi_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); if (not TRACE_smpi_view_internals()) { - TRACE_smpi_recv(src_traced, rank, 0); + TRACE_smpi_recv(src_traced, my_proc_id, 0); } log_timed_action (action, clock); @@ -297,19 +256,15 @@ static void action_recv(const char *const *action) { static void action_Irecv(const char *const *action) { CHECK_ACTION_PARAMS(action, 2, 1) - int from = atoi(action[2]); + int from = std::stoi(action[2]); 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; + MPI_Datatype 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); - TRACE_smpi_comm_in(rank, __FUNCTION__, - new simgrid::instr::Pt2PtTIData("Irecv", src_traced, size, encode_datatype(MPI_CURRENT_TYPE))); + int my_proc_id = Actor::self()->getPid(); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::Pt2PtTIData("Irecv", from, size, MPI_CURRENT_TYPE->encode())); MPI_Status status; //unknow size from the receiver pov if (size <= 0.0) { @@ -319,7 +274,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_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); get_reqq_self()->push_back(request); log_timed_action (action, clock); @@ -337,8 +292,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(); - TRACE_smpi_testing_in(rank); + int my_proc_id = Actor::self()->getPid(); + TRACE_smpi_testing_in(my_proc_id); int flag = Request::test(&request, &status); @@ -346,7 +301,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); } @@ -390,17 +345,18 @@ static void action_waitall(const char *const *action){ if (count_requests>0) { MPI_Status status[count_requests]; - int rank_traced = smpi_process()->index(); - TRACE_smpi_comm_in(rank_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; + 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); @@ -408,19 +364,19 @@ 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_comm_out(rank_traced); + TRACE_smpi_comm_out(my_proc_id_traced); } log_timed_action (action, clock); } static void action_barrier(const char *const *action){ double clock = smpi_process()->simulated_elapsed(); - int rank = smpi_process()->index(); - TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::NoOpTIData("barrier")); + 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_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); log_timed_action (action, clock); } @@ -429,26 +385,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]) ? std::stoi(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_Datatype MPI_CURRENT_TYPE = (action[3] && action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE; - int rank = smpi_process()->index(); - TRACE_smpi_comm_in(rank, __FUNCTION__, - new simgrid::instr::CollTIData("bcast", MPI_COMM_WORLD->group()->index(root), -1.0, size, -1, - encode_datatype(MPI_CURRENT_TYPE), "")); + 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, MPI_CURRENT_TYPE->encode(), "")); void *sendbuf = smpi_get_tmp_sendbuffer(size* MPI_CURRENT_TYPE->size()); Colls::bcast(sendbuf, size, MPI_CURRENT_TYPE, root, MPI_COMM_WORLD); - TRACE_smpi_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); log_timed_action (action, clock); } @@ -458,26 +408,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]) ? std::stoi(action[4]) : 0; - if(action[4]) { - root= atoi(action[4]); - if(action[5]) - MPI_CURRENT_TYPE=decode_datatype(action[5]); - } + MPI_Datatype MPI_CURRENT_TYPE = (action[4] && action[5]) ? decode_datatype(action[5]) : MPI_DEFAULT_TYPE; - int rank = smpi_process()->index(); - TRACE_smpi_comm_in(rank, __FUNCTION__, - new simgrid::instr::CollTIData("reduce", MPI_COMM_WORLD->group()->index(root), comp_size, - comm_size, -1, encode_datatype(MPI_CURRENT_TYPE), "")); + 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, MPI_CURRENT_TYPE->encode(), "")); 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_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); log_timed_action (action, clock); } @@ -486,22 +431,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_Datatype MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE; double clock = smpi_process()->simulated_elapsed(); - int rank = smpi_process()->index(); - TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::CollTIData("allReduce", -1, comp_size, comm_size, -1, - encode_datatype(MPI_CURRENT_TYPE), "")); + 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, + MPI_CURRENT_TYPE->encode(), "")); - void *recvbuf = smpi_get_tmp_sendbuffer(comm_size* MPI_CURRENT_TYPE->size()); + void *recvbuf = smpi_get_tmp_recvbuffer(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_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); log_timed_action (action, clock); } @@ -511,26 +453,20 @@ 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_Datatype 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(); - TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::CollTIData("allToAll", -1, -1.0, send_size, recv_size, - encode_datatype(MPI_CURRENT_TYPE), - encode_datatype(MPI_CURRENT_TYPE2))); + 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, + MPI_CURRENT_TYPE->encode(), MPI_CURRENT_TYPE2->encode())); Colls::alltoall(send, send_size, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, MPI_COMM_WORLD); - TRACE_smpi_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); log_timed_action (action, clock); } @@ -549,30 +485,24 @@ 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_Datatype 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]) ? std::stoi(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))); + TRACE_smpi_comm_in(rank, __FUNCTION__, + new simgrid::instr::CollTIData("gather", root, -1.0, send_size, recv_size, + MPI_CURRENT_TYPE->encode(), MPI_CURRENT_TYPE2->encode())); Colls::gather(send, send_size, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, root, MPI_COMM_WORLD); - TRACE_smpi_comm_out(smpi_process()->index()); + TRACE_smpi_comm_out(Actor::self()->getPid()); log_timed_action (action, clock); } @@ -592,30 +522,24 @@ static void action_scatter(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_Datatype 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]) ? std::stoi(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))); + TRACE_smpi_comm_in(rank, __FUNCTION__, + new simgrid::instr::CollTIData("gather", root, -1.0, send_size, recv_size, + MPI_CURRENT_TYPE->encode(), MPI_CURRENT_TYPE2->encode())); Colls::scatter(send, send_size, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, root, MPI_COMM_WORLD); - TRACE_smpi_comm_out(smpi_process()->index()); + TRACE_smpi_comm_out(Actor::self()->getPid()); log_timed_action(action, clock); } @@ -633,42 +557,35 @@ static void action_gatherv(const char *const *action) { int comm_size = MPI_COMM_WORLD->size(); CHECK_ACTION_PARAMS(action, comm_size+1, 2) int send_size = parse_double(action[2]); - int disps[comm_size]; - int recvcounts[comm_size]; - int recv_sum=0; + std::vector disps(comm_size, 0); + std::shared_ptr> recvcounts(new std::vector(comm_size)); - 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_Datatype 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; for(int i=0;ibegin(), recvcounts->end(), 0); - int root=atoi(action[3+comm_size]); + int root = (action[3 + comm_size]) ? std::stoi(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()); - 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]); - - 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))); + TRACE_smpi_comm_in(rank, __FUNCTION__, + new simgrid::instr::VarCollTIData("gatherV", root, send_size, nullptr, -1, recvcounts, + MPI_CURRENT_TYPE->encode(), MPI_CURRENT_TYPE2->encode())); - Colls::gatherv(send, send_size, MPI_CURRENT_TYPE, recv, recvcounts, disps, MPI_CURRENT_TYPE2, root, MPI_COMM_WORLD); + Colls::gatherv(send, send_size, MPI_CURRENT_TYPE, recv, recvcounts->data(), disps.data(), MPI_CURRENT_TYPE2, root, + MPI_COMM_WORLD); - TRACE_smpi_comm_out(smpi_process()->index()); + TRACE_smpi_comm_out(Actor::self()->getPid()); log_timed_action (action, clock); } @@ -687,42 +604,35 @@ static void action_scatterv(const char* const* action) 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; + std::vector disps(comm_size, 0); + std::shared_ptr> sendcounts(new std::vector(comm_size)); - 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_Datatype 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; + (*sendcounts)[i] = std::stoi(action[i + 2]); } + int send_sum = std::accumulate(sendcounts->begin(), sendcounts->end(), 0); - int root = atoi(action[3 + comm_size]); + int root = (action[3 + comm_size]) ? std::stoi(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; - for (int i = 0; i < comm_size; i++) // copy data to avoid bad free - trace_sendcounts->push_back(sendcounts[i]); - - 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))); + TRACE_smpi_comm_in(rank, __FUNCTION__, + new simgrid::instr::VarCollTIData("gatherV", root, -1, sendcounts, recv_size, nullptr, + MPI_CURRENT_TYPE->encode(), MPI_CURRENT_TYPE2->encode())); - Colls::scatterv(send, sendcounts, disps, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, root, MPI_COMM_WORLD); + Colls::scatterv(send, sendcounts->data(), disps.data(), MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, root, + MPI_COMM_WORLD); - TRACE_smpi_comm_out(smpi_process()->index()); + TRACE_smpi_comm_out(Actor::self()->getPid()); log_timed_action(action, clock); } @@ -738,33 +648,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; - std::vector* trace_recvcounts = new std::vector; - 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::shared_ptr> recvcounts(new std::vector); + MPI_Datatype MPI_CURRENT_TYPE = (action[3 + comm_size]) ? decode_datatype(action[3 + comm_size]) : MPI_DEFAULT_TYPE; for(int i=0;ipush_back(recvcounts[i]); - size+=recvcounts[i]; + recvcounts->push_back(std::stoi(action[i + 2])); } + int size{std::accumulate(recvcounts->begin(), recvcounts->end(), 0)}; - TRACE_smpi_comm_in(rank, __FUNCTION__, - new simgrid::instr::VarCollTIData("reduceScatter", -1, 0, nullptr, -1, trace_recvcounts, + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::VarCollTIData("reduceScatter", -1, 0, nullptr, -1, recvcounts, std::to_string(comp_size), /* ugly hack to print comp_size */ - encode_datatype(MPI_CURRENT_TYPE))); + MPI_CURRENT_TYPE->encode())); 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, recvcounts->data(), MPI_CURRENT_TYPE, MPI_OP_NULL, MPI_COMM_WORLD); smpi_execute_flops(comp_size); - TRACE_smpi_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); log_timed_action (action, clock); } @@ -779,29 +683,24 @@ static void action_allgather(const char *const *action) { double clock = smpi_process()->simulated_elapsed(); CHECK_ACTION_PARAMS(action, 2, 2) - int sendcount=atoi(action[2]); - int recvcount=atoi(action[3]); - - MPI_Datatype MPI_CURRENT_TYPE2 = MPI_DEFAULT_TYPE; + int sendcount = std::stoi(action[2]); + int recvcount = std::stoi(action[3]); - 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_Datatype 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(); + int my_proc_id = Actor::self()->getPid(); - TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::CollTIData("allGather", -1, -1.0, sendcount, recvcount, - encode_datatype(MPI_CURRENT_TYPE), - encode_datatype(MPI_CURRENT_TYPE2))); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::CollTIData("allGather", -1, -1.0, sendcount, recvcount, + MPI_CURRENT_TYPE->encode(), MPI_CURRENT_TYPE2->encode())); Colls::allgather(sendbuf, sendcount, MPI_CURRENT_TYPE, recvbuf, recvcount, MPI_CURRENT_TYPE2, MPI_COMM_WORLD); - TRACE_smpi_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); log_timed_action (action, clock); } @@ -817,41 +716,46 @@ static void action_allgatherv(const char *const *action) { int comm_size = MPI_COMM_WORLD->size(); CHECK_ACTION_PARAMS(action, comm_size+1, 2) - int sendcount=atoi(action[2]); - 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; + int sendcount = std::stoi(action[2]); + std::shared_ptr> recvcounts(new std::vector(comm_size)); + std::vector disps(comm_size, 0); + + int datatype_index = 0, disp_index = 0; + if (action[3 + 2 * comm_size]) { /* datatype + disp are specified */ + datatype_index = 3 + comm_size; + disp_index = datatype_index + 1; + } else if (action[3 + 2 * comm_size]) { /* disps specified; datatype is not specified; use the default one */ + datatype_index = -1; + disp_index = 3 + comm_size; + } else if (action[3 + comm_size]) { /* only datatype, no disp specified */ + datatype_index = 3 + comm_size; + } + + if (disp_index != 0) { + std::copy(action[disp_index], action[disp_index + comm_size], disps.begin()); + } + + MPI_Datatype MPI_CURRENT_TYPE{(datatype_index > 0) ? decode_datatype(action[datatype_index]) : MPI_DEFAULT_TYPE}; + MPI_Datatype MPI_CURRENT_TYPE2{(datatype_index > 0) ? decode_datatype(action[datatype_index]) : MPI_DEFAULT_TYPE}; void *sendbuf = smpi_get_tmp_sendbuffer(sendcount* MPI_CURRENT_TYPE->size()); for(int i=0;ibegin(), recvcounts->end(), 0); void *recvbuf = smpi_get_tmp_recvbuffer(recv_sum* MPI_CURRENT_TYPE2->size()); - int rank = smpi_process()->index(); - - 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]); + int my_proc_id = Actor::self()->getPid(); - TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::VarCollTIData( - "allGatherV", -1, sendcount, nullptr, -1, trace_recvcounts, - encode_datatype(MPI_CURRENT_TYPE), encode_datatype(MPI_CURRENT_TYPE2))); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::VarCollTIData("allGatherV", -1, sendcount, nullptr, -1, recvcounts, + MPI_CURRENT_TYPE->encode(), MPI_CURRENT_TYPE2->encode())); - Colls::allgatherv(sendbuf, sendcount, MPI_CURRENT_TYPE, recvbuf, recvcounts, disps, MPI_CURRENT_TYPE2, - MPI_COMM_WORLD); + Colls::allgatherv(sendbuf, sendcount, MPI_CURRENT_TYPE, recvbuf, recvcounts->data(), disps.data(), MPI_CURRENT_TYPE2, + MPI_COMM_WORLD); - TRACE_smpi_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); log_timed_action (action, clock); } @@ -868,49 +772,39 @@ 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; + std::shared_ptr> sendcounts(new std::vector(comm_size)); + std::shared_ptr> recvcounts(new std::vector(comm_size)); + std::vector senddisps(comm_size, 0); + std::vector recvdisps(comm_size, 0); + + MPI_Datatype 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 rank = smpi_process()->index(); + 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; + (*sendcounts)[i] = std::stoi(action[3 + i]); + (*recvcounts)[i] = std::stoi(action[4 + comm_size + i]); } + int send_size = std::accumulate(sendcounts->begin(), sendcounts->end(), 0); + int recv_size = std::accumulate(recvcounts->begin(), recvcounts->end(), 0); - TRACE_smpi_comm_in(rank, __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))); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::VarCollTIData("allToAllV", -1, send_size, sendcounts, recv_size, recvcounts, + MPI_CURRENT_TYPE->encode(), MPI_CURRENT_TYPE2->encode())); - Colls::alltoallv(sendbuf, sendcounts, senddisps, MPI_CURRENT_TYPE,recvbuf, recvcounts, recvdisps, - MPI_CURRENT_TYPE, MPI_COMM_WORLD); + Colls::alltoallv(sendbuf, sendcounts->data(), senddisps.data(), MPI_CURRENT_TYPE, recvbuf, recvcounts->data(), + recvdisps.data(), MPI_CURRENT_TYPE, MPI_COMM_WORLD); - TRACE_smpi_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); log_timed_action (action, clock); } @@ -923,11 +817,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); - TRACE_smpi_comm_in(rank, "smpi_replay_run_init", new simgrid::instr::NoOpTIData("init")); - TRACE_smpi_comm_out(rank); + 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); @@ -997,12 +891,12 @@ void smpi_replay_main(int* argc, char*** argv) xbt_free(recvbuffer); } - TRACE_smpi_comm_in(smpi_process()->index(), "smpi_replay_run_finalize", new simgrid::instr::NoOpTIData("finalize")); + TRACE_smpi_comm_in(Actor::self()->getPid(), "smpi_replay_run_finalize", new simgrid::instr::NoOpTIData("finalize")); smpi_process()->finalize(); - TRACE_smpi_comm_out(smpi_process()->index()); - 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 */