X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4ff3a4cf6e03165421f65616a22be86b8f528e21..453434d0a99cf069777049230d135478dbfe848c:/src/smpi/internals/smpi_replay.cpp diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp index 40f5cdbd15..7eb9815677 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -16,25 +16,86 @@ #include #include #include +#include #include 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 int active_processes = 0; static std::unordered_map*> reqq; static MPI_Datatype MPI_DEFAULT_TYPE; #define CHECK_ACTION_PARAMS(action, mandatory, optional) \ { \ - if (action.size() < static_cast(mandatory + 2)) \ + 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)); \ + __func__, action.size(), static_cast(mandatory), static_cast(optional), \ + ss.str().c_str()); \ + } \ } static void log_timed_action(simgrid::xbt::ReplayAction& action, double clock) @@ -47,12 +108,12 @@ static void log_timed_action(simgrid::xbt::ReplayAction& action, double clock) static std::vector* get_reqq_self() { - return reqq.at(simgrid::s4u::this_actor::getPid()); + return reqq.at(simgrid::s4u::this_actor::get_pid()); } static void set_reqq_self(std::vector *mpi_request) { - reqq.insert({simgrid::s4u::this_actor::getPid(), mpi_request}); + reqq.insert({simgrid::s4u::this_actor::get_pid(), mpi_request}); } /* Helper function */ @@ -76,15 +137,17 @@ public: /* communication partner; if we send, this is the receiver and vice versa */ int partner; double size; + int tag; MPI_Datatype datatype1 = MPI_DEFAULT_TYPE; void parse(simgrid::xbt::ReplayAction& action, std::string name) override { - CHECK_ACTION_PARAMS(action, 2, 1) + CHECK_ACTION_PARAMS(action, 3, 1) partner = std::stoi(action[2]); - size = parse_double(action[3]); - if (action.size() > 4) - datatype1 = simgrid::smpi::Datatype::decode(action[4]); + tag = std::stoi(action[3]); + size = parse_double(action[4]); + if (action.size() > 5) + datatype1 = simgrid::smpi::Datatype::decode(action[5]); } }; @@ -398,7 +461,7 @@ protected: T args; public: - explicit ReplayAction(std::string name) : name(name), my_proc_id(simgrid::s4u::this_actor::getPid()) {} + explicit ReplayAction(std::string name) : name(name), my_proc_id(simgrid::s4u::this_actor::get_pid()) {} virtual ~ReplayAction() = default; virtual void execute(simgrid::xbt::ReplayAction& action) @@ -446,6 +509,7 @@ public: // 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")); @@ -455,7 +519,7 @@ public: TRACE_smpi_comm_out(rank); if (is_wait_for_receive) - TRACE_smpi_recv(src, dst, 0); + TRACE_smpi_recv(src, dst, tag); } }; @@ -468,14 +532,14 @@ public: 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, - Datatype::encode(args.datatype1))); + args.tag, 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()); + 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, 0, MPI_COMM_WORLD); + 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, 0, MPI_COMM_WORLD); + MPI_Request request = Request::isend(nullptr, args.size, args.datatype1, args.partner, args.tag, MPI_COMM_WORLD); get_reqq_self()->push_back(request); } else { xbt_die("Don't know this action, %s", name.c_str()); @@ -494,26 +558,26 @@ public: int src_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, - Datatype::encode(args.datatype1))); + 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, 0, MPI_COMM_WORLD, &status); + Request::probe(args.partner, args.tag, MPI_COMM_WORLD, &status); args.size = status.count; } if (name == "recv") { - Request::recv(nullptr, args.size, args.datatype1, args.partner, 0, MPI_COMM_WORLD, &status); + 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, 0, MPI_COMM_WORLD); + MPI_Request request = Request::irecv(nullptr, args.size, args.datatype1, args.partner, args.tag, MPI_COMM_WORLD); get_reqq_self()->push_back(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); + TRACE_smpi_recv(src_traced, my_proc_id, args.tag); } } }; @@ -566,9 +630,6 @@ public: /* start a simulated timer */ smpi_process()->simulated_start(); - /*initialize the number of active processes */ - active_processes = smpi_process_count(); - set_reqq_self(new std::vector); } }; @@ -812,7 +873,7 @@ void smpi_replay_init(int* argc, char*** argv) 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")); @@ -860,6 +921,8 @@ void smpi_replay_init(int* argc, char*** argv) /** @brief actually run the replay after initialization */ void smpi_replay_main(int* argc, char*** argv) { + static int active_processes = 0; + active_processes++; simgrid::xbt::replay_runner(*argc, *argv); /* and now, finalize everything */ @@ -886,13 +949,13 @@ void smpi_replay_main(int* argc, char*** argv) 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 */