X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/abc78cf930ac5738e62e20ebbb94c793657e8f93..a882344bc908a258a991701e226556ec23fd7cd6:/src/smpi/internals/smpi_replay.cpp diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp index 71d1f36ea6..9f4bba0daf 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -1,16 +1,19 @@ -/* Copyright (c) 2009-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2022. 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 "smpi_replay.hpp" +#include "simgrid/s4u/Exec.hpp" #include "smpi_coll.hpp" #include "smpi_comm.hpp" +#include "smpi_config.hpp" #include "smpi_datatype.hpp" #include "smpi_group.hpp" #include "smpi_request.hpp" +#include "src/smpi/include/private.hpp" #include "xbt/replay.hpp" -#include -#include +#include "xbt/str.h" #include #include @@ -21,7 +24,6 @@ #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_replay, smpi, "Trace Replay with SMPI"); - // 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. @@ -76,6 +78,15 @@ static double parse_double(const std::string& string) return xbt_str_parse_double(string.c_str(), "not a double"); } +template static T parse_integer(const std::string& string) +{ + double val = trunc(xbt_str_parse_double(string.c_str(), "not a double")); + xbt_assert(static_cast(std::numeric_limits::min()) <= val && + val <= static_cast(std::numeric_limits::max()), + "out of range: %g", val); + return static_cast(val); +} + static int parse_root(const simgrid::xbt::ReplayAction& action, unsigned i) { return i < action.size() ? std::stoi(action[i]) : 0; @@ -95,7 +106,7 @@ MPI_Datatype MPI_DEFAULT_TYPE; class RequestStorage { private: using req_key_t = std::tuple; - using req_storage_t = std::unordered_map>>; + using req_storage_t = std::unordered_map, hash_tuple::hash>>; req_storage_t store; @@ -108,40 +119,49 @@ public: void get_requests(std::vector& vec) const { for (auto const& pair : store) { - auto& req = pair.second; + auto& reqs = pair.second; aid_t 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"); + for (auto& req: reqs){ + if (req != MPI_REQUEST_NULL && (req->src() == my_proc_id || req->dst() == my_proc_id)) { + vec.push_back(req); + req->print_request("MM"); + } } } } - MPI_Request find(int src, int dst, int tag) - { - auto it = store.find(req_key_t(src, dst, tag)); - return (it == store.end()) ? MPI_REQUEST_NULL : it->second; - } - - void remove(const Request* req) - { - if (req == MPI_REQUEST_NULL) return; - - store.erase(req_key_t(req->src()-1, req->dst()-1, req->tag())); - } + MPI_Request pop(int src, int dst, int tag) + { + auto it = store.find(req_key_t(src, dst, tag)); + if (it == store.end()) + return MPI_REQUEST_NULL; + MPI_Request req = it->second.front(); + it->second.pop_front(); + if(it->second.empty()) + store.erase(req_key_t(src, dst, tag)); + return req; + } - 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}); + void add(MPI_Request req) + { + if (req != MPI_REQUEST_NULL){ // Can and does happen in the case of TestAction + auto it = store.find(req_key_t(req->src()-1, req->dst()-1, req->tag())); + if (it == store.end()) + store.insert({req_key_t(req->src()-1, req->dst()-1, req->tag()), std::list()}); + store[req_key_t(req->src()-1, req->dst()-1, req->tag())].push_back(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(MPI_COMM_WORLD->group()->actor(src) - 1, MPI_COMM_WORLD->group()->actor(dst) - 1, tag), - MPI_REQUEST_NULL}); - } + /* 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) + { + int src_pid = MPI_COMM_WORLD->group()->actor(src) - 1; + int dest_pid = MPI_COMM_WORLD->group()->actor(dst) - 1; + auto it = store.find(req_key_t(src_pid, dest_pid, tag)); + if (it == store.end()) + store.insert({req_key_t(src_pid, dest_pid, tag), std::list()}); + store[req_key_t(src_pid, dest_pid, tag)].push_back(MPI_REQUEST_NULL); + } }; void WaitTestParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) @@ -157,7 +177,7 @@ void SendRecvParser::parse(simgrid::xbt::ReplayAction& action, const std::string CHECK_ACTION_PARAMS(action, 3, 1) partner = std::stoi(action[2]); tag = std::stoi(action[3]); - size = parse_double(action[4]); + size = parse_integer(action[4]); datatype1 = parse_datatype(action, 5); } @@ -183,7 +203,7 @@ void LocationParser::parse(simgrid::xbt::ReplayAction& action, const std::string void BcastArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) { CHECK_ACTION_PARAMS(action, 1, 2) - size = parse_double(action[2]); + size = parse_integer(action[2]); root = parse_root(action, 3); datatype1 = parse_datatype(action, 4); } @@ -191,9 +211,7 @@ void BcastArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string void ReduceArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) { CHECK_ACTION_PARAMS(action, 2, 2) - double arg2 = trunc(parse_double(action[2])); - xbt_assert(0.0 <= arg2 && arg2 <= static_cast(std::numeric_limits::max())); - comm_size = static_cast(arg2); + comm_size = parse_integer(action[2]); comp_size = parse_double(action[3]); root = parse_root(action, 4); datatype1 = parse_datatype(action, 5); @@ -202,9 +220,7 @@ void ReduceArgParser::parse(simgrid::xbt::ReplayAction& action, const std::strin void AllReduceArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) { CHECK_ACTION_PARAMS(action, 2, 1) - double arg2 = trunc(parse_double(action[2])); - xbt_assert(0.0 <= arg2 && arg2 <= static_cast(std::numeric_limits::max())); - comm_size = static_cast(arg2); + comm_size = parse_integer(action[2]); comp_size = parse_double(action[3]); datatype1 = parse_datatype(action, 4); } @@ -213,8 +229,8 @@ void AllToAllArgParser::parse(simgrid::xbt::ReplayAction& action, const std::str { CHECK_ACTION_PARAMS(action, 2, 1) comm_size = MPI_COMM_WORLD->size(); - send_size = parse_double(action[2]); - recv_size = parse_double(action[3]); + send_size = parse_integer(action[2]); + recv_size = parse_integer(action[3]); datatype1 = parse_datatype(action, 4); datatype2 = parse_datatype(action, 5); } @@ -232,8 +248,8 @@ void GatherArgParser::parse(simgrid::xbt::ReplayAction& action, const std::strin */ CHECK_ACTION_PARAMS(action, 2, 3) comm_size = MPI_COMM_WORLD->size(); - send_size = parse_double(action[2]); - recv_size = parse_double(action[3]); + send_size = parse_integer(action[2]); + recv_size = parse_integer(action[3]); if (name == "gather") { root = parse_root(action, 4); @@ -259,7 +275,7 @@ void GatherVArgParser::parse(simgrid::xbt::ReplayAction& action, const std::stri */ comm_size = MPI_COMM_WORLD->size(); CHECK_ACTION_PARAMS(action, comm_size + 1, 2) - send_size = parse_double(action[2]); + send_size = parse_integer(action[2]); disps = std::vector(comm_size, 0); recvcounts = std::make_shared>(comm_size); @@ -313,10 +329,11 @@ void ScatterArgParser::parse(simgrid::xbt::ReplayAction& action, const std::stri 4) 0 is the send datatype id, see simgrid::smpi::Datatype::decode() 5) 0 is the recv datatype id, see simgrid::smpi::Datatype::decode() */ + comm_size = MPI_COMM_WORLD->size(); CHECK_ACTION_PARAMS(action, 2, 3) comm_size = MPI_COMM_WORLD->size(); - send_size = parse_double(action[2]); - recv_size = parse_double(action[3]); + send_size = parse_integer(action[2]); + recv_size = parse_integer(action[3]); root = parse_root(action, 4); datatype1 = parse_datatype(action, 5); datatype2 = parse_datatype(action, 6); @@ -333,8 +350,9 @@ void ScatterVArgParser::parse(simgrid::xbt::ReplayAction& action, const std::str 4) 0 is the send datatype id, see simgrid::smpi::Datatype::decode() 5) 0 is the recv datatype id, see simgrid::smpi::Datatype::decode() */ + comm_size = MPI_COMM_WORLD->size(); CHECK_ACTION_PARAMS(action, comm_size + 1, 2) - recv_size = parse_double(action[2 + comm_size]); + recv_size = parse_integer(action[2 + comm_size]); disps = std::vector(comm_size, 0); sendcounts = std::make_shared>(comm_size); @@ -364,11 +382,19 @@ void ReduceScatterArgParser::parse(simgrid::xbt::ReplayAction& action, const std datatype1 = parse_datatype(action, 3 + comm_size); for (unsigned int i = 0; i < comm_size; i++) { - recvcounts->push_back(std::stoi(action[i + 2])); + (*recvcounts)[i]= std::stoi(action[i + 2]); } recv_size_sum = std::accumulate(recvcounts->begin(), recvcounts->end(), 0); } +void ScanArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) +{ + CHECK_ACTION_PARAMS(action, 2, 1) + size = parse_integer(action[2]); + comp_size = parse_double(action[3]); + datatype1 = parse_datatype(action, 4); +} + 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: @@ -389,8 +415,8 @@ void AllToAllVArgParser::parse(simgrid::xbt::ReplayAction& action, const std::st datatype1 = parse_datatype(action, 4 + 2 * comm_size); datatype2 = parse_datatype(action, 5 + 2 * comm_size); - send_buf_size = parse_double(action[2]); - recv_buf_size = parse_double(action[3 + comm_size]); + send_buf_size = parse_integer(action[2]); + recv_buf_size = parse_integer(action[3 + comm_size]); for (unsigned int i = 0; i < comm_size; i++) { (*sendcounts)[i] = std::stoi(action[3 + i]); (*recvcounts)[i] = std::stoi(action[4 + comm_size + i]); @@ -404,8 +430,7 @@ 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); + MPI_Request request = req_storage.pop(args.src, args.dst, args.tag); if (request == MPI_REQUEST_NULL) { /* Assume that the trace is well formed, meaning the comm might have been caught by an MPI_test. Then just @@ -413,20 +438,19 @@ void WaitAction::kernel(simgrid::xbt::ReplayAction& action) return; } - aid_t 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() & MPI_REQ_RECV); - // 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)); + + TRACE_smpi_comm_in(get_pid(), __func__, new simgrid::instr::WaitTIData("wait", args.src, args.dst, args.tag)); MPI_Status status; Request::wait(&request, &status); - - TRACE_smpi_comm_out(rank); + if(request!=MPI_REQUEST_NULL) + Request::unref(&request); + TRACE_smpi_comm_out(get_pid()); if (is_wait_for_receive) - TRACE_smpi_recv(args.src, args.dst, args.tag); + TRACE_smpi_recv(MPI_COMM_WORLD->group()->actor(args.src), MPI_COMM_WORLD->group()->actor(args.dst), args.tag); } void SendAction::kernel(simgrid::xbt::ReplayAction&) @@ -461,8 +485,8 @@ void RecvAction::kernel(simgrid::xbt::ReplayAction&) MPI_Status status; // unknown size from the receiver point of view - double arg_size = args.size; - if (arg_size <= 0.0) { + size_t arg_size = args.size; + if (arg_size == 0) { Request::probe(args.partner, args.tag, MPI_COMM_WORLD, &status); arg_size = status.count; } @@ -512,13 +536,12 @@ void LocationAction::kernel(simgrid::xbt::ReplayAction&) 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); + MPI_Request request = req_storage.pop(args.src, args.dst, args.tag); // 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(get_pid(), __func__, new simgrid::instr::NoOpTIData("test")); + TRACE_smpi_comm_in(get_pid(), __func__, new simgrid::instr::WaitTIData("test", args.src, args.dst, args.tag)); MPI_Status status; int flag = 0; @@ -553,13 +576,12 @@ void CommunicatorAction::kernel(simgrid::xbt::ReplayAction&) void WaitAllAction::kernel(simgrid::xbt::ReplayAction&) { - const size_t count_requests = req_storage.size(); - - if (count_requests > 0) { - TRACE_smpi_comm_in(get_pid(), __func__, new simgrid::instr::Pt2PtTIData("waitall", -1, count_requests, "")); + if (req_storage.size() > 0) { std::vector> sender_receiver; std::vector reqs; req_storage.get_requests(reqs); + unsigned long count_requests = reqs.size(); + TRACE_smpi_comm_in(get_pid(), __func__, new simgrid::instr::CpuTIData("waitall", count_requests)); for (auto const& req : reqs) { if (req && (req->flags() & MPI_REQ_RECV)) { sender_receiver.emplace_back(req->src(), req->dst()); @@ -568,6 +590,10 @@ void WaitAllAction::kernel(simgrid::xbt::ReplayAction&) Request::waitall(count_requests, &(reqs.data())[0], MPI_STATUSES_IGNORE); req_storage.get_store().clear(); + for (MPI_Request& req : reqs) + if (req != MPI_REQUEST_NULL) + Request::unref(&req); + for (auto const& pair : sender_receiver) { TRACE_smpi_recv(pair.first, pair.second, 0); } @@ -586,7 +612,7 @@ void BcastAction::kernel(simgrid::xbt::ReplayAction&) { const BcastArgParser& args = get_args(); TRACE_smpi_comm_in(get_pid(), "action_bcast", - new simgrid::instr::CollTIData("bcast", MPI_COMM_WORLD->group()->actor(args.root), -1.0, args.size, + new simgrid::instr::CollTIData("bcast", args.root, -1.0, args.size, 0, Datatype::encode(args.datatype1), "")); colls::bcast(send_buffer(args.size * args.datatype1->size()), args.size, args.datatype1, args.root, MPI_COMM_WORLD); @@ -598,13 +624,17 @@ void ReduceAction::kernel(simgrid::xbt::ReplayAction&) { const ReduceArgParser& args = get_args(); TRACE_smpi_comm_in(get_pid(), "action_reduce", - new simgrid::instr::CollTIData("reduce", MPI_COMM_WORLD->group()->actor(args.root), args.comp_size, + new simgrid::instr::CollTIData("reduce", args.root, args.comp_size, args.comm_size, 0, 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); - private_execute_flops(args.comp_size); + if (args.comp_size != 0.0) + simgrid::s4u::this_actor::exec_init(args.comp_size) + ->set_name("computation") + ->start() + ->wait(); TRACE_smpi_comm_out(get_pid()); } @@ -619,7 +649,11 @@ void AllReduceAction::kernel(simgrid::xbt::ReplayAction&) 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); + if (args.comp_size != 0.0) + simgrid::s4u::this_actor::exec_init(args.comp_size) + ->set_name("computation") + ->start() + ->wait(); TRACE_smpi_comm_out(get_pid()); } @@ -666,7 +700,7 @@ void GatherVAction::kernel(simgrid::xbt::ReplayAction&) 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, 0, + 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") { @@ -703,7 +737,7 @@ void ScatterVAction::kernel(simgrid::xbt::ReplayAction&) int rank = MPI_COMM_WORLD->rank(); const ScatterVArgParser& args = get_args(); TRACE_smpi_comm_in(get_pid(), "action_scatterv", - new simgrid::instr::VarCollTIData(get_name(), args.root, 0, args.sendcounts, args.recv_size, + new simgrid::instr::VarCollTIData(get_name(), args.root, -1, args.sendcounts, args.recv_size, nullptr, Datatype::encode(args.datatype1), Datatype::encode(args.datatype2))); @@ -720,15 +754,43 @@ void ReduceScatterAction::kernel(simgrid::xbt::ReplayAction&) const ReduceScatterArgParser& args = get_args(); TRACE_smpi_comm_in( get_pid(), "action_reducescatter", - new simgrid::instr::VarCollTIData("reducescatter", -1, 0, nullptr, 0, args.recvcounts, - std::to_string(args.comp_size), /* ugly hack to print comp_size */ + new simgrid::instr::VarCollTIData(get_name(), -1, -1, nullptr, -1, args.recvcounts, + /* ugly as we use datatype field to pass computation as string */ + /* and because of the trick to avoid getting 0.000000 when 0 is given */ + args.comp_size == 0 ? "0" : std::to_string(args.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); + if (args.comp_size != 0.0) + simgrid::s4u::this_actor::exec_init(args.comp_size) + ->set_name("computation") + ->start() + ->wait(); + TRACE_smpi_comm_out(get_pid()); +} - private_execute_flops(args.comp_size); +void ScanAction::kernel(simgrid::xbt::ReplayAction&) +{ + const ScanArgParser& args = get_args(); + TRACE_smpi_comm_in(get_pid(), "action_scan", + new simgrid::instr::CollTIData(get_name(), -1, args.comp_size, + args.size, 0, Datatype::encode(args.datatype1), "")); + if (get_name() == "scan") + colls::scan(send_buffer(args.size * args.datatype1->size()), + recv_buffer(args.size * args.datatype1->size()), args.size, + args.datatype1, MPI_OP_NULL, MPI_COMM_WORLD); + else + colls::exscan(send_buffer(args.size * args.datatype1->size()), + recv_buffer(args.size * args.datatype1->size()), args.size, + args.datatype1, MPI_OP_NULL, MPI_COMM_WORLD); + + if (args.comp_size != 0.0) + simgrid::s4u::this_actor::exec_init(args.comp_size) + ->set_name("computation") + ->start() + ->wait(); TRACE_smpi_comm_out(get_pid()); } @@ -737,7 +799,7 @@ void AllToAllVAction::kernel(simgrid::xbt::ReplayAction&) const AllToAllVArgParser& args = get_args(); TRACE_smpi_comm_in(get_pid(), __func__, new simgrid::instr::VarCollTIData( - "alltoallv", 0, args.send_size_sum, args.sendcounts, args.recv_size_sum, args.recvcounts, + "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(), @@ -788,6 +850,8 @@ void smpi_replay_init(const char* instance_id, int rank, double start_delay_flop xbt_replay_action_register("allgather", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::GatherAction("allgather").execute(action); }); 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("scan", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ScanAction("scan").execute(action); }); + xbt_replay_action_register("exscan", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ScanAction("exscan").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); }); @@ -800,6 +864,8 @@ void smpi_replay_init(const char* instance_id, int rank, double start_delay_flop // Wait for the other actors to initialize also simgrid::s4u::this_actor::yield(); } + if(_smpi_init_sleep > 0) + simgrid::s4u::this_actor::sleep_for(_smpi_init_sleep); } /** @brief actually run the replay after initialization */ @@ -820,11 +886,17 @@ void smpi_replay_main(int rank, const char* private_trace_filename) unsigned int i=0; for (auto const& pair : storage[simgrid::s4u::this_actor::get_pid()].get_store()) { - requests[i] = pair.second; + for (auto& req: pair.second){ + requests[i] = req; + } i++; } simgrid::smpi::Request::waitall(count_requests, requests.data(), MPI_STATUSES_IGNORE); } + + if(simgrid::config::get_value("smpi/finalization-barrier")) + simgrid::smpi::colls::barrier(MPI_COMM_WORLD); + active_processes--; if(active_processes==0){