X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c7c6662f2627dddac82f15cb8d4f1b42ac23e2b9..aa4c8eeb3051e5adfef317cda2ae590ca13e6f3e:/include/simgrid/smpi/replay.hpp diff --git a/include/simgrid/smpi/replay.hpp b/include/simgrid/smpi/replay.hpp index 0a4f4a6551..4da7a7ee7a 100644 --- a/include/simgrid/smpi/replay.hpp +++ b/include/simgrid/smpi/replay.hpp @@ -1,28 +1,40 @@ -/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2020. 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" +#ifndef SMPI_REPLAY_HPP_ +#define SMPI_REPLAY_HPP_ + +#include "src/smpi/include/smpi_actor.hpp" + +#include #include +#include +#include #include -#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()); \ - } \ -} +#define CHECK_ACTION_PARAMS(action, mandatory, optional) \ + { \ + if ((action).size() < static_cast((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 unsigned char* smpi_get_tmp_sendbuffer(size_t size); +XBT_PRIVATE unsigned char* smpi_get_tmp_recvbuffer(size_t size); + +XBT_PRIVATE void log_timed_action(const simgrid::xbt::ReplayAction& action, double clock); namespace simgrid { namespace smpi { @@ -37,7 +49,7 @@ class RequestStorage; // Forward decl 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(xbt::ReplayAction& action, const std::string& name) { CHECK_ACTION_PARAMS(action, 0, 0) } }; class WaitTestParser : public ActionArgParser { @@ -46,7 +58,7 @@ public: int dst; int tag; - void parse(simgrid::xbt::ReplayAction& action, std::string name) override; + void parse(xbt::ReplayAction& action, const std::string& name) override; }; class SendRecvParser : public ActionArgParser { @@ -57,15 +69,29 @@ public: int tag; MPI_Datatype datatype1 = MPI_DEFAULT_TYPE; - void parse(simgrid::xbt::ReplayAction& action, std::string name) override; + void parse(xbt::ReplayAction& action, const std::string& name) override; }; class ComputeParser : public ActionArgParser { public: - /* 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(xbt::ReplayAction& action, const std::string& name) override; +}; + +class SleepParser : public ActionArgParser { +public: + double time; + + void parse(xbt::ReplayAction& action, const std::string& name) override; +}; + +class LocationParser : public ActionArgParser { +public: + std::string filename; + int line; + + void parse(xbt::ReplayAction& action, const std::string& name) override; }; class CollCommParser : public ActionArgParser { @@ -82,27 +108,27 @@ public: class BcastArgParser : public CollCommParser { public: - void parse(simgrid::xbt::ReplayAction& action, std::string name) override; + void parse(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(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(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(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(xbt::ReplayAction& action, const std::string& name) override; }; class GatherVArgParser : public CollCommParser { @@ -110,12 +136,12 @@ public: int recv_size_sum; std::shared_ptr> recvcounts; std::vector disps; - void parse(simgrid::xbt::ReplayAction& action, std::string name) override; + void parse(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(xbt::ReplayAction& action, const std::string& name) override; }; class ScatterVArgParser : public CollCommParser { @@ -124,7 +150,7 @@ public: int send_size_sum; std::shared_ptr> sendcounts; std::vector disps; - void parse(simgrid::xbt::ReplayAction& action, std::string name) override; + void parse(xbt::ReplayAction& action, const std::string& name) override; }; class ReduceScatterArgParser : public CollCommParser { @@ -132,7 +158,7 @@ public: int recv_size_sum; std::shared_ptr> recvcounts; std::vector disps; - void parse(simgrid::xbt::ReplayAction& action, std::string name) override; + void parse(xbt::ReplayAction& action, const std::string& name) override; }; class AllToAllVArgParser : public CollCommParser { @@ -145,62 +171,84 @@ public: std::vector recvdisps; int send_buf_size; int recv_buf_size; - void parse(simgrid::xbt::ReplayAction& action, std::string name) override; + void parse(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 ReplayAction { + const std::string name_; + const aid_t my_proc_id_ = s4u::this_actor::get_pid(); + T args_; + protected: - const std::string name; - const int my_proc_id; - T args; + const std::string& get_name() const { return name_; } + aid_t get_pid() const { return my_proc_id_; } + const T& get_args() const { return args_; } public: - explicit ReplayAction(std::string name) : name(name), my_proc_id(simgrid::s4u::this_actor::get_pid()) {} + explicit ReplayAction(const std::string& name) : name_(name) {} virtual ~ReplayAction() = default; - virtual void execute(simgrid::xbt::ReplayAction& action); + void execute(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); } + unsigned char* send_buffer(int size) { return smpi_get_tmp_sendbuffer(size); } + unsigned char* recv_buffer(int size) { return smpi_get_tmp_recvbuffer(size); } }; class WaitAction : public ReplayAction { -private: RequestStorage& req_storage; public: explicit WaitAction(RequestStorage& storage) : ReplayAction("Wait"), req_storage(storage) {} - void kernel(simgrid::xbt::ReplayAction& action) override; + void kernel(xbt::ReplayAction& action) override; }; class SendAction : public ReplayAction { -private: RequestStorage& req_storage; public: - explicit SendAction(std::string name, RequestStorage& storage) : ReplayAction(name), req_storage(storage) {} - void kernel(simgrid::xbt::ReplayAction& action) override; + explicit SendAction(const std::string& name, RequestStorage& storage) : ReplayAction(name), req_storage(storage) {} + void kernel(xbt::ReplayAction& action) override; }; class RecvAction : public ReplayAction { -private: RequestStorage& req_storage; public: - explicit RecvAction(std::string name, RequestStorage& storage) : ReplayAction(name), req_storage(storage) {} - void kernel(simgrid::xbt::ReplayAction& action) override; + explicit RecvAction(const std::string& name, RequestStorage& storage) : ReplayAction(name), req_storage(storage) {} + void kernel(xbt::ReplayAction& action) override; }; class ComputeAction : public ReplayAction { public: explicit ComputeAction() : ReplayAction("compute") {} - void kernel(simgrid::xbt::ReplayAction& action) override; + void kernel(xbt::ReplayAction& action) override; +}; + +class SleepAction : public ReplayAction { +public: + explicit SleepAction() : ReplayAction("sleep") {} + void kernel(xbt::ReplayAction& action) override; +}; + +class LocationAction : public ReplayAction { +public: + explicit LocationAction() : ReplayAction("location") {} + void kernel(xbt::ReplayAction& action) override; }; class TestAction : public ReplayAction { @@ -209,95 +257,97 @@ private: public: explicit TestAction(RequestStorage& storage) : ReplayAction("Test"), req_storage(storage) {} - void kernel(simgrid::xbt::ReplayAction& action) override; + void kernel(xbt::ReplayAction& action) override; }; class InitAction : public ReplayAction { public: explicit InitAction() : ReplayAction("Init") {} - void kernel(simgrid::xbt::ReplayAction& action) override; + void kernel(xbt::ReplayAction& action) override; }; class CommunicatorAction : public ReplayAction { public: explicit CommunicatorAction() : ReplayAction("Comm") {} - void kernel(simgrid::xbt::ReplayAction& action) override; + void kernel(xbt::ReplayAction& action) override; }; class WaitAllAction : public ReplayAction { -private: RequestStorage& req_storage; public: - explicit WaitAllAction(RequestStorage& storage) : ReplayAction("waitAll"), req_storage(storage) {} - void kernel(simgrid::xbt::ReplayAction& action) override; + explicit WaitAllAction(RequestStorage& storage) : ReplayAction("waitall"), req_storage(storage) {} + void kernel(xbt::ReplayAction& action) override; }; class BarrierAction : public ReplayAction { public: explicit BarrierAction() : ReplayAction("barrier") {} - void kernel(simgrid::xbt::ReplayAction& action) override; + void kernel(xbt::ReplayAction& action) override; }; class BcastAction : public ReplayAction { public: explicit BcastAction() : ReplayAction("bcast") {} - void kernel(simgrid::xbt::ReplayAction& action) override; + void kernel(xbt::ReplayAction& action) override; }; class ReduceAction : public ReplayAction { public: explicit ReduceAction() : ReplayAction("reduce") {} - void kernel(simgrid::xbt::ReplayAction& action) override; + void kernel(xbt::ReplayAction& action) override; }; class AllReduceAction : public ReplayAction { public: - explicit AllReduceAction() : ReplayAction("allReduce") {} - void kernel(simgrid::xbt::ReplayAction& action) override; + explicit AllReduceAction() : ReplayAction("allreduce") {} + void kernel(xbt::ReplayAction& action) override; }; class AllToAllAction : public ReplayAction { public: - explicit AllToAllAction() : ReplayAction("allToAll") {} - void kernel(simgrid::xbt::ReplayAction& action) override; + explicit AllToAllAction() : ReplayAction("alltoall") {} + void kernel(xbt::ReplayAction& action) override; }; class GatherAction : public ReplayAction { public: - explicit GatherAction(std::string name) : ReplayAction(name) {} - void kernel(simgrid::xbt::ReplayAction& action) override; + explicit GatherAction(const std::string& name) : ReplayAction(name) {} + void kernel(xbt::ReplayAction& action) override; }; class GatherVAction : public ReplayAction { public: - explicit GatherVAction(std::string name) : ReplayAction(name) {} - void kernel(simgrid::xbt::ReplayAction& action) override; + explicit GatherVAction(const std::string& name) : ReplayAction(name) {} + void kernel(xbt::ReplayAction& action) override; }; class ScatterAction : public ReplayAction { public: explicit ScatterAction() : ReplayAction("scatter") {} - void kernel(simgrid::xbt::ReplayAction& action) override; + void kernel(xbt::ReplayAction& action) override; }; class ScatterVAction : public ReplayAction { public: - explicit ScatterVAction() : ReplayAction("scatterV") {} - void kernel(simgrid::xbt::ReplayAction& action) override; + explicit ScatterVAction() : ReplayAction("scatterv") {} + void kernel(xbt::ReplayAction& action) override; }; class ReduceScatterAction : public ReplayAction { public: - explicit ReduceScatterAction() : ReplayAction("reduceScatter") {} - void kernel(simgrid::xbt::ReplayAction& action) override; + explicit ReduceScatterAction() : ReplayAction("reducescatter") {} + void kernel(xbt::ReplayAction& action) override; }; class AllToAllVAction : public ReplayAction { public: - explicit AllToAllVAction() : ReplayAction("allToAllV") {} - void kernel(simgrid::xbt::ReplayAction& action) override; + explicit AllToAllVAction() : ReplayAction("alltoallv") {} + void kernel(xbt::ReplayAction& action) override; }; -} -} -} + +} // namespace replay +} // namespace smpi +} // namespace simgrid + +#endif