X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/172531ecb21baf9c6d79a1e78f7364adf3b768ff..f807f3ecd43bd280674b57f277d3af275fbfbaa5:/src/smpi/internals/smpi_replay.cpp diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp index e503a2107e..dfec134f00 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2021. 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. */ @@ -9,7 +9,7 @@ #include "smpi_group.hpp" #include "smpi_request.hpp" #include "xbt/replay.hpp" -#include +#include #include #include @@ -61,10 +61,10 @@ public: }; } -typedef std::tuple req_key_t; -typedef std::unordered_map>> req_storage_t; +using req_key_t = std::tuple; +using req_storage_t = std::unordered_map>>; -void log_timed_action(simgrid::xbt::ReplayAction& action, double clock) +void log_timed_action(const simgrid::xbt::ReplayAction& action, double clock) { if (XBT_LOG_ISENABLED(smpi_replay, xbt_log_priority_verbose)){ std::string s = boost::algorithm::join(action, " "); @@ -73,7 +73,7 @@ void log_timed_action(simgrid::xbt::ReplayAction& action, double clock) } /* Helper function */ -static double parse_double(std::string string) +static double parse_double(const std::string& string) { return xbt_str_parse_double(string.c_str(), "%s is not a double"); } @@ -89,36 +89,30 @@ private: req_storage_t store; public: - RequestStorage() {} - int size() - { - return store.size(); - } + RequestStorage() = default; + int size() const { return store.size(); } - req_storage_t& get_store() - { - return store; - } + 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::get_pid(); - 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"); - } + void get_requests(std::vector& vec) const + { + for (auto const& pair : store) { + auto& req = pair.second; + auto my_proc_id = simgrid::s4u::this_actor::get_pid(); + 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)); + auto it = store.find(req_key_t(src, dst, tag)); return (it == store.end()) ? MPI_REQUEST_NULL : it->second; } - void remove(MPI_Request req) + void remove(const Request* req) { if (req == MPI_REQUEST_NULL) return; @@ -134,11 +128,13 @@ public: /* 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}); + store.insert( + {req_key_t(MPI_COMM_WORLD->group()->actor_pid(src) - 1, MPI_COMM_WORLD->group()->actor_pid(dst) - 1, tag), + MPI_REQUEST_NULL}); } }; -void WaitTestParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +void WaitTestParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) { CHECK_ACTION_PARAMS(action, 3, 0) src = std::stoi(action[2]); @@ -146,7 +142,7 @@ void WaitTestParser::parse(simgrid::xbt::ReplayAction& action, std::string name) tag = std::stoi(action[4]); } -void SendRecvParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +void SendRecvParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) { CHECK_ACTION_PARAMS(action, 3, 1) partner = std::stoi(action[2]); @@ -156,13 +152,26 @@ void SendRecvParser::parse(simgrid::xbt::ReplayAction& action, std::string name) datatype1 = simgrid::smpi::Datatype::decode(action[5]); } -void ComputeParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +void ComputeParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) { CHECK_ACTION_PARAMS(action, 1, 0) flops = parse_double(action[2]); } -void BcastArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +void SleepParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) +{ + CHECK_ACTION_PARAMS(action, 1, 0) + time = parse_double(action[2]); +} + +void LocationParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) +{ + CHECK_ACTION_PARAMS(action, 2, 0) + filename = std::string(action[2]); + line = std::stoi(action[3]); +} + +void BcastArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) { CHECK_ACTION_PARAMS(action, 1, 2) size = parse_double(action[2]); @@ -171,7 +180,7 @@ void BcastArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) datatype1 = simgrid::smpi::Datatype::decode(action[4]); } -void ReduceArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +void ReduceArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) { CHECK_ACTION_PARAMS(action, 2, 2) comm_size = parse_double(action[2]); @@ -181,7 +190,7 @@ void ReduceArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name datatype1 = simgrid::smpi::Datatype::decode(action[5]); } -void AllReduceArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +void AllReduceArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) { CHECK_ACTION_PARAMS(action, 2, 1) comm_size = parse_double(action[2]); @@ -190,7 +199,7 @@ void AllReduceArgParser::parse(simgrid::xbt::ReplayAction& action, std::string n datatype1 = simgrid::smpi::Datatype::decode(action[4]); } -void AllToAllArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +void AllToAllArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) { CHECK_ACTION_PARAMS(action, 2, 1) comm_size = MPI_COMM_WORLD->size(); @@ -203,7 +212,7 @@ void AllToAllArgParser::parse(simgrid::xbt::ReplayAction& action, std::string na datatype2 = simgrid::smpi::Datatype::decode(action[5]); } -void GatherArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +void GatherArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string& name) { /* The structure of the gather action for the rank 0 (total 4 processes) is the following: 0 gather 68 68 0 0 0 @@ -233,7 +242,7 @@ void GatherArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name } } -void GatherVArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +void GatherVArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string& name) { /* The structure of the gatherv action for the rank 0 (total 4 processes) is the following: 0 gather 68 68 10 10 10 0 0 0 @@ -248,7 +257,7 @@ void GatherVArgParser::parse(simgrid::xbt::ReplayAction& action, std::string nam CHECK_ACTION_PARAMS(action, comm_size + 1, 2) send_size = parse_double(action[2]); disps = std::vector(comm_size, 0); - recvcounts = std::shared_ptr>(new std::vector(comm_size)); + recvcounts = std::make_shared>(comm_size); if (name == "gatherv") { root = (action.size() > 3 + comm_size) ? std::stoi(action[3 + comm_size]) : 0; @@ -257,13 +266,12 @@ void GatherVArgParser::parse(simgrid::xbt::ReplayAction& action, std::string nam if (action.size() > 5 + comm_size) datatype2 = simgrid::smpi::Datatype::decode(action[5 + comm_size]); } else { - int datatype_index = 0; int disp_index = 0; /* The 3 comes from "0 gather ", which must always be present. * The + comm_size is the recvcounts array, which must also be present */ if (action.size() > 3 + comm_size + comm_size) { /* datatype + disp are specified */ - datatype_index = 3 + comm_size; + int datatype_index = 3 + comm_size; disp_index = datatype_index + 1; datatype1 = simgrid::smpi::Datatype::decode(action[datatype_index]); datatype2 = simgrid::smpi::Datatype::decode(action[datatype_index]); @@ -271,7 +279,7 @@ void GatherVArgParser::parse(simgrid::xbt::ReplayAction& action, std::string nam 3 + comm_size + 2) { /* disps specified; datatype is not specified; use the default one */ disp_index = 3 + comm_size; } else if (action.size() > 3 + comm_size) { /* only datatype, no disp specified */ - datatype_index = 3 + comm_size; + int datatype_index = 3 + comm_size; datatype1 = simgrid::smpi::Datatype::decode(action[datatype_index]); datatype2 = simgrid::smpi::Datatype::decode(action[datatype_index]); } @@ -288,7 +296,7 @@ void GatherVArgParser::parse(simgrid::xbt::ReplayAction& action, std::string nam recv_size_sum = std::accumulate(recvcounts->begin(), recvcounts->end(), 0); } -void ScatterArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +void ScatterArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) { /* The structure of the scatter action for the rank 0 (total 4 processes) is the following: 0 gather 68 68 0 0 0 @@ -310,7 +318,7 @@ void ScatterArgParser::parse(simgrid::xbt::ReplayAction& action, std::string nam datatype2 = simgrid::smpi::Datatype::decode(action[6]); } -void ScatterVArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +void ScatterVArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) { /* The structure of the scatterv action for the rank 0 (total 4 processes) is the following: 0 gather 68 10 10 10 68 0 0 0 @@ -324,7 +332,7 @@ void ScatterVArgParser::parse(simgrid::xbt::ReplayAction& action, std::string na CHECK_ACTION_PARAMS(action, comm_size + 1, 2) recv_size = parse_double(action[2 + comm_size]); disps = std::vector(comm_size, 0); - sendcounts = std::shared_ptr>(new std::vector(comm_size)); + sendcounts = std::make_shared>(comm_size); if (action.size() > 5 + comm_size) datatype1 = simgrid::smpi::Datatype::decode(action[4 + comm_size]); @@ -338,7 +346,7 @@ void ScatterVArgParser::parse(simgrid::xbt::ReplayAction& action, std::string na root = (action.size() > 3 + comm_size) ? std::stoi(action[3 + comm_size]) : 0; } -void ReduceScatterArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +void ReduceScatterArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) { /* The structure of the reducescatter action for the rank 0 (total 4 processes) is the following: 0 reducescatter 275427 275427 275427 204020 11346849 0 @@ -350,7 +358,7 @@ void ReduceScatterArgParser::parse(simgrid::xbt::ReplayAction& action, std::stri comm_size = MPI_COMM_WORLD->size(); CHECK_ACTION_PARAMS(action, comm_size + 1, 1) comp_size = parse_double(action[2 + comm_size]); - recvcounts = std::shared_ptr>(new std::vector(comm_size)); + recvcounts = std::make_shared>(comm_size); if (action.size() > 3 + comm_size) datatype1 = simgrid::smpi::Datatype::decode(action[3 + comm_size]); @@ -360,7 +368,7 @@ void ReduceScatterArgParser::parse(simgrid::xbt::ReplayAction& action, std::stri recv_size_sum = std::accumulate(recvcounts->begin(), recvcounts->end(), 0); } -void AllToAllVArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +void AllToAllVArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) { /* The structure of the alltoallv action for the rank 0 (total 4 processes) is the following: 0 alltoallv 100 1 7 10 12 100 1 70 10 5 @@ -372,8 +380,8 @@ void AllToAllVArgParser::parse(simgrid::xbt::ReplayAction& action, std::string n */ comm_size = MPI_COMM_WORLD->size(); CHECK_ACTION_PARAMS(action, 2 * comm_size + 2, 2) - sendcounts = std::shared_ptr>(new std::vector(comm_size)); - recvcounts = std::shared_ptr>(new std::vector(comm_size)); + sendcounts = std::make_shared>(comm_size); + recvcounts = std::make_shared>(comm_size); senddisps = std::vector(comm_size, 0); recvdisps = std::vector(comm_size, 0); @@ -396,11 +404,12 @@ 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()); + const WaitTestParser& args = get_args(); 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 + /* Assume that the trace is well formed, meaning the comm might have been caught by an MPI_test. Then just * return.*/ return; } @@ -410,7 +419,7 @@ void WaitAction::kernel(simgrid::xbt::ReplayAction& action) // 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) + // TODO: Here we take the rank while we normally take the process id (look for get_pid()) TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::WaitTIData(args.src, args.dst, args.tag)); MPI_Status status; @@ -421,74 +430,100 @@ void WaitAction::kernel(simgrid::xbt::ReplayAction& action) TRACE_smpi_recv(args.src, args.dst, args.tag); } -void SendAction::kernel(simgrid::xbt::ReplayAction& action) +void SendAction::kernel(simgrid::xbt::ReplayAction&) { - int dst_traced = MPI_COMM_WORLD->group()->actor(args.partner)->get_pid(); + const SendRecvParser& args = get_args(); + int dst_traced = MPI_COMM_WORLD->group()->actor_pid(args.partner); - TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData(name, args.partner, args.size, - args.tag, Datatype::encode(args.datatype1))); + TRACE_smpi_comm_in( + get_pid(), __func__, + new simgrid::instr::Pt2PtTIData(get_name(), args.partner, args.size, args.tag, Datatype::encode(args.datatype1))); if (not TRACE_smpi_view_internals()) - TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, args.tag, args.size * args.datatype1->size()); + TRACE_smpi_send(get_pid(), get_pid(), dst_traced, args.tag, args.size * args.datatype1->size()); - if (name == "send") { + if (get_name() == "send") { Request::send(nullptr, args.size, args.datatype1, args.partner, args.tag, MPI_COMM_WORLD); - } else if (name == "isend") { + } else if (get_name() == "isend") { MPI_Request request = Request::isend(nullptr, args.size, args.datatype1, args.partner, args.tag, MPI_COMM_WORLD); req_storage.add(request); } else { - xbt_die("Don't know this action, %s", name.c_str()); + xbt_die("Don't know this action, %s", get_name().c_str()); } - TRACE_smpi_comm_out(my_proc_id); + TRACE_smpi_comm_out(get_pid()); } -void RecvAction::kernel(simgrid::xbt::ReplayAction& action) +void RecvAction::kernel(simgrid::xbt::ReplayAction&) { - 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, - args.tag, Datatype::encode(args.datatype1))); + const SendRecvParser& args = get_args(); + TRACE_smpi_comm_in( + get_pid(), __func__, + new simgrid::instr::Pt2PtTIData(get_name(), args.partner, args.size, args.tag, Datatype::encode(args.datatype1))); MPI_Status status; // unknown size from the receiver point of view - if (args.size <= 0.0) { + double arg_size = args.size; + if (arg_size <= 0.0) { Request::probe(args.partner, args.tag, MPI_COMM_WORLD, &status); - args.size = status.count; + arg_size = status.count; } - if (name == "recv") { - 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, args.tag, MPI_COMM_WORLD); + bool is_recv = false; // Help analyzers understanding that status is not used uninitialized + if (get_name() == "recv") { + is_recv = true; + Request::recv(nullptr, arg_size, args.datatype1, args.partner, args.tag, MPI_COMM_WORLD, &status); + } else if (get_name() == "irecv") { + MPI_Request request = Request::irecv(nullptr, arg_size, args.datatype1, args.partner, args.tag, MPI_COMM_WORLD); req_storage.add(request); + } else { + THROW_IMPOSSIBLE; } - 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, args.tag); + TRACE_smpi_comm_out(get_pid()); + if (is_recv && not TRACE_smpi_view_internals()) { + int src_traced = MPI_COMM_WORLD->group()->actor_pid(status.MPI_SOURCE); + TRACE_smpi_recv(src_traced, get_pid(), args.tag); } } -void ComputeAction::kernel(simgrid::xbt::ReplayAction& action) +void ComputeAction::kernel(simgrid::xbt::ReplayAction&) { - TRACE_smpi_computing_in(my_proc_id, args.flops); - smpi_execute_flops(args.flops); - TRACE_smpi_computing_out(my_proc_id); + const ComputeParser& args = get_args(); + if (smpi_cfg_simulate_computation()) { + smpi_execute_flops(args.flops/smpi_adjust_comp_speed()); + } +} + +void SleepAction::kernel(simgrid::xbt::ReplayAction&) +{ + const SleepParser& args = get_args(); + XBT_DEBUG("Sleep for: %lf secs", args.time); + int rank = simgrid::s4u::this_actor::get_pid(); + TRACE_smpi_sleeping_in(rank, args.time); + simgrid::s4u::this_actor::sleep_for(args.time/smpi_adjust_comp_speed()); + TRACE_smpi_sleeping_out(rank); } -void TestAction::kernel(simgrid::xbt::ReplayAction& action) +void LocationAction::kernel(simgrid::xbt::ReplayAction&) { + const LocationParser& args = get_args(); + smpi_trace_set_call_location(args.filename.c_str(), args.line); +} + +void TestAction::kernel(simgrid::xbt::ReplayAction&) +{ + const WaitTestParser& args = get_args(); MPI_Request request = req_storage.find(args.src, args.dst, args.tag); req_storage.remove(request); // if request is null here, this may mean that a previous test has succeeded // Different times in traced application and replayed version may lead to this // In this case, ignore the extra calls. if (request != MPI_REQUEST_NULL) { - TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("test")); + TRACE_smpi_comm_in(get_pid(), __func__, new simgrid::instr::NoOpTIData("test")); MPI_Status status; - int flag = Request::test(&request, &status); + int flag = 0; + Request::test(&request, &status, &flag); XBT_DEBUG("MPI_Test result: %d", flag); /* push back request in vector to be caught by a subsequent wait. if the test did succeed, the request is now @@ -498,7 +533,7 @@ void TestAction::kernel(simgrid::xbt::ReplayAction& action) else req_storage.add(request); - TRACE_smpi_comm_out(my_proc_id); + TRACE_smpi_comm_out(get_pid()); } } @@ -512,207 +547,228 @@ void InitAction::kernel(simgrid::xbt::ReplayAction& action) smpi_process()->simulated_start(); } -void CommunicatorAction::kernel(simgrid::xbt::ReplayAction& action) +void CommunicatorAction::kernel(simgrid::xbt::ReplayAction&) { /* nothing to do */ } -void WaitAllAction::kernel(simgrid::xbt::ReplayAction& action) +void WaitAllAction::kernel(simgrid::xbt::ReplayAction&) { const unsigned int count_requests = req_storage.size(); if (count_requests > 0) { - TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("waitall", -1, count_requests, "")); + TRACE_smpi_comm_in(get_pid(), __func__, new simgrid::instr::Pt2PtTIData("waitall", -1, count_requests, "")); std::vector> sender_receiver; std::vector reqs; req_storage.get_requests(reqs); - for (const auto& req : reqs) { + for (auto const& req : reqs) { if (req && (req->flags() & MPI_REQ_RECV)) { - sender_receiver.push_back({req->src(), req->dst()}); + sender_receiver.emplace_back(req->src(), req->dst()); } } - MPI_Status status[count_requests]; - Request::waitall(count_requests, &(reqs.data())[0], status); + Request::waitall(count_requests, &(reqs.data())[0], MPI_STATUSES_IGNORE); req_storage.get_store().clear(); - for (auto& pair : sender_receiver) { + for (auto const& pair : sender_receiver) { TRACE_smpi_recv(pair.first, pair.second, 0); } - TRACE_smpi_comm_out(my_proc_id); + TRACE_smpi_comm_out(get_pid()); } } -void BarrierAction::kernel(simgrid::xbt::ReplayAction& action) +void BarrierAction::kernel(simgrid::xbt::ReplayAction&) { - 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); + TRACE_smpi_comm_in(get_pid(), __func__, new simgrid::instr::NoOpTIData("barrier")); + colls::barrier(MPI_COMM_WORLD); + TRACE_smpi_comm_out(get_pid()); } -void BcastAction::kernel(simgrid::xbt::ReplayAction& action) +void BcastAction::kernel(simgrid::xbt::ReplayAction&) { - TRACE_smpi_comm_in(my_proc_id, "action_bcast", - new simgrid::instr::CollTIData("bcast", MPI_COMM_WORLD->group()->actor(args.root)->get_pid(), - -1.0, args.size, -1, Datatype::encode(args.datatype1), "")); + const BcastArgParser& args = get_args(); + TRACE_smpi_comm_in(get_pid(), "action_bcast", + new simgrid::instr::CollTIData("bcast", MPI_COMM_WORLD->group()->actor_pid(args.root), -1.0, + args.size, -1, Datatype::encode(args.datatype1), "")); - Colls::bcast(send_buffer(args.size * args.datatype1->size()), args.size, args.datatype1, args.root, MPI_COMM_WORLD); + colls::bcast(send_buffer(args.size * args.datatype1->size()), args.size, args.datatype1, args.root, MPI_COMM_WORLD); - TRACE_smpi_comm_out(my_proc_id); + TRACE_smpi_comm_out(get_pid()); } -void ReduceAction::kernel(simgrid::xbt::ReplayAction& action) +void ReduceAction::kernel(simgrid::xbt::ReplayAction&) { - TRACE_smpi_comm_in(my_proc_id, "action_reduce", - new simgrid::instr::CollTIData("reduce", MPI_COMM_WORLD->group()->actor(args.root)->get_pid(), - args.comp_size, args.comm_size, -1, - Datatype::encode(args.datatype1), "")); + const ReduceArgParser& args = get_args(); + TRACE_smpi_comm_in(get_pid(), "action_reduce", + new simgrid::instr::CollTIData("reduce", MPI_COMM_WORLD->group()->actor_pid(args.root), + args.comp_size, args.comm_size, -1, + Datatype::encode(args.datatype1), "")); - Colls::reduce(send_buffer(args.comm_size * args.datatype1->size()), - recv_buffer(args.comm_size * args.datatype1->size()), args.comm_size, args.datatype1, MPI_OP_NULL, args.root, MPI_COMM_WORLD); - smpi_execute_flops(args.comp_size); + colls::reduce(send_buffer(args.comm_size * args.datatype1->size()), + recv_buffer(args.comm_size * args.datatype1->size()), args.comm_size, args.datatype1, MPI_OP_NULL, + args.root, MPI_COMM_WORLD); + private_execute_flops(args.comp_size); - TRACE_smpi_comm_out(my_proc_id); + TRACE_smpi_comm_out(get_pid()); } -void AllReduceAction::kernel(simgrid::xbt::ReplayAction& action) +void AllReduceAction::kernel(simgrid::xbt::ReplayAction&) { - 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), "")); + const AllReduceArgParser& args = get_args(); + TRACE_smpi_comm_in(get_pid(), "action_allreduce", + new simgrid::instr::CollTIData("allreduce", -1, args.comp_size, args.comm_size, -1, + Datatype::encode(args.datatype1), "")); - Colls::allreduce(send_buffer(args.comm_size * args.datatype1->size()), - recv_buffer(args.comm_size * args.datatype1->size()), args.comm_size, args.datatype1, MPI_OP_NULL, MPI_COMM_WORLD); - smpi_execute_flops(args.comp_size); + colls::allreduce(send_buffer(args.comm_size * args.datatype1->size()), + recv_buffer(args.comm_size * args.datatype1->size()), args.comm_size, args.datatype1, MPI_OP_NULL, + MPI_COMM_WORLD); + private_execute_flops(args.comp_size); - TRACE_smpi_comm_out(my_proc_id); + TRACE_smpi_comm_out(get_pid()); } -void AllToAllAction::kernel(simgrid::xbt::ReplayAction& action) +void AllToAllAction::kernel(simgrid::xbt::ReplayAction&) { - TRACE_smpi_comm_in(my_proc_id, "action_alltoall", - new simgrid::instr::CollTIData("alltoall", -1, -1.0, args.send_size, args.recv_size, - Datatype::encode(args.datatype1), - Datatype::encode(args.datatype2))); + const AllToAllArgParser& args = get_args(); + TRACE_smpi_comm_in(get_pid(), "action_alltoall", + new simgrid::instr::CollTIData("alltoall", -1, -1.0, args.send_size, args.recv_size, + Datatype::encode(args.datatype1), + Datatype::encode(args.datatype2))); - Colls::alltoall(send_buffer(args.send_size * args.comm_size * args.datatype1->size()), args.send_size, - args.datatype1, recv_buffer(args.recv_size * args.comm_size * args.datatype2->size()), - args.recv_size, args.datatype2, MPI_COMM_WORLD); + colls::alltoall(send_buffer(args.send_size * args.comm_size * args.datatype1->size()), args.send_size, args.datatype1, + recv_buffer(args.recv_size * args.comm_size * args.datatype2->size()), args.recv_size, args.datatype2, + MPI_COMM_WORLD); - TRACE_smpi_comm_out(my_proc_id); + TRACE_smpi_comm_out(get_pid()); } -void GatherAction::kernel(simgrid::xbt::ReplayAction& action) +void GatherAction::kernel(simgrid::xbt::ReplayAction&) { - 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))); + const GatherArgParser& args = get_args(); + TRACE_smpi_comm_in(get_pid(), get_name().c_str(), + new simgrid::instr::CollTIData(get_name(), (get_name() == "gather") ? args.root : -1, -1.0, + args.send_size, args.recv_size, Datatype::encode(args.datatype1), + Datatype::encode(args.datatype2))); - if (name == "gather") { + if (get_name() == "gather") { int rank = MPI_COMM_WORLD->rank(); - Colls::gather(send_buffer(args.send_size * args.datatype1->size()), args.send_size, args.datatype1, - (rank == args.root) ? recv_buffer(args.recv_size * args.comm_size * args.datatype2->size()) : nullptr, args.recv_size, args.datatype2, args.root, MPI_COMM_WORLD); - } - else - Colls::allgather(send_buffer(args.send_size * args.datatype1->size()), args.send_size, args.datatype1, - recv_buffer(args.recv_size * args.datatype2->size()), args.recv_size, args.datatype2, MPI_COMM_WORLD); + colls::gather(send_buffer(args.send_size * args.datatype1->size()), args.send_size, args.datatype1, + (rank == args.root) ? recv_buffer(args.recv_size * args.comm_size * args.datatype2->size()) : nullptr, + args.recv_size, args.datatype2, args.root, MPI_COMM_WORLD); + } else + colls::allgather(send_buffer(args.send_size * args.datatype1->size()), args.send_size, args.datatype1, + recv_buffer(args.recv_size * args.datatype2->size()), args.recv_size, args.datatype2, + MPI_COMM_WORLD); - TRACE_smpi_comm_out(my_proc_id); + TRACE_smpi_comm_out(get_pid()); } -void GatherVAction::kernel(simgrid::xbt::ReplayAction& action) +void GatherVAction::kernel(simgrid::xbt::ReplayAction&) { int rank = MPI_COMM_WORLD->rank(); - - TRACE_smpi_comm_in(my_proc_id, name.c_str(), new simgrid::instr::VarCollTIData( - name, (name == "gatherv") ? args.root : -1, args.send_size, nullptr, -1, args.recvcounts, - Datatype::encode(args.datatype1), Datatype::encode(args.datatype2))); - - if (name == "gatherv") { - Colls::gatherv(send_buffer(args.send_size * args.datatype1->size()), args.send_size, args.datatype1, - (rank == args.root) ? recv_buffer(args.recv_size_sum * args.datatype2->size()) : nullptr, - args.recvcounts->data(), args.disps.data(), args.datatype2, args.root, MPI_COMM_WORLD); - } - else { - Colls::allgatherv(send_buffer(args.send_size * args.datatype1->size()), args.send_size, args.datatype1, - recv_buffer(args.recv_size_sum * args.datatype2->size()), args.recvcounts->data(), - args.disps.data(), args.datatype2, MPI_COMM_WORLD); + const GatherVArgParser& args = get_args(); + TRACE_smpi_comm_in(get_pid(), get_name().c_str(), + new simgrid::instr::VarCollTIData( + get_name(), (get_name() == "gatherv") ? args.root : -1, args.send_size, nullptr, -1, + args.recvcounts, Datatype::encode(args.datatype1), Datatype::encode(args.datatype2))); + + if (get_name() == "gatherv") { + colls::gatherv(send_buffer(args.send_size * args.datatype1->size()), args.send_size, args.datatype1, + (rank == args.root) ? recv_buffer(args.recv_size_sum * args.datatype2->size()) : nullptr, + args.recvcounts->data(), args.disps.data(), args.datatype2, args.root, MPI_COMM_WORLD); + } else { + colls::allgatherv(send_buffer(args.send_size * args.datatype1->size()), args.send_size, args.datatype1, + recv_buffer(args.recv_size_sum * args.datatype2->size()), args.recvcounts->data(), + args.disps.data(), args.datatype2, MPI_COMM_WORLD); } - TRACE_smpi_comm_out(my_proc_id); + TRACE_smpi_comm_out(get_pid()); } -void ScatterAction::kernel(simgrid::xbt::ReplayAction& action) +void ScatterAction::kernel(simgrid::xbt::ReplayAction&) { 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, - Datatype::encode(args.datatype1), - Datatype::encode(args.datatype2))); + const ScatterArgParser& args = get_args(); + TRACE_smpi_comm_in(get_pid(), "action_scatter", + new simgrid::instr::CollTIData(get_name(), args.root, -1.0, args.send_size, args.recv_size, + Datatype::encode(args.datatype1), + Datatype::encode(args.datatype2))); - Colls::scatter(send_buffer(args.send_size * args.datatype1->size()), args.send_size, args.datatype1, - (rank == args.root) ? recv_buffer(args.recv_size * args.datatype2->size()) : nullptr, args.recv_size, args.datatype2, args.root, MPI_COMM_WORLD); + colls::scatter(send_buffer(args.send_size * args.datatype1->size()), args.send_size, args.datatype1, + (rank == args.root) ? recv_buffer(args.recv_size * args.datatype2->size()) : nullptr, args.recv_size, + args.datatype2, args.root, MPI_COMM_WORLD); - TRACE_smpi_comm_out(my_proc_id); + TRACE_smpi_comm_out(get_pid()); } -void ScatterVAction::kernel(simgrid::xbt::ReplayAction& action) +void ScatterVAction::kernel(simgrid::xbt::ReplayAction&) { 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, - nullptr, Datatype::encode(args.datatype1), - Datatype::encode(args.datatype2))); + const ScatterVArgParser& args = get_args(); + TRACE_smpi_comm_in(get_pid(), "action_scatterv", + new simgrid::instr::VarCollTIData(get_name(), args.root, -1, args.sendcounts, args.recv_size, + nullptr, Datatype::encode(args.datatype1), + Datatype::encode(args.datatype2))); - Colls::scatterv((rank == args.root) ? send_buffer(args.send_size_sum * args.datatype1->size()) : nullptr, - args.sendcounts->data(), args.disps.data(), args.datatype1, - recv_buffer(args.recv_size * args.datatype2->size()), args.recv_size, args.datatype2, args.root, - MPI_COMM_WORLD); + colls::scatterv((rank == args.root) ? send_buffer(args.send_size_sum * args.datatype1->size()) : nullptr, + args.sendcounts->data(), args.disps.data(), args.datatype1, + recv_buffer(args.recv_size * args.datatype2->size()), args.recv_size, args.datatype2, args.root, + MPI_COMM_WORLD); - TRACE_smpi_comm_out(my_proc_id); + TRACE_smpi_comm_out(get_pid()); } -void ReduceScatterAction::kernel(simgrid::xbt::ReplayAction& action) +void ReduceScatterAction::kernel(simgrid::xbt::ReplayAction&) { - TRACE_smpi_comm_in(my_proc_id, "action_reducescatter", + const ReduceScatterArgParser& args = get_args(); + TRACE_smpi_comm_in( + get_pid(), "action_reducescatter", new simgrid::instr::VarCollTIData("reducescatter", -1, 0, nullptr, -1, args.recvcounts, - std::to_string(args.comp_size), /* ugly hack to print comp_size */ - Datatype::encode(args.datatype1))); + std::to_string(args.comp_size), /* ugly hack to print comp_size */ + Datatype::encode(args.datatype1))); - Colls::reduce_scatter(send_buffer(args.recv_size_sum * args.datatype1->size()), - recv_buffer(args.recv_size_sum * args.datatype1->size()), args.recvcounts->data(), - args.datatype1, MPI_OP_NULL, MPI_COMM_WORLD); + colls::reduce_scatter(send_buffer(args.recv_size_sum * args.datatype1->size()), + recv_buffer(args.recv_size_sum * args.datatype1->size()), args.recvcounts->data(), + args.datatype1, MPI_OP_NULL, MPI_COMM_WORLD); - smpi_execute_flops(args.comp_size); - TRACE_smpi_comm_out(my_proc_id); + private_execute_flops(args.comp_size); + TRACE_smpi_comm_out(get_pid()); } -void AllToAllVAction::kernel(simgrid::xbt::ReplayAction& action) +void AllToAllVAction::kernel(simgrid::xbt::ReplayAction&) { - TRACE_smpi_comm_in(my_proc_id, __func__, - new simgrid::instr::VarCollTIData( - "alltoallv", -1, args.send_size_sum, args.sendcounts, args.recv_size_sum, args.recvcounts, - Datatype::encode(args.datatype1), Datatype::encode(args.datatype2))); + const AllToAllVArgParser& args = get_args(); + TRACE_smpi_comm_in(get_pid(), __func__, + new simgrid::instr::VarCollTIData( + "alltoallv", -1, args.send_size_sum, args.sendcounts, args.recv_size_sum, args.recvcounts, + Datatype::encode(args.datatype1), Datatype::encode(args.datatype2))); - Colls::alltoallv(send_buffer(args.send_buf_size * args.datatype1->size()), args.sendcounts->data(), args.senddisps.data(), args.datatype1, - recv_buffer(args.recv_buf_size * args.datatype2->size()), args.recvcounts->data(), args.recvdisps.data(), args.datatype2, MPI_COMM_WORLD); + colls::alltoallv(send_buffer(args.send_buf_size * args.datatype1->size()), args.sendcounts->data(), + args.senddisps.data(), args.datatype1, recv_buffer(args.recv_buf_size * args.datatype2->size()), + args.recvcounts->data(), args.recvdisps.data(), args.datatype2, MPI_COMM_WORLD); - TRACE_smpi_comm_out(my_proc_id); + TRACE_smpi_comm_out(get_pid()); } } // Replay Namespace }} // namespace simgrid::smpi static std::unordered_map storage; /** @brief Only initialize the replay, don't do it for real */ -void smpi_replay_init(int* argc, char*** argv) +void smpi_replay_init(const char* instance_id, int rank, double start_delay_flops) { - simgrid::smpi::Process::init(argc, argv); + xbt_assert(not smpi_process()->initializing()); + + simgrid::s4u::Actor::self()->set_property("instance_id", instance_id); + simgrid::s4u::Actor::self()->set_property("rank", std::to_string(rank)); + simgrid::smpi::ActorExt::init(); + smpi_process()->mark_as_initialized(); smpi_process()->set_replaying(true); 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")); - TRACE_smpi_comm_out(my_proc_id); + TRACE_smpi_init(my_proc_id, "smpi_replay_run_init"); xbt_replay_action_register("init", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::InitAction().execute(action); }); - xbt_replay_action_register("finalize", [](simgrid::xbt::ReplayAction& action) { /* nothing to do */ }); + xbt_replay_action_register("finalize", [](simgrid::xbt::ReplayAction const&) { /* nothing to do */ }); xbt_replay_action_register("comm_size", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::CommunicatorAction().execute(action); }); xbt_replay_action_register("comm_split",[](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::CommunicatorAction().execute(action); }); xbt_replay_action_register("comm_dup", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::CommunicatorAction().execute(action); }); @@ -737,41 +793,41 @@ void smpi_replay_init(int* argc, char*** argv) xbt_replay_action_register("allgatherv", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::GatherVAction("allgatherv").execute(action); }); xbt_replay_action_register("reducescatter", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ReduceScatterAction().execute(action); }); xbt_replay_action_register("compute", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ComputeAction().execute(action); }); + xbt_replay_action_register("sleep", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::SleepAction().execute(action); }); + xbt_replay_action_register("location", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::LocationAction().execute(action); }); //if we have a delayed start, sleep here. - if(*argc>2){ - double value = xbt_str_parse_double((*argv)[2], "%s is not a double"); - XBT_VERB("Delayed start for instance - Sleeping for %f flops ",value ); - smpi_execute_flops(value); + if (start_delay_flops > 0) { + XBT_VERB("Delayed start for instance - Sleeping for %f flops ", start_delay_flops); + private_execute_flops(start_delay_flops); } else { - //UGLY: force a context switch to be sure that all MSG_processes begin initialization - XBT_DEBUG("Force context switch by smpi_execute_flops - Sleeping for 0.0 flops "); - smpi_execute_flops(0.0); + // Wait for the other actors to initialize also + simgrid::s4u::this_actor::yield(); } } /** @brief actually run the replay after initialization */ -void smpi_replay_main(int* argc, char*** argv) +void smpi_replay_main(int rank, const char* private_trace_filename) { static int active_processes = 0; active_processes++; storage[simgrid::s4u::this_actor::get_pid()] = simgrid::smpi::replay::RequestStorage(); - simgrid::xbt::replay_runner(*argc, *argv); + std::string rank_string = std::to_string(rank); + simgrid::xbt::replay_runner(rank_string.c_str(), private_trace_filename); /* and now, finalize everything */ /* One active process will stop. Decrease the counter*/ unsigned int count_requests = storage[simgrid::s4u::this_actor::get_pid()].size(); XBT_DEBUG("There are %ud elements in reqq[*]", count_requests); if (count_requests > 0) { - MPI_Request requests[count_requests]; - MPI_Status status[count_requests]; + std::vector requests(count_requests); unsigned int i=0; for (auto const& pair : storage[simgrid::s4u::this_actor::get_pid()].get_store()) { requests[i] = pair.second; i++; } - simgrid::smpi::Request::waitall(count_requests, requests, status); + simgrid::smpi::Request::waitall(count_requests, requests.data(), MPI_STATUSES_IGNORE); } active_processes--; @@ -787,12 +843,11 @@ void smpi_replay_main(int* argc, char*** argv) smpi_process()->finalize(); 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 */ -void smpi_replay_run(int* argc, char*** argv) +void smpi_replay_run(const char* instance_id, int rank, double start_delay_flops, const char* private_trace_filename) { - smpi_replay_init(argc, argv); - smpi_replay_main(argc, argv); + smpi_replay_init(instance_id, rank, start_delay_flops); + smpi_replay_main(rank, private_trace_filename); }