X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a1e141180960ef6c943d48c19fa9c4e114813db0..ebee0de43b18a921c6d76f678b0ba50ea0a75025:/src/smpi/internals/smpi_replay.cpp diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp index bfd780e599..b3e2fc6a84 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -216,10 +216,7 @@ static void action_send(const char *const *action) double size=parse_double(action[3]); double clock = smpi_process()->simulated_elapsed(); - if(action[4]) - MPI_CURRENT_TYPE=decode_datatype(action[4]); - else - MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE; + MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE; int my_proc_id = Actor::self()->getPid(); int dst_traced = MPI_COMM_WORLD->group()->actor(to)->getPid(); @@ -227,7 +224,7 @@ static void action_send(const char *const *action) TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::Pt2PtTIData("send", to, size, encode_datatype(MPI_CURRENT_TYPE))); if (not TRACE_smpi_view_internals()) - TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, 0, size*MPI_CURRENT_TYPE->size()); + TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, 0, size * MPI_CURRENT_TYPE->size()); Request::send(nullptr, size, MPI_CURRENT_TYPE, to , 0, MPI_COMM_WORLD); @@ -243,17 +240,14 @@ static void action_Isend(const char *const *action) double size=parse_double(action[3]); double clock = smpi_process()->simulated_elapsed(); - if(action[4]) - MPI_CURRENT_TYPE=decode_datatype(action[4]); - else - MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE; + MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE; 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))); if (not TRACE_smpi_view_internals()) - TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, 0, size*MPI_CURRENT_TYPE->size()); + TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, 0, size * MPI_CURRENT_TYPE->size()); MPI_Request request = Request::isend(nullptr, size, MPI_CURRENT_TYPE, to, 0, MPI_COMM_WORLD); @@ -271,10 +265,7 @@ static void action_recv(const char *const *action) { double clock = smpi_process()->simulated_elapsed(); MPI_Status status; - if(action[4]) - MPI_CURRENT_TYPE=decode_datatype(action[4]); - else - MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE; + MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE; int my_proc_id = Actor::self()->getPid(); int src_traced = MPI_COMM_WORLD->group()->actor(from)->getPid(); @@ -305,10 +296,7 @@ static void action_Irecv(const char *const *action) double size=parse_double(action[3]); double clock = smpi_process()->simulated_elapsed(); - if(action[4]) - MPI_CURRENT_TYPE=decode_datatype(action[4]); - else - MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE; + MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE; int my_proc_id = Actor::self()->getPid(); TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, @@ -393,17 +381,18 @@ static void action_waitall(const char *const *action){ if (count_requests>0) { MPI_Status status[count_requests]; - 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; + 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); @@ -432,20 +421,16 @@ 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=0; + int root = (action[3]) ? atoi(action[3]) : 0; /* Initialize MPI_CURRENT_TYPE in order to decrease the number of the checks */ MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE; - if(action[3]) { - root= atoi(action[3]); - if(action[4]) - MPI_CURRENT_TYPE=decode_datatype(action[4]); - } + 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), "")); + new simgrid::instr::CollTIData("bcast", MPI_COMM_WORLD->group()->actor(root)->getPid(), -1.0, size, + -1, encode_datatype(MPI_CURRENT_TYPE), "")); void *sendbuf = smpi_get_tmp_sendbuffer(size* MPI_CURRENT_TYPE->size()); @@ -461,14 +446,9 @@ 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=0; - MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE; + int root = (action[4]) ? atoi(action[4]) : 0; - if(action[4]) { - root= atoi(action[4]); - if(action[5]) - MPI_CURRENT_TYPE=decode_datatype(action[5]); - } + 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__, @@ -489,15 +469,12 @@ static void action_allReduce(const char *const *action) { double comm_size = parse_double(action[2]); double comp_size = parse_double(action[3]); - if(action[4]) - MPI_CURRENT_TYPE=decode_datatype(action[4]); - else - MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE; + MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE; 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), "")); + encode_datatype(MPI_CURRENT_TYPE), "")); void *recvbuf = smpi_get_tmp_sendbuffer(comm_size* MPI_CURRENT_TYPE->size()); void *sendbuf = smpi_get_tmp_sendbuffer(comm_size* MPI_CURRENT_TYPE->size()); @@ -514,22 +491,17 @@ static void action_allToAll(const char *const *action) { int comm_size = MPI_COMM_WORLD->size(); int send_size = parse_double(action[2]); int recv_size = parse_double(action[3]); - MPI_Datatype MPI_CURRENT_TYPE2 = MPI_DEFAULT_TYPE; - - if(action[4] && action[5]) { - MPI_CURRENT_TYPE=decode_datatype(action[4]); - MPI_CURRENT_TYPE2=decode_datatype(action[5]); - } - else - MPI_CURRENT_TYPE=MPI_DEFAULT_TYPE; + 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}; 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()); 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))); + 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))); Colls::alltoall(send, send_size, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, MPI_COMM_WORLD); @@ -552,18 +524,12 @@ static void action_gather(const char *const *action) { int comm_size = MPI_COMM_WORLD->size(); int send_size = parse_double(action[2]); int recv_size = parse_double(action[3]); - MPI_Datatype MPI_CURRENT_TYPE2 = MPI_DEFAULT_TYPE; - if(action[4] && action[5]) { - MPI_CURRENT_TYPE=decode_datatype(action[5]); - MPI_CURRENT_TYPE2=decode_datatype(action[6]); - } else { - MPI_CURRENT_TYPE=MPI_DEFAULT_TYPE; - } + MPI_CURRENT_TYPE = (action[5] && action[6]) ? decode_datatype(action[5]) : MPI_DEFAULT_TYPE; + MPI_Datatype MPI_CURRENT_TYPE2{(action[5] && action[6]) ? decode_datatype(action[6]) : MPI_DEFAULT_TYPE}; + void *send = smpi_get_tmp_sendbuffer(send_size* MPI_CURRENT_TYPE->size()); void *recv = nullptr; - int root=0; - if(action[4]) - root=atoi(action[4]); + int root = (action[4]) ? atoi(action[4]) : 0; int rank = MPI_COMM_WORLD->rank(); if(rank==root) @@ -595,18 +561,12 @@ static void action_scatter(const char* const* action) int comm_size = MPI_COMM_WORLD->size(); int send_size = parse_double(action[2]); int recv_size = parse_double(action[3]); - MPI_Datatype MPI_CURRENT_TYPE2 = MPI_DEFAULT_TYPE; - if (action[4] && action[5]) { - MPI_CURRENT_TYPE = decode_datatype(action[5]); - MPI_CURRENT_TYPE2 = decode_datatype(action[6]); - } else { - MPI_CURRENT_TYPE = MPI_DEFAULT_TYPE; - } + MPI_CURRENT_TYPE = (action[5] && action[6]) ? decode_datatype(action[5]) : MPI_DEFAULT_TYPE; + MPI_Datatype MPI_CURRENT_TYPE2{(action[5] && action[6]) ? decode_datatype(action[6]) : MPI_DEFAULT_TYPE}; + void* send = smpi_get_tmp_sendbuffer(send_size * MPI_CURRENT_TYPE->size()); void* recv = nullptr; - int root = 0; - if (action[4]) - root = atoi(action[4]); + int root = (action[4]) ? atoi(action[4]) : 0; int rank = MPI_COMM_WORLD->rank(); if (rank == root) @@ -640,12 +600,10 @@ static void action_gatherv(const char *const *action) { int recvcounts[comm_size]; int recv_sum=0; - MPI_Datatype MPI_CURRENT_TYPE2 = MPI_DEFAULT_TYPE; - if(action[4+comm_size] && action[5+comm_size]) { - MPI_CURRENT_TYPE=decode_datatype(action[4+comm_size]); - MPI_CURRENT_TYPE2=decode_datatype(action[5+comm_size]); - } else - MPI_CURRENT_TYPE=MPI_DEFAULT_TYPE; + MPI_CURRENT_TYPE = + (action[4 + comm_size] && action[5 + comm_size]) ? decode_datatype(action[4 + comm_size]) : MPI_DEFAULT_TYPE; + MPI_Datatype MPI_CURRENT_TYPE2{ + (action[4 + comm_size] && action[5 + comm_size]) ? decode_datatype(action[5 + comm_size]) : MPI_DEFAULT_TYPE}; void *send = smpi_get_tmp_sendbuffer(send_size* MPI_CURRENT_TYPE->size()); void *recv = nullptr; @@ -655,15 +613,13 @@ static void action_gatherv(const char *const *action) { disps[i]=0; } - int root=atoi(action[3+comm_size]); + int root = (action[3 + comm_size]) ? atoi(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()); - std::vector* trace_recvcounts = new std::vector; - for (int i = 0; i < comm_size; i++) // copy data to avoid bad free - trace_recvcounts->push_back(recvcounts[i]); + std::vector* trace_recvcounts = new std::vector(recvcounts, recvcounts + comm_size); TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::VarCollTIData( "gatherV", root, send_size, nullptr, -1, trace_recvcounts, @@ -694,12 +650,10 @@ static void action_scatterv(const char* const* action) int sendcounts[comm_size]; int send_sum = 0; - MPI_Datatype MPI_CURRENT_TYPE2 = MPI_DEFAULT_TYPE; - if (action[4 + comm_size] && action[5 + comm_size]) { - MPI_CURRENT_TYPE = decode_datatype(action[4 + comm_size]); - MPI_CURRENT_TYPE2 = decode_datatype(action[5 + comm_size]); - } else - MPI_CURRENT_TYPE = MPI_DEFAULT_TYPE; + MPI_CURRENT_TYPE = + (action[4 + comm_size] && action[5 + comm_size]) ? decode_datatype(action[4 + comm_size]) : MPI_DEFAULT_TYPE; + MPI_Datatype MPI_CURRENT_TYPE2{ + (action[4 + comm_size] && action[5 + comm_size]) ? decode_datatype(action[5 + comm_size]) : MPI_DEFAULT_TYPE}; void* send = nullptr; void* recv = smpi_get_tmp_recvbuffer(recv_size * MPI_CURRENT_TYPE->size()); @@ -709,15 +663,13 @@ static void action_scatterv(const char* const* action) disps[i] = 0; } - int root = atoi(action[3 + comm_size]); + int root = (action[3 + comm_size]) ? atoi(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()); - std::vector* trace_sendcounts = new std::vector; - for (int i = 0; i < comm_size; i++) // copy data to avoid bad free - trace_sendcounts->push_back(sendcounts[i]); + std::vector* trace_sendcounts = new std::vector(sendcounts, sendcounts + comm_size); TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::VarCollTIData( "gatherV", root, -1, trace_sendcounts, recv_size, nullptr, @@ -742,13 +694,10 @@ static void action_reducescatter(const char *const *action) { CHECK_ACTION_PARAMS(action, comm_size+1, 1) int comp_size = parse_double(action[2+comm_size]); int recvcounts[comm_size]; - int my_proc_id = Actor::self()->getPid(); + int my_proc_id = Actor::self()->getPid(); int size = 0; std::vector* trace_recvcounts = new std::vector; - if(action[3+comm_size]) - MPI_CURRENT_TYPE=decode_datatype(action[3+comm_size]); - else - MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE; + MPI_CURRENT_TYPE = (action[3 + comm_size]) ? decode_datatype(action[3 + comm_size]) : MPI_DEFAULT_TYPE; for(int i=0;isize()); 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, - encode_datatype(MPI_CURRENT_TYPE), - encode_datatype(MPI_CURRENT_TYPE2))); + 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))); Colls::allgather(sendbuf, sendcount, MPI_CURRENT_TYPE, recvbuf, recvcount, MPI_CURRENT_TYPE2, MPI_COMM_WORLD); @@ -824,13 +769,11 @@ static void action_allgatherv(const char *const *action) { int recvcounts[comm_size]; int disps[comm_size]; int recv_sum=0; - MPI_Datatype MPI_CURRENT_TYPE2 = MPI_DEFAULT_TYPE; - if(action[3+comm_size] && action[4+comm_size]) { - MPI_CURRENT_TYPE = decode_datatype(action[3+comm_size]); - MPI_CURRENT_TYPE2 = decode_datatype(action[4+comm_size]); - } else - MPI_CURRENT_TYPE = MPI_DEFAULT_TYPE; + 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}; void *sendbuf = smpi_get_tmp_sendbuffer(sendcount* MPI_CURRENT_TYPE->size()); @@ -843,13 +786,12 @@ static void action_allgatherv(const char *const *action) { int my_proc_id = Actor::self()->getPid(); - std::vector* trace_recvcounts = new std::vector; - for (int i = 0; i < comm_size; i++) // copy data to avoid bad free - trace_recvcounts->push_back(recvcounts[i]); + std::vector* trace_recvcounts = new std::vector(recvcounts, recvcounts + comm_size); - TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::VarCollTIData( - "allGatherV", -1, sendcount, nullptr, -1, trace_recvcounts, - encode_datatype(MPI_CURRENT_TYPE), encode_datatype(MPI_CURRENT_TYPE2))); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::VarCollTIData("allGatherV", -1, sendcount, nullptr, -1, trace_recvcounts, + encode_datatype(MPI_CURRENT_TYPE), + encode_datatype(MPI_CURRENT_TYPE2))); Colls::allgatherv(sendbuf, sendcount, MPI_CURRENT_TYPE, recvbuf, recvcounts, disps, MPI_CURRENT_TYPE2, MPI_COMM_WORLD); @@ -880,18 +822,16 @@ static void action_allToAllv(const char *const *action) { int senddisps[comm_size]; int recvdisps[comm_size]; - MPI_Datatype MPI_CURRENT_TYPE2 = MPI_DEFAULT_TYPE; + MPI_CURRENT_TYPE = (action[4 + 2 * comm_size] && action[5 + 2 * comm_size]) + ? decode_datatype(action[4 + 2 * comm_size]) + : MPI_DEFAULT_TYPE; + MPI_Datatype MPI_CURRENT_TYPE2{(action[4 + 2 * comm_size] && action[5 + 2 * comm_size]) + ? decode_datatype(action[5 + 2 * comm_size]) + : MPI_DEFAULT_TYPE}; int send_buf_size=parse_double(action[2]); int recv_buf_size=parse_double(action[3+comm_size]); - if(action[4+2*comm_size] && action[5+2*comm_size]) { - MPI_CURRENT_TYPE=decode_datatype(action[4+2*comm_size]); - MPI_CURRENT_TYPE2=decode_datatype(action[5+2*comm_size]); - } - else - MPI_CURRENT_TYPE=MPI_DEFAULT_TYPE; - - int my_proc_id = Actor::self()->getPid(); + int my_proc_id = Actor::self()->getPid(); void *sendbuf = smpi_get_tmp_sendbuffer(send_buf_size* MPI_CURRENT_TYPE->size()); void *recvbuf = smpi_get_tmp_recvbuffer(recv_buf_size* MPI_CURRENT_TYPE2->size()); @@ -906,9 +846,10 @@ static void action_allToAllv(const char *const *action) { recvdisps[i] = 0; } - TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::VarCollTIData( - "allToAllV", -1, send_size, trace_sendcounts, recv_size, trace_recvcounts, - encode_datatype(MPI_CURRENT_TYPE), encode_datatype(MPI_CURRENT_TYPE2))); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::VarCollTIData("allToAllV", -1, send_size, trace_sendcounts, recv_size, + trace_recvcounts, encode_datatype(MPI_CURRENT_TYPE), + encode_datatype(MPI_CURRENT_TYPE2))); Colls::alltoallv(sendbuf, sendcounts, senddisps, MPI_CURRENT_TYPE,recvbuf, recvcounts, recvdisps, MPI_CURRENT_TYPE, MPI_COMM_WORLD);