X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ffaf79e21d090ad203a2076d72da2a79194fd1a4..bba28202d80db522aef1af8dd81c9b9e3e0d3049:/src/smpi/internals/smpi_replay.cpp?ds=sidebyside diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp index 42d181af6c..21d9183f0a 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -405,49 +405,36 @@ void ReplayAction::execute(simgrid::xbt::ReplayAction& action) log_timed_action(action, start_time); } -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 - { - 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); - - 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; - } +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); + + 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; + } - 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() & 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")); + // 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::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(args.src, args.dst, args.tag); } -}; - -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 + void SendAction::kernel(simgrid::xbt::ReplayAction& action) { int dst_traced = MPI_COMM_WORLD->group()->actor(args.partner)->get_pid(); @@ -467,15 +454,8 @@ public: TRACE_smpi_comm_out(my_proc_id); } -}; - -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 + void RecvAction::kernel(simgrid::xbt::ReplayAction& action) { int src_traced = MPI_COMM_WORLD->group()->actor(args.partner)->get_pid(); @@ -502,26 +482,15 @@ public: TRACE_smpi_recv(src_traced, my_proc_id, args.tag); } } -}; -class ComputeAction : public ReplayAction { -public: - ComputeAction() : ReplayAction("compute") {} - void kernel(simgrid::xbt::ReplayAction& action) override + void ComputeAction::kernel(simgrid::xbt::ReplayAction& action) { 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 { -private: - RequestStorage& req_storage; - -public: - explicit TestAction(RequestStorage& storage) : ReplayAction("Test"), req_storage(storage) {} - void kernel(simgrid::xbt::ReplayAction& action) override + void TestAction::kernel(simgrid::xbt::ReplayAction& action) { MPI_Request request = req_storage.find(args.src, args.dst, args.tag); req_storage.remove(request); @@ -545,12 +514,8 @@ public: TRACE_smpi_testing_out(my_proc_id); } } -}; -class InitAction : public ReplayAction { -public: - InitAction() : ReplayAction("Init") {} - void kernel(simgrid::xbt::ReplayAction& action) override + void InitAction::kernel(simgrid::xbt::ReplayAction& action) { CHECK_ACTION_PARAMS(action, 0, 1) MPI_DEFAULT_TYPE = (action.size() > 2) ? MPI_DOUBLE // default MPE datatype @@ -559,21 +524,13 @@ public: /* start a simulated timer */ smpi_process()->simulated_start(); } -}; - -class CommunicatorAction : public ReplayAction { -public: - CommunicatorAction() : ReplayAction("Comm") {} - void kernel(simgrid::xbt::ReplayAction& action) override { /* nothing to do */} -}; -class WaitAllAction : public ReplayAction { -private: - RequestStorage& req_storage; + void CommunicatorAction::kernel(simgrid::xbt::ReplayAction& action) + { + /* nothing to do */ + } -public: - explicit WaitAllAction(RequestStorage& storage) : ReplayAction("waitAll"), req_storage(storage) {} - void kernel(simgrid::xbt::ReplayAction& action) override + void WaitAllAction::kernel(simgrid::xbt::ReplayAction& action) { const unsigned int count_requests = req_storage.size(); @@ -583,7 +540,7 @@ public: std::vector reqs; req_storage.get_requests(reqs); for (const auto& req : reqs) { - if (req && (req->flags() & RECV)) { + if (req && (req->flags() & MPI_REQ_RECV)) { sender_receiver.push_back({req->src(), req->dst()}); } } @@ -597,23 +554,15 @@ public: TRACE_smpi_comm_out(my_proc_id); } } -}; -class BarrierAction : public ReplayAction { -public: - BarrierAction() : ReplayAction("barrier") {} - void kernel(simgrid::xbt::ReplayAction& action) override + void BarrierAction::kernel(simgrid::xbt::ReplayAction& action) { 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); } -}; -class BcastAction : public ReplayAction { -public: - BcastAction() : ReplayAction("bcast") {} - void kernel(simgrid::xbt::ReplayAction& action) override + void BcastAction::kernel(simgrid::xbt::ReplayAction& action) { TRACE_smpi_comm_in(my_proc_id, "action_bcast", new simgrid::instr::CollTIData("bcast", MPI_COMM_WORLD->group()->actor(args.root)->get_pid(), @@ -623,12 +572,8 @@ public: TRACE_smpi_comm_out(my_proc_id); } -}; -class ReduceAction : public ReplayAction { -public: - ReduceAction() : ReplayAction("reduce") {} - void kernel(simgrid::xbt::ReplayAction& action) override + void ReduceAction::kernel(simgrid::xbt::ReplayAction& action) { TRACE_smpi_comm_in(my_proc_id, "action_reduce", new simgrid::instr::CollTIData("reduce", MPI_COMM_WORLD->group()->actor(args.root)->get_pid(), @@ -641,12 +586,8 @@ public: TRACE_smpi_comm_out(my_proc_id); } -}; -class AllReduceAction : public ReplayAction { -public: - AllReduceAction() : ReplayAction("allReduce") {} - void kernel(simgrid::xbt::ReplayAction& action) override + void AllReduceAction::kernel(simgrid::xbt::ReplayAction& action) { 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), "")); @@ -657,12 +598,8 @@ public: TRACE_smpi_comm_out(my_proc_id); } -}; -class AllToAllAction : public ReplayAction { -public: - AllToAllAction() : ReplayAction("allToAll") {} - void kernel(simgrid::xbt::ReplayAction& action) override + void AllToAllAction::kernel(simgrid::xbt::ReplayAction& action) { TRACE_smpi_comm_in(my_proc_id, "action_allToAll", new simgrid::instr::CollTIData("allToAll", -1, -1.0, args.send_size, args.recv_size, @@ -675,12 +612,8 @@ public: TRACE_smpi_comm_out(my_proc_id); } -}; -class GatherAction : public ReplayAction { -public: - explicit GatherAction(std::string name) : ReplayAction(name) {} - void kernel(simgrid::xbt::ReplayAction& action) override + void GatherAction::kernel(simgrid::xbt::ReplayAction& action) { 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))); @@ -696,12 +629,8 @@ public: TRACE_smpi_comm_out(my_proc_id); } -}; -class GatherVAction : public ReplayAction { -public: - explicit GatherVAction(std::string name) : ReplayAction(name) {} - void kernel(simgrid::xbt::ReplayAction& action) override + void GatherVAction::kernel(simgrid::xbt::ReplayAction& action) { int rank = MPI_COMM_WORLD->rank(); @@ -722,12 +651,8 @@ public: TRACE_smpi_comm_out(my_proc_id); } -}; -class ScatterAction : public ReplayAction { -public: - ScatterAction() : ReplayAction("scatter") {} - void kernel(simgrid::xbt::ReplayAction& action) override + void ScatterAction::kernel(simgrid::xbt::ReplayAction& action) { 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, @@ -739,13 +664,8 @@ public: TRACE_smpi_comm_out(my_proc_id); } -}; - -class ScatterVAction : public ReplayAction { -public: - ScatterVAction() : ReplayAction("scatterV") {} - void kernel(simgrid::xbt::ReplayAction& action) override + void ScatterVAction::kernel(simgrid::xbt::ReplayAction& action) { 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, @@ -759,12 +679,8 @@ public: TRACE_smpi_comm_out(my_proc_id); } -}; -class ReduceScatterAction : public ReplayAction { -public: - ReduceScatterAction() : ReplayAction("reduceScatter") {} - void kernel(simgrid::xbt::ReplayAction& action) override + void ReduceScatterAction::kernel(simgrid::xbt::ReplayAction& action) { TRACE_smpi_comm_in(my_proc_id, "action_reducescatter", new simgrid::instr::VarCollTIData("reduceScatter", -1, 0, nullptr, -1, args.recvcounts, @@ -778,12 +694,8 @@ public: smpi_execute_flops(args.comp_size); TRACE_smpi_comm_out(my_proc_id); } -}; -class AllToAllVAction : public ReplayAction { -public: - AllToAllVAction() : ReplayAction("allToAllV") {} - void kernel(simgrid::xbt::ReplayAction& action) override + void AllToAllVAction::kernel(simgrid::xbt::ReplayAction& action) { TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::VarCollTIData( @@ -795,7 +707,6 @@ public: TRACE_smpi_comm_out(my_proc_id); } -}; } // Replay Namespace }} // namespace simgrid::smpi