X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1657559f7a990ddc091757a83d8e11201bdd5f64..05235cab14333e478e8719a57ba7b89fc0d30139:/src/smpi/internals/smpi_replay.cpp diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp index 0241c05beb..8067fd4cd3 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -12,6 +12,9 @@ #include "smpi_request.hpp" #include "xbt/replay.hpp" +#include +#include +#include #include #include @@ -24,18 +27,22 @@ static int active_processes = 0; static std::unordered_map*> reqq; static MPI_Datatype MPI_DEFAULT_TYPE; -static MPI_Datatype MPI_CURRENT_TYPE; -static int sendbuffer_size = 0; -static char* sendbuffer = nullptr; -static int recvbuffer_size = 0; -static char* recvbuffer = nullptr; +#define CHECK_ACTION_PARAMS(action, mandatory, optional) \ + { \ + if (action.size() < static_cast(mandatory + 2)) \ + THROWF(arg_error, 0, "%s replay failed.\n" \ + "%lu items were given on the line. First two should be process_id and action. " \ + "This action needs after them %lu mandatory arguments, and accepts %lu optional ones. \n" \ + "Please contact the Simgrid team if support is needed", \ + __FUNCTION__, action.size(), static_cast(mandatory), \ + static_cast(optional)); \ + } -static void log_timed_action (const char *const *action, double clock){ +static void log_timed_action (simgrid::xbt::ReplayAction& action, double clock){ if (XBT_LOG_ISENABLED(smpi_replay, xbt_log_priority_verbose)){ - char *name = xbt_str_join_array(action, " "); - XBT_VERB("%s %f", name, smpi_process()->simulated_elapsed()-clock); - xbt_free(name); + std::string s = boost::algorithm::join(action, " "); + XBT_VERB("%s %f", s.c_str(), smpi_process()->simulated_elapsed()-clock); } } @@ -49,116 +56,90 @@ static void set_reqq_self(std::vector *mpi_request) reqq.insert({Actor::self()->getPid(), mpi_request}); } -//allocate a single buffer for all sends, growing it if needed -void* smpi_get_tmp_sendbuffer(int size) +/* Helper function */ +static double parse_double(std::string string) { - if (not smpi_process()->replaying()) - return xbt_malloc(size); - if (sendbuffer_size(xbt_realloc(sendbuffer,size)); - sendbuffer_size=size; - } - return sendbuffer; + return xbt_str_parse_double(string.c_str(), "%s is not a double"); } -//allocate a single buffer for all recv -void* smpi_get_tmp_recvbuffer(int size){ - if (not smpi_process()->replaying()) - return xbt_malloc(size); - if (recvbuffer_size(xbt_realloc(recvbuffer,size)); - recvbuffer_size=size; - } - return recvbuffer; -} +namespace simgrid { +namespace smpi { -void smpi_free_tmp_buffer(void* buf){ - if (not smpi_process()->replaying()) - xbt_free(buf); -} +namespace Replay { +class ActionArgParser { +public: + virtual void parse(simgrid::xbt::ReplayAction& action){}; +}; -/* Helper function */ -static double parse_double(const char *string) -{ - char *endptr; - double value = strtod(string, &endptr); - if (*endptr != '\0') - THROWF(unknown_error, 0, "%s is not a double", 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: - return MPI_DOUBLE; - break; - case 1: - return MPI_INT; - break; - case 2: - return MPI_CHAR; - break; - case 3: - return MPI_SHORT; - break; - case 4: - return MPI_LONG; - break; - case 5: - return MPI_FLOAT; - break; - case 6: - return MPI_BYTE; - break; - default: - return MPI_DEFAULT_TYPE; - break; +template class ReplayAction { + protected: + const std::string name; + T args; + + /* + * Used to compute the duration of this action. + */ + double start_time; + + int my_proc_id; + +public: + explicit ReplayAction(std::string name) + : name(name), start_time(smpi_process()->simulated_elapsed()), my_proc_id(simgrid::s4u::Actor::self()->getPid()) + { } -} -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"; -} - -#define CHECK_ACTION_PARAMS(action, mandatory, optional) {\ - int i=0;\ - while(action[i]!=nullptr)\ - i++;\ - if(i { +public: + WaitAction() : ReplayAction("Wait") {} + void kernel(simgrid::xbt::ReplayAction& action) override + { + CHECK_ACTION_PARAMS(action, 0, 0) + MPI_Status status; + + std::string s = boost::algorithm::join(action, " "); + xbt_assert(get_reqq_self()->size(), "action wait not preceded by any irecv or isend: %s", s.c_str()); + MPI_Request request = get_reqq_self()->back(); + get_reqq_self()->pop_back(); + + if (request == nullptr) { + /* Assume that the trace is well formed, meaning the comm might have been caught by a MPI_test. Then just + * return.*/ + return; + } + + int rank = request->comm() != MPI_COMM_NULL ? request->comm()->rank() : -1; + + MPI_Group group = request->comm()->group(); + int src_traced = group->rank(request->src()); + int dst_traced = group->rank(request->dst()); + bool is_wait_for_receive = (request->flags() & RECV); + // TODO: Here we take the rank while we normally take the process id (look for my_proc_id) + TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::NoOpTIData("wait")); + + Request::wait(&request, &status); -static void action_init(const char *const *action) + TRACE_smpi_comm_out(rank); + if (is_wait_for_receive) + TRACE_smpi_recv(src_traced, dst_traced, 0); + } +}; + +static void action_init(simgrid::xbt::ReplayAction& action) { XBT_DEBUG("Initialize the counters"); CHECK_ACTION_PARAMS(action, 0, 1) - if(action[2]) + if (action.size() > 2) MPI_DEFAULT_TYPE = MPI_DOUBLE; // default MPE datatype else MPI_DEFAULT_TYPE = MPI_BYTE; // default TAU datatype @@ -171,28 +152,28 @@ static void action_init(const char *const *action) set_reqq_self(new std::vector); } -static void action_finalize(const char *const *action) +static void action_finalize(simgrid::xbt::ReplayAction& action) { /* Nothing to do */ } -static void action_comm_size(const char *const *action) +static void action_comm_size(simgrid::xbt::ReplayAction& action) { communicator_size = parse_double(action[2]); log_timed_action (action, smpi_process()->simulated_elapsed()); } -static void action_comm_split(const char *const *action) +static void action_comm_split(simgrid::xbt::ReplayAction& action) { log_timed_action (action, smpi_process()->simulated_elapsed()); } -static void action_comm_dup(const char *const *action) +static void action_comm_dup(simgrid::xbt::ReplayAction& action) { log_timed_action (action, smpi_process()->simulated_elapsed()); } -static void action_compute(const char *const *action) +static void action_compute(simgrid::xbt::ReplayAction& action) { CHECK_ACTION_PARAMS(action, 1, 0) double clock = smpi_process()->simulated_elapsed(); @@ -206,20 +187,20 @@ static void action_compute(const char *const *action) log_timed_action (action, clock); } -static void action_send(const char *const *action) +static void action_send(simgrid::xbt::ReplayAction& 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(); - MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE; + MPI_Datatype MPI_CURRENT_TYPE = (action.size() > 4) ? simgrid::smpi::Datatype::decode(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))); + new simgrid::instr::Pt2PtTIData("send", to, size, Datatype::encode(MPI_CURRENT_TYPE))); if (not TRACE_smpi_view_internals()) TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, 0, size * MPI_CURRENT_TYPE->size()); @@ -230,19 +211,19 @@ static void action_send(const char *const *action) log_timed_action(action, clock); } -static void action_Isend(const char *const *action) +static void action_Isend(simgrid::xbt::ReplayAction& 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(); - MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE; + MPI_Datatype MPI_CURRENT_TYPE = (action.size() > 4) ? simgrid::smpi::Datatype::decode(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))); + new simgrid::instr::Pt2PtTIData("Isend", to, size, Datatype::encode(MPI_CURRENT_TYPE))); if (not TRACE_smpi_view_internals()) TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, 0, size * MPI_CURRENT_TYPE->size()); @@ -255,20 +236,21 @@ static void action_Isend(const char *const *action) log_timed_action (action, clock); } -static void action_recv(const char *const *action) { +static void action_recv(simgrid::xbt::ReplayAction& 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; - MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE; + MPI_Datatype MPI_CURRENT_TYPE = (action.size() > 4) ? simgrid::smpi::Datatype::decode(action[4]) : MPI_DEFAULT_TYPE; int my_proc_id = Actor::self()->getPid(); int src_traced = MPI_COMM_WORLD->group()->actor(from)->getPid(); TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, - new simgrid::instr::Pt2PtTIData("recv", from, size, encode_datatype(MPI_CURRENT_TYPE))); + new simgrid::instr::Pt2PtTIData("recv", from, size, Datatype::encode(MPI_CURRENT_TYPE))); //unknown size from the receiver point of view if (size <= 0.0) { @@ -286,18 +268,18 @@ static void action_recv(const char *const *action) { log_timed_action (action, clock); } -static void action_Irecv(const char *const *action) +static void action_Irecv(simgrid::xbt::ReplayAction& 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_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE; + MPI_Datatype MPI_CURRENT_TYPE = (action.size() > 4) ? simgrid::smpi::Datatype::decode(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))); + new simgrid::instr::Pt2PtTIData("Irecv", from, size, Datatype::encode(MPI_CURRENT_TYPE))); MPI_Status status; //unknow size from the receiver pov if (size <= 0.0) { @@ -313,7 +295,7 @@ static void action_Irecv(const char *const *action) log_timed_action (action, clock); } -static void action_test(const char* const* action) +static void action_test(simgrid::xbt::ReplayAction& action) { CHECK_ACTION_PARAMS(action, 0, 0) double clock = smpi_process()->simulated_elapsed(); @@ -339,38 +321,13 @@ static void action_test(const char* const* action) log_timed_action (action, clock); } -static void action_wait(const char *const *action){ - CHECK_ACTION_PARAMS(action, 0, 0) - double clock = smpi_process()->simulated_elapsed(); - MPI_Status status; - - xbt_assert(get_reqq_self()->size(), "action wait not preceded by any irecv or isend: %s", - xbt_str_join_array(action," ")); - MPI_Request request = get_reqq_self()->back(); - get_reqq_self()->pop_back(); - - if (request==nullptr){ - /* Assume that the trace is well formed, meaning the comm might have been caught by a MPI_test. Then just return.*/ - return; - } - - int rank = request->comm() != MPI_COMM_NULL ? request->comm()->rank() : -1; - - MPI_Group group = request->comm()->group(); - int src_traced = group->rank(request->src()); - int dst_traced = group->rank(request->dst()); - int is_wait_for_receive = (request->flags() & RECV); - TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::NoOpTIData("wait")); - - Request::wait(&request, &status); - - TRACE_smpi_comm_out(rank); - if (is_wait_for_receive) - TRACE_smpi_recv(src_traced, dst_traced, 0); - log_timed_action (action, clock); +static void action_wait(simgrid::xbt::ReplayAction& action) +{ + Replay::WaitAction().execute(action); } -static void action_waitall(const char *const *action){ +static void action_waitall(simgrid::xbt::ReplayAction& action) +{ CHECK_ACTION_PARAMS(action, 0, 0) double clock = smpi_process()->simulated_elapsed(); const unsigned int count_requests = get_reqq_self()->size(); @@ -402,7 +359,8 @@ static void action_waitall(const char *const *action){ log_timed_action (action, clock); } -static void action_barrier(const char *const *action){ +static void action_barrier(simgrid::xbt::ReplayAction& action) +{ double clock = smpi_process()->simulated_elapsed(); int my_proc_id = Actor::self()->getPid(); TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::NoOpTIData("barrier")); @@ -413,19 +371,19 @@ static void action_barrier(const char *const *action){ log_timed_action (action, clock); } -static void action_bcast(const char *const *action) +static void action_bcast(simgrid::xbt::ReplayAction& action) { CHECK_ACTION_PARAMS(action, 1, 2) double size = parse_double(action[2]); double clock = smpi_process()->simulated_elapsed(); - int root = (action[3]) ? atoi(action[3]) : 0; + int root = (action.size() > 3) ? std::stoi(action[3]) : 0; /* Initialize MPI_CURRENT_TYPE in order to decrease the number of the checks */ - MPI_CURRENT_TYPE = (action[3] && action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE; + MPI_Datatype MPI_CURRENT_TYPE = (action.size() > 4) ? simgrid::smpi::Datatype::decode(action[4]) : MPI_DEFAULT_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, encode_datatype(MPI_CURRENT_TYPE), "")); + -1, Datatype::encode(MPI_CURRENT_TYPE), "")); void *sendbuf = smpi_get_tmp_sendbuffer(size* MPI_CURRENT_TYPE->size()); @@ -435,20 +393,20 @@ static void action_bcast(const char *const *action) log_timed_action (action, clock); } -static void action_reduce(const char *const *action) +static void action_reduce(simgrid::xbt::ReplayAction& action) { CHECK_ACTION_PARAMS(action, 2, 2) double comm_size = parse_double(action[2]); double comp_size = parse_double(action[3]); double clock = smpi_process()->simulated_elapsed(); - int root = (action[4]) ? atoi(action[4]) : 0; + int root = (action.size() > 4) ? std::stoi(action[4]) : 0; - MPI_CURRENT_TYPE = (action[4] && action[5]) ? decode_datatype(action[5]) : MPI_DEFAULT_TYPE; + MPI_Datatype MPI_CURRENT_TYPE = (action.size() > 5) ? simgrid::smpi::Datatype::decode(action[5]) : MPI_DEFAULT_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, encode_datatype(MPI_CURRENT_TYPE), "")); + comm_size, -1, Datatype::encode(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()); @@ -459,19 +417,20 @@ static void action_reduce(const char *const *action) log_timed_action (action, clock); } -static void action_allReduce(const char *const *action) { +static void action_allReduce(simgrid::xbt::ReplayAction& action) +{ CHECK_ACTION_PARAMS(action, 2, 1) double comm_size = parse_double(action[2]); double comp_size = parse_double(action[3]); - MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE; + MPI_Datatype MPI_CURRENT_TYPE = (action.size() > 4) ? simgrid::smpi::Datatype::decode(action[4]) : MPI_DEFAULT_TYPE; double clock = smpi_process()->simulated_elapsed(); 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), "")); + Datatype::encode(MPI_CURRENT_TYPE), "")); - 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); @@ -480,14 +439,15 @@ static void action_allReduce(const char *const *action) { log_timed_action (action, clock); } -static void action_allToAll(const char *const *action) { +static void action_allToAll(simgrid::xbt::ReplayAction& action) +{ CHECK_ACTION_PARAMS(action, 2, 2) //two mandatory (send and recv volumes) and two optional (corresponding datatypes) double clock = smpi_process()->simulated_elapsed(); - int comm_size = MPI_COMM_WORLD->size(); + unsigned long comm_size = MPI_COMM_WORLD->size(); int send_size = parse_double(action[2]); int recv_size = parse_double(action[3]); - 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}; + MPI_Datatype MPI_CURRENT_TYPE{(action.size() > 5) ? simgrid::smpi::Datatype::decode(action[4]) : MPI_DEFAULT_TYPE}; + MPI_Datatype MPI_CURRENT_TYPE2{(action.size() > 5) ? simgrid::smpi::Datatype::decode(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()); @@ -495,8 +455,8 @@ static void action_allToAll(const char *const *action) { 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))); + Datatype::encode(MPI_CURRENT_TYPE), + Datatype::encode(MPI_CURRENT_TYPE2))); Colls::alltoall(send, send_size, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, MPI_COMM_WORLD); @@ -504,35 +464,36 @@ static void action_allToAll(const char *const *action) { log_timed_action (action, clock); } -static void action_gather(const char *const *action) { +static void action_gather(simgrid::xbt::ReplayAction& action) +{ /* The structure of the gather 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() + 4) 0 is the send datatype id, see simgrid::smpi::Datatype::decode() + 5) 0 is the recv datatype id, see simgrid::smpi::Datatype::decode() */ CHECK_ACTION_PARAMS(action, 2, 3) double clock = smpi_process()->simulated_elapsed(); - int comm_size = MPI_COMM_WORLD->size(); + unsigned long 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}; + MPI_Datatype MPI_CURRENT_TYPE{(action.size() > 6) ? simgrid::smpi::Datatype::decode(action[5]) : MPI_DEFAULT_TYPE}; + MPI_Datatype MPI_CURRENT_TYPE2{(action.size() > 6) ? simgrid::smpi::Datatype::decode(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 root = (action.size() > 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))); + Datatype::encode(MPI_CURRENT_TYPE), + Datatype::encode(MPI_CURRENT_TYPE2))); Colls::gather(send, send_size, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, root, MPI_COMM_WORLD); @@ -540,7 +501,7 @@ static void action_gather(const char *const *action) { log_timed_action (action, clock); } -static void action_scatter(const char* const* action) +static void action_scatter(simgrid::xbt::ReplayAction& action) { /* The structure of the scatter action for the rank 0 (total 4 processes) is the following: 0 gather 68 68 0 0 0 @@ -548,28 +509,28 @@ static void action_scatter(const char* const* action) 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() + 4) 0 is the send datatype id, see simgrid::smpi::Datatype::decode() + 5) 0 is the recv datatype id, see simgrid::smpi::Datatype::decode() */ CHECK_ACTION_PARAMS(action, 2, 3) double clock = smpi_process()->simulated_elapsed(); - int comm_size = MPI_COMM_WORLD->size(); + unsigned long 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}; + MPI_Datatype MPI_CURRENT_TYPE{(action.size() > 6) ? simgrid::smpi::Datatype::decode(action[5]) : MPI_DEFAULT_TYPE}; + MPI_Datatype MPI_CURRENT_TYPE2{(action.size() > 6) ? simgrid::smpi::Datatype::decode(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 root = (action.size() > 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))); + Datatype::encode(MPI_CURRENT_TYPE), + Datatype::encode(MPI_CURRENT_TYPE2))); Colls::scatter(send, send_size, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, root, MPI_COMM_WORLD); @@ -577,56 +538,54 @@ static void action_scatter(const char* const* action) log_timed_action(action, clock); } -static void action_gatherv(const char *const *action) { +static void action_gatherv(simgrid::xbt::ReplayAction& 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 where: 1) 68 is the sendcount 2) 68 10 10 10 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() + 4) 0 is the send datatype id, see simgrid::smpi::Datatype::decode() + 5) 0 is the recv datatype id, see simgrid::smpi::Datatype::decode() */ double clock = smpi_process()->simulated_elapsed(); - int comm_size = MPI_COMM_WORLD->size(); + unsigned long 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_CURRENT_TYPE = - (action[4 + comm_size] && action[5 + comm_size]) ? decode_datatype(action[4 + comm_size]) : MPI_DEFAULT_TYPE; + MPI_Datatype MPI_CURRENT_TYPE = + (action.size() > 5 + comm_size) ? simgrid::smpi::Datatype::decode(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}; + (action.size() > 5 + comm_size) ? simgrid::smpi::Datatype::decode(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 = (action[3 + comm_size]) ? atoi(action[3 + comm_size]) : 0; + int root = (action.size() > 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(recvcounts, recvcounts + comm_size); - 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))); + "gatherV", root, send_size, nullptr, -1, recvcounts, + Datatype::encode(MPI_CURRENT_TYPE), Datatype::encode(MPI_CURRENT_TYPE2))); - 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(Actor::self()->getPid()); log_timed_action (action, clock); } -static void action_scatterv(const char* const* action) +static void action_scatterv(simgrid::xbt::ReplayAction& 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 @@ -634,103 +593,101 @@ static void action_scatterv(const char* const* action) 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() + 4) 0 is the send datatype id, see simgrid::smpi::Datatype::decode() + 5) 0 is the recv datatype id, see simgrid::smpi::Datatype::decode() */ double clock = smpi_process()->simulated_elapsed(); - int comm_size = MPI_COMM_WORLD->size(); + unsigned long 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_CURRENT_TYPE = - (action[4 + comm_size] && action[5 + comm_size]) ? decode_datatype(action[4 + comm_size]) : MPI_DEFAULT_TYPE; + MPI_Datatype MPI_CURRENT_TYPE = + (action.size() > 5 + comm_size) ? simgrid::smpi::Datatype::decode(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}; + (action.size() > 5 + comm_size) ? simgrid::smpi::Datatype::decode(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; + for (unsigned int i = 0; i < comm_size; i++) { + (*sendcounts)[i] = std::stoi(action[i + 2]); } + int send_sum = std::accumulate(sendcounts->begin(), sendcounts->end(), 0); - int root = (action[3 + comm_size]) ? atoi(action[3 + comm_size]) : 0; + int root = (action.size() > 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(sendcounts, sendcounts + comm_size); + TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::VarCollTIData("gatherV", root, -1, sendcounts, recv_size, + nullptr, Datatype::encode(MPI_CURRENT_TYPE), + Datatype::encode(MPI_CURRENT_TYPE2))); - 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); + Colls::scatterv(send, sendcounts->data(), disps.data(), 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 - where: - 1) The first four values after the name of the action declare the recvcounts array - 2) The value 11346849 is the amount of instructions - 3) The last value corresponds to the datatype, see decode_datatype(). -*/ +static void action_reducescatter(simgrid::xbt::ReplayAction& 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 + where: + 1) The first four values after the name of the action declare the recvcounts array + 2) The value 11346849 is the amount of instructions + 3) The last value corresponds to the datatype, see simgrid::smpi::Datatype::decode(). + */ double clock = smpi_process()->simulated_elapsed(); - int comm_size = MPI_COMM_WORLD->size(); + unsigned long 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 my_proc_id = Actor::self()->getPid(); - int size = 0; - 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(recvcounts[i]); - size+=recvcounts[i]; + std::shared_ptr> recvcounts(new std::vector); + MPI_Datatype MPI_CURRENT_TYPE = + (action.size() > 3 + comm_size) ? simgrid::smpi::Datatype::decode(action[3 + comm_size]) : MPI_DEFAULT_TYPE; + + for (unsigned int i = 0; i < comm_size; i++) { + recvcounts->push_back(std::stoi(action[i + 2])); } + int size{std::accumulate(recvcounts->begin(), recvcounts->end(), 0)}; TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, - new simgrid::instr::VarCollTIData("reduceScatter", -1, 0, nullptr, -1, trace_recvcounts, + 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))); + Datatype::encode(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, recvcounts->data(), MPI_CURRENT_TYPE, MPI_OP_NULL, MPI_COMM_WORLD); smpi_execute_flops(comp_size); TRACE_smpi_comm_out(my_proc_id); log_timed_action (action, clock); } -static void action_allgather(const char *const *action) { +static void action_allgather(simgrid::xbt::ReplayAction& action) +{ /* The structure of the allgather action for the rank 0 (total 4 processes) is the following: 0 allGather 275427 275427 where: 1) 275427 is the sendcount 2) 275427 is the recvcount - 3) No more values mean that the datatype for sent and receive buffer is the default one, see decode_datatype(). + 3) No more values mean that the datatype for sent and receive buffer is the default one, see + simgrid::smpi::Datatype::decode(). */ double clock = smpi_process()->simulated_elapsed(); CHECK_ACTION_PARAMS(action, 2, 2) - int sendcount=atoi(action[2]); - int recvcount=atoi(action[3]); + int sendcount = std::stoi(action[2]); + int recvcount = std::stoi(action[3]); - 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}; + MPI_Datatype MPI_CURRENT_TYPE{(action.size() > 5) ? simgrid::smpi::Datatype::decode(action[4]) : MPI_DEFAULT_TYPE}; + MPI_Datatype MPI_CURRENT_TYPE2{(action.size() > 5) ? simgrid::smpi::Datatype::decode(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()); @@ -739,8 +696,8 @@ static void action_allgather(const char *const *action) { 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))); + Datatype::encode(MPI_CURRENT_TYPE), + Datatype::encode(MPI_CURRENT_TYPE2))); Colls::allgather(sendbuf, sendcount, MPI_CURRENT_TYPE, recvbuf, recvcount, MPI_CURRENT_TYPE2, MPI_COMM_WORLD); @@ -748,54 +705,69 @@ static void action_allgather(const char *const *action) { log_timed_action (action, clock); } -static void action_allgatherv(const char *const *action) { +static void action_allgatherv(simgrid::xbt::ReplayAction& action) +{ /* The structure of the allgatherv action for the rank 0 (total 4 processes) is the following: 0 allGatherV 275427 275427 275427 275427 204020 where: 1) 275427 is the sendcount 2) The next four elements declare the recvcounts array - 3) No more values mean that the datatype for sent and receive buffer is the default one, see decode_datatype(). + 3) No more values mean that the datatype for sent and receive buffer is the default one, see + simgrid::smpi::Datatype::decode(). */ double clock = smpi_process()->simulated_elapsed(); - int comm_size = MPI_COMM_WORLD->size(); + unsigned long 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; + 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.size() > 3 + 2 * comm_size) { /* datatype + disp are specified */ + datatype_index = 3 + comm_size; + disp_index = datatype_index + 1; + } else if (action.size() > 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.size() > 3 + comm_size) { /* only datatype, no disp specified */ + datatype_index = 3 + comm_size; + } - 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}; + if (disp_index != 0) { + for (unsigned int i = 0; i < comm_size; i++) + disps[i] = std::stoi(action[disp_index + i]); + } + + MPI_Datatype MPI_CURRENT_TYPE{(datatype_index > 0) ? simgrid::smpi::Datatype::decode(action[datatype_index]) + : MPI_DEFAULT_TYPE}; + MPI_Datatype MPI_CURRENT_TYPE2{(datatype_index > 0) ? simgrid::smpi::Datatype::decode(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 my_proc_id = Actor::self()->getPid(); - 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))); + new simgrid::instr::VarCollTIData("allGatherV", -1, sendcount, nullptr, -1, recvcounts, + Datatype::encode(MPI_CURRENT_TYPE), + Datatype::encode(MPI_CURRENT_TYPE2))); - 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(my_proc_id); log_timed_action (action, clock); } -static void action_allToAllv(const char *const *action) { +static void action_allToAllv(simgrid::xbt::ReplayAction& action) +{ /* The structure of the allToAllV action for the rank 0 (total 4 processes) is the following: 0 allToAllV 100 1 7 10 12 100 1 70 10 5 where: @@ -806,22 +778,18 @@ static void action_allToAllv(const char *const *action) { */ double clock = smpi_process()->simulated_elapsed(); - int comm_size = MPI_COMM_WORLD->size(); + unsigned long 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_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]) + 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.size() > 5 + 2 * comm_size) + ? simgrid::smpi::Datatype::decode(action[4 + 2 * comm_size]) + : MPI_DEFAULT_TYPE; + MPI_Datatype MPI_CURRENT_TYPE2{(action.size() > 5 + 2 * comm_size) + ? simgrid::smpi::Datatype::decode(action[5 + 2 * comm_size]) : MPI_DEFAULT_TYPE}; int send_buf_size=parse_double(action[2]); @@ -830,24 +798,20 @@ static void action_allToAllv(const char *const *action) { 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; + for (unsigned int i = 0; i < comm_size; i++) { + (*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(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))); + new simgrid::instr::VarCollTIData("allToAllV", -1, send_size, sendcounts, recv_size, recvcounts, + Datatype::encode(MPI_CURRENT_TYPE), + Datatype::encode(MPI_CURRENT_TYPE2))); - 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(my_proc_id); log_timed_action (action, clock); @@ -932,8 +896,7 @@ void smpi_replay_main(int* argc, char*** argv) if(active_processes==0){ /* Last process alive speaking: end the simulated timer */ XBT_INFO("Simulation time %f", smpi_process()->simulated_elapsed()); - xbt_free(sendbuffer); - xbt_free(recvbuffer); + smpi_free_replay_tmp_buffers(); } TRACE_smpi_comm_in(Actor::self()->getPid(), "smpi_replay_run_finalize", new simgrid::instr::NoOpTIData("finalize"));