X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0b0b8f8999313ce3423d4de8dd4f4046fce2f8c0..9a9d4426f9baa07b062abc3efc7df532ac61baf2:/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 0657505103..8f0caad0f3 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -100,6 +100,97 @@ public: } }; +class CollCommParser : public ActionArgParser { +public: + double size; + double comm_size; + double comp_size; + int send_size; + int recv_size; + int root = 0; + MPI_Datatype datatype1 = MPI_DEFAULT_TYPE; + MPI_Datatype datatype2 = MPI_DEFAULT_TYPE; +}; + +class BcastArgParser : public CollCommParser { +public: + void parse(simgrid::xbt::ReplayAction& action) override + { + 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]); + } +}; + +class ReduceArgParser : public CollCommParser { +public: + void parse(simgrid::xbt::ReplayAction& action) override + { + CHECK_ACTION_PARAMS(action, 2, 2) + comm_size = parse_double(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]); + } +}; + +class AllReduceArgParser : public CollCommParser { +public: + void parse(simgrid::xbt::ReplayAction& action) override + { + CHECK_ACTION_PARAMS(action, 2, 1) + comm_size = parse_double(action[2]); + comp_size = parse_double(action[3]); + if (action.size() > 4) + datatype1 = simgrid::smpi::Datatype::decode(action[4]); + } +}; + +class AllToAllArgParser : public CollCommParser { +public: + void parse(simgrid::xbt::ReplayAction& action) override + { + 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]); + } +}; + +class GatherParser : public CollCommParser { +public: + void parse(simgrid::xbt::ReplayAction& action) override + { + /* The structure of the gather action for the rank 0 (total 4 processes) is the following: + 0 gather 68 68 0 0 0 + where: + 1) 68 is the sendcounts + 2) 68 is the recvcounts + 3) 0 is the root node + 4) 0 is the send datatype id, see simgrid::smpi::Datatype::decode() + 5) 0 is the recv datatype id, see simgrid::smpi::Datatype::decode() + */ + 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]); + } +}; + template class ReplayAction { protected: const std::string name; @@ -116,10 +207,21 @@ public: double start_time = smpi_process()->simulated_elapsed(); args.parse(action); kernel(action); - log_timed_action(action, start_time); + if (name != "Init") + log_timed_action(action, start_time); } virtual void kernel(simgrid::xbt::ReplayAction& action) = 0; + + void* send_buffer(int size) + { + return smpi_get_tmp_sendbuffer(size); + } + + void* recv_buffer(int size) + { + return smpi_get_tmp_recvbuffer(size); + } }; class WaitAction : public ReplayAction { @@ -127,9 +229,6 @@ public: WaitAction() : ReplayAction("Wait") {} void kernel(simgrid::xbt::ReplayAction& action) override { - CHECK_ACTION_PARAMS(action, 0, 0) - MPI_Status status; - std::string s = boost::algorithm::join(action, " "); xbt_assert(get_reqq_self()->size(), "action wait not preceded by any irecv or isend: %s", s.c_str()); MPI_Request request = get_reqq_self()->back(); @@ -143,18 +242,20 @@ public: int rank = request->comm() != MPI_COMM_NULL ? request->comm()->rank() : -1; - MPI_Group group = request->comm()->group(); - int src_traced = group->rank(request->src()); - int dst_traced = group->rank(request->dst()); + // Must be taken before Request::wait() since the request may be set to + // MPI_REQUEST_NULL by Request::wait! + int src = request->comm()->group()->rank(request->src()); + int dst = request->comm()->group()->rank(request->dst()); 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, __FUNCTION__, new simgrid::instr::NoOpTIData("wait")); + MPI_Status status; Request::wait(&request, &status); TRACE_smpi_comm_out(rank); if (is_wait_for_receive) - TRACE_smpi_recv(src_traced, dst_traced, 0); + TRACE_smpi_recv(src, dst, 0); } }; @@ -228,250 +329,179 @@ public: } }; -} // Replay Namespace - -static void action_init(simgrid::xbt::ReplayAction& action) -{ - XBT_DEBUG("Initialize the counters"); - CHECK_ACTION_PARAMS(action, 0, 1) - if (action.size() > 2) - MPI_DEFAULT_TYPE = MPI_DOUBLE; // default MPE datatype - else - MPI_DEFAULT_TYPE = MPI_BYTE; // default TAU datatype - - /* start a simulated timer */ - smpi_process()->simulated_start(); - /*initialize the number of active processes */ - active_processes = smpi_process_count(); - - set_reqq_self(new std::vector); -} - -static void action_finalize(simgrid::xbt::ReplayAction& action) -{ - /* Nothing to do */ -} - -static void action_comm_size(simgrid::xbt::ReplayAction& action) -{ - log_timed_action (action, smpi_process()->simulated_elapsed()); -} - -static void action_comm_split(simgrid::xbt::ReplayAction& action) -{ - log_timed_action (action, smpi_process()->simulated_elapsed()); -} - -static void action_comm_dup(simgrid::xbt::ReplayAction& action) -{ - log_timed_action (action, smpi_process()->simulated_elapsed()); -} - -static void action_compute(simgrid::xbt::ReplayAction& action) -{ - Replay::ComputeAction().execute(action); -} - -static void action_test(simgrid::xbt::ReplayAction& action) -{ - CHECK_ACTION_PARAMS(action, 0, 0) - double clock = smpi_process()->simulated_elapsed(); - MPI_Status status; - - MPI_Request request = get_reqq_self()->back(); - get_reqq_self()->pop_back(); - //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!=nullptr){ - int my_proc_id = Actor::self()->getPid(); - TRACE_smpi_testing_in(my_proc_id); - - int flag = Request::test(&request, &status); - - 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 nullptr.*/ - get_reqq_self()->push_back(request); +class TestAction : public ReplayAction { +public: + TestAction() : ReplayAction("Test") {} + void kernel(simgrid::xbt::ReplayAction& action) override + { + MPI_Request request = get_reqq_self()->back(); + get_reqq_self()->pop_back(); + // 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 != nullptr) { + TRACE_smpi_testing_in(my_proc_id); + + MPI_Status status; + int flag = Request::test(&request, &status); + + 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 + * nullptr.*/ + get_reqq_self()->push_back(request); - TRACE_smpi_testing_out(my_proc_id); + TRACE_smpi_testing_out(my_proc_id); + } } - log_timed_action (action, clock); -} +}; -static void action_waitall(simgrid::xbt::ReplayAction& action) -{ - CHECK_ACTION_PARAMS(action, 0, 0) - double clock = smpi_process()->simulated_elapsed(); - const unsigned int count_requests = get_reqq_self()->size(); +class InitAction : public ReplayAction { +public: + InitAction() : ReplayAction("Init") {} + void kernel(simgrid::xbt::ReplayAction& action) override + { + CHECK_ACTION_PARAMS(action, 0, 1) + MPI_DEFAULT_TYPE = (action.size() > 2) ? MPI_DOUBLE // default MPE datatype + : MPI_BYTE; // default TAU datatype - if (count_requests>0) { - MPI_Status status[count_requests]; + /* start a simulated timer */ + smpi_process()->simulated_start(); + /*initialize the number of active processes */ + active_processes = smpi_process_count(); - int my_proc_id_traced = Actor::self()->getPid(); - TRACE_smpi_comm_in(my_proc_id_traced, __FUNCTION__, - new simgrid::instr::Pt2PtTIData("waitAll", -1, count_requests, "")); - int recvs_snd[count_requests]; - int recvs_rcv[count_requests]; - for (unsigned int i = 0; i < count_requests; i++) { - const auto& req = (*get_reqq_self())[i]; - if (req && (req->flags() & RECV)) { - recvs_snd[i] = req->src(); - recvs_rcv[i] = req->dst(); - } else - recvs_snd[i] = -100; - } - Request::waitall(count_requests, &(*get_reqq_self())[0], status); - - for (unsigned i = 0; i < count_requests; i++) { - if (recvs_snd[i]!=-100) - TRACE_smpi_recv(recvs_snd[i], recvs_rcv[i],0); - } - TRACE_smpi_comm_out(my_proc_id_traced); + set_reqq_self(new std::vector); } - log_timed_action (action, clock); -} - -static void action_barrier(simgrid::xbt::ReplayAction& action) -{ - double clock = smpi_process()->simulated_elapsed(); - int my_proc_id = Actor::self()->getPid(); - TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::NoOpTIData("barrier")); - - Colls::barrier(MPI_COMM_WORLD); - - TRACE_smpi_comm_out(my_proc_id); - log_timed_action (action, clock); -} - -static void action_bcast(simgrid::xbt::ReplayAction& action) -{ - CHECK_ACTION_PARAMS(action, 1, 2) - double size = parse_double(action[2]); - double clock = smpi_process()->simulated_elapsed(); - int root = (action.size() > 3) ? std::stoi(action[3]) : 0; - /* Initialize MPI_CURRENT_TYPE in order to decrease the number of the checks */ - MPI_Datatype MPI_CURRENT_TYPE = (action.size() > 4) ? simgrid::smpi::Datatype::decode(action[4]) : MPI_DEFAULT_TYPE; - - int my_proc_id = Actor::self()->getPid(); - TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, - new simgrid::instr::CollTIData("bcast", MPI_COMM_WORLD->group()->actor(root)->getPid(), -1.0, size, - -1, Datatype::encode(MPI_CURRENT_TYPE), "")); - - void *sendbuf = smpi_get_tmp_sendbuffer(size* MPI_CURRENT_TYPE->size()); - - Colls::bcast(sendbuf, size, MPI_CURRENT_TYPE, root, MPI_COMM_WORLD); - - TRACE_smpi_comm_out(my_proc_id); - log_timed_action (action, clock); -} - -static void action_reduce(simgrid::xbt::ReplayAction& action) -{ - CHECK_ACTION_PARAMS(action, 2, 2) - double comm_size = parse_double(action[2]); - double comp_size = parse_double(action[3]); - double clock = smpi_process()->simulated_elapsed(); - int root = (action.size() > 4) ? std::stoi(action[4]) : 0; - - MPI_Datatype MPI_CURRENT_TYPE = (action.size() > 5) ? simgrid::smpi::Datatype::decode(action[5]) : MPI_DEFAULT_TYPE; +}; - int my_proc_id = Actor::self()->getPid(); - TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, - new simgrid::instr::CollTIData("reduce", MPI_COMM_WORLD->group()->actor(root)->getPid(), comp_size, - comm_size, -1, Datatype::encode(MPI_CURRENT_TYPE), "")); +class CommunicatorAction : public ReplayAction { +public: + CommunicatorAction() : ReplayAction("Comm") {} + void kernel(simgrid::xbt::ReplayAction& action) override { /* nothing to do */} +}; - void *recvbuf = smpi_get_tmp_sendbuffer(comm_size* MPI_CURRENT_TYPE->size()); - void *sendbuf = smpi_get_tmp_sendbuffer(comm_size* MPI_CURRENT_TYPE->size()); - Colls::reduce(sendbuf, recvbuf, comm_size, MPI_CURRENT_TYPE, MPI_OP_NULL, root, MPI_COMM_WORLD); - smpi_execute_flops(comp_size); +class WaitAllAction : public ReplayAction { +public: + WaitAllAction() : ReplayAction("waitAll") {} + void kernel(simgrid::xbt::ReplayAction& action) override + { + const unsigned int count_requests = get_reqq_self()->size(); + + if (count_requests > 0) { + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::Pt2PtTIData("waitAll", -1, count_requests, "")); + std::vector> sender_receiver; + for (const auto& req : (*get_reqq_self())) { + if (req && (req->flags() & RECV)) { + sender_receiver.push_back({req->src(), req->dst()}); + } + } + MPI_Status status[count_requests]; + Request::waitall(count_requests, &(*get_reqq_self())[0], status); + + for (auto& pair : sender_receiver) { + TRACE_smpi_recv(pair.first, pair.second, 0); + } + TRACE_smpi_comm_out(my_proc_id); + } + } +}; - TRACE_smpi_comm_out(my_proc_id); - log_timed_action (action, clock); -} +class BarrierAction : public ReplayAction { +public: + BarrierAction() : ReplayAction("barrier") {} + void kernel(simgrid::xbt::ReplayAction& action) override + { + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::NoOpTIData("barrier")); + Colls::barrier(MPI_COMM_WORLD); + TRACE_smpi_comm_out(my_proc_id); + } +}; -static void action_allReduce(simgrid::xbt::ReplayAction& action) -{ - CHECK_ACTION_PARAMS(action, 2, 1) - double comm_size = parse_double(action[2]); - double comp_size = parse_double(action[3]); +class BcastAction : public ReplayAction { +public: + BcastAction() : ReplayAction("bcast") {} + void kernel(simgrid::xbt::ReplayAction& action) override + { + TRACE_smpi_comm_in(my_proc_id, "action_bcast", + new simgrid::instr::CollTIData("bcast", MPI_COMM_WORLD->group()->actor(args.root)->getPid(), + -1.0, args.size, -1, Datatype::encode(args.datatype1), "")); - MPI_Datatype MPI_CURRENT_TYPE = (action.size() > 4) ? simgrid::smpi::Datatype::decode(action[4]) : MPI_DEFAULT_TYPE; + Colls::bcast(send_buffer(args.size * args.datatype1->size()), args.size, args.datatype1, args.root, MPI_COMM_WORLD); - double clock = smpi_process()->simulated_elapsed(); - int my_proc_id = Actor::self()->getPid(); - TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::CollTIData("allReduce", -1, comp_size, comm_size, -1, - Datatype::encode(MPI_CURRENT_TYPE), "")); - - void *recvbuf = smpi_get_tmp_recvbuffer(comm_size* MPI_CURRENT_TYPE->size()); - void *sendbuf = smpi_get_tmp_sendbuffer(comm_size* MPI_CURRENT_TYPE->size()); - Colls::allreduce(sendbuf, recvbuf, comm_size, MPI_CURRENT_TYPE, MPI_OP_NULL, MPI_COMM_WORLD); - smpi_execute_flops(comp_size); + TRACE_smpi_comm_out(my_proc_id); + } +}; - TRACE_smpi_comm_out(my_proc_id); - log_timed_action (action, clock); -} +class ReduceAction : public ReplayAction { +public: + ReduceAction() : ReplayAction("reduce") {} + void kernel(simgrid::xbt::ReplayAction& action) override + { + TRACE_smpi_comm_in(my_proc_id, "action_reduce", + new simgrid::instr::CollTIData("reduce", MPI_COMM_WORLD->group()->actor(args.root)->getPid(), args.comp_size, + args.comm_size, -1, Datatype::encode(args.datatype1), "")); -static void action_allToAll(simgrid::xbt::ReplayAction& action) -{ - CHECK_ACTION_PARAMS(action, 2, 2) //two mandatory (send and recv volumes) and two optional (corresponding datatypes) - double clock = smpi_process()->simulated_elapsed(); - unsigned long comm_size = MPI_COMM_WORLD->size(); - int send_size = parse_double(action[2]); - int recv_size = parse_double(action[3]); - MPI_Datatype MPI_CURRENT_TYPE{(action.size() > 5) ? simgrid::smpi::Datatype::decode(action[4]) : MPI_DEFAULT_TYPE}; - MPI_Datatype MPI_CURRENT_TYPE2{(action.size() > 5) ? simgrid::smpi::Datatype::decode(action[5]) : MPI_DEFAULT_TYPE}; + 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); - void *send = smpi_get_tmp_sendbuffer(send_size*comm_size* MPI_CURRENT_TYPE->size()); - void *recv = smpi_get_tmp_recvbuffer(recv_size*comm_size* MPI_CURRENT_TYPE2->size()); + TRACE_smpi_comm_out(my_proc_id); + } +}; - int my_proc_id = Actor::self()->getPid(); - TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, - new simgrid::instr::CollTIData("allToAll", -1, -1.0, send_size, recv_size, - Datatype::encode(MPI_CURRENT_TYPE), - Datatype::encode(MPI_CURRENT_TYPE2))); +class AllReduceAction : public ReplayAction { +public: + AllReduceAction() : ReplayAction("allReduce") {} + void kernel(simgrid::xbt::ReplayAction& action) override + { + 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), "")); - Colls::alltoall(send, send_size, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, MPI_COMM_WORLD); + 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); - TRACE_smpi_comm_out(my_proc_id); - log_timed_action (action, clock); -} + TRACE_smpi_comm_out(my_proc_id); + } +}; -static void action_gather(simgrid::xbt::ReplayAction& action) -{ - /* The structure of the gather action for the rank 0 (total 4 processes) is the following: - 0 gather 68 68 0 0 0 - where: - 1) 68 is the sendcounts - 2) 68 is the recvcounts - 3) 0 is the root node - 4) 0 is the send datatype id, see simgrid::smpi::Datatype::decode() - 5) 0 is the recv datatype id, see simgrid::smpi::Datatype::decode() - */ - CHECK_ACTION_PARAMS(action, 2, 3) - double clock = smpi_process()->simulated_elapsed(); - unsigned long comm_size = MPI_COMM_WORLD->size(); - int send_size = parse_double(action[2]); - int recv_size = parse_double(action[3]); - MPI_Datatype MPI_CURRENT_TYPE{(action.size() > 6) ? simgrid::smpi::Datatype::decode(action[5]) : MPI_DEFAULT_TYPE}; - MPI_Datatype MPI_CURRENT_TYPE2{(action.size() > 6) ? simgrid::smpi::Datatype::decode(action[6]) : MPI_DEFAULT_TYPE}; +class AllToAllAction : public ReplayAction { +public: + AllToAllAction() : ReplayAction("allToAll") {} + void kernel(simgrid::xbt::ReplayAction& action) override + { + 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))); - void *send = smpi_get_tmp_sendbuffer(send_size* MPI_CURRENT_TYPE->size()); - void *recv = nullptr; - int root = (action.size() > 4) ? std::stoi(action[4]) : 0; - int rank = MPI_COMM_WORLD->rank(); + 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); - if(rank==root) - recv = smpi_get_tmp_recvbuffer(recv_size*comm_size* MPI_CURRENT_TYPE2->size()); + TRACE_smpi_comm_out(my_proc_id); + } +}; - TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::CollTIData("gather", root, -1.0, send_size, recv_size, - Datatype::encode(MPI_CURRENT_TYPE), - Datatype::encode(MPI_CURRENT_TYPE2))); +class GatherAction : public ReplayAction { +public: + GatherAction(std::string name) : ReplayAction(name) {} + void kernel(simgrid::xbt::ReplayAction& action) override + { + TRACE_smpi_comm_in(my_proc_id, name, 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))); - Colls::gather(send, send_size, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, root, MPI_COMM_WORLD); + if (name == "gather") + 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(Actor::self()->getPid()); - log_timed_action (action, clock); -} + TRACE_smpi_comm_out(my_proc_id); + } +}; +} // Replay Namespace static void action_scatter(simgrid::xbt::ReplayAction& action) { @@ -642,41 +672,6 @@ static void action_reducescatter(simgrid::xbt::ReplayAction& action) log_timed_action (action, clock); } -static void action_allgather(simgrid::xbt::ReplayAction& action) -{ - /* The structure of the allgather action for the rank 0 (total 4 processes) is the following: - 0 allGather 275427 275427 - where: - 1) 275427 is the sendcount - 2) 275427 is the recvcount - 3) No more values mean that the datatype for sent and receive buffer is the default one, see - simgrid::smpi::Datatype::decode(). - */ - double clock = smpi_process()->simulated_elapsed(); - - CHECK_ACTION_PARAMS(action, 2, 2) - int sendcount = std::stoi(action[2]); - int recvcount = std::stoi(action[3]); - - MPI_Datatype MPI_CURRENT_TYPE{(action.size() > 5) ? simgrid::smpi::Datatype::decode(action[4]) : MPI_DEFAULT_TYPE}; - MPI_Datatype MPI_CURRENT_TYPE2{(action.size() > 5) ? simgrid::smpi::Datatype::decode(action[5]) : MPI_DEFAULT_TYPE}; - - void *sendbuf = smpi_get_tmp_sendbuffer(sendcount* MPI_CURRENT_TYPE->size()); - void *recvbuf = smpi_get_tmp_recvbuffer(recvcount* MPI_CURRENT_TYPE2->size()); - - int my_proc_id = Actor::self()->getPid(); - - TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, - new simgrid::instr::CollTIData("allGather", -1, -1.0, sendcount, recvcount, - Datatype::encode(MPI_CURRENT_TYPE), - Datatype::encode(MPI_CURRENT_TYPE2))); - - Colls::allgather(sendbuf, sendcount, MPI_CURRENT_TYPE, recvbuf, recvcount, MPI_CURRENT_TYPE2, MPI_COMM_WORLD); - - TRACE_smpi_comm_out(my_proc_id); - log_timed_action (action, clock); -} - static void action_allgatherv(simgrid::xbt::ReplayAction& action) { /* The structure of the allgatherv action for the rank 0 (total 4 processes) is the following: @@ -803,44 +798,33 @@ void smpi_replay_init(int* argc, char*** argv) 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); - xbt_replay_action_register("init", simgrid::smpi::action_init); - xbt_replay_action_register("finalize", simgrid::smpi::action_finalize); - xbt_replay_action_register("comm_size", simgrid::smpi::action_comm_size); - xbt_replay_action_register("comm_split", simgrid::smpi::action_comm_split); - xbt_replay_action_register("comm_dup", simgrid::smpi::action_comm_dup); - - std::shared_ptr isend(new simgrid::smpi::Replay::SendAction("Isend")); - std::shared_ptr send(new simgrid::smpi::Replay::SendAction("send")); - std::shared_ptr irecv(new simgrid::smpi::Replay::RecvAction("Irecv")); - std::shared_ptr recv(new simgrid::smpi::Replay::RecvAction("recv")); - std::shared_ptr wait(new simgrid::smpi::Replay::WaitAction()); - - xbt_replay_action_register("send", - std::bind(&simgrid::smpi::Replay::SendAction::execute, send, std::placeholders::_1)); - xbt_replay_action_register("Isend", - std::bind(&simgrid::smpi::Replay::SendAction::execute, isend, std::placeholders::_1)); - xbt_replay_action_register("recv", - std::bind(&simgrid::smpi::Replay::RecvAction::execute, recv, std::placeholders::_1)); - xbt_replay_action_register("Irecv", - std::bind(&simgrid::smpi::Replay::RecvAction::execute, irecv, std::placeholders::_1)); - xbt_replay_action_register("test", simgrid::smpi::action_test); - xbt_replay_action_register("wait", - std::bind(&simgrid::smpi::Replay::WaitAction::execute, wait, std::placeholders::_1)); - xbt_replay_action_register("waitAll", simgrid::smpi::action_waitall); - xbt_replay_action_register("barrier", simgrid::smpi::action_barrier); - xbt_replay_action_register("bcast", simgrid::smpi::action_bcast); - xbt_replay_action_register("reduce", simgrid::smpi::action_reduce); - xbt_replay_action_register("allReduce", simgrid::smpi::action_allReduce); - xbt_replay_action_register("allToAll", simgrid::smpi::action_allToAll); + 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("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); }); + + xbt_replay_action_register("send", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::SendAction("send").execute(action); }); + xbt_replay_action_register("Isend", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::SendAction("Isend").execute(action); }); + xbt_replay_action_register("recv", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::RecvAction("recv").execute(action); }); + xbt_replay_action_register("Irecv", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::RecvAction("Irecv").execute(action); }); + xbt_replay_action_register("test", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::TestAction().execute(action); }); + xbt_replay_action_register("wait", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::WaitAction().execute(action); }); + xbt_replay_action_register("waitAll", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::WaitAllAction().execute(action); }); + xbt_replay_action_register("barrier", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::BarrierAction().execute(action); }); + xbt_replay_action_register("bcast", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::BcastAction().execute(action); }); + xbt_replay_action_register("reduce", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::ReduceAction().execute(action); }); + xbt_replay_action_register("allReduce", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::AllReduceAction().execute(action); }); + xbt_replay_action_register("allToAll", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::AllToAllAction().execute(action); }); xbt_replay_action_register("allToAllV", simgrid::smpi::action_allToAllv); - xbt_replay_action_register("gather", simgrid::smpi::action_gather); + xbt_replay_action_register("gather", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::GatherAction("gather").execute(action); }); xbt_replay_action_register("scatter", simgrid::smpi::action_scatter); xbt_replay_action_register("gatherV", simgrid::smpi::action_gatherv); xbt_replay_action_register("scatterV", simgrid::smpi::action_scatterv); - xbt_replay_action_register("allGather", simgrid::smpi::action_allgather); + xbt_replay_action_register("allGather", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::GatherAction("allGather").execute(action); }); xbt_replay_action_register("allGatherV", simgrid::smpi::action_allgatherv); xbt_replay_action_register("reduceScatter", simgrid::smpi::action_reducescatter); - xbt_replay_action_register("compute", simgrid::smpi::action_compute); + xbt_replay_action_register("compute", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::ComputeAction().execute(action); }); //if we have a delayed start, sleep here. if(*argc>2){