X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e30d391831c58e590aa83dce5f30f218cc3f53ce..4d4fe07327faa75ebe7dd12ff343b961fe04cb51:/src/smpi/internals/smpi_replay.cpp diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp index e6fe8bc34e..7fc301d672 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -11,12 +11,12 @@ #include "smpi_process.hpp" #include "smpi_request.hpp" #include "xbt/replay.hpp" +#include #include #include #include #include -#include #include #include @@ -65,24 +65,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_replay,smpi,"Trace Replay with SMPI"); typedef std::tuple req_key_t; typedef std::unordered_map>> req_storage_t; -static MPI_Datatype MPI_DEFAULT_TYPE; - -#define CHECK_ACTION_PARAMS(action, mandatory, optional) \ - { \ - if (action.size() < static_cast(mandatory + 2)) { \ - std::stringstream ss; \ - for (const auto& elem : action) { \ - ss << elem << " "; \ - } \ - THROWF(arg_error, 0, "%s replay failed.\n" \ - "%zu 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" \ - "The full line that was given is:\n %s\n" \ - "Please contact the Simgrid team if support is needed", \ - __func__, action.size(), static_cast(mandatory), static_cast(optional), \ - ss.str().c_str()); \ - } \ - } static void log_timed_action(simgrid::xbt::ReplayAction& action, double clock) { @@ -102,6 +84,7 @@ namespace simgrid { namespace smpi { namespace replay { +MPI_Datatype MPI_DEFAULT_TYPE; class RequestStorage { private: @@ -157,381 +140,272 @@ public: } }; -class ActionArgParser { -public: - virtual ~ActionArgParser() = default; - virtual void parse(simgrid::xbt::ReplayAction& action, std::string name) { CHECK_ACTION_PARAMS(action, 0, 0) } -}; +void WaitTestParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +{ + CHECK_ACTION_PARAMS(action, 3, 0) + src = std::stoi(action[2]); + dst = std::stoi(action[3]); + tag = std::stoi(action[4]); +} -class WaitTestParser : public ActionArgParser { -public: - int src; - int dst; - int tag; +void SendRecvParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +{ + CHECK_ACTION_PARAMS(action, 3, 1) + partner = std::stoi(action[2]); + tag = std::stoi(action[3]); + size = parse_double(action[4]); + if (action.size() > 5) + datatype1 = simgrid::smpi::Datatype::decode(action[5]); +} - void parse(simgrid::xbt::ReplayAction& action, std::string name) override - { - CHECK_ACTION_PARAMS(action, 3, 0) - src = std::stoi(action[2]); - dst = std::stoi(action[3]); - tag = std::stoi(action[4]); - } -}; -class SendRecvParser : public ActionArgParser { -public: - /* communication partner; if we send, this is the receiver and vice versa */ - int partner; - double size; - int tag; - MPI_Datatype datatype1 = MPI_DEFAULT_TYPE; +void ComputeParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +{ + CHECK_ACTION_PARAMS(action, 1, 0) + flops = parse_double(action[2]); +} - void parse(simgrid::xbt::ReplayAction& action, std::string name) override - { - CHECK_ACTION_PARAMS(action, 3, 1) - partner = std::stoi(action[2]); - tag = std::stoi(action[3]); - size = parse_double(action[4]); - if (action.size() > 5) - datatype1 = simgrid::smpi::Datatype::decode(action[5]); - } -}; +void BcastArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +{ + CHECK_ACTION_PARAMS(action, 1, 2) + size = parse_double(action[2]); + root = (action.size() > 3) ? std::stoi(action[3]) : 0; + if (action.size() > 4) + datatype1 = simgrid::smpi::Datatype::decode(action[4]); +} -class ComputeParser : public ActionArgParser { -public: - /* communication partner; if we send, this is the receiver and vice versa */ - double flops; +void ReduceArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +{ + CHECK_ACTION_PARAMS(action, 2, 2) + comm_size = parse_double(action[2]); + comp_size = parse_double(action[3]); + root = (action.size() > 4) ? std::stoi(action[4]) : 0; + if (action.size() > 5) + datatype1 = simgrid::smpi::Datatype::decode(action[5]); +} - void parse(simgrid::xbt::ReplayAction& action, std::string name) override - { - CHECK_ACTION_PARAMS(action, 1, 0) - flops = parse_double(action[2]); - } -}; +void AllReduceArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +{ + CHECK_ACTION_PARAMS(action, 2, 1) + comm_size = parse_double(action[2]); + comp_size = parse_double(action[3]); + if (action.size() > 4) + datatype1 = simgrid::smpi::Datatype::decode(action[4]); +} -class CollCommParser : public ActionArgParser { -public: - double size; - double comm_size; - double comp_size; - int send_size; - int recv_size; - int root = 0; - MPI_Datatype datatype1 = MPI_DEFAULT_TYPE; - MPI_Datatype datatype2 = MPI_DEFAULT_TYPE; -}; +void AllToAllArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +{ + CHECK_ACTION_PARAMS(action, 2, 1) + comm_size = MPI_COMM_WORLD->size(); + send_size = parse_double(action[2]); + recv_size = parse_double(action[3]); + + if (action.size() > 4) + datatype1 = simgrid::smpi::Datatype::decode(action[4]); + if (action.size() > 5) + datatype2 = simgrid::smpi::Datatype::decode(action[5]); +} -class BcastArgParser : public CollCommParser { -public: - void parse(simgrid::xbt::ReplayAction& action, std::string name) override - { - CHECK_ACTION_PARAMS(action, 1, 2) - size = parse_double(action[2]); - root = (action.size() > 3) ? std::stoi(action[3]) : 0; - if (action.size() > 4) - datatype1 = simgrid::smpi::Datatype::decode(action[4]); - } -}; +void GatherArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +{ + /* 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 simgrid::smpi::Datatype::decode() + 5) 0 is the recv datatype id, see simgrid::smpi::Datatype::decode() + */ + CHECK_ACTION_PARAMS(action, 2, 3) + comm_size = MPI_COMM_WORLD->size(); + send_size = parse_double(action[2]); + recv_size = parse_double(action[3]); -class ReduceArgParser : public CollCommParser { -public: - void parse(simgrid::xbt::ReplayAction& action, std::string name) override - { - CHECK_ACTION_PARAMS(action, 2, 2) - comm_size = parse_double(action[2]); - comp_size = parse_double(action[3]); + if (name == "gather") { root = (action.size() > 4) ? std::stoi(action[4]) : 0; if (action.size() > 5) datatype1 = simgrid::smpi::Datatype::decode(action[5]); + if (action.size() > 6) + datatype2 = simgrid::smpi::Datatype::decode(action[6]); } -}; - -class AllReduceArgParser : public CollCommParser { -public: - void parse(simgrid::xbt::ReplayAction& action, std::string name) override - { - CHECK_ACTION_PARAMS(action, 2, 1) - comm_size = parse_double(action[2]); - comp_size = parse_double(action[3]); - if (action.size() > 4) - datatype1 = simgrid::smpi::Datatype::decode(action[4]); - } -}; - -class AllToAllArgParser : public CollCommParser { -public: - void parse(simgrid::xbt::ReplayAction& action, std::string name) override - { - CHECK_ACTION_PARAMS(action, 2, 1) - comm_size = MPI_COMM_WORLD->size(); - send_size = parse_double(action[2]); - recv_size = parse_double(action[3]); - + else { if (action.size() > 4) datatype1 = simgrid::smpi::Datatype::decode(action[4]); if (action.size() > 5) datatype2 = simgrid::smpi::Datatype::decode(action[5]); } -}; - -class GatherArgParser : public CollCommParser { -public: - void parse(simgrid::xbt::ReplayAction& action, std::string name) override - { - /* 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 simgrid::smpi::Datatype::decode() - 5) 0 is the recv datatype id, see simgrid::smpi::Datatype::decode() - */ - CHECK_ACTION_PARAMS(action, 2, 3) - comm_size = MPI_COMM_WORLD->size(); - send_size = parse_double(action[2]); - recv_size = parse_double(action[3]); - - if (name == "gather") { - root = (action.size() > 4) ? std::stoi(action[4]) : 0; - if (action.size() > 5) - datatype1 = simgrid::smpi::Datatype::decode(action[5]); - if (action.size() > 6) - datatype2 = simgrid::smpi::Datatype::decode(action[6]); - } - else { - if (action.size() > 4) - datatype1 = simgrid::smpi::Datatype::decode(action[4]); - if (action.size() > 5) - datatype2 = simgrid::smpi::Datatype::decode(action[5]); - } - } -}; - -class GatherVArgParser : public CollCommParser { -public: - int recv_size_sum; - std::shared_ptr> recvcounts; - std::vector disps; - void parse(simgrid::xbt::ReplayAction& action, std::string name) override - { - /* 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 simgrid::smpi::Datatype::decode() - 5) 0 is the recv datatype id, see simgrid::smpi::Datatype::decode() - */ - comm_size = MPI_COMM_WORLD->size(); - CHECK_ACTION_PARAMS(action, comm_size+1, 2) - send_size = parse_double(action[2]); - disps = std::vector(comm_size, 0); - recvcounts = std::shared_ptr>(new std::vector(comm_size)); - - if (name == "gatherV") { - root = (action.size() > 3 + comm_size) ? std::stoi(action[3 + comm_size]) : 0; - if (action.size() > 4 + comm_size) - datatype1 = simgrid::smpi::Datatype::decode(action[4 + comm_size]); - if (action.size() > 5 + comm_size) - datatype2 = simgrid::smpi::Datatype::decode(action[5 + comm_size]); - } - else { - int datatype_index = 0; - int disp_index = 0; - /* The 3 comes from "0 gather ", which must always be present. - * The + comm_size is the recvcounts array, which must also be present - */ - if (action.size() > 3 + comm_size + comm_size) { /* datatype + disp are specified */ - datatype_index = 3 + comm_size; - disp_index = datatype_index + 1; - datatype1 = simgrid::smpi::Datatype::decode(action[datatype_index]); - datatype2 = simgrid::smpi::Datatype::decode(action[datatype_index]); - } else if (action.size() > 3 + comm_size + 2) { /* disps specified; datatype is not specified; use the default one */ - disp_index = 3 + comm_size; - } else if (action.size() > 3 + comm_size) { /* only datatype, no disp specified */ - datatype_index = 3 + comm_size; - datatype1 = simgrid::smpi::Datatype::decode(action[datatype_index]); - datatype2 = simgrid::smpi::Datatype::decode(action[datatype_index]); - } +} - if (disp_index != 0) { - for (unsigned int i = 0; i < comm_size; i++) - disps[i] = std::stoi(action[disp_index + i]); - } +void GatherVArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +{ + /* 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 simgrid::smpi::Datatype::decode() + 5) 0 is the recv datatype id, see simgrid::smpi::Datatype::decode() + */ + comm_size = MPI_COMM_WORLD->size(); + CHECK_ACTION_PARAMS(action, comm_size+1, 2) + send_size = parse_double(action[2]); + disps = std::vector(comm_size, 0); + recvcounts = std::shared_ptr>(new std::vector(comm_size)); + + if (name == "gatherV") { + root = (action.size() > 3 + comm_size) ? std::stoi(action[3 + comm_size]) : 0; + if (action.size() > 4 + comm_size) + datatype1 = simgrid::smpi::Datatype::decode(action[4 + comm_size]); + if (action.size() > 5 + comm_size) + datatype2 = simgrid::smpi::Datatype::decode(action[5 + comm_size]); + } + else { + int datatype_index = 0; + int disp_index = 0; + /* The 3 comes from "0 gather ", which must always be present. + * The + comm_size is the recvcounts array, which must also be present + */ + if (action.size() > 3 + comm_size + comm_size) { /* datatype + disp are specified */ + datatype_index = 3 + comm_size; + disp_index = datatype_index + 1; + datatype1 = simgrid::smpi::Datatype::decode(action[datatype_index]); + datatype2 = simgrid::smpi::Datatype::decode(action[datatype_index]); + } else if (action.size() > 3 + comm_size + 2) { /* disps specified; datatype is not specified; use the default one */ + disp_index = 3 + comm_size; + } else if (action.size() > 3 + comm_size) { /* only datatype, no disp specified */ + datatype_index = 3 + comm_size; + datatype1 = simgrid::smpi::Datatype::decode(action[datatype_index]); + datatype2 = simgrid::smpi::Datatype::decode(action[datatype_index]); } - for (unsigned int i = 0; i < comm_size; i++) { - (*recvcounts)[i] = std::stoi(action[i + 3]); + if (disp_index != 0) { + for (unsigned int i = 0; i < comm_size; i++) + disps[i] = std::stoi(action[disp_index + i]); } - recv_size_sum = std::accumulate(recvcounts->begin(), recvcounts->end(), 0); } -}; -class ScatterArgParser : public CollCommParser { -public: - void parse(simgrid::xbt::ReplayAction& action, std::string name) override - { - /* 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 simgrid::smpi::Datatype::decode() - 5) 0 is the recv datatype id, see simgrid::smpi::Datatype::decode() - */ - CHECK_ACTION_PARAMS(action, 2, 3) - comm_size = MPI_COMM_WORLD->size(); - send_size = parse_double(action[2]); - recv_size = parse_double(action[3]); - root = (action.size() > 4) ? std::stoi(action[4]) : 0; - if (action.size() > 5) - datatype1 = simgrid::smpi::Datatype::decode(action[5]); - if (action.size() > 6) - datatype2 = simgrid::smpi::Datatype::decode(action[6]); + for (unsigned int i = 0; i < comm_size; i++) { + (*recvcounts)[i] = std::stoi(action[i + 3]); } -}; + recv_size_sum = std::accumulate(recvcounts->begin(), recvcounts->end(), 0); +} -class ScatterVArgParser : public CollCommParser { -public: - int recv_size_sum; - int send_size_sum; - std::shared_ptr> sendcounts; - std::vector disps; - void parse(simgrid::xbt::ReplayAction& action, std::string name) override - { - /* 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 +void ScatterArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +{ + /* 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 simgrid::smpi::Datatype::decode() 5) 0 is the recv datatype id, see simgrid::smpi::Datatype::decode() - */ - CHECK_ACTION_PARAMS(action, comm_size + 1, 2) - recv_size = parse_double(action[2 + comm_size]); - disps = std::vector(comm_size, 0); - sendcounts = std::shared_ptr>(new std::vector(comm_size)); - - if (action.size() > 5 + comm_size) - datatype1 = simgrid::smpi::Datatype::decode(action[4 + comm_size]); - if (action.size() > 5 + comm_size) - datatype2 = simgrid::smpi::Datatype::decode(action[5]); - - for (unsigned int i = 0; i < comm_size; i++) { - (*sendcounts)[i] = std::stoi(action[i + 2]); - } - send_size_sum = std::accumulate(sendcounts->begin(), sendcounts->end(), 0); - root = (action.size() > 3 + comm_size) ? std::stoi(action[3 + comm_size]) : 0; - } -}; - -class ReduceScatterArgParser : public CollCommParser { -public: - int recv_size_sum; - std::shared_ptr> recvcounts; - std::vector disps; - void parse(simgrid::xbt::ReplayAction& action, std::string name) override - { - /* 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(). - */ - comm_size = MPI_COMM_WORLD->size(); - CHECK_ACTION_PARAMS(action, comm_size+1, 1) - comp_size = parse_double(action[2+comm_size]); - recvcounts = std::shared_ptr>(new std::vector(comm_size)); - if (action.size() > 3 + comm_size) - datatype1 = simgrid::smpi::Datatype::decode(action[3 + comm_size]); - - for (unsigned int i = 0; i < comm_size; i++) { - recvcounts->push_back(std::stoi(action[i + 2])); - } - recv_size_sum = std::accumulate(recvcounts->begin(), recvcounts->end(), 0); - } -}; - -class AllToAllVArgParser : public CollCommParser { -public: - int recv_size_sum; - int send_size_sum; - std::shared_ptr> recvcounts; - std::shared_ptr> sendcounts; - std::vector senddisps; - std::vector recvdisps; - int send_buf_size; - int recv_buf_size; - void parse(simgrid::xbt::ReplayAction& action, std::string name) override - { - /* 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: - 1) 100 is the size of the send buffer *sizeof(int), - 2) 1 7 10 12 is the sendcounts array - 3) 100*sizeof(int) is the size of the receiver buffer - 4) 1 70 10 5 is the recvcounts array - */ - comm_size = MPI_COMM_WORLD->size(); - CHECK_ACTION_PARAMS(action, 2*comm_size+2, 2) - sendcounts = std::shared_ptr>(new std::vector(comm_size)); - recvcounts = std::shared_ptr>(new std::vector(comm_size)); - senddisps = std::vector(comm_size, 0); - recvdisps = std::vector(comm_size, 0); - - if (action.size() > 5 + 2 * comm_size) - datatype1 = simgrid::smpi::Datatype::decode(action[4 + 2 * comm_size]); - if (action.size() > 5 + 2 * comm_size) - datatype2 = simgrid::smpi::Datatype::decode(action[5 + 2 * comm_size]); - - send_buf_size=parse_double(action[2]); - recv_buf_size=parse_double(action[3+comm_size]); - 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]); - } - send_size_sum = std::accumulate(sendcounts->begin(), sendcounts->end(), 0); - recv_size_sum = std::accumulate(recvcounts->begin(), recvcounts->end(), 0); - } -}; - -template class ReplayAction { -protected: - const std::string name; - const int my_proc_id; - T args; - -public: - explicit ReplayAction(std::string name) : name(name), my_proc_id(simgrid::s4u::this_actor::get_pid()) {} - virtual ~ReplayAction() = default; + */ + CHECK_ACTION_PARAMS(action, 2, 3) + comm_size = MPI_COMM_WORLD->size(); + send_size = parse_double(action[2]); + recv_size = parse_double(action[3]); + root = (action.size() > 4) ? std::stoi(action[4]) : 0; + if (action.size() > 5) + datatype1 = simgrid::smpi::Datatype::decode(action[5]); + if (action.size() > 6) + datatype2 = simgrid::smpi::Datatype::decode(action[6]); +} - virtual void execute(simgrid::xbt::ReplayAction& action) - { - // Needs to be re-initialized for every action, hence here - double start_time = smpi_process()->simulated_elapsed(); - args.parse(action, name); - kernel(action); - if (name != "Init") - log_timed_action(action, start_time); - } +void ScatterVArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +{ + /* 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 simgrid::smpi::Datatype::decode() + 5) 0 is the recv datatype id, see simgrid::smpi::Datatype::decode() + */ + CHECK_ACTION_PARAMS(action, comm_size + 1, 2) + recv_size = parse_double(action[2 + comm_size]); + disps = std::vector(comm_size, 0); + sendcounts = std::shared_ptr>(new std::vector(comm_size)); + + if (action.size() > 5 + comm_size) + datatype1 = simgrid::smpi::Datatype::decode(action[4 + comm_size]); + if (action.size() > 5 + comm_size) + datatype2 = simgrid::smpi::Datatype::decode(action[5]); + + for (unsigned int i = 0; i < comm_size; i++) { + (*sendcounts)[i] = std::stoi(action[i + 2]); + } + send_size_sum = std::accumulate(sendcounts->begin(), sendcounts->end(), 0); + root = (action.size() > 3 + comm_size) ? std::stoi(action[3 + comm_size]) : 0; +} - virtual void kernel(simgrid::xbt::ReplayAction& action) = 0; +void ReduceScatterArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +{ + /* 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(). + */ + comm_size = MPI_COMM_WORLD->size(); + CHECK_ACTION_PARAMS(action, comm_size+1, 1) + comp_size = parse_double(action[2+comm_size]); + recvcounts = std::shared_ptr>(new std::vector(comm_size)); + if (action.size() > 3 + comm_size) + datatype1 = simgrid::smpi::Datatype::decode(action[3 + comm_size]); + + for (unsigned int i = 0; i < comm_size; i++) { + recvcounts->push_back(std::stoi(action[i + 2])); + } + recv_size_sum = std::accumulate(recvcounts->begin(), recvcounts->end(), 0); +} - void* send_buffer(int size) - { - return smpi_get_tmp_sendbuffer(size); - } +void AllToAllVArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +{ + /* 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: + 1) 100 is the size of the send buffer *sizeof(int), + 2) 1 7 10 12 is the sendcounts array + 3) 100*sizeof(int) is the size of the receiver buffer + 4) 1 70 10 5 is the recvcounts array + */ + comm_size = MPI_COMM_WORLD->size(); + CHECK_ACTION_PARAMS(action, 2*comm_size+2, 2) + sendcounts = std::shared_ptr>(new std::vector(comm_size)); + recvcounts = std::shared_ptr>(new std::vector(comm_size)); + senddisps = std::vector(comm_size, 0); + recvdisps = std::vector(comm_size, 0); + + if (action.size() > 5 + 2 * comm_size) + datatype1 = simgrid::smpi::Datatype::decode(action[4 + 2 * comm_size]); + if (action.size() > 5 + 2 * comm_size) + datatype2 = simgrid::smpi::Datatype::decode(action[5 + 2 * comm_size]); + + send_buf_size=parse_double(action[2]); + recv_buf_size=parse_double(action[3+comm_size]); + 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]); + } + send_size_sum = std::accumulate(sendcounts->begin(), sendcounts->end(), 0); + recv_size_sum = std::accumulate(recvcounts->begin(), recvcounts->end(), 0); +} - void* recv_buffer(int size) - { - return smpi_get_tmp_recvbuffer(size); - } -}; +template +void ReplayAction::execute(simgrid::xbt::ReplayAction& action) +{ + // Needs to be re-initialized for every action, hence here + double start_time = smpi_process()->simulated_elapsed(); + args.parse(action, name); + kernel(action); + if (name != "Init") + log_timed_action(action, start_time); +} class WaitAction : public ReplayAction { private: @@ -947,7 +821,6 @@ void smpi_replay_init(int* argc, char*** argv) xbt_replay_action_register("comm_size", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::CommunicatorAction().execute(action); }); xbt_replay_action_register("comm_split",[](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::CommunicatorAction().execute(action); }); xbt_replay_action_register("comm_dup", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::CommunicatorAction().execute(action); }); - xbt_replay_action_register("send", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::SendAction("send", storage[simgrid::s4u::this_actor::get_pid()-1]).execute(action); }); xbt_replay_action_register("Isend", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::SendAction("Isend", storage[simgrid::s4u::this_actor::get_pid()-1]).execute(action); }); xbt_replay_action_register("recv", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::RecvAction("recv", storage[simgrid::s4u::this_actor::get_pid()-1]).execute(action); });