X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8dc3394c8bcc3849bbda44a668a714596e714a18..1f7b8e8c82729f1d274419748e04fcca6b909d3b:/src/smpi/internals/smpi_replay.cpp diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp index 3e4ec9b6b1..42bbacdff4 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -1,104 +1,69 @@ -/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2021. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "private.hpp" +#include "smpi_replay.hpp" +#include "simgrid/s4u/Exec.hpp" #include "smpi_coll.hpp" #include "smpi_comm.hpp" +#include "smpi_config.hpp" #include "smpi_datatype.hpp" #include "smpi_group.hpp" -#include "smpi_process.hpp" #include "smpi_request.hpp" +#include "src/smpi/include/private.hpp" #include "xbt/replay.hpp" -#include +#include +#include #include #include +#include #include -#include #include -using simgrid::s4u::Actor; - -#include +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_replay, smpi, "Trace Replay with SMPI"); // From https://stackoverflow.com/questions/7110301/generic-hash-for-tuples-in-unordered-map-unordered-set // This is all just to make std::unordered_map work with std::tuple. If we need this in other places, // this could go into a header file. -namespace hash_tuple{ - template - struct hash - { - size_t - operator()(TT const& tt) const - { - return std::hash()(tt); - } - }; - - template - inline void hash_combine(std::size_t& seed, T const& v) - { - seed ^= hash_tuple::hash()(v) + 0x9e3779b9 + (seed<<6) + (seed>>2); - } +namespace hash_tuple { +template class hash { +public: + size_t operator()(TT const& tt) const { return std::hash()(tt); } +}; - // Recursive template code derived from Matthieu M. - template ::value - 1> - struct HashValueImpl - { - static void apply(size_t& seed, Tuple const& tuple) - { - HashValueImpl::apply(seed, tuple); - hash_combine(seed, std::get(tuple)); - } - }; +template inline void hash_combine(std::size_t& seed, T const& v) +{ + seed ^= hash_tuple::hash()(v) + 0x9e3779b9 + (seed << 6) + (seed >> 2); +} - template - struct HashValueImpl - { - static void apply(size_t& seed, Tuple const& tuple) - { - hash_combine(seed, std::get<0>(tuple)); - } - }; +// Recursive template code derived from Matthieu M. +template ::value - 1> class HashValueImpl { +public: + static void apply(size_t& seed, Tuple const& tuple) + { + HashValueImpl::apply(seed, tuple); + hash_combine(seed, std::get(tuple)); + } +}; - template - struct hash> - { - size_t - operator()(std::tuple const& tt) const - { - size_t seed = 0; - HashValueImpl >::apply(seed, tt); - return seed; - } - }; -} +template class HashValueImpl { +public: + static void apply(size_t& seed, Tuple const& tuple) { hash_combine(seed, std::get<0>(tuple)); } +}; -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_replay,smpi,"Trace Replay with SMPI"); - -static std::unordered_map*> reqq; - -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()); \ - } \ +template class hash> { +public: + size_t operator()(std::tuple const& tt) const + { + size_t seed = 0; + HashValueImpl>::apply(seed, tt); + return seed; } +}; +} -static void log_timed_action(simgrid::xbt::ReplayAction& action, double clock) +void log_timed_action(const simgrid::xbt::ReplayAction& action, double clock) { if (XBT_LOG_ISENABLED(smpi_replay, xbt_log_priority_verbose)){ std::string s = boost::algorithm::join(action, " "); @@ -106,62 +71,69 @@ static void log_timed_action(simgrid::xbt::ReplayAction& action, double clock) } } -static std::vector* get_reqq_self() +/* Helper functions */ +static double parse_double(const std::string& string) { - return reqq.at(simgrid::s4u::this_actor::get_pid()); + return xbt_str_parse_double(string.c_str(), "not a double"); } -static void set_reqq_self(std::vector *mpi_request) +template static T parse_integer(const std::string& string) { - reqq.insert({simgrid::s4u::this_actor::get_pid(), mpi_request}); + double val = trunc(xbt_str_parse_double(string.c_str(), "not a double")); + xbt_assert(static_cast(std::numeric_limits::min()) <= val && + val <= static_cast(std::numeric_limits::max()), + "out of range: %g", val); + return static_cast(val); } -/* Helper function */ -static double parse_double(std::string string) +static int parse_root(const simgrid::xbt::ReplayAction& action, unsigned i) { - return xbt_str_parse_double(string.c_str(), "%s is not a double"); + return i < action.size() ? std::stoi(action[i]) : 0; +} + +static MPI_Datatype parse_datatype(const simgrid::xbt::ReplayAction& action, unsigned i) +{ + return i < action.size() ? simgrid::smpi::Datatype::decode(action[i]) : simgrid::smpi::replay::MPI_DEFAULT_TYPE; } namespace simgrid { namespace smpi { namespace replay { +MPI_Datatype MPI_DEFAULT_TYPE; class RequestStorage { private: - req_storage_t store; + using req_key_t = std::tuple; + using req_storage_t = std::unordered_map>>; + + req_storage_t store; public: - RequestStorage() {} - int size() - { - return store.size(); - } + RequestStorage() = default; + size_t size() const { return store.size(); } - req_storage_t& get_store() - { - return store; - } + req_storage_t& get_store() { return store; } - void get_requests(std::vector& vec) - { - for (auto& pair : store) { - auto& req = pair.second; - auto my_proc_id = simgrid::s4u::this_actor::getPid(); - if (req != MPI_REQUEST_NULL && (req->src() == my_proc_id || req->dst() == my_proc_id)) { - vec.push_back(pair.second); - pair.second->print_request("MM"); - } + void get_requests(std::vector& vec) const + { + for (auto const& pair : store) { + auto& req = pair.second; + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); + if (req != MPI_REQUEST_NULL && (req->src() == my_proc_id || req->dst() == my_proc_id)) { + vec.push_back(pair.second); + pair.second->print_request("MM"); } } + } MPI_Request find(int src, int dst, int tag) { - req_storage_t::iterator it = store.find(req_key_t(src, dst, tag)); + auto it = store.find(req_key_t(src, dst, tag)); return (it == store.end()) ? MPI_REQUEST_NULL : it->second; } - void remove(MPI_Request req) + void remove(const Request* req) { if (req == MPI_REQUEST_NULL) return; @@ -177,838 +149,740 @@ public: /* Sometimes we need to re-insert MPI_REQUEST_NULL but we still need src,dst and tag */ void addNullRequest(int src, int dst, int tag) { - store.insert({req_key_t(src, dst, tag), MPI_REQUEST_NULL}); + store.insert({req_key_t(MPI_COMM_WORLD->group()->actor(src) - 1, MPI_COMM_WORLD->group()->actor(dst) - 1, tag), + MPI_REQUEST_NULL}); } }; -class ActionArgParser { -public: - virtual ~ActionArgParser() = default; - virtual void parse(simgrid::xbt::ReplayAction& action, std::string name) { CHECK_ACTION_PARAMS(action, 0, 0) } -}; - -class WaitTestParser : public ActionArgParser { -public: - int src; - int dst; - int tag; - - 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 WaitTestParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) +{ + CHECK_ACTION_PARAMS(action, 3, 0) + src = std::stoi(action[2]); + dst = std::stoi(action[3]); + tag = std::stoi(action[4]); +} - 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 SendRecvParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) +{ + CHECK_ACTION_PARAMS(action, 3, 1) + partner = std::stoi(action[2]); + tag = std::stoi(action[3]); + size = parse_integer(action[4]); + datatype1 = parse_datatype(action, 5); +} -class ComputeParser : public ActionArgParser { -public: - /* communication partner; if we send, this is the receiver and vice versa */ - double flops; +void ComputeParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) +{ + 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, 1, 0) - flops = parse_double(action[2]); - } -}; +void SleepParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) +{ + CHECK_ACTION_PARAMS(action, 1, 0) + time = parse_double(action[2]); +} -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 LocationParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) +{ + CHECK_ACTION_PARAMS(action, 2, 0) + filename = std::string(action[2]); + line = std::stoi(action[3]); +} -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 BcastArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) +{ + CHECK_ACTION_PARAMS(action, 1, 2) + size = parse_integer(action[2]); + root = parse_root(action, 3); + datatype1 = parse_datatype(action, 4); +} -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]); - root = (action.size() > 4) ? std::stoi(action[4]) : 0; - if (action.size() > 5) - datatype1 = simgrid::smpi::Datatype::decode(action[5]); - } -}; +void ReduceArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) +{ + CHECK_ACTION_PARAMS(action, 2, 2) + comm_size = parse_integer(action[2]); + comp_size = parse_double(action[3]); + root = parse_root(action, 4); + datatype1 = parse_datatype(action, 5); +} -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]); - } -}; +void AllReduceArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) +{ + CHECK_ACTION_PARAMS(action, 2, 1) + comm_size = parse_integer(action[2]); + comp_size = parse_double(action[3]); + datatype1 = parse_datatype(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]); - - if (action.size() > 4) - datatype1 = simgrid::smpi::Datatype::decode(action[4]); - if (action.size() > 5) - datatype2 = simgrid::smpi::Datatype::decode(action[5]); - } -}; +void AllToAllArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) +{ + CHECK_ACTION_PARAMS(action, 2, 1) + comm_size = MPI_COMM_WORLD->size(); + send_size = parse_integer(action[2]); + recv_size = parse_integer(action[3]); + datatype1 = parse_datatype(action, 4); + datatype2 = parse_datatype(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]); - } +void GatherArgParser::parse(simgrid::xbt::ReplayAction& action, const 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_integer(action[2]); + recv_size = parse_integer(action[3]); + + if (name == "gather") { + root = parse_root(action, 4); + datatype1 = parse_datatype(action, 5); + datatype2 = parse_datatype(action, 6); + } else { + root = 0; + datatype1 = parse_datatype(action, 4); + datatype2 = parse_datatype(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, const 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_integer(action[2]); + disps = std::vector(comm_size, 0); + recvcounts = std::make_shared>(comm_size); + + if (name == "gatherv") { + root = parse_root(action, 3 + comm_size); + datatype1 = parse_datatype(action, 4 + comm_size); + datatype2 = parse_datatype(action, 5 + comm_size); + } else { + root = 0; + unsigned 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 + datatype1 = parse_datatype(action, 3 + comm_size); + datatype2 = parse_datatype(action, 4 + comm_size); + disp_index = 5 + comm_size; + } else if (action.size() > 3 + comm_size + 2) { + // disps specified; datatype is not specified; use the default one + datatype1 = MPI_DEFAULT_TYPE; + datatype2 = MPI_DEFAULT_TYPE; + disp_index = 3 + comm_size; + } else { + // no disp specified, maybe only datatype, + datatype1 = parse_datatype(action, 3 + comm_size); + datatype2 = parse_datatype(action, 4 + comm_size); } - for (unsigned int i = 0; i < comm_size; i++) { - (*recvcounts)[i] = std::stoi(action[i + 3]); + if (disp_index != 0) { + xbt_assert(disp_index + comm_size <= action.size()); + for (unsigned 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, const std::string&) +{ + /* 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); - } -}; + */ + comm_size = MPI_COMM_WORLD->size(); + CHECK_ACTION_PARAMS(action, 2, 3) + comm_size = MPI_COMM_WORLD->size(); + send_size = parse_integer(action[2]); + recv_size = parse_integer(action[3]); + root = parse_root(action, 4); + datatype1 = parse_datatype(action, 5); + datatype2 = parse_datatype(action, 6); +} -template class ReplayAction { -protected: - const std::string name; - const int my_proc_id; - T args; +void ScatterVArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) +{ + /* 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() + */ + comm_size = MPI_COMM_WORLD->size(); + CHECK_ACTION_PARAMS(action, comm_size + 1, 2) + recv_size = parse_integer(action[2 + comm_size]); + disps = std::vector(comm_size, 0); + sendcounts = std::make_shared>(comm_size); + + root = parse_root(action, 3 + comm_size); + datatype1 = parse_datatype(action, 4 + comm_size); + datatype2 = parse_datatype(action, 5 + comm_size); + + 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); +} -public: - explicit ReplayAction(std::string name) : name(name), my_proc_id(simgrid::s4u::this_actor::get_pid()) {} - virtual ~ReplayAction() = default; +void ReduceScatterArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) +{ + /* 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::make_shared>(comm_size); + datatype1 = parse_datatype(action, 3 + comm_size); + + for (unsigned int i = 0; i < comm_size; i++) { + (*recvcounts)[i]= std::stoi(action[i + 2]); + } + recv_size_sum = std::accumulate(recvcounts->begin(), recvcounts->end(), 0); +} - 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 ScanArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) +{ + CHECK_ACTION_PARAMS(action, 2, 1) + size = parse_integer(action[2]); + comp_size = parse_double(action[3]); + datatype1 = parse_datatype(action, 4); +} - virtual void kernel(simgrid::xbt::ReplayAction& action) = 0; +void AllToAllVArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) +{ + /* 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::make_shared>(comm_size); + recvcounts = std::make_shared>(comm_size); + senddisps = std::vector(comm_size, 0); + recvdisps = std::vector(comm_size, 0); + + datatype1 = parse_datatype(action, 4 + 2 * comm_size); + datatype2 = parse_datatype(action, 5 + 2 * comm_size); + + send_buf_size = parse_integer(action[2]); + recv_buf_size = parse_integer(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* send_buffer(int size) - { - return smpi_get_tmp_sendbuffer(size); - } +void WaitAction::kernel(simgrid::xbt::ReplayAction& action) +{ + std::string s = boost::algorithm::join(action, " "); + xbt_assert(req_storage.size(), "action wait not preceded by any irecv or isend: %s", s.c_str()); + const WaitTestParser& args = get_args(); + MPI_Request request = req_storage.find(args.src, args.dst, args.tag); + req_storage.remove(request); - void* recv_buffer(int size) - { - return smpi_get_tmp_recvbuffer(size); + if (request == MPI_REQUEST_NULL) { + /* Assume that the trace is well formed, meaning the comm might have been caught by an MPI_test. Then just + * return.*/ + return; } -}; -class WaitAction : public ReplayAction { -public: - WaitAction() : ReplayAction("Wait") {} - void kernel(simgrid::xbt::ReplayAction& action) override - { - 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 == MPI_REQUEST_NULL) { - /* Assume that the trace is well formed, meaning the comm might have been caught by a MPI_test. Then just - * return.*/ - return; - } + // Must be taken before Request::wait() since the request may be set to + // MPI_REQUEST_NULL by Request::wait! + bool is_wait_for_receive = (request->flags() & MPI_REQ_RECV); - int rank = request->comm() != MPI_COMM_NULL ? request->comm()->rank() : -1; + TRACE_smpi_comm_in(get_pid(), __func__, new simgrid::instr::WaitTIData(args.src, args.dst, args.tag)); - // Must be taken before Request::wait() since the request may be set to - // MPI_REQUEST_NULL by Request::wait! - 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, __func__, new simgrid::instr::NoOpTIData("wait")); + MPI_Status status; + Request::wait(&request, &status); - MPI_Status status; - Request::wait(&request, &status); + TRACE_smpi_comm_out(get_pid()); + if (is_wait_for_receive) + TRACE_smpi_recv(MPI_COMM_WORLD->group()->actor(args.src), MPI_COMM_WORLD->group()->actor(args.dst), args.tag); +} - TRACE_smpi_comm_out(rank); - if (is_wait_for_receive) - TRACE_smpi_recv(args.src, args.dst, args.tag); +void SendAction::kernel(simgrid::xbt::ReplayAction&) +{ + const SendRecvParser& args = get_args(); + aid_t dst_traced = MPI_COMM_WORLD->group()->actor(args.partner); + + TRACE_smpi_comm_in( + get_pid(), __func__, + new simgrid::instr::Pt2PtTIData(get_name(), args.partner, args.size, args.tag, Datatype::encode(args.datatype1))); + if (not TRACE_smpi_view_internals()) + TRACE_smpi_send(get_pid(), get_pid(), dst_traced, args.tag, args.size * args.datatype1->size()); + + if (get_name() == "send") { + Request::send(nullptr, args.size, args.datatype1, args.partner, args.tag, MPI_COMM_WORLD); + } else if (get_name() == "isend") { + MPI_Request request = Request::isend(nullptr, args.size, args.datatype1, args.partner, args.tag, MPI_COMM_WORLD); + req_storage.add(request); + } else { + xbt_die("Don't know this action, %s", get_name().c_str()); } -}; -class SendAction : public ReplayAction { -public: - SendAction() = delete; - explicit SendAction(std::string name) : ReplayAction(name) {} - void kernel(simgrid::xbt::ReplayAction& action) override - { - int dst_traced = MPI_COMM_WORLD->group()->actor(args.partner)->get_pid(); - - TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData(name, args.partner, args.size, - args.tag, Datatype::encode(args.datatype1))); - if (not TRACE_smpi_view_internals()) - TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, args.tag, args.size * args.datatype1->size()); - - if (name == "send") { - Request::send(nullptr, args.size, args.datatype1, args.partner, args.tag, MPI_COMM_WORLD); - } else if (name == "Isend") { - MPI_Request request = Request::isend(nullptr, args.size, args.datatype1, args.partner, args.tag, MPI_COMM_WORLD); - get_reqq_self()->push_back(request); - } else { - xbt_die("Don't know this action, %s", name.c_str()); - } + TRACE_smpi_comm_out(get_pid()); +} - TRACE_smpi_comm_out(my_proc_id); +void RecvAction::kernel(simgrid::xbt::ReplayAction&) +{ + const SendRecvParser& args = get_args(); + TRACE_smpi_comm_in( + get_pid(), __func__, + new simgrid::instr::Pt2PtTIData(get_name(), args.partner, args.size, args.tag, Datatype::encode(args.datatype1))); + + MPI_Status status; + // unknown size from the receiver point of view + size_t arg_size = args.size; + if (arg_size == 0) { + Request::probe(args.partner, args.tag, MPI_COMM_WORLD, &status); + arg_size = status.count; + } + + bool is_recv = false; // Help analyzers understanding that status is not used uninitialized + if (get_name() == "recv") { + is_recv = true; + Request::recv(nullptr, arg_size, args.datatype1, args.partner, args.tag, MPI_COMM_WORLD, &status); + } else if (get_name() == "irecv") { + MPI_Request request = Request::irecv(nullptr, arg_size, args.datatype1, args.partner, args.tag, MPI_COMM_WORLD); + req_storage.add(request); + } else { + THROW_IMPOSSIBLE; } -}; -class RecvAction : public ReplayAction { -public: - RecvAction() = delete; - explicit RecvAction(std::string name) : ReplayAction(name) {} - void kernel(simgrid::xbt::ReplayAction& action) override - { - int src_traced = MPI_COMM_WORLD->group()->actor(args.partner)->get_pid(); + TRACE_smpi_comm_out(get_pid()); + if (is_recv && not TRACE_smpi_view_internals()) { + aid_t src_traced = MPI_COMM_WORLD->group()->actor(status.MPI_SOURCE); + TRACE_smpi_recv(src_traced, get_pid(), args.tag); + } +} - TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData(name, args.partner, args.size, - args.tag, Datatype::encode(args.datatype1))); +void ComputeAction::kernel(simgrid::xbt::ReplayAction&) +{ + const ComputeParser& args = get_args(); + if (smpi_cfg_simulate_computation()) { + smpi_execute_flops(args.flops/smpi_adjust_comp_speed()); + } +} - MPI_Status status; - // unknown size from the receiver point of view - if (args.size <= 0.0) { - Request::probe(args.partner, args.tag, MPI_COMM_WORLD, &status); - args.size = status.count; - } +void SleepAction::kernel(simgrid::xbt::ReplayAction&) +{ + const SleepParser& args = get_args(); + XBT_DEBUG("Sleep for: %lf secs", args.time); + aid_t pid = simgrid::s4u::this_actor::get_pid(); + TRACE_smpi_sleeping_in(pid, args.time); + simgrid::s4u::this_actor::sleep_for(args.time/smpi_adjust_comp_speed()); + TRACE_smpi_sleeping_out(pid); +} - if (name == "recv") { - Request::recv(nullptr, args.size, args.datatype1, args.partner, args.tag, MPI_COMM_WORLD, &status); - } else if (name == "Irecv") { - MPI_Request request = Request::irecv(nullptr, args.size, args.datatype1, args.partner, args.tag, MPI_COMM_WORLD); - get_reqq_self()->push_back(request); - } +void LocationAction::kernel(simgrid::xbt::ReplayAction&) +{ + const LocationParser& args = get_args(); + smpi_trace_set_call_location(args.filename.c_str(), args.line); +} - TRACE_smpi_comm_out(my_proc_id); - // TODO: Check why this was only activated in the "recv" case and not in the "Irecv" case - if (name == "recv" && not TRACE_smpi_view_internals()) { - TRACE_smpi_recv(src_traced, my_proc_id, args.tag); - } - } -}; +void TestAction::kernel(simgrid::xbt::ReplayAction&) +{ + const WaitTestParser& args = get_args(); + MPI_Request request = req_storage.find(args.src, args.dst, args.tag); + req_storage.remove(request); + // if request is null here, this may mean that a previous test has succeeded + // Different times in traced application and replayed version may lead to this + // In this case, ignore the extra calls. + if (request != MPI_REQUEST_NULL) { + TRACE_smpi_comm_in(get_pid(), __func__, new simgrid::instr::NoOpTIData("test")); -class ComputeAction : public ReplayAction { -public: - ComputeAction() : ReplayAction("compute") {} - void kernel(simgrid::xbt::ReplayAction& action) override - { - TRACE_smpi_computing_in(my_proc_id, args.flops); - smpi_execute_flops(args.flops); - TRACE_smpi_computing_out(my_proc_id); - } -}; + MPI_Status status; + int flag = 0; + Request::test(&request, &status, &flag); + + XBT_DEBUG("MPI_Test result: %d", flag); + /* push back request in vector to be caught by a subsequent wait. if the test did succeed, the request is now + * nullptr.*/ + if (request == MPI_REQUEST_NULL) + req_storage.addNullRequest(args.src, args.dst, args.tag); + else + req_storage.add(request); -class TestAction : public ReplayAction { -public: - TestAction() : ReplayAction("Test") {} - void kernel(simgrid::xbt::ReplayAction& action) override - { - MPI_Request request = get_reqq_self()->back(); - get_reqq_self()->pop_back(); - // if request is null here, this may mean that a previous test has succeeded - // Different times in traced application and replayed version may lead to this - // In this case, ignore the extra calls. - if (request != nullptr) { - TRACE_smpi_testing_in(my_proc_id); - - MPI_Status status; - int flag = Request::test(&request, &status); - - XBT_DEBUG("MPI_Test result: %d", flag); - /* 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(my_proc_id); - } + TRACE_smpi_comm_out(get_pid()); } -}; +} -class InitAction : public ReplayAction { -public: - InitAction() : ReplayAction("Init") {} - void kernel(simgrid::xbt::ReplayAction& action) override - { - CHECK_ACTION_PARAMS(action, 0, 1) +void InitAction::kernel(simgrid::xbt::ReplayAction& action) +{ + CHECK_ACTION_PARAMS(action, 0, 1) MPI_DEFAULT_TYPE = (action.size() > 2) ? MPI_DOUBLE // default MPE datatype - : MPI_BYTE; // default TAU datatype - - /* start a simulated timer */ - smpi_process()->simulated_start(); - set_reqq_self(new std::vector); - } -}; + : MPI_BYTE; // default TAU datatype -class CommunicatorAction : public ReplayAction { -public: - CommunicatorAction() : ReplayAction("Comm") {} - void kernel(simgrid::xbt::ReplayAction& action) override { /* nothing to do */} -}; + /* start a simulated timer */ + smpi_process()->simulated_start(); +} -class WaitAllAction : public ReplayAction { -public: - WaitAllAction() : ReplayAction("waitAll") {} - void kernel(simgrid::xbt::ReplayAction& action) override - { - const unsigned int count_requests = get_reqq_self()->size(); - - if (count_requests > 0) { - TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("waitAll", -1, count_requests, "")); - std::vector> sender_receiver; - for (const auto& req : (*get_reqq_self())) { - if (req && (req->flags() & RECV)) { - sender_receiver.push_back({req->src(), req->dst()}); - } - } - MPI_Status status[count_requests]; - Request::waitall(count_requests, &(*get_reqq_self())[0], status); +void CommunicatorAction::kernel(simgrid::xbt::ReplayAction&) +{ + /* nothing to do */ +} - for (auto& pair : sender_receiver) { - TRACE_smpi_recv(pair.first, pair.second, 0); +void WaitAllAction::kernel(simgrid::xbt::ReplayAction&) +{ + const size_t count_requests = req_storage.size(); + + if (count_requests > 0) { + TRACE_smpi_comm_in(get_pid(), __func__, new simgrid::instr::CpuTIData("waitall", count_requests)); + std::vector> sender_receiver; + std::vector reqs; + req_storage.get_requests(reqs); + for (auto const& req : reqs) { + if (req && (req->flags() & MPI_REQ_RECV)) { + sender_receiver.emplace_back(req->src(), req->dst()); } - TRACE_smpi_comm_out(my_proc_id); } - } -}; + Request::waitall(count_requests, &(reqs.data())[0], MPI_STATUSES_IGNORE); + req_storage.get_store().clear(); -class BarrierAction : public ReplayAction { -public: - BarrierAction() : ReplayAction("barrier") {} - void kernel(simgrid::xbt::ReplayAction& action) override - { - TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("barrier")); - Colls::barrier(MPI_COMM_WORLD); - TRACE_smpi_comm_out(my_proc_id); + for (auto const& pair : sender_receiver) { + TRACE_smpi_recv(pair.first, pair.second, 0); + } + TRACE_smpi_comm_out(get_pid()); } -}; - -class BcastAction : public ReplayAction { -public: - BcastAction() : ReplayAction("bcast") {} - void kernel(simgrid::xbt::ReplayAction& action) override - { - TRACE_smpi_comm_in(my_proc_id, "action_bcast", - new simgrid::instr::CollTIData("bcast", MPI_COMM_WORLD->group()->actor(args.root)->get_pid(), - -1.0, args.size, -1, Datatype::encode(args.datatype1), "")); - - Colls::bcast(send_buffer(args.size * args.datatype1->size()), args.size, args.datatype1, args.root, MPI_COMM_WORLD); +} - TRACE_smpi_comm_out(my_proc_id); - } -}; +void BarrierAction::kernel(simgrid::xbt::ReplayAction&) +{ + TRACE_smpi_comm_in(get_pid(), __func__, new simgrid::instr::NoOpTIData("barrier")); + colls::barrier(MPI_COMM_WORLD); + TRACE_smpi_comm_out(get_pid()); +} -class ReduceAction : public ReplayAction { -public: - ReduceAction() : ReplayAction("reduce") {} - void kernel(simgrid::xbt::ReplayAction& action) override - { - TRACE_smpi_comm_in(my_proc_id, "action_reduce", - new simgrid::instr::CollTIData("reduce", MPI_COMM_WORLD->group()->actor(args.root)->get_pid(), - args.comp_size, args.comm_size, -1, - Datatype::encode(args.datatype1), "")); +void BcastAction::kernel(simgrid::xbt::ReplayAction&) +{ + const BcastArgParser& args = get_args(); + TRACE_smpi_comm_in(get_pid(), "action_bcast", + new simgrid::instr::CollTIData("bcast", args.root, -1.0, args.size, + 0, Datatype::encode(args.datatype1), "")); - Colls::reduce(send_buffer(args.comm_size * args.datatype1->size()), - recv_buffer(args.comm_size * args.datatype1->size()), args.comm_size, args.datatype1, MPI_OP_NULL, args.root, MPI_COMM_WORLD); - smpi_execute_flops(args.comp_size); + colls::bcast(send_buffer(args.size * args.datatype1->size()), args.size, args.datatype1, args.root, MPI_COMM_WORLD); - TRACE_smpi_comm_out(my_proc_id); - } -}; - -class AllReduceAction : public ReplayAction { -public: - AllReduceAction() : ReplayAction("allReduce") {} - void kernel(simgrid::xbt::ReplayAction& action) override - { - TRACE_smpi_comm_in(my_proc_id, "action_allReduce", new simgrid::instr::CollTIData("allReduce", -1, args.comp_size, args.comm_size, -1, - Datatype::encode(args.datatype1), "")); + TRACE_smpi_comm_out(get_pid()); +} - Colls::allreduce(send_buffer(args.comm_size * args.datatype1->size()), - recv_buffer(args.comm_size * args.datatype1->size()), args.comm_size, args.datatype1, MPI_OP_NULL, MPI_COMM_WORLD); - smpi_execute_flops(args.comp_size); +void ReduceAction::kernel(simgrid::xbt::ReplayAction&) +{ + const ReduceArgParser& args = get_args(); + TRACE_smpi_comm_in(get_pid(), "action_reduce", + new simgrid::instr::CollTIData("reduce", args.root, args.comp_size, + args.comm_size, 0, Datatype::encode(args.datatype1), "")); + + colls::reduce(send_buffer(args.comm_size * args.datatype1->size()), + recv_buffer(args.comm_size * args.datatype1->size()), args.comm_size, args.datatype1, MPI_OP_NULL, + args.root, MPI_COMM_WORLD); + if (args.comp_size != 0.0) + simgrid::s4u::this_actor::exec_init(args.comp_size) + ->set_name("computation") + ->start() + ->wait(); + + TRACE_smpi_comm_out(get_pid()); +} - TRACE_smpi_comm_out(my_proc_id); - } -}; +void AllReduceAction::kernel(simgrid::xbt::ReplayAction&) +{ + const AllReduceArgParser& args = get_args(); + TRACE_smpi_comm_in(get_pid(), "action_allreduce", + new simgrid::instr::CollTIData("allreduce", -1, args.comp_size, args.comm_size, 0, + Datatype::encode(args.datatype1), "")); + + colls::allreduce(send_buffer(args.comm_size * args.datatype1->size()), + recv_buffer(args.comm_size * args.datatype1->size()), args.comm_size, args.datatype1, MPI_OP_NULL, + MPI_COMM_WORLD); + if (args.comp_size != 0.0) + simgrid::s4u::this_actor::exec_init(args.comp_size) + ->set_name("computation") + ->start() + ->wait(); + + TRACE_smpi_comm_out(get_pid()); +} -class AllToAllAction : public ReplayAction { -public: - AllToAllAction() : ReplayAction("allToAll") {} - void kernel(simgrid::xbt::ReplayAction& action) override - { - TRACE_smpi_comm_in(my_proc_id, "action_allToAll", - new simgrid::instr::CollTIData("allToAll", -1, -1.0, args.send_size, args.recv_size, +void AllToAllAction::kernel(simgrid::xbt::ReplayAction&) +{ + const AllToAllArgParser& args = get_args(); + TRACE_smpi_comm_in(get_pid(), "action_alltoall", + new simgrid::instr::CollTIData("alltoall", -1, -1.0, args.send_size, args.recv_size, Datatype::encode(args.datatype1), Datatype::encode(args.datatype2))); - Colls::alltoall(send_buffer(args.send_size * args.comm_size * args.datatype1->size()), args.send_size, - args.datatype1, recv_buffer(args.recv_size * args.comm_size * args.datatype2->size()), - args.recv_size, args.datatype2, MPI_COMM_WORLD); - - TRACE_smpi_comm_out(my_proc_id); - } -}; - -class GatherAction : public ReplayAction { -public: - explicit GatherAction(std::string name) : ReplayAction(name) {} - void kernel(simgrid::xbt::ReplayAction& action) override - { - TRACE_smpi_comm_in(my_proc_id, name.c_str(), new simgrid::instr::CollTIData(name, (name == "gather") ? args.root : -1, -1.0, args.send_size, args.recv_size, - Datatype::encode(args.datatype1), Datatype::encode(args.datatype2))); - - if (name == "gather") { - int rank = MPI_COMM_WORLD->rank(); - Colls::gather(send_buffer(args.send_size * args.datatype1->size()), args.send_size, args.datatype1, - (rank == args.root) ? recv_buffer(args.recv_size * args.comm_size * args.datatype2->size()) : nullptr, args.recv_size, args.datatype2, args.root, MPI_COMM_WORLD); - } - else - Colls::allgather(send_buffer(args.send_size * args.datatype1->size()), args.send_size, args.datatype1, - recv_buffer(args.recv_size * args.datatype2->size()), args.recv_size, args.datatype2, MPI_COMM_WORLD); - - TRACE_smpi_comm_out(my_proc_id); - } -}; + colls::alltoall(send_buffer(args.datatype1->size() * args.send_size * args.comm_size), args.send_size, args.datatype1, + recv_buffer(args.datatype2->size() * args.recv_size * args.comm_size), args.recv_size, args.datatype2, + MPI_COMM_WORLD); -class GatherVAction : public ReplayAction { -public: - explicit GatherVAction(std::string name) : ReplayAction(name) {} - void kernel(simgrid::xbt::ReplayAction& action) override - { - int rank = MPI_COMM_WORLD->rank(); - - TRACE_smpi_comm_in(my_proc_id, name.c_str(), new simgrid::instr::VarCollTIData( - name, (name == "gatherV") ? args.root : -1, args.send_size, nullptr, -1, args.recvcounts, - Datatype::encode(args.datatype1), Datatype::encode(args.datatype2))); - - if (name == "gatherV") { - Colls::gatherv(send_buffer(args.send_size * args.datatype1->size()), args.send_size, args.datatype1, - (rank == args.root) ? recv_buffer(args.recv_size_sum * args.datatype2->size()) : nullptr, - args.recvcounts->data(), args.disps.data(), args.datatype2, args.root, MPI_COMM_WORLD); - } - else { - Colls::allgatherv(send_buffer(args.send_size * args.datatype1->size()), args.send_size, args.datatype1, - recv_buffer(args.recv_size_sum * args.datatype2->size()), args.recvcounts->data(), - args.disps.data(), args.datatype2, MPI_COMM_WORLD); - } + TRACE_smpi_comm_out(get_pid()); +} - TRACE_smpi_comm_out(my_proc_id); - } -}; +void GatherAction::kernel(simgrid::xbt::ReplayAction&) +{ + const GatherArgParser& args = get_args(); + TRACE_smpi_comm_in(get_pid(), get_name().c_str(), + new simgrid::instr::CollTIData(get_name(), (get_name() == "gather") ? args.root : -1, -1.0, + args.send_size, args.recv_size, Datatype::encode(args.datatype1), + Datatype::encode(args.datatype2))); -class ScatterAction : public ReplayAction { -public: - ScatterAction() : ReplayAction("scatter") {} - void kernel(simgrid::xbt::ReplayAction& action) override - { + if (get_name() == "gather") { int rank = MPI_COMM_WORLD->rank(); - TRACE_smpi_comm_in(my_proc_id, "action_scatter", new simgrid::instr::CollTIData(name, args.root, -1.0, args.send_size, args.recv_size, - Datatype::encode(args.datatype1), - Datatype::encode(args.datatype2))); - - Colls::scatter(send_buffer(args.send_size * args.datatype1->size()), args.send_size, args.datatype1, - (rank == args.root) ? recv_buffer(args.recv_size * args.datatype2->size()) : nullptr, args.recv_size, args.datatype2, args.root, MPI_COMM_WORLD); + colls::gather(send_buffer(args.send_size * args.datatype1->size()), args.send_size, args.datatype1, + (rank == args.root) ? recv_buffer(args.datatype2->size() * args.recv_size * args.comm_size) : nullptr, + args.recv_size, args.datatype2, args.root, MPI_COMM_WORLD); + } else + colls::allgather(send_buffer(args.send_size * args.datatype1->size()), args.send_size, args.datatype1, + recv_buffer(args.recv_size * args.datatype2->size()), args.recv_size, args.datatype2, + MPI_COMM_WORLD); + + TRACE_smpi_comm_out(get_pid()); +} - TRACE_smpi_comm_out(my_proc_id); +void GatherVAction::kernel(simgrid::xbt::ReplayAction&) +{ + int rank = MPI_COMM_WORLD->rank(); + const GatherVArgParser& args = get_args(); + TRACE_smpi_comm_in(get_pid(), get_name().c_str(), + new simgrid::instr::VarCollTIData( + get_name(), (get_name() == "gatherv") ? args.root : -1, args.send_size, nullptr, -1, + args.recvcounts, Datatype::encode(args.datatype1), Datatype::encode(args.datatype2))); + + if (get_name() == "gatherv") { + colls::gatherv(send_buffer(args.send_size * args.datatype1->size()), args.send_size, args.datatype1, + (rank == args.root) ? recv_buffer(args.recv_size_sum * args.datatype2->size()) : nullptr, + args.recvcounts->data(), args.disps.data(), args.datatype2, args.root, MPI_COMM_WORLD); + } else { + colls::allgatherv(send_buffer(args.send_size * args.datatype1->size()), args.send_size, args.datatype1, + recv_buffer(args.recv_size_sum * args.datatype2->size()), args.recvcounts->data(), + args.disps.data(), args.datatype2, MPI_COMM_WORLD); } -}; + TRACE_smpi_comm_out(get_pid()); +} -class ScatterVAction : public ReplayAction { -public: - ScatterVAction() : ReplayAction("scatterV") {} - void kernel(simgrid::xbt::ReplayAction& action) override - { - int rank = MPI_COMM_WORLD->rank(); - TRACE_smpi_comm_in(my_proc_id, "action_scatterv", new simgrid::instr::VarCollTIData(name, args.root, -1, args.sendcounts, args.recv_size, - nullptr, Datatype::encode(args.datatype1), - Datatype::encode(args.datatype2))); +void ScatterAction::kernel(simgrid::xbt::ReplayAction&) +{ + int rank = MPI_COMM_WORLD->rank(); + const ScatterArgParser& args = get_args(); + TRACE_smpi_comm_in(get_pid(), "action_scatter", + new simgrid::instr::CollTIData(get_name(), args.root, -1.0, args.send_size, args.recv_size, + Datatype::encode(args.datatype1), + Datatype::encode(args.datatype2))); - Colls::scatterv((rank == args.root) ? send_buffer(args.send_size_sum * args.datatype1->size()) : nullptr, - args.sendcounts->data(), args.disps.data(), args.datatype1, - recv_buffer(args.recv_size * args.datatype2->size()), args.recv_size, args.datatype2, args.root, - MPI_COMM_WORLD); + colls::scatter(send_buffer(args.send_size * args.datatype1->size()), args.send_size, args.datatype1, + (rank == args.root) ? recv_buffer(args.recv_size * args.datatype2->size()) : nullptr, args.recv_size, + args.datatype2, args.root, MPI_COMM_WORLD); - TRACE_smpi_comm_out(my_proc_id); - } -}; + TRACE_smpi_comm_out(get_pid()); +} -class ReduceScatterAction : public ReplayAction { -public: - ReduceScatterAction() : ReplayAction("reduceScatter") {} - void kernel(simgrid::xbt::ReplayAction& action) override - { - TRACE_smpi_comm_in(my_proc_id, "action_reducescatter", - new simgrid::instr::VarCollTIData("reduceScatter", -1, 0, nullptr, -1, args.recvcounts, - std::to_string(args.comp_size), /* ugly hack to print comp_size */ - Datatype::encode(args.datatype1))); +void ScatterVAction::kernel(simgrid::xbt::ReplayAction&) +{ + int rank = MPI_COMM_WORLD->rank(); + const ScatterVArgParser& args = get_args(); + TRACE_smpi_comm_in(get_pid(), "action_scatterv", + new simgrid::instr::VarCollTIData(get_name(), args.root, -1, args.sendcounts, args.recv_size, + nullptr, Datatype::encode(args.datatype1), + Datatype::encode(args.datatype2))); + + colls::scatterv((rank == args.root) ? send_buffer(args.send_size_sum * args.datatype1->size()) : nullptr, + args.sendcounts->data(), args.disps.data(), args.datatype1, + recv_buffer(args.recv_size * args.datatype2->size()), args.recv_size, args.datatype2, args.root, + MPI_COMM_WORLD); + + TRACE_smpi_comm_out(get_pid()); +} - Colls::reduce_scatter(send_buffer(args.recv_size_sum * args.datatype1->size()), - recv_buffer(args.recv_size_sum * args.datatype1->size()), args.recvcounts->data(), - args.datatype1, MPI_OP_NULL, MPI_COMM_WORLD); +void ReduceScatterAction::kernel(simgrid::xbt::ReplayAction&) +{ + const ReduceScatterArgParser& args = get_args(); + TRACE_smpi_comm_in( + get_pid(), "action_reducescatter", + new simgrid::instr::VarCollTIData(get_name(), -1, -1, nullptr, -1, args.recvcounts, + /* ugly as we use datatype field to pass computation as string */ + /* and because of the trick to avoid getting 0.000000 when 0 is given */ + args.comp_size == 0 ? "0" : std::to_string(args.comp_size), + Datatype::encode(args.datatype1))); + + colls::reduce_scatter(send_buffer(args.recv_size_sum * args.datatype1->size()), + recv_buffer(args.recv_size_sum * args.datatype1->size()), args.recvcounts->data(), + args.datatype1, MPI_OP_NULL, MPI_COMM_WORLD); + if (args.comp_size != 0.0) + simgrid::s4u::this_actor::exec_init(args.comp_size) + ->set_name("computation") + ->start() + ->wait(); + TRACE_smpi_comm_out(get_pid()); +} - smpi_execute_flops(args.comp_size); - TRACE_smpi_comm_out(my_proc_id); - } -}; +void ScanAction::kernel(simgrid::xbt::ReplayAction&) +{ + const ScanArgParser& args = get_args(); + TRACE_smpi_comm_in(get_pid(), "action_scan", + new simgrid::instr::CollTIData(get_name(), -1, args.comp_size, + args.size, 0, Datatype::encode(args.datatype1), "")); + if (get_name() == "scan") + colls::scan(send_buffer(args.size * args.datatype1->size()), + recv_buffer(args.size * args.datatype1->size()), args.size, + args.datatype1, MPI_OP_NULL, MPI_COMM_WORLD); + else + colls::exscan(send_buffer(args.size * args.datatype1->size()), + recv_buffer(args.size * args.datatype1->size()), args.size, + args.datatype1, MPI_OP_NULL, MPI_COMM_WORLD); + + if (args.comp_size != 0.0) + simgrid::s4u::this_actor::exec_init(args.comp_size) + ->set_name("computation") + ->start() + ->wait(); + TRACE_smpi_comm_out(get_pid()); +} -class AllToAllVAction : public ReplayAction { -public: - AllToAllVAction() : ReplayAction("allToAllV") {} - void kernel(simgrid::xbt::ReplayAction& action) override - { - TRACE_smpi_comm_in(my_proc_id, __func__, - new simgrid::instr::VarCollTIData( - "allToAllV", -1, args.send_size_sum, args.sendcounts, args.recv_size_sum, args.recvcounts, - Datatype::encode(args.datatype1), Datatype::encode(args.datatype2))); +void AllToAllVAction::kernel(simgrid::xbt::ReplayAction&) +{ + const AllToAllVArgParser& args = get_args(); + TRACE_smpi_comm_in(get_pid(), __func__, + new simgrid::instr::VarCollTIData( + "alltoallv", -1, args.send_size_sum, args.sendcounts, args.recv_size_sum, args.recvcounts, + Datatype::encode(args.datatype1), Datatype::encode(args.datatype2))); - Colls::alltoallv(send_buffer(args.send_buf_size * args.datatype1->size()), args.sendcounts->data(), args.senddisps.data(), args.datatype1, - recv_buffer(args.recv_buf_size * args.datatype2->size()), args.recvcounts->data(), args.recvdisps.data(), args.datatype2, MPI_COMM_WORLD); + colls::alltoallv(send_buffer(args.send_buf_size * args.datatype1->size()), args.sendcounts->data(), + args.senddisps.data(), args.datatype1, recv_buffer(args.recv_buf_size * args.datatype2->size()), + args.recvcounts->data(), args.recvdisps.data(), args.datatype2, MPI_COMM_WORLD); - TRACE_smpi_comm_out(my_proc_id); - } -}; + TRACE_smpi_comm_out(get_pid()); +} } // Replay Namespace }} // namespace simgrid::smpi -std::vector storage; +static std::unordered_map storage; /** @brief Only initialize the replay, don't do it for real */ -void smpi_replay_init(int* argc, char*** argv) +void smpi_replay_init(const char* instance_id, int rank, double start_delay_flops) { - simgrid::smpi::Process::init(argc, argv); + xbt_assert(not smpi_process()->initializing()); + + simgrid::s4u::Actor::self()->set_property("instance_id", instance_id); + simgrid::s4u::Actor::self()->set_property("rank", std::to_string(rank)); + simgrid::smpi::ActorExt::init(); + smpi_process()->mark_as_initialized(); smpi_process()->set_replaying(true); - int my_proc_id = simgrid::s4u::this_actor::get_pid(); - 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); + TRACE_smpi_init(simgrid::s4u::this_actor::get_pid(), "smpi_replay_run_init"); xbt_replay_action_register("init", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::InitAction().execute(action); }); - xbt_replay_action_register("finalize", [](simgrid::xbt::ReplayAction& action) { /* nothing to do */ }); + xbt_replay_action_register("finalize", [](simgrid::xbt::ReplayAction const&) { /* nothing to do */ }); 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").execute(action); }); - xbt_replay_action_register("Isend", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::SendAction("Isend").execute(action); }); - xbt_replay_action_register("recv", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::RecvAction("recv").execute(action); }); - xbt_replay_action_register("Irecv", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::RecvAction("Irecv").execute(action); }); - xbt_replay_action_register("test", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::TestAction().execute(action); }); - xbt_replay_action_register("wait", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::WaitAction().execute(action); }); - xbt_replay_action_register("waitAll", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::WaitAllAction().execute(action); }); + xbt_replay_action_register("send", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::SendAction("send", storage[simgrid::s4u::this_actor::get_pid()]).execute(action); }); + xbt_replay_action_register("isend", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::SendAction("isend", storage[simgrid::s4u::this_actor::get_pid()]).execute(action); }); + xbt_replay_action_register("recv", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::RecvAction("recv", storage[simgrid::s4u::this_actor::get_pid()]).execute(action); }); + xbt_replay_action_register("irecv", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::RecvAction("irecv", storage[simgrid::s4u::this_actor::get_pid()]).execute(action); }); + xbt_replay_action_register("test", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::TestAction(storage[simgrid::s4u::this_actor::get_pid()]).execute(action); }); + xbt_replay_action_register("wait", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::WaitAction(storage[simgrid::s4u::this_actor::get_pid()]).execute(action); }); + xbt_replay_action_register("waitall", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::WaitAllAction(storage[simgrid::s4u::this_actor::get_pid()]).execute(action); }); xbt_replay_action_register("barrier", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::BarrierAction().execute(action); }); xbt_replay_action_register("bcast", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::BcastAction().execute(action); }); xbt_replay_action_register("reduce", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ReduceAction().execute(action); }); - xbt_replay_action_register("allReduce", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::AllReduceAction().execute(action); }); - xbt_replay_action_register("allToAll", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::AllToAllAction().execute(action); }); - xbt_replay_action_register("allToAllV", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::AllToAllVAction().execute(action); }); + xbt_replay_action_register("allreduce", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::AllReduceAction().execute(action); }); + xbt_replay_action_register("alltoall", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::AllToAllAction().execute(action); }); + xbt_replay_action_register("alltoallv", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::AllToAllVAction().execute(action); }); xbt_replay_action_register("gather", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::GatherAction("gather").execute(action); }); xbt_replay_action_register("scatter", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ScatterAction().execute(action); }); - xbt_replay_action_register("gatherV", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::GatherVAction("gatherV").execute(action); }); - xbt_replay_action_register("scatterV", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ScatterVAction().execute(action); }); - xbt_replay_action_register("allGather", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::GatherAction("allGather").execute(action); }); - xbt_replay_action_register("allGatherV", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::GatherVAction("allGatherV").execute(action); }); - xbt_replay_action_register("reduceScatter", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ReduceScatterAction().execute(action); }); + xbt_replay_action_register("gatherv", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::GatherVAction("gatherv").execute(action); }); + xbt_replay_action_register("scatterv", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ScatterVAction().execute(action); }); + xbt_replay_action_register("allgather", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::GatherAction("allgather").execute(action); }); + xbt_replay_action_register("allgatherv", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::GatherVAction("allgatherv").execute(action); }); + xbt_replay_action_register("reducescatter", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ReduceScatterAction().execute(action); }); + xbt_replay_action_register("scan", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ScanAction("scan").execute(action); }); + xbt_replay_action_register("exscan", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ScanAction("exscan").execute(action); }); xbt_replay_action_register("compute", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ComputeAction().execute(action); }); + xbt_replay_action_register("sleep", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::SleepAction().execute(action); }); + xbt_replay_action_register("location", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::LocationAction().execute(action); }); //if we have a delayed start, sleep here. - if(*argc>2){ - double value = xbt_str_parse_double((*argv)[2], "%s is not a double"); - XBT_VERB("Delayed start for instance - Sleeping for %f flops ",value ); - smpi_execute_flops(value); + if (start_delay_flops > 0) { + XBT_VERB("Delayed start for instance - Sleeping for %f flops ", start_delay_flops); + private_execute_flops(start_delay_flops); } else { - //UGLY: force a context switch to be sure that all MSG_processes begin initialization - XBT_DEBUG("Force context switch by smpi_execute_flops - Sleeping for 0.0 flops "); - smpi_execute_flops(0.0); + // Wait for the other actors to initialize also + simgrid::s4u::this_actor::yield(); } + if(_smpi_init_sleep > 0) + simgrid::s4u::this_actor::sleep_for(_smpi_init_sleep); } /** @brief actually run the replay after initialization */ -void smpi_replay_main(int* argc, char*** argv) +void smpi_replay_main(int rank, const char* private_trace_filename) { static int active_processes = 0; active_processes++; - simgrid::xbt::replay_runner(*argc, *argv); + storage[simgrid::s4u::this_actor::get_pid()] = simgrid::smpi::replay::RequestStorage(); + std::string rank_string = std::to_string(rank); + simgrid::xbt::replay_runner(rank_string.c_str(), private_trace_filename); /* and now, finalize everything */ /* One active process will stop. Decrease the counter*/ - XBT_DEBUG("There are %zu elements in reqq[*]", get_reqq_self()->size()); - if (not get_reqq_self()->empty()) { - unsigned int count_requests=get_reqq_self()->size(); - MPI_Request requests[count_requests]; - MPI_Status status[count_requests]; + unsigned int count_requests = storage[simgrid::s4u::this_actor::get_pid()].size(); + XBT_DEBUG("There are %u elements in reqq[*]", count_requests); + if (count_requests > 0) { + std::vector requests(count_requests); unsigned int i=0; - for (auto const& req : *get_reqq_self()) { - requests[i] = req; + for (auto const& pair : storage[simgrid::s4u::this_actor::get_pid()].get_store()) { + requests[i] = pair.second; i++; } - simgrid::smpi::Request::waitall(count_requests, requests, status); + simgrid::smpi::Request::waitall(count_requests, requests.data(), MPI_STATUSES_IGNORE); } - delete get_reqq_self(); + + if(simgrid::config::get_value("smpi/finalization-barrier")) + simgrid::smpi::colls::barrier(MPI_COMM_WORLD); + active_processes--; if(active_processes==0){ @@ -1023,12 +897,11 @@ void smpi_replay_main(int* argc, char*** argv) smpi_process()->finalize(); TRACE_smpi_comm_out(simgrid::s4u::this_actor::get_pid()); - TRACE_smpi_finalize(simgrid::s4u::this_actor::get_pid()); } /** @brief chain a replay initialization and a replay start */ -void smpi_replay_run(int* argc, char*** argv) +void smpi_replay_run(const char* instance_id, int rank, double start_delay_flops, const char* private_trace_filename) { - smpi_replay_init(argc, argv); - smpi_replay_main(argc, argv); + smpi_replay_init(instance_id, rank, start_delay_flops); + smpi_replay_main(rank, private_trace_filename); }