X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6847a26d9973030337f6ef9f18464b1f04ce7452..8dc3394c8bcc3849bbda44a668a714596e714a18:/src/smpi/internals/smpi_replay.cpp diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp index 0258665e3c..3e4ec9b6b1 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -21,6 +21,60 @@ using simgrid::s4u::Actor; +#include +// 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); + } + + // 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 + struct HashValueImpl + { + static void apply(size_t& seed, Tuple const& tuple) + { + hash_combine(seed, std::get<0>(tuple)); + } + }; + + template + struct hash> + { + size_t + operator()(std::tuple const& tt) const + { + size_t seed = 0; + HashValueImpl >::apply(seed, tt); + return seed; + } + }; +} + XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_replay,smpi,"Trace Replay with SMPI"); static std::unordered_map*> reqq; @@ -29,18 +83,19 @@ 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 << " "; \ - } \ + 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" \ + "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()); \ - }\ + __func__, action.size(), static_cast(mandatory), static_cast(optional), \ + ss.str().c_str()); \ + } \ } static void log_timed_action(simgrid::xbt::ReplayAction& action, double clock) @@ -71,12 +126,82 @@ namespace simgrid { namespace smpi { namespace replay { + +class RequestStorage { +private: + req_storage_t store; + +public: + RequestStorage() {} + int size() + { + return store.size(); + } + + 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"); + } + } + } + + 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; + } + + void remove(MPI_Request req) + { + if (req == MPI_REQUEST_NULL) return; + + store.erase(req_key_t(req->src()-1, req->dst()-1, req->tag())); + } + + 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}); + } + + /* 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}); + } +}; + 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 */ @@ -432,7 +557,7 @@ public: } }; -class WaitAction : public ReplayAction { +class WaitAction : public ReplayAction { public: WaitAction() : ReplayAction("Wait") {} void kernel(simgrid::xbt::ReplayAction& action) override @@ -442,7 +567,7 @@ public: MPI_Request request = get_reqq_self()->back(); get_reqq_self()->pop_back(); - if (request == nullptr) { + 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; @@ -452,9 +577,6 @@ public: // 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()); - int tag = request->tag(); 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")); @@ -464,7 +586,7 @@ public: TRACE_smpi_comm_out(rank); if (is_wait_for_receive) - TRACE_smpi_recv(src, dst, tag); + TRACE_smpi_recv(args.src, args.dst, args.tag); } }; @@ -538,7 +660,7 @@ public: } }; -class TestAction : public ReplayAction { +class TestAction : public ReplayAction { public: TestAction() : ReplayAction("Test") {} void kernel(simgrid::xbt::ReplayAction& action) override @@ -811,6 +933,7 @@ public: } // Replay Namespace }} // namespace simgrid::smpi +std::vector storage; /** @brief Only initialize the replay, don't do it for real */ void smpi_replay_init(int* argc, char*** argv) {