X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e709643ef0c5b61c6c878016c418bffa2b1b20cd..1dff1442420796e8ba41b1c5bd4c33786468b707:/src/smpi/internals/smpi_replay.cpp diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp index d05763b69a..966fbdbaa5 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2020. 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. */ @@ -8,17 +8,19 @@ #include "smpi_datatype.hpp" #include "smpi_group.hpp" #include "smpi_request.hpp" +#include "simgrid/s4u/Exec.hpp" #include "xbt/replay.hpp" -#include +#include #include +#include +#include #include #include +#include #include #include -#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 @@ -61,9 +63,6 @@ public: }; } -typedef std::tuple req_key_t; -typedef std::unordered_map>> req_storage_t; - void log_timed_action(const simgrid::xbt::ReplayAction& action, double clock) { if (XBT_LOG_ISENABLED(smpi_replay, xbt_log_priority_verbose)){ @@ -72,10 +71,29 @@ void log_timed_action(const simgrid::xbt::ReplayAction& action, double clock) } } -/* Helper function */ +/* Helper functions */ static double parse_double(const std::string& string) { - return xbt_str_parse_double(string.c_str(), "%s is not a double"); + 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; +} + +static MPI_Datatype parse_datatype(const simgrid::xbt::ReplayAction& action, unsigned i) +{ + return i < action.size() ? simgrid::smpi::Datatype::decode(action[i]) : simgrid::smpi::replay::MPI_DEFAULT_TYPE; } namespace simgrid { @@ -86,32 +104,32 @@ MPI_Datatype MPI_DEFAULT_TYPE; class RequestStorage { private: - req_storage_t store; + using req_key_t = std::tuple; + using req_storage_t = std::unordered_map>>; + + req_storage_t store; public: - RequestStorage() {} - int size() const { return store.size(); } + RequestStorage() = default; + size_t 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) 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"); - } + void get_requests(std::vector& vec) const + { + for (auto const& pair : store) { + auto& req = 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"); } } + } 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; } @@ -131,10 +149,8 @@ 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( - MPI_COMM_WORLD->group()->actor(src)->get_pid()-1, - MPI_COMM_WORLD->group()->actor(dst)->get_pid()-1, - tag), MPI_REQUEST_NULL}); + store.insert({req_key_t(MPI_COMM_WORLD->group()->actor(src) - 1, MPI_COMM_WORLD->group()->actor(dst) - 1, tag), + MPI_REQUEST_NULL}); } }; @@ -151,9 +167,8 @@ 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]); - if (action.size() > 5) - datatype1 = simgrid::smpi::Datatype::decode(action[5]); + size = parse_integer(action[4]); + datatype1 = parse_datatype(action, 5); } void ComputeParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) @@ -178,42 +193,36 @@ 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]); - root = (action.size() > 3) ? std::stoi(action[3]) : 0; - if (action.size() > 4) - datatype1 = simgrid::smpi::Datatype::decode(action[4]); + size = parse_integer(action[2]); + root = parse_root(action, 3); + datatype1 = parse_datatype(action, 4); } void ReduceArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) { CHECK_ACTION_PARAMS(action, 2, 2) - comm_size = parse_double(action[2]); + comm_size = parse_integer(action[2]); comp_size = parse_double(action[3]); - root = (action.size() > 4) ? std::stoi(action[4]) : 0; - if (action.size() > 5) - datatype1 = simgrid::smpi::Datatype::decode(action[5]); + root = parse_root(action, 4); + datatype1 = parse_datatype(action, 5); } void AllReduceArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) { CHECK_ACTION_PARAMS(action, 2, 1) - comm_size = parse_double(action[2]); + comm_size = parse_integer(action[2]); comp_size = parse_double(action[3]); - if (action.size() > 4) - datatype1 = simgrid::smpi::Datatype::decode(action[4]); + datatype1 = parse_datatype(action, 4); } void AllToAllArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) { CHECK_ACTION_PARAMS(action, 2, 1) comm_size = MPI_COMM_WORLD->size(); - send_size = parse_double(action[2]); - recv_size = parse_double(action[3]); - - if (action.size() > 4) - datatype1 = simgrid::smpi::Datatype::decode(action[4]); - if (action.size() > 5) - datatype2 = simgrid::smpi::Datatype::decode(action[5]); + send_size = parse_integer(action[2]); + recv_size = parse_integer(action[3]); + datatype1 = parse_datatype(action, 4); + datatype2 = parse_datatype(action, 5); } void GatherArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string& name) @@ -229,20 +238,17 @@ 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 = (action.size() > 4) ? std::stoi(action[4]) : 0; - if (action.size() > 5) - datatype1 = simgrid::smpi::Datatype::decode(action[5]); - if (action.size() > 6) - datatype2 = simgrid::smpi::Datatype::decode(action[6]); + root = parse_root(action, 4); + datatype1 = parse_datatype(action, 5); + datatype2 = parse_datatype(action, 6); } else { - if (action.size() > 4) - datatype1 = simgrid::smpi::Datatype::decode(action[4]); - if (action.size() > 5) - datatype2 = simgrid::smpi::Datatype::decode(action[5]); + root = 0; + datatype1 = parse_datatype(action, 4); + datatype2 = parse_datatype(action, 5); } } @@ -259,37 +265,39 @@ 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::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; - if (action.size() > 4 + comm_size) - datatype1 = simgrid::smpi::Datatype::decode(action[4 + comm_size]); - if (action.size() > 5 + comm_size) - datatype2 = simgrid::smpi::Datatype::decode(action[5 + comm_size]); + root = parse_root(action, 3 + comm_size); + datatype1 = parse_datatype(action, 4 + comm_size); + datatype2 = parse_datatype(action, 5 + comm_size); } else { - int disp_index = 0; + root = 0; + unsigned 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 */ - 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]); - } else if (action.size() > - 3 + comm_size + 2) { /* disps specified; datatype is not specified; use the default one */ + if (action.size() > 3 + comm_size + comm_size) { + // datatype + disp are specified + datatype1 = parse_datatype(action, 3 + comm_size); + datatype2 = parse_datatype(action, 4 + comm_size); + disp_index = 5 + comm_size; + } else if (action.size() > 3 + comm_size + 2) { + // disps specified; datatype is not specified; use the default one + datatype1 = MPI_DEFAULT_TYPE; + datatype2 = MPI_DEFAULT_TYPE; disp_index = 3 + comm_size; - } else if (action.size() > 3 + comm_size) { /* only datatype, no disp specified */ - int datatype_index = 3 + comm_size; - datatype1 = simgrid::smpi::Datatype::decode(action[datatype_index]); - datatype2 = simgrid::smpi::Datatype::decode(action[datatype_index]); + } else { + // no disp specified, maybe only datatype, + datatype1 = parse_datatype(action, 3 + comm_size); + datatype2 = parse_datatype(action, 4 + comm_size); } if (disp_index != 0) { - for (unsigned int i = 0; i < comm_size; i++) + xbt_assert(disp_index + comm_size <= action.size()); + for (unsigned i = 0; i < comm_size; i++) disps[i] = std::stoi(action[disp_index + i]); } } @@ -311,15 +319,14 @@ 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]); - root = (action.size() > 4) ? std::stoi(action[4]) : 0; - if (action.size() > 5) - datatype1 = simgrid::smpi::Datatype::decode(action[5]); - if (action.size() > 6) - datatype2 = simgrid::smpi::Datatype::decode(action[6]); + 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); } void ScatterVArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) @@ -333,21 +340,20 @@ 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::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]); - if (action.size() > 5 + comm_size) - datatype2 = simgrid::smpi::Datatype::decode(action[5]); + root = parse_root(action, 3 + comm_size); + datatype1 = parse_datatype(action, 4 + comm_size); + datatype2 = parse_datatype(action, 5 + comm_size); for (unsigned int i = 0; i < comm_size; i++) { (*sendcounts)[i] = std::stoi(action[i + 2]); } send_size_sum = std::accumulate(sendcounts->begin(), sendcounts->end(), 0); - root = (action.size() > 3 + comm_size) ? std::stoi(action[3 + comm_size]) : 0; } void ReduceScatterArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string&) @@ -362,16 +368,23 @@ void ReduceScatterArgParser::parse(simgrid::xbt::ReplayAction& action, const std 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)); - if (action.size() > 3 + comm_size) - datatype1 = simgrid::smpi::Datatype::decode(action[3 + comm_size]); + recvcounts = std::make_shared>(comm_size); + 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: @@ -384,18 +397,16 @@ void AllToAllVArgParser::parse(simgrid::xbt::ReplayAction& action, const std::st */ 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); - if (action.size() > 5 + 2 * comm_size) - datatype1 = simgrid::smpi::Datatype::decode(action[4 + 2 * comm_size]); - if (action.size() > 5 + 2 * comm_size) - datatype2 = simgrid::smpi::Datatype::decode(action[5 + 2 * comm_size]); + 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]); @@ -413,31 +424,29 @@ void WaitAction::kernel(simgrid::xbt::ReplayAction& action) 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; } - 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() & 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(args.src, args.dst, args.tag)); MPI_Status status; Request::wait(&request, &status); - TRACE_smpi_comm_out(rank); + 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&) { const SendRecvParser& args = get_args(); - int dst_traced = MPI_COMM_WORLD->group()->actor(args.partner)->get_pid(); + aid_t dst_traced = MPI_COMM_WORLD->group()->actor(args.partner); TRACE_smpi_comm_in( get_pid(), __func__, @@ -466,8 +475,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; } @@ -485,7 +494,7 @@ void RecvAction::kernel(simgrid::xbt::ReplayAction&) TRACE_smpi_comm_out(get_pid()); if (is_recv && not TRACE_smpi_view_internals()) { - int src_traced = MPI_COMM_WORLD->group()->actor(status.MPI_SOURCE)->get_pid(); + aid_t src_traced = MPI_COMM_WORLD->group()->actor(status.MPI_SOURCE); TRACE_smpi_recv(src_traced, get_pid(), args.tag); } } @@ -502,10 +511,10 @@ 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); + aid_t pid = simgrid::s4u::this_actor::get_pid(); + TRACE_smpi_sleeping_in(pid, args.time); simgrid::s4u::this_actor::sleep_for(args.time/smpi_adjust_comp_speed()); - TRACE_smpi_sleeping_out(rank); + TRACE_smpi_sleeping_out(pid); } void LocationAction::kernel(simgrid::xbt::ReplayAction&) @@ -558,16 +567,16 @@ void CommunicatorAction::kernel(simgrid::xbt::ReplayAction&) void WaitAllAction::kernel(simgrid::xbt::ReplayAction&) { - const unsigned int count_requests = req_storage.size(); + 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, "")); - std::vector> sender_receiver; + TRACE_smpi_comm_in(get_pid(), __func__, new simgrid::instr::CpuTIData("waitall", count_requests)); + std::vector> sender_receiver; std::vector reqs; req_storage.get_requests(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()); } } Request::waitall(count_requests, &(reqs.data())[0], MPI_STATUSES_IGNORE); @@ -591,8 +600,8 @@ 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)->get_pid(), -1.0, - args.size, -1, Datatype::encode(args.datatype1), "")); + 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); @@ -603,14 +612,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)->get_pid(), - args.comp_size, args.comm_size, -1, - Datatype::encode(args.datatype1), "")); + 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,13 +631,17 @@ void AllReduceAction::kernel(simgrid::xbt::ReplayAction&) { 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, + new simgrid::instr::CollTIData("allreduce", -1, args.comp_size, args.comm_size, 0, 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); - 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()); } @@ -638,8 +654,8 @@ void AllToAllAction::kernel(simgrid::xbt::ReplayAction&) 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, + colls::alltoall(send_buffer(args.datatype1->size() * args.send_size * args.comm_size), args.send_size, args.datatype1, + recv_buffer(args.datatype2->size() * args.recv_size * args.comm_size), args.recv_size, args.datatype2, MPI_COMM_WORLD); TRACE_smpi_comm_out(get_pid()); @@ -656,7 +672,7 @@ void GatherAction::kernel(simgrid::xbt::ReplayAction&) 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, + (rank == args.root) ? recv_buffer(args.datatype2->size() * args.recv_size * args.comm_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, @@ -726,15 +742,41 @@ 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, -1, 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, + 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()); } @@ -768,9 +810,7 @@ void smpi_replay_init(const char* instance_id, int rank, double start_delay_flop 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, "smpi_replay_run_init"); + TRACE_smpi_init(simgrid::s4u::this_actor::get_pid(), "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 const&) { /* nothing to do */ }); xbt_replay_action_register("comm_size", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::CommunicatorAction().execute(action); }); @@ -796,6 +836,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); }); @@ -811,29 +853,32 @@ void smpi_replay_init(const char* instance_id, int rank, double start_delay_flop } /** @brief actually run the replay after initialization */ -void smpi_replay_main(int rank, const char* trace_filename) +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(); std::string rank_string = std::to_string(rank); - simgrid::xbt::replay_runner(rank_string.c_str(), trace_filename); + 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); + XBT_DEBUG("There are %u elements in reqq[*]", count_requests); if (count_requests > 0) { - MPI_Request* requests= new MPI_Request[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, MPI_STATUSES_IGNORE); - delete[] requests; + 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){ @@ -851,8 +896,8 @@ void smpi_replay_main(int rank, const char* trace_filename) } /** @brief chain a replay initialization and a replay start */ -void smpi_replay_run(const char* instance_id, int rank, double start_delay_flops, const char* trace_filename) +void smpi_replay_run(const char* instance_id, int rank, double start_delay_flops, const char* private_trace_filename) { smpi_replay_init(instance_id, rank, start_delay_flops); - smpi_replay_main(rank, trace_filename); + smpi_replay_main(rank, private_trace_filename); }