-/* 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. */
-#ifndef SMPI_REPLAY_HPP
-#define SMPI_REPLAY_HPP
+#ifndef SMPI_REPLAY_HPP_
+#define SMPI_REPLAY_HPP_
-#include "smpi/smpi.h"
-#include <simgrid/s4u/Actor.hpp>
-#include <memory>
+#include "src/smpi/include/smpi_actor.hpp"
+
+#include <boost/algorithm/string/join.hpp>
#include <xbt/replay.hpp>
#include <xbt/ex.h>
+#include <memory>
#include <sstream>
-#define CHECK_ACTION_PARAMS(action, mandatory, optional) \
-{ \
- if (action.size() < static_cast<unsigned long>(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<unsigned long>(mandatory), static_cast<unsigned long>(optional), \
- ss.str().c_str()); \
- } \
-}
-
-extern XBT_PRIVATE void* smpi_get_tmp_sendbuffer(int size);
-extern XBT_PRIVATE void* smpi_get_tmp_recvbuffer(int size);
-extern XBT_PRIVATE void smpi_free_tmp_buffer(void* buf);
-extern XBT_PRIVATE void smpi_free_replay_tmp_buffers();
+#define CHECK_ACTION_PARAMS(action, mandatory, optional) \
+ { \
+ if (action.size() < static_cast<unsigned long>(mandatory + 2)) { \
+ std::stringstream ss; \
+ ss << __func__ << " replay failed.\n" \
+ << action.size() << " items were given on the line. First two should be process_id and action. " \
+ << "This action needs after them " << mandatory << " mandatory arguments, and accepts " << optional \
+ << " optional ones. \n" \
+ << "The full line that was given is:\n "; \
+ for (const auto& elem : action) { \
+ ss << elem << " "; \
+ } \
+ ss << "\nPlease contact the Simgrid team if support is needed"; \
+ throw std::invalid_argument(ss.str()); \
+ } \
+ }
+
+XBT_PRIVATE void* smpi_get_tmp_sendbuffer(int size);
+XBT_PRIVATE void* smpi_get_tmp_recvbuffer(int size);
+XBT_PRIVATE void smpi_free_tmp_buffer(void* buf);
+XBT_PRIVATE void smpi_free_replay_tmp_buffers();
+
+XBT_PRIVATE void log_timed_action(simgrid::xbt::ReplayAction& action, double clock);
namespace simgrid {
namespace smpi {
class ActionArgParser {
public:
virtual ~ActionArgParser() = default;
- virtual void parse(simgrid::xbt::ReplayAction& action, std::string name) { CHECK_ACTION_PARAMS(action, 0, 0) }
+ virtual void parse(simgrid::xbt::ReplayAction& action, const std::string& name) { CHECK_ACTION_PARAMS(action, 0, 0) }
};
class WaitTestParser : public ActionArgParser {
int dst;
int tag;
- void parse(simgrid::xbt::ReplayAction& action, std::string name) override;
+ void parse(simgrid::xbt::ReplayAction& action, const std::string& name) override;
};
class SendRecvParser : public ActionArgParser {
int tag;
MPI_Datatype datatype1 = MPI_DEFAULT_TYPE;
- void parse(simgrid::xbt::ReplayAction& action, std::string name) override;
+ void parse(simgrid::xbt::ReplayAction& action, const std::string& name) override;
};
class ComputeParser : public ActionArgParser {
/* communication partner; if we send, this is the receiver and vice versa */
double flops;
- void parse(simgrid::xbt::ReplayAction& action, std::string name) override;
+ void parse(simgrid::xbt::ReplayAction& action, const std::string& name) override;
};
class CollCommParser : public ActionArgParser {
class BcastArgParser : public CollCommParser {
public:
- void parse(simgrid::xbt::ReplayAction& action, std::string name) override;
+ void parse(simgrid::xbt::ReplayAction& action, const std::string& name) override;
};
class ReduceArgParser : public CollCommParser {
public:
- void parse(simgrid::xbt::ReplayAction& action, std::string name) override;
+ void parse(simgrid::xbt::ReplayAction& action, const std::string& name) override;
};
class AllReduceArgParser : public CollCommParser {
public:
- void parse(simgrid::xbt::ReplayAction& action, std::string name) override;
+ void parse(simgrid::xbt::ReplayAction& action, const std::string& name) override;
};
class AllToAllArgParser : public CollCommParser {
public:
- void parse(simgrid::xbt::ReplayAction& action, std::string name) override;
+ void parse(simgrid::xbt::ReplayAction& action, const std::string& name) override;
};
class GatherArgParser : public CollCommParser {
public:
- void parse(simgrid::xbt::ReplayAction& action, std::string name) override;
+ void parse(simgrid::xbt::ReplayAction& action, const std::string& name) override;
};
class GatherVArgParser : public CollCommParser {
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;
+ void parse(simgrid::xbt::ReplayAction& action, const std::string& name) override;
};
class ScatterArgParser : public CollCommParser {
public:
- void parse(simgrid::xbt::ReplayAction& action, std::string name) override;
+ void parse(simgrid::xbt::ReplayAction& action, const std::string& name) override;
};
class ScatterVArgParser : public CollCommParser {
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;
+ void parse(simgrid::xbt::ReplayAction& action, const std::string& name) override;
};
class ReduceScatterArgParser : public CollCommParser {
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;
+ void parse(simgrid::xbt::ReplayAction& action, const std::string& name) override;
};
class AllToAllVArgParser : public CollCommParser {
std::vector<int> recvdisps;
int send_buf_size;
int recv_buf_size;
- void parse(simgrid::xbt::ReplayAction& action, std::string name) override;
+ void parse(simgrid::xbt::ReplayAction& action, const std::string& name) override;
};
/**
* Base class for all ReplayActions.
* Note that this class actually implements the behavior of each action
- * while the parsing of the replay arguments is done in the ActionArgParser class.
+ * while the parsing of the replay arguments is done in the @ref ActionArgParser class.
* In other words: The logic goes here, the setup is done by the ActionArgParser.
*/
template <class T> class ReplayAction {
protected:
const std::string name;
- const int my_proc_id;
+ const aid_t my_proc_id;
T args;
public:
- explicit ReplayAction(std::string name) : name(name), my_proc_id(simgrid::s4u::this_actor::get_pid()) {}
+ explicit ReplayAction(std::string name) : name(std::move(name)), my_proc_id(simgrid::s4u::this_actor::get_pid()) {}
virtual ~ReplayAction() = default;
- virtual void execute(simgrid::xbt::ReplayAction& action);
+ 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);
+ }
+
virtual void kernel(simgrid::xbt::ReplayAction& action) = 0;
void* send_buffer(int size) { return smpi_get_tmp_sendbuffer(size); }
void* recv_buffer(int size) { return smpi_get_tmp_recvbuffer(size); }
RequestStorage& req_storage;
public:
- explicit SendAction(std::string name, RequestStorage& storage) : ReplayAction(name), req_storage(storage) {}
+ explicit SendAction(std::string name, RequestStorage& storage) : ReplayAction(std::move(name)), req_storage(storage)
+ {
+ }
void kernel(simgrid::xbt::ReplayAction& action) override;
};
RequestStorage& req_storage;
public:
- explicit RecvAction(std::string name, RequestStorage& storage) : ReplayAction(name), req_storage(storage) {}
+ explicit RecvAction(std::string name, RequestStorage& storage) : ReplayAction(std::move(name)), req_storage(storage)
+ {
+ }
void kernel(simgrid::xbt::ReplayAction& action) override;
};
RequestStorage& req_storage;
public:
- explicit WaitAllAction(RequestStorage& storage) : ReplayAction("waitAll"), req_storage(storage) {}
+ explicit WaitAllAction(RequestStorage& storage) : ReplayAction("waitall"), req_storage(storage) {}
void kernel(simgrid::xbt::ReplayAction& action) override;
};
class AllReduceAction : public ReplayAction<AllReduceArgParser> {
public:
- explicit AllReduceAction() : ReplayAction("allReduce") {}
+ explicit AllReduceAction() : ReplayAction("allreduce") {}
void kernel(simgrid::xbt::ReplayAction& action) override;
};
class AllToAllAction : public ReplayAction<AllToAllArgParser> {
public:
- explicit AllToAllAction() : ReplayAction("allToAll") {}
+ explicit AllToAllAction() : ReplayAction("alltoall") {}
void kernel(simgrid::xbt::ReplayAction& action) override;
};
class GatherAction : public ReplayAction<GatherArgParser> {
public:
- explicit GatherAction(std::string name) : ReplayAction(name) {}
+ explicit GatherAction(std::string name) : ReplayAction(std::move(name)) {}
void kernel(simgrid::xbt::ReplayAction& action) override;
};
class GatherVAction : public ReplayAction<GatherVArgParser> {
public:
- explicit GatherVAction(std::string name) : ReplayAction(name) {}
+ explicit GatherVAction(std::string name) : ReplayAction(std::move(name)) {}
void kernel(simgrid::xbt::ReplayAction& action) override;
};
class ScatterVAction : public ReplayAction<ScatterVArgParser> {
public:
- explicit ScatterVAction() : ReplayAction("scatterV") {}
+ explicit ScatterVAction() : ReplayAction("scatterv") {}
void kernel(simgrid::xbt::ReplayAction& action) override;
};
class ReduceScatterAction : public ReplayAction<ReduceScatterArgParser> {
public:
- explicit ReduceScatterAction() : ReplayAction("reduceScatter") {}
+ explicit ReduceScatterAction() : ReplayAction("reducescatter") {}
void kernel(simgrid::xbt::ReplayAction& action) override;
};
class AllToAllVAction : public ReplayAction<AllToAllVArgParser> {
public:
- explicit AllToAllVAction() : ReplayAction("allToAllV") {}
+ explicit AllToAllVAction() : ReplayAction("alltoallv") {}
void kernel(simgrid::xbt::ReplayAction& action) override;
};
}