-/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-2019. 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_coll.hpp"
#include "smpi_comm.hpp"
#include "smpi_datatype.hpp"
#include "smpi_group.hpp"
-#include "smpi_process.hpp"
#include "smpi_request.hpp"
#include "xbt/replay.hpp"
+#include <simgrid/smpi/replay.hpp>
+#include <src/smpi/include/private.hpp>
-#include <boost/algorithm/string/join.hpp>
#include <memory>
#include <numeric>
#include <unordered_map>
#include <vector>
-using simgrid::s4u::Actor;
+#include <tuple>
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_replay,smpi,"Trace Replay with SMPI");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_replay, smpi, "Trace Replay with SMPI");
-static int active_processes = 0;
-static std::unordered_map<int, std::vector<MPI_Request>*> reqq;
+// 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 <typename TT> class hash {
+public:
+ size_t operator()(TT const& tt) const { return std::hash<TT>()(tt); }
+};
-static MPI_Datatype MPI_DEFAULT_TYPE;
+template <class T> inline void hash_combine(std::size_t& seed, T const& v)
+{
+ seed ^= hash_tuple::hash<T>()(v) + 0x9e3779b9 + (seed << 6) + (seed >> 2);
+}
-#define CHECK_ACTION_PARAMS(action, mandatory, optional) \
- { \
- if (action.size() < static_cast<unsigned long>(mandatory + 2)) \
- 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" \
- "Please contact the Simgrid team if support is needed", \
- __func__, action.size(), static_cast<unsigned long>(mandatory), static_cast<unsigned long>(optional)); \
+// Recursive template code derived from Matthieu M.
+template <class Tuple, size_t Index = std::tuple_size<Tuple>::value - 1> class HashValueImpl {
+public:
+ static void apply(size_t& seed, Tuple const& tuple)
+ {
+ HashValueImpl<Tuple, Index - 1>::apply(seed, tuple);
+ hash_combine(seed, std::get<Index>(tuple));
}
+};
-static void log_timed_action(simgrid::xbt::ReplayAction& action, double clock)
-{
- if (XBT_LOG_ISENABLED(smpi_replay, xbt_log_priority_verbose)){
- std::string s = boost::algorithm::join(action, " ");
- XBT_VERB("%s %f", s.c_str(), smpi_process()->simulated_elapsed() - clock);
+template <class Tuple> class HashValueImpl<Tuple, 0> {
+public:
+ static void apply(size_t& seed, Tuple const& tuple) { hash_combine(seed, std::get<0>(tuple)); }
+};
+
+template <typename... TT> class hash<std::tuple<TT...>> {
+public:
+ size_t operator()(std::tuple<TT...> const& tt) const
+ {
+ size_t seed = 0;
+ HashValueImpl<std::tuple<TT...>>::apply(seed, tt);
+ return seed;
}
+};
}
-static std::vector<MPI_Request>* get_reqq_self()
-{
- return reqq.at(simgrid::s4u::this_actor::getPid());
-}
+typedef std::tuple</*sender*/ int, /* reciever */ int, /* tag */int> req_key_t;
+typedef std::unordered_map<req_key_t, MPI_Request, hash_tuple::hash<std::tuple<int,int,int>>> req_storage_t;
-static void set_reqq_self(std::vector<MPI_Request> *mpi_request)
+void log_timed_action(simgrid::xbt::ReplayAction& action, double clock)
{
- reqq.insert({simgrid::s4u::this_actor::getPid(), mpi_request});
+ if (XBT_LOG_ISENABLED(smpi_replay, xbt_log_priority_verbose)){
+ std::string s = boost::algorithm::join(action, " ");
+ XBT_VERB("%s %f", s.c_str(), smpi_process()->simulated_elapsed() - clock);
+ }
}
/* Helper function */
namespace smpi {
namespace replay {
-class ActionArgParser {
-public:
- virtual ~ActionArgParser() = default;
- virtual void parse(simgrid::xbt::ReplayAction& action, std::string name) { CHECK_ACTION_PARAMS(action, 0, 0) }
-};
+MPI_Datatype MPI_DEFAULT_TYPE;
+
+class RequestStorage {
+private:
+ req_storage_t store;
-class SendRecvParser : public ActionArgParser {
public:
- /* communication partner; if we send, this is the receiver and vice versa */
- int partner;
- double size;
- MPI_Datatype datatype1 = MPI_DEFAULT_TYPE;
+ RequestStorage() {}
+ int size()
+ {
+ return store.size();
+ }
- void parse(simgrid::xbt::ReplayAction& action, std::string name) override
- {
- CHECK_ACTION_PARAMS(action, 2, 1)
- partner = std::stoi(action[2]);
- size = parse_double(action[3]);
- if (action.size() > 4)
- datatype1 = simgrid::smpi::Datatype::decode(action[4]);
- }
-};
+ req_storage_t& get_store()
+ {
+ return store;
+ }
-class ComputeParser : public ActionArgParser {
-public:
- /* communication partner; if we send, this is the receiver and vice versa */
- double flops;
+ void get_requests(std::vector<MPI_Request>& vec)
+ {
+ for (auto& pair : store) {
+ auto& req = pair.second;
+ auto 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");
+ }
+ }
+ }
- void parse(simgrid::xbt::ReplayAction& action, std::string name) override
- {
- CHECK_ACTION_PARAMS(action, 1, 0)
- flops = parse_double(action[2]);
- }
-};
+ MPI_Request find(int src, int dst, int tag)
+ {
+ req_storage_t::iterator it = store.find(req_key_t(src, dst, tag));
+ return (it == store.end()) ? MPI_REQUEST_NULL : it->second;
+ }
-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 remove(MPI_Request req)
+ {
+ if (req == MPI_REQUEST_NULL) return;
-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]);
- }
-};
+ store.erase(req_key_t(req->src()-1, req->dst()-1, req->tag()));
+ }
-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 add(MPI_Request req)
+ {
+ if (req != MPI_REQUEST_NULL) // Can and does happen in the case of TestAction
+ store.insert({req_key_t(req->src()-1, req->dst()-1, req->tag()), req});
+ }
-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]);
- }
+ /* 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(
+ MPI_COMM_WORLD->group()->actor(src)->get_pid()-1,
+ MPI_COMM_WORLD->group()->actor(dst)->get_pid()-1,
+ tag), MPI_REQUEST_NULL});
+ }
};
-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]);
+void WaitTestParser::parse(simgrid::xbt::ReplayAction& action, std::string)
+{
+ CHECK_ACTION_PARAMS(action, 3, 0)
+ src = std::stoi(action[2]);
+ dst = std::stoi(action[3]);
+ tag = std::stoi(action[4]);
+}
- if (action.size() > 4)
- datatype1 = simgrid::smpi::Datatype::decode(action[4]);
- if (action.size() > 5)
- datatype2 = simgrid::smpi::Datatype::decode(action[5]);
- }
-};
+void SendRecvParser::parse(simgrid::xbt::ReplayAction& action, std::string)
+{
+ 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]);
+}
-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 ComputeParser::parse(simgrid::xbt::ReplayAction& action, std::string)
+{
+ CHECK_ACTION_PARAMS(action, 1, 0)
+ flops = parse_double(action[2]);
+}
-class GatherVArgParser : public CollCommParser {
-public:
- int recv_size_sum;
- std::shared_ptr<std::vector<int>> recvcounts;
- std::vector<int> 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<int>(comm_size, 0);
- recvcounts = std::shared_ptr<std::vector<int>>(new std::vector<int>(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 <sendcount>", 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]);
- }
+void BcastArgParser::parse(simgrid::xbt::ReplayAction& action, std::string)
+{
+ 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]);
+}
- if (disp_index != 0) {
- for (unsigned int i = 0; i < comm_size; i++)
- disps[i] = std::stoi(action[disp_index + i]);
- }
- }
+void ReduceArgParser::parse(simgrid::xbt::ReplayAction& action, std::string)
+{
+ 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]);
+}
- 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);
- }
-};
+void AllReduceArgParser::parse(simgrid::xbt::ReplayAction& action, std::string)
+{
+ 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 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;
+void AllToAllArgParser::parse(simgrid::xbt::ReplayAction& action, std::string)
+{
+ 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 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]);
+
+ 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 ScatterVArgParser : public CollCommParser {
-public:
- int recv_size_sum;
- int send_size_sum;
- std::shared_ptr<std::vector<int>> sendcounts;
- std::vector<int> 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
- 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<int>(comm_size, 0);
- sendcounts = std::shared_ptr<std::vector<int>>(new std::vector<int>(comm_size));
+}
- if (action.size() > 5 + comm_size)
+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<int>(comm_size, 0);
+ recvcounts = std::shared_ptr<std::vector<int>>(new std::vector<int>(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]);
-
- for (unsigned int i = 0; i < comm_size; i++) {
- (*sendcounts)[i] = std::stoi(action[i + 2]);
+ datatype2 = simgrid::smpi::Datatype::decode(action[5 + comm_size]);
+ } else {
+ int datatype_index = 0;
+ int disp_index = 0;
+ /* The 3 comes from "0 gather <sendcount>", 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]);
}
- 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<std::vector<int>> recvcounts;
- std::vector<int> 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<std::vector<int>>(new std::vector<int>(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]));
+ 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 AllToAllVArgParser : public CollCommParser {
-public:
- int recv_size_sum;
- int send_size_sum;
- std::shared_ptr<std::vector<int>> recvcounts;
- std::shared_ptr<std::vector<int>> sendcounts;
- std::vector<int> senddisps;
- std::vector<int> 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<std::vector<int>>(new std::vector<int>(comm_size));
- recvcounts = std::shared_ptr<std::vector<int>>(new std::vector<int>(comm_size));
- senddisps = std::vector<int>(comm_size, 0);
- recvdisps = std::vector<int>(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);
+ for (unsigned int i = 0; i < comm_size; i++) {
+ (*recvcounts)[i] = std::stoi(action[i + 3]);
}
-};
-
-template <class T> class ReplayAction {
-protected:
- const std::string name;
- T args;
+ recv_size_sum = std::accumulate(recvcounts->begin(), recvcounts->end(), 0);
+}
- int my_proc_id;
+void ScatterArgParser::parse(simgrid::xbt::ReplayAction& action, 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, 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]);
+}
-public:
- explicit ReplayAction(std::string name) : name(name), my_proc_id(simgrid::s4u::this_actor::getPid()) {}
- virtual ~ReplayAction() = default;
+void ScatterVArgParser::parse(simgrid::xbt::ReplayAction& action, 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()
+ */
+ CHECK_ACTION_PARAMS(action, comm_size + 1, 2)
+ recv_size = parse_double(action[2 + comm_size]);
+ disps = std::vector<int>(comm_size, 0);
+ sendcounts = std::shared_ptr<std::vector<int>>(new std::vector<int>(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 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 ReduceScatterArgParser::parse(simgrid::xbt::ReplayAction& action, 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::shared_ptr<std::vector<int>>(new std::vector<int>(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);
+}
- virtual void kernel(simgrid::xbt::ReplayAction& action) = 0;
+void AllToAllVArgParser::parse(simgrid::xbt::ReplayAction& action, 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::shared_ptr<std::vector<int>>(new std::vector<int>(comm_size));
+ recvcounts = std::shared_ptr<std::vector<int>>(new std::vector<int>(comm_size));
+ senddisps = std::vector<int>(comm_size, 0);
+ recvdisps = std::vector<int>(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* 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());
+ 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 a MPI_test. Then just
+ * return.*/
+ return;
}
-};
-class WaitAction : public ReplayAction<ActionArgParser> {
-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 == 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;
- int rank = request->comm() != MPI_COMM_NULL ? request->comm()->rank() : -1;
+ // 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);
+ // 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::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!
- int src = request->comm()->group()->rank(request->src());
- int dst = request->comm()->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, __func__, new simgrid::instr::NoOpTIData("wait"));
+ MPI_Status status;
+ Request::wait(&request, &status);
- MPI_Status status;
- Request::wait(&request, &status);
+ TRACE_smpi_comm_out(rank);
+ if (is_wait_for_receive)
+ TRACE_smpi_recv(args.src, args.dst, args.tag);
+}
- TRACE_smpi_comm_out(rank);
- if (is_wait_for_receive)
- TRACE_smpi_recv(src, dst, 0);
+void SendAction::kernel(simgrid::xbt::ReplayAction&)
+{
+ 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);
+ req_storage.add(request);
+ } else {
+ xbt_die("Don't know this action, %s", name.c_str());
}
-};
-class SendAction : public ReplayAction<SendRecvParser> {
-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)->getPid();
-
- TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData(name, args.partner, args.size,
- Datatype::encode(args.datatype1)));
- if (not TRACE_smpi_view_internals())
- TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, 0, args.size * args.datatype1->size());
-
- if (name == "send") {
- Request::send(nullptr, args.size, args.datatype1, args.partner, 0, MPI_COMM_WORLD);
- } else if (name == "Isend") {
- MPI_Request request = Request::isend(nullptr, args.size, args.datatype1, args.partner, 0, 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(my_proc_id);
+}
- TRACE_smpi_comm_out(my_proc_id);
+void RecvAction::kernel(simgrid::xbt::ReplayAction&)
+{
+ TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData(name, args.partner, args.size,
+ args.tag, Datatype::encode(args.datatype1)));
+
+ 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;
+ }
+
+ bool is_recv = false; // Help analyzers understanding that status is not used unintialized
+ if (name == "recv") {
+ is_recv = true;
+ 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);
+ req_storage.add(request);
+ } else {
+ THROW_IMPOSSIBLE;
}
-};
-class RecvAction : public ReplayAction<SendRecvParser> {
-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)->getPid();
+ TRACE_smpi_comm_out(my_proc_id);
+ if (is_recv && not TRACE_smpi_view_internals()) {
+ int src_traced = MPI_COMM_WORLD->group()->actor(status.MPI_SOURCE)->get_pid();
+ TRACE_smpi_recv(src_traced, my_proc_id, args.tag);
+ }
+}
- TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData(name, args.partner, args.size,
- Datatype::encode(args.datatype1)));
+void ComputeAction::kernel(simgrid::xbt::ReplayAction&)
+{
+ TRACE_smpi_computing_in(my_proc_id, args.flops);
+ smpi_execute_flops(args.flops);
+ TRACE_smpi_computing_out(my_proc_id);
+}
+
+void TestAction::kernel(simgrid::xbt::ReplayAction&)
+{
+ 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(my_proc_id, __func__, new simgrid::instr::NoOpTIData("test"));
MPI_Status status;
- // unknown size from the receiver point of view
- if (args.size <= 0.0) {
- Request::probe(args.partner, 0, MPI_COMM_WORLD, &status);
- args.size = status.count;
- }
+ int flag = Request::test(&request, &status);
- if (name == "recv") {
- Request::recv(nullptr, args.size, args.datatype1, args.partner, 0, MPI_COMM_WORLD, &status);
- } else if (name == "Irecv") {
- MPI_Request request = Request::irecv(nullptr, args.size, args.datatype1, args.partner, 0, MPI_COMM_WORLD);
- get_reqq_self()->push_back(request);
- }
+ 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);
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, 0);
- }
- }
-};
-
-class ComputeAction : public ReplayAction<ComputeParser> {
-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);
- }
-};
-
-class TestAction : public ReplayAction<ActionArgParser> {
-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);
- }
}
-};
+}
-class InitAction : public ReplayAction<ActionArgParser> {
-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();
- /*initialize the number of active processes */
- active_processes = smpi_process_count();
+ : MPI_BYTE; // default TAU datatype
- set_reqq_self(new std::vector<MPI_Request>);
- }
-};
-
-class CommunicatorAction : public ReplayAction<ActionArgParser> {
-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<ActionArgParser> {
-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<std::pair</*sender*/int,/*recv*/int>> 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 unsigned int count_requests = req_storage.size();
+
+ if (count_requests > 0) {
+ TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("waitall", -1, count_requests, ""));
+ std::vector<std::pair</*sender*/int,/*recv*/int>> sender_receiver;
+ std::vector<MPI_Request> reqs;
+ req_storage.get_requests(reqs);
+ for (const auto& req : reqs) {
+ if (req && (req->flags() & MPI_REQ_RECV)) {
+ sender_receiver.push_back({req->src(), req->dst()});
}
- TRACE_smpi_comm_out(my_proc_id);
}
- }
-};
+ MPI_Status status[count_requests];
+ Request::waitall(count_requests, &(reqs.data())[0], status);
+ req_storage.get_store().clear();
-class BarrierAction : public ReplayAction<ActionArgParser> {
-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);
+ for (auto& pair : sender_receiver) {
+ TRACE_smpi_recv(pair.first, pair.second, 0);
+ }
TRACE_smpi_comm_out(my_proc_id);
}
-};
+}
-class BcastAction : public ReplayAction<BcastArgParser> {
-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)->getPid(),
- -1.0, args.size, -1, Datatype::encode(args.datatype1), ""));
+void BarrierAction::kernel(simgrid::xbt::ReplayAction&)
+{
+ 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);
+}
- Colls::bcast(send_buffer(args.size * args.datatype1->size()), args.size, args.datatype1, args.root, MPI_COMM_WORLD);
+void BcastAction::kernel(simgrid::xbt::ReplayAction&)
+{
+ 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), ""));
- TRACE_smpi_comm_out(my_proc_id);
- }
-};
+ Colls::bcast(send_buffer(args.size * args.datatype1->size()), args.size, args.datatype1, args.root, MPI_COMM_WORLD);
-class ReduceAction : public ReplayAction<ReduceArgParser> {
-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)->getPid(), args.comp_size,
- args.comm_size, -1, Datatype::encode(args.datatype1), ""));
+ TRACE_smpi_comm_out(my_proc_id);
+}
+
+void ReduceAction::kernel(simgrid::xbt::ReplayAction&)
+{
+ 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), ""));
- 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::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);
- TRACE_smpi_comm_out(my_proc_id);
- }
-};
+ TRACE_smpi_comm_out(my_proc_id);
+}
-class AllReduceAction : public ReplayAction<AllReduceArgParser> {
-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), ""));
+void AllReduceAction::kernel(simgrid::xbt::ReplayAction&)
+{
+ 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), ""));
- 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);
+ 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);
- TRACE_smpi_comm_out(my_proc_id);
- }
-};
+ TRACE_smpi_comm_out(my_proc_id);
+}
-class AllToAllAction : public ReplayAction<AllToAllArgParser> {
-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,
- Datatype::encode(args.datatype1),
- Datatype::encode(args.datatype2)));
+void AllToAllAction::kernel(simgrid::xbt::ReplayAction&)
+{
+ TRACE_smpi_comm_in(my_proc_id, "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()),
+ 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<GatherArgParser> {
-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)));
+ TRACE_smpi_comm_out(my_proc_id);
+}
- 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);
+void GatherAction::kernel(simgrid::xbt::ReplayAction&)
+{
+ 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)));
- TRACE_smpi_comm_out(my_proc_id);
+ 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);
-class GatherVAction : public ReplayAction<GatherVArgParser> {
-public:
- explicit GatherVAction(std::string name) : ReplayAction(name) {}
- void kernel(simgrid::xbt::ReplayAction& action) override
- {
- int rank = MPI_COMM_WORLD->rank();
+ TRACE_smpi_comm_out(my_proc_id);
+}
- 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)));
+void GatherVAction::kernel(simgrid::xbt::ReplayAction&)
+{
+ int rank = MPI_COMM_WORLD->rank();
- 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_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)));
- TRACE_smpi_comm_out(my_proc_id);
+ 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);
}
-};
-class ScatterAction : public ReplayAction<ScatterArgParser> {
-public:
- ScatterAction() : ReplayAction("scatter") {}
- void kernel(simgrid::xbt::ReplayAction& action) override
- {
- 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)));
+ TRACE_smpi_comm_out(my_proc_id);
+}
- 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);
+void ScatterAction::kernel(simgrid::xbt::ReplayAction&)
+{
+ 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)));
- TRACE_smpi_comm_out(my_proc_id);
- }
-};
+ 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);
+}
-class ScatterVAction : public ReplayAction<ScatterVArgParser> {
-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 ScatterVAction::kernel(simgrid::xbt::ReplayAction&)
+{
+ 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)));
- 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::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(my_proc_id);
- }
-};
+ TRACE_smpi_comm_out(my_proc_id);
+}
-class ReduceScatterAction : public ReplayAction<ReduceScatterArgParser> {
-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 ReduceScatterAction::kernel(simgrid::xbt::ReplayAction&)
+{
+ 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)));
- 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);
+ 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);
- smpi_execute_flops(args.comp_size);
- TRACE_smpi_comm_out(my_proc_id);
- }
-};
+ smpi_execute_flops(args.comp_size);
+ TRACE_smpi_comm_out(my_proc_id);
+}
-class AllToAllVAction : public ReplayAction<AllToAllVArgParser> {
-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&)
+{
+ 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)));
- 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(my_proc_id);
+}
} // Replay Namespace
}} // namespace simgrid::smpi
+static std::unordered_map<aid_t, simgrid::smpi::replay::RequestStorage> 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);
+ if (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::getPid();
+ 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);
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&) { /* 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("compute", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ComputeAction().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);
+ smpi_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();
}
}
/** @brief actually run the replay after initialization */
-void smpi_replay_main(int* argc, char*** argv)
+void smpi_replay_main(int rank, const char* trace_filename)
{
- simgrid::xbt::replay_runner(*argc, *argv);
+ static int active_processes = 0;
+ active_processes++;
+ 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(), 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();
+ unsigned int count_requests = storage[simgrid::s4u::this_actor::get_pid()].size();
+ XBT_DEBUG("There are %ud elements in reqq[*]", count_requests);
+ if (count_requests > 0) {
MPI_Request requests[count_requests];
MPI_Status status[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);
}
- delete get_reqq_self();
active_processes--;
if(active_processes==0){
smpi_free_replay_tmp_buffers();
}
- TRACE_smpi_comm_in(simgrid::s4u::this_actor::getPid(), "smpi_replay_run_finalize",
+ TRACE_smpi_comm_in(simgrid::s4u::this_actor::get_pid(), "smpi_replay_run_finalize",
new simgrid::instr::NoOpTIData("finalize"));
smpi_process()->finalize();
- TRACE_smpi_comm_out(simgrid::s4u::this_actor::getPid());
- TRACE_smpi_finalize(simgrid::s4u::this_actor::getPid());
+ 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* 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, trace_filename);
}
