X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dacc7f742e213df2a54511bfc5dc7b350987b014..fc6f9c6d91e16fedad411f4e0c403d2174af735a:/src/smpi/internals/smpi_replay.cpp diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp index 42c8904076..676685c42a 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -27,10 +27,16 @@ static std::unordered_map*> reqq; static MPI_Datatype MPI_DEFAULT_TYPE; -static int sendbuffer_size = 0; -static char* sendbuffer = nullptr; -static int recvbuffer_size = 0; -static char* recvbuffer = nullptr; +#define CHECK_ACTION_PARAMS(action, mandatory, optional) {\ + int i=0;\ + while(action[i]!=nullptr)\ + i++;\ + if(i *mpi_request) reqq.insert({Actor::self()->getPid(), mpi_request}); } -//allocate a single buffer for all sends, growing it if needed -void* smpi_get_tmp_sendbuffer(int size) -{ - if (not smpi_process()->replaying()) - return xbt_malloc(size); - if (sendbuffer_size(xbt_realloc(sendbuffer,size)); - sendbuffer_size=size; - } - return sendbuffer; -} - -//allocate a single buffer for all recv -void* smpi_get_tmp_recvbuffer(int size){ - if (not smpi_process()->replaying()) - return xbt_malloc(size); - if (recvbuffer_size(xbt_realloc(recvbuffer,size)); - recvbuffer_size=size; - } - return recvbuffer; -} - -void smpi_free_tmp_buffer(void* buf){ - if (not smpi_process()->replaying()) - xbt_free(buf); -} - /* Helper function */ static double parse_double(const char *string) { @@ -107,17 +85,6 @@ const char* encode_datatype(MPI_Datatype datatype) return datatype->encode(); } -#define CHECK_ACTION_PARAMS(action, mandatory, optional) {\ - int i=0;\ - while(action[i]!=nullptr)\ - i++;\ - if(isimulated_elapsed(); @@ -186,7 +153,7 @@ static void action_send(const char *const *action) int dst_traced = MPI_COMM_WORLD->group()->actor(to)->getPid(); TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, - new simgrid::instr::Pt2PtTIData("send", to, size, encode_datatype(MPI_CURRENT_TYPE))); + new simgrid::instr::Pt2PtTIData("send", to, size, MPI_CURRENT_TYPE->encode())); if (not TRACE_smpi_view_internals()) TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, 0, size * MPI_CURRENT_TYPE->size()); @@ -200,7 +167,7 @@ static void action_send(const char *const *action) static void action_Isend(const char *const *action) { CHECK_ACTION_PARAMS(action, 2, 1) - int to = atoi(action[2]); + int to = std::stoi(action[2]); double size=parse_double(action[3]); double clock = smpi_process()->simulated_elapsed(); @@ -209,7 +176,7 @@ static void action_Isend(const char *const *action) int my_proc_id = Actor::self()->getPid(); int dst_traced = MPI_COMM_WORLD->group()->actor(to)->getPid(); TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, - new simgrid::instr::Pt2PtTIData("Isend", to, size, encode_datatype(MPI_CURRENT_TYPE))); + new simgrid::instr::Pt2PtTIData("Isend", to, size, MPI_CURRENT_TYPE->encode())); if (not TRACE_smpi_view_internals()) TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, 0, size * MPI_CURRENT_TYPE->size()); @@ -224,7 +191,7 @@ static void action_Isend(const char *const *action) static void action_recv(const char *const *action) { CHECK_ACTION_PARAMS(action, 2, 1) - int from = atoi(action[2]); + int from = std::stoi(action[2]); double size=parse_double(action[3]); double clock = smpi_process()->simulated_elapsed(); MPI_Status status; @@ -235,7 +202,7 @@ static void action_recv(const char *const *action) { int src_traced = MPI_COMM_WORLD->group()->actor(from)->getPid(); TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, - new simgrid::instr::Pt2PtTIData("recv", from, size, encode_datatype(MPI_CURRENT_TYPE))); + new simgrid::instr::Pt2PtTIData("recv", from, size, MPI_CURRENT_TYPE->encode())); //unknown size from the receiver point of view if (size <= 0.0) { @@ -256,7 +223,7 @@ static void action_recv(const char *const *action) { static void action_Irecv(const char *const *action) { CHECK_ACTION_PARAMS(action, 2, 1) - int from = atoi(action[2]); + int from = std::stoi(action[2]); double size=parse_double(action[3]); double clock = smpi_process()->simulated_elapsed(); @@ -264,7 +231,7 @@ static void action_Irecv(const char *const *action) int my_proc_id = Actor::self()->getPid(); TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, - new simgrid::instr::Pt2PtTIData("Irecv", from, size, encode_datatype(MPI_CURRENT_TYPE))); + new simgrid::instr::Pt2PtTIData("Irecv", from, size, MPI_CURRENT_TYPE->encode())); MPI_Status status; //unknow size from the receiver pov if (size <= 0.0) { @@ -385,14 +352,14 @@ static void action_bcast(const char *const *action) CHECK_ACTION_PARAMS(action, 1, 2) double size = parse_double(action[2]); double clock = smpi_process()->simulated_elapsed(); - int root = (action[3]) ? atoi(action[3]) : 0; + int root = (action[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[3] && action[4]) ? decode_datatype(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, encode_datatype(MPI_CURRENT_TYPE), "")); + -1, MPI_CURRENT_TYPE->encode(), "")); void *sendbuf = smpi_get_tmp_sendbuffer(size* MPI_CURRENT_TYPE->size()); @@ -408,14 +375,14 @@ static void action_reduce(const char *const *action) double comm_size = parse_double(action[2]); double comp_size = parse_double(action[3]); double clock = smpi_process()->simulated_elapsed(); - int root = (action[4]) ? atoi(action[4]) : 0; + int root = (action[4]) ? std::stoi(action[4]) : 0; MPI_Datatype MPI_CURRENT_TYPE = (action[4] && action[5]) ? decode_datatype(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, encode_datatype(MPI_CURRENT_TYPE), "")); + comm_size, -1, MPI_CURRENT_TYPE->encode(), "")); void *recvbuf = smpi_get_tmp_sendbuffer(comm_size* MPI_CURRENT_TYPE->size()); void *sendbuf = smpi_get_tmp_sendbuffer(comm_size* MPI_CURRENT_TYPE->size()); @@ -436,9 +403,9 @@ static void action_allReduce(const char *const *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::CollTIData("allReduce", -1, comp_size, comm_size, -1, - encode_datatype(MPI_CURRENT_TYPE), "")); + MPI_CURRENT_TYPE->encode(), "")); - void *recvbuf = smpi_get_tmp_sendbuffer(comm_size* MPI_CURRENT_TYPE->size()); + 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); @@ -462,8 +429,7 @@ static void action_allToAll(const char *const *action) { 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, - encode_datatype(MPI_CURRENT_TYPE), - encode_datatype(MPI_CURRENT_TYPE2))); + MPI_CURRENT_TYPE->encode(), MPI_CURRENT_TYPE2->encode())); Colls::alltoall(send, send_size, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, MPI_COMM_WORLD); @@ -491,15 +457,15 @@ static void action_gather(const char *const *action) { void *send = smpi_get_tmp_sendbuffer(send_size* MPI_CURRENT_TYPE->size()); void *recv = nullptr; - int root = (action[4]) ? atoi(action[4]) : 0; + int root = (action[4]) ? std::stoi(action[4]) : 0; int rank = MPI_COMM_WORLD->rank(); if(rank==root) recv = smpi_get_tmp_recvbuffer(recv_size*comm_size* MPI_CURRENT_TYPE2->size()); - TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::CollTIData("gather", root, -1.0, send_size, recv_size, - encode_datatype(MPI_CURRENT_TYPE), - encode_datatype(MPI_CURRENT_TYPE2))); + TRACE_smpi_comm_in(rank, __FUNCTION__, + new simgrid::instr::CollTIData("gather", root, -1.0, send_size, recv_size, + MPI_CURRENT_TYPE->encode(), MPI_CURRENT_TYPE2->encode())); Colls::gather(send, send_size, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, root, MPI_COMM_WORLD); @@ -528,15 +494,15 @@ static void action_scatter(const char* const* action) void* send = smpi_get_tmp_sendbuffer(send_size * MPI_CURRENT_TYPE->size()); void* recv = nullptr; - int root = (action[4]) ? atoi(action[4]) : 0; + int root = (action[4]) ? std::stoi(action[4]) : 0; int rank = MPI_COMM_WORLD->rank(); if (rank == root) recv = smpi_get_tmp_recvbuffer(recv_size * comm_size * MPI_CURRENT_TYPE2->size()); - TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::CollTIData("gather", root, -1.0, send_size, recv_size, - encode_datatype(MPI_CURRENT_TYPE), - encode_datatype(MPI_CURRENT_TYPE2))); + TRACE_smpi_comm_in(rank, __FUNCTION__, + new simgrid::instr::CollTIData("gather", root, -1.0, send_size, recv_size, + MPI_CURRENT_TYPE->encode(), MPI_CURRENT_TYPE2->encode())); Colls::scatter(send, send_size, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, root, MPI_COMM_WORLD); @@ -569,19 +535,19 @@ static void action_gatherv(const char *const *action) { void *send = smpi_get_tmp_sendbuffer(send_size* MPI_CURRENT_TYPE->size()); void *recv = nullptr; for(int i=0;ibegin(), recvcounts->end(), 0); - int root = (action[3 + comm_size]) ? atoi(action[3 + comm_size]) : 0; + int root = (action[3 + comm_size]) ? std::stoi(action[3 + comm_size]) : 0; int rank = MPI_COMM_WORLD->rank(); if(rank==root) recv = smpi_get_tmp_recvbuffer(recv_sum* MPI_CURRENT_TYPE2->size()); - TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::VarCollTIData( - "gatherV", root, send_size, nullptr, -1, recvcounts, - encode_datatype(MPI_CURRENT_TYPE), encode_datatype(MPI_CURRENT_TYPE2))); + TRACE_smpi_comm_in(rank, __FUNCTION__, + new simgrid::instr::VarCollTIData("gatherV", root, send_size, nullptr, -1, recvcounts, + MPI_CURRENT_TYPE->encode(), MPI_CURRENT_TYPE2->encode())); Colls::gatherv(send, send_size, MPI_CURRENT_TYPE, recv, recvcounts->data(), disps.data(), MPI_CURRENT_TYPE2, root, MPI_COMM_WORLD); @@ -616,19 +582,19 @@ static void action_scatterv(const char* const* action) void* send = nullptr; void* recv = smpi_get_tmp_recvbuffer(recv_size * MPI_CURRENT_TYPE->size()); for (int i = 0; i < comm_size; i++) { - (*sendcounts)[i] = atoi(action[i + 2]); + (*sendcounts)[i] = std::stoi(action[i + 2]); } int send_sum = std::accumulate(sendcounts->begin(), sendcounts->end(), 0); - int root = (action[3 + comm_size]) ? atoi(action[3 + comm_size]) : 0; + int root = (action[3 + comm_size]) ? std::stoi(action[3 + comm_size]) : 0; int rank = MPI_COMM_WORLD->rank(); if (rank == root) send = smpi_get_tmp_sendbuffer(send_sum * MPI_CURRENT_TYPE2->size()); - TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::VarCollTIData("gatherV", root, -1, sendcounts, recv_size, - nullptr, encode_datatype(MPI_CURRENT_TYPE), - encode_datatype(MPI_CURRENT_TYPE2))); + TRACE_smpi_comm_in(rank, __FUNCTION__, + new simgrid::instr::VarCollTIData("gatherV", root, -1, sendcounts, recv_size, nullptr, + MPI_CURRENT_TYPE->encode(), MPI_CURRENT_TYPE2->encode())); Colls::scatterv(send, sendcounts->data(), disps.data(), MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, root, MPI_COMM_WORLD); @@ -654,14 +620,14 @@ static void action_reducescatter(const char *const *action) { MPI_Datatype MPI_CURRENT_TYPE = (action[3 + comm_size]) ? decode_datatype(action[3 + comm_size]) : MPI_DEFAULT_TYPE; for(int i=0;ipush_back(atoi(action[i + 2])); + recvcounts->push_back(std::stoi(action[i + 2])); } int size{std::accumulate(recvcounts->begin(), recvcounts->end(), 0)}; TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::VarCollTIData("reduceScatter", -1, 0, nullptr, -1, recvcounts, std::to_string(comp_size), /* ugly hack to print comp_size */ - encode_datatype(MPI_CURRENT_TYPE))); + MPI_CURRENT_TYPE->encode())); void *sendbuf = smpi_get_tmp_sendbuffer(size* MPI_CURRENT_TYPE->size()); void *recvbuf = smpi_get_tmp_recvbuffer(size* MPI_CURRENT_TYPE->size()); @@ -684,8 +650,8 @@ static void action_allgather(const char *const *action) { double clock = smpi_process()->simulated_elapsed(); CHECK_ACTION_PARAMS(action, 2, 2) - int sendcount=atoi(action[2]); - int recvcount=atoi(action[3]); + int sendcount = std::stoi(action[2]); + int recvcount = std::stoi(action[3]); MPI_Datatype MPI_CURRENT_TYPE = (action[4] && action[5]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE; MPI_Datatype MPI_CURRENT_TYPE2{(action[4] && action[5]) ? decode_datatype(action[5]) : MPI_DEFAULT_TYPE}; @@ -697,8 +663,7 @@ static void action_allgather(const char *const *action) { TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::CollTIData("allGather", -1, -1.0, sendcount, recvcount, - encode_datatype(MPI_CURRENT_TYPE), - encode_datatype(MPI_CURRENT_TYPE2))); + MPI_CURRENT_TYPE->encode(), MPI_CURRENT_TYPE2->encode())); Colls::allgather(sendbuf, sendcount, MPI_CURRENT_TYPE, recvbuf, recvcount, MPI_CURRENT_TYPE2, MPI_COMM_WORLD); @@ -718,19 +683,32 @@ static void action_allgatherv(const char *const *action) { int comm_size = MPI_COMM_WORLD->size(); CHECK_ACTION_PARAMS(action, comm_size+1, 2) - int sendcount=atoi(action[2]); + int sendcount = std::stoi(action[2]); std::shared_ptr> recvcounts(new std::vector(comm_size)); std::vector disps(comm_size, 0); - MPI_Datatype MPI_CURRENT_TYPE = - (action[3 + comm_size] && action[4 + comm_size]) ? decode_datatype(action[3 + comm_size]) : MPI_DEFAULT_TYPE; - MPI_Datatype MPI_CURRENT_TYPE2{ - (action[3 + comm_size] && action[4 + comm_size]) ? decode_datatype(action[4 + comm_size]) : MPI_DEFAULT_TYPE}; + int datatype_index = 0, disp_index = 0; + if (action[3 + 2 * comm_size]) { /* datatype + disp are specified */ + datatype_index = 3 + comm_size; + disp_index = datatype_index + 1; + } else if (action[3 + 2 * comm_size]) { /* disps specified; datatype is not specified; use the default one */ + datatype_index = -1; + disp_index = 3 + comm_size; + } else if (action[3 + comm_size]) { /* only datatype, no disp specified */ + datatype_index = 3 + comm_size; + } + + if (disp_index != 0) { + std::copy(action[disp_index], action[disp_index + comm_size], disps.begin()); + } + + MPI_Datatype MPI_CURRENT_TYPE{(datatype_index > 0) ? decode_datatype(action[datatype_index]) : MPI_DEFAULT_TYPE}; + MPI_Datatype MPI_CURRENT_TYPE2{(datatype_index > 0) ? decode_datatype(action[datatype_index]) : MPI_DEFAULT_TYPE}; void *sendbuf = smpi_get_tmp_sendbuffer(sendcount* MPI_CURRENT_TYPE->size()); for(int i=0;ibegin(), recvcounts->end(), 0); void *recvbuf = smpi_get_tmp_recvbuffer(recv_sum* MPI_CURRENT_TYPE2->size()); @@ -739,8 +717,7 @@ static void action_allgatherv(const char *const *action) { TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::VarCollTIData("allGatherV", -1, sendcount, nullptr, -1, recvcounts, - encode_datatype(MPI_CURRENT_TYPE), - encode_datatype(MPI_CURRENT_TYPE2))); + MPI_CURRENT_TYPE->encode(), MPI_CURRENT_TYPE2->encode())); Colls::allgatherv(sendbuf, sendcount, MPI_CURRENT_TYPE, recvbuf, recvcounts->data(), disps.data(), MPI_CURRENT_TYPE2, MPI_COMM_WORLD); @@ -781,16 +758,15 @@ static void action_allToAllv(const char *const *action) { void *recvbuf = smpi_get_tmp_recvbuffer(recv_buf_size* MPI_CURRENT_TYPE2->size()); for(int i=0;ibegin(), sendcounts->end(), 0); int recv_size = std::accumulate(recvcounts->begin(), recvcounts->end(), 0); TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::VarCollTIData("allToAllV", -1, send_size, sendcounts, recv_size, recvcounts, - encode_datatype(MPI_CURRENT_TYPE), - encode_datatype(MPI_CURRENT_TYPE2))); + MPI_CURRENT_TYPE->encode(), MPI_CURRENT_TYPE2->encode())); Colls::alltoallv(sendbuf, sendcounts->data(), senddisps.data(), MPI_CURRENT_TYPE, recvbuf, recvcounts->data(), recvdisps.data(), MPI_CURRENT_TYPE, MPI_COMM_WORLD); @@ -878,8 +854,7 @@ void smpi_replay_main(int* argc, char*** argv) if(active_processes==0){ /* Last process alive speaking: end the simulated timer */ XBT_INFO("Simulation time %f", smpi_process()->simulated_elapsed()); - xbt_free(sendbuffer); - xbt_free(recvbuffer); + smpi_free_replay_tmp_buffers(); } TRACE_smpi_comm_in(Actor::self()->getPid(), "smpi_replay_run_finalize", new simgrid::instr::NoOpTIData("finalize"));