X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/364eee0fc6ab77fddc5437ac273527bd27711724..5614098526a38994481b306b2e1f950ab10b5dbd:/src/smpi/bindings/smpi_pmpi_request.cpp diff --git a/src/smpi/bindings/smpi_pmpi_request.cpp b/src/smpi/bindings/smpi_pmpi_request.cpp index 81dbe1baa5..49efe868ff 100644 --- a/src/smpi/bindings/smpi_pmpi_request.cpp +++ b/src/smpi/bindings/smpi_pmpi_request.cpp @@ -11,6 +11,13 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smpi_pmpi); +static int getPid(MPI_Comm, int); +static int getPid(MPI_Comm comm, int id) +{ + simgrid::s4u::ActorPtr actor = comm->group()->actor(id); + return (actor == nullptr) ? MPI_UNDEFINED : actor->getPid() - 1; +} + /* PMPI User level calls */ extern "C" { // Obviously, the C MPI interface should use the C linkage @@ -158,24 +165,17 @@ int PMPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MP } else { int rank = smpi_process()->index(); - int src_traced = comm->group()->index(src); - - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_IRECV; - extra->src = src_traced; - extra->dst = rank; - int known=0; - extra->datatype1 = encode_datatype(datatype, &known); - int dt_size_send = 1; - if(known==0) - dt_size_send = datatype->size(); - extra->send_size = count*dt_size_send; - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); + int src_traced = getPid(comm, src); + + TRACE_smpi_comm_in(rank, __FUNCTION__, + new simgrid::instr::Pt2PtTIData("Irecv", src_traced, + datatype->is_replayable() ? count : count * datatype->size(), + encode_datatype(datatype))); *request = simgrid::smpi::Request::irecv(buf, count, datatype, src, tag, comm); retval = MPI_SUCCESS; - TRACE_smpi_ptp_out(rank, rank, __FUNCTION__); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); @@ -206,25 +206,19 @@ int PMPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MP } else if(tag<0 && tag != MPI_ANY_TAG){ retval = MPI_ERR_TAG; } else { - int rank = smpi_process()->index(); - int dst_traced = comm->group()->index(dst); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_ISEND; - extra->src = rank; - extra->dst = dst_traced; - int known=0; - extra->datatype1 = encode_datatype(datatype, &known); - int dt_size_send = 1; - if(known==0) - dt_size_send = datatype->size(); - extra->send_size = count*dt_size_send; - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); - TRACE_smpi_send(rank, rank, dst_traced, tag, count*datatype->size()); + int rank = smpi_process()->index(); + int trace_dst = getPid(comm, dst); + TRACE_smpi_comm_in(rank, __FUNCTION__, + new simgrid::instr::Pt2PtTIData("Isend", trace_dst, + datatype->is_replayable() ? count : count * datatype->size(), + encode_datatype(datatype))); + + TRACE_smpi_send(rank, rank, trace_dst, tag, count * datatype->size()); *request = simgrid::smpi::Request::isend(buf, count, datatype, dst, tag, comm); retval = MPI_SUCCESS; - TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); @@ -254,25 +248,18 @@ int PMPI_Issend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, M } else if(tag<0 && tag != MPI_ANY_TAG){ retval = MPI_ERR_TAG; } else { - int rank = smpi_process()->index(); - int dst_traced = comm->group()->index(dst); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_ISSEND; - extra->src = rank; - extra->dst = dst_traced; - int known=0; - extra->datatype1 = encode_datatype(datatype, &known); - int dt_size_send = 1; - if(known==0) - dt_size_send = datatype->size(); - extra->send_size = count*dt_size_send; - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); - TRACE_smpi_send(rank, rank, dst_traced, tag, count*datatype->size()); + int rank = smpi_process()->index(); + int trace_dst = getPid(comm, dst); + TRACE_smpi_comm_in(rank, __FUNCTION__, + new simgrid::instr::Pt2PtTIData("ISsend", trace_dst, + datatype->is_replayable() ? count : count * datatype->size(), + encode_datatype(datatype))); + TRACE_smpi_send(rank, rank, trace_dst, tag, count * datatype->size()); *request = simgrid::smpi::Request::issend(buf, count, datatype, dst, tag, comm); retval = MPI_SUCCESS; - TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); @@ -302,30 +289,23 @@ int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI retval = MPI_ERR_TAG; } else { int rank = smpi_process()->index(); - int src_traced = comm->group()->index(src); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1); - extra->type = TRACING_RECV; - extra->src = src_traced; - extra->dst = rank; - int known = 0; - extra->datatype1 = encode_datatype(datatype, &known); - int dt_size_send = 1; - if (known == 0) - dt_size_send = datatype->size(); - extra->send_size = count * dt_size_send; - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); + int src_traced = getPid(comm, src); + TRACE_smpi_comm_in(rank, __FUNCTION__, + new simgrid::instr::Pt2PtTIData("recv", src_traced, + datatype->is_replayable() ? count : count * datatype->size(), + encode_datatype(datatype))); simgrid::smpi::Request::recv(buf, count, datatype, src, tag, comm, status); retval = MPI_SUCCESS; // the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE) if (status != MPI_STATUS_IGNORE) { - src_traced = comm->group()->index(status->MPI_SOURCE); + src_traced = getPid(comm, status->MPI_SOURCE); if (not TRACE_smpi_view_internals()) { TRACE_smpi_recv(src_traced, rank, tag); } } - TRACE_smpi_ptp_out(rank, rank, __FUNCTION__); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); @@ -352,19 +332,11 @@ int PMPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI retval = MPI_ERR_TAG; } else { int rank = smpi_process()->index(); - int dst_traced = comm->group()->index(dst); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_SEND; - extra->src = rank; - extra->dst = dst_traced; - int known = 0; - extra->datatype1 = encode_datatype(datatype, &known); - int dt_size_send = 1; - if (known == 0) { - dt_size_send = datatype->size(); - } - extra->send_size = count*dt_size_send; - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); + int dst_traced = getPid(comm, dst); + TRACE_smpi_comm_in(rank, __FUNCTION__, + new simgrid::instr::Pt2PtTIData("send", dst_traced, + datatype->is_replayable() ? count : count * datatype->size(), + encode_datatype(datatype))); if (not TRACE_smpi_view_internals()) { TRACE_smpi_send(rank, rank, dst_traced, tag,count*datatype->size()); } @@ -372,7 +344,7 @@ int PMPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI simgrid::smpi::Request::send(buf, count, datatype, dst, tag, comm); retval = MPI_SUCCESS; - TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); @@ -398,25 +370,17 @@ int PMPI_Ssend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, MP retval = MPI_ERR_TAG; } else { int rank = smpi_process()->index(); - int dst_traced = comm->group()->index(dst); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_SSEND; - extra->src = rank; - extra->dst = dst_traced; - int known = 0; - extra->datatype1 = encode_datatype(datatype, &known); - int dt_size_send = 1; - if(known == 0) { - dt_size_send = datatype->size(); - } - extra->send_size = count*dt_size_send; - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); - TRACE_smpi_send(rank, rank, dst_traced, tag,count*datatype->size()); + int dst_traced = getPid(comm, dst); + TRACE_smpi_comm_in(rank, __FUNCTION__, + new simgrid::instr::Pt2PtTIData("Ssend", dst_traced, + datatype->is_replayable() ? count : count * datatype->size(), + encode_datatype(datatype))); + TRACE_smpi_send(rank, rank, dst_traced, tag, count * datatype->size()); simgrid::smpi::Request::ssend(buf, count, datatype, dst, tag, comm); retval = MPI_SUCCESS; - TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); @@ -447,35 +411,29 @@ int PMPI_Sendrecv(void* sendbuf, int sendcount, MPI_Datatype sendtype, int dst, } else if((sendtag<0 && sendtag != MPI_ANY_TAG)||(recvtag<0 && recvtag != MPI_ANY_TAG)){ retval = MPI_ERR_TAG; } else { - int rank = smpi_process()->index(); - int dst_traced = comm->group()->index(dst); - int src_traced = comm->group()->index(src); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1); - extra->type = TRACING_SENDRECV; - extra->src = src_traced; - extra->dst = dst_traced; - int known = 0; - extra->datatype1 = encode_datatype(sendtype, &known); - int dt_size_send = 1; - if (known == 0) - dt_size_send = sendtype->size(); - extra->send_size = sendcount * dt_size_send; - extra->datatype2 = encode_datatype(recvtype, &known); - int dt_size_recv = 1; - if (known == 0) - dt_size_recv = recvtype->size(); - extra->recv_size = recvcount * dt_size_recv; - - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); + int dst_traced = getPid(comm, dst); + int src_traced = getPid(comm, src); + + // FIXME: Hack the way to trace this one + std::vector* dst_hack = new std::vector; + std::vector* src_hack = new std::vector; + dst_hack->push_back(dst_traced); + src_hack->push_back(src_traced); + TRACE_smpi_comm_in(rank, __FUNCTION__, + new simgrid::instr::VarCollTIData( + "sendRecv", -1, sendtype->is_replayable() ? sendcount : sendcount * sendtype->size(), dst_hack, + recvtype->is_replayable() ? recvcount : recvcount * recvtype->size(), src_hack, + encode_datatype(sendtype), encode_datatype(recvtype))); + TRACE_smpi_send(rank, rank, dst_traced, sendtag, sendcount * sendtype->size()); simgrid::smpi::Request::sendrecv(sendbuf, sendcount, sendtype, dst, sendtag, recvbuf, recvcount, recvtype, src, recvtag, comm, status); retval = MPI_SUCCESS; - TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__); TRACE_smpi_recv(src_traced, rank, recvtag); + TRACE_smpi_comm_out(rank); } smpi_bench_begin(); @@ -516,9 +474,7 @@ int PMPI_Test(MPI_Request * request, int *flag, MPI_Status * status) } else { int rank = ((*request)->comm() != MPI_COMM_NULL) ? smpi_process()->index() : -1; - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_TEST; - TRACE_smpi_testing_in(rank, extra); + TRACE_smpi_testing_in(rank); *flag = simgrid::smpi::Request::test(request,status); @@ -600,6 +556,23 @@ int PMPI_Iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status* statu return retval; } +// TODO: cheinrich: Move declaration to other file? Rename this function - it's used for PMPI_Wait*? +static void trace_smpi_recv_helper(MPI_Request* request, MPI_Status* status); +static void trace_smpi_recv_helper(MPI_Request* request, MPI_Status* status) +{ + MPI_Request req = *request; + if (req != MPI_REQUEST_NULL) { // Received requests become null + int src_traced = req->src(); + // the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE) + int dst_traced = req->dst(); + if (req->flags() & RECV) { // Is this request a wait for RECV? + if (src_traced == MPI_ANY_SOURCE) + src_traced = (status != MPI_STATUSES_IGNORE) ? req->comm()->group()->rank(status->MPI_SOURCE) : req->src(); + TRACE_smpi_recv(src_traced, dst_traced, req->tag()); + } + } +} + int PMPI_Wait(MPI_Request * request, MPI_Status * status) { int retval = 0; @@ -615,25 +588,14 @@ int PMPI_Wait(MPI_Request * request, MPI_Status * status) } else { int rank = (*request)->comm() != MPI_COMM_NULL ? smpi_process()->index() : -1; - int src_traced = (*request)->src(); - int dst_traced = (*request)->dst(); - int tag_traced= (*request)->tag(); - MPI_Comm comm = (*request)->comm(); - int is_wait_for_receive = ((*request)->flags() & RECV); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_WAIT; - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); + TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::NoOpTIData("wait")); simgrid::smpi::Request::wait(request, status); retval = MPI_SUCCESS; //the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE) - TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__); - if (is_wait_for_receive) { - if(src_traced==MPI_ANY_SOURCE) - src_traced = (status != MPI_STATUS_IGNORE) ? comm->group()->rank(status->MPI_SOURCE) : src_traced; - TRACE_smpi_recv(src_traced, dst_traced, tag_traced); - } + TRACE_smpi_comm_out(rank); + trace_smpi_recv_helper(request, status); } smpi_bench_begin(); @@ -649,44 +611,16 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta return MPI_SUCCESS; smpi_bench_end(); - //save requests information for tracing - struct savedvalstype { - int src; - int dst; - int recv; - int tag; - MPI_Comm comm; - }; - savedvalstype* savedvals = xbt_new0(savedvalstype, count); - for (int i = 0; i < count; i++) { - MPI_Request req = requests[i]; //already received requests are no longer valid - if (req) { - savedvals[i]=(savedvalstype){req->src(), req->dst(), (req->flags() & RECV), req->tag(), req->comm()}; - } - } - int rank_traced = smpi_process()->index(); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_WAITANY; - extra->send_size=count; - TRACE_smpi_ptp_in(rank_traced, __FUNCTION__,extra); + int rank_traced = smpi_process()->index(); // FIXME: In PMPI_Wait, we check if the comm is null? + TRACE_smpi_comm_in(rank_traced, __FUNCTION__, new simgrid::instr::CpuTIData("waitAny", static_cast(count))); *index = simgrid::smpi::Request::waitany(count, requests, status); if(*index!=MPI_UNDEFINED){ - int src_traced = savedvals[*index].src; - //the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE) - int dst_traced = savedvals[*index].dst; - int is_wait_for_receive = savedvals[*index].recv; - if (is_wait_for_receive) { - if(savedvals[*index].src==MPI_ANY_SOURCE) - src_traced = (status != MPI_STATUSES_IGNORE) ? savedvals[*index].comm->group()->rank(status->MPI_SOURCE) - : savedvals[*index].src; - TRACE_smpi_recv(src_traced, dst_traced, savedvals[*index].tag); - } - TRACE_smpi_ptp_out(rank_traced, dst_traced, __FUNCTION__); + trace_smpi_recv_helper(&requests[*index], status); + TRACE_smpi_comm_out(rank_traced); } - xbt_free(savedvals); smpi_bench_begin(); return MPI_SUCCESS; @@ -695,49 +629,16 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[]) { smpi_bench_end(); - //save information from requests - struct savedvalstype { - int src; - int dst; - int recv; - int tag; - int valid; - MPI_Comm comm; - }; - savedvalstype* savedvals=xbt_new0(savedvalstype, count); - for (int i = 0; i < count; i++) { - MPI_Request req = requests[i]; - if(req!=MPI_REQUEST_NULL){ - savedvals[i]=(savedvalstype){req->src(), req->dst(), (req->flags() & RECV), req->tag(), 1, req->comm()}; - }else{ - savedvals[i].valid=0; - } - } - int rank_traced = smpi_process()->index(); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_WAITALL; - extra->send_size=count; - TRACE_smpi_ptp_in(rank_traced, __FUNCTION__,extra); + int rank_traced = smpi_process()->index(); // FIXME: In PMPI_Wait, we check if the comm is null? + TRACE_smpi_comm_in(rank_traced, __FUNCTION__, new simgrid::instr::CpuTIData("waitAll", static_cast(count))); int retval = simgrid::smpi::Request::waitall(count, requests, status); for (int i = 0; i < count; i++) { - if(savedvals[i].valid){ - // the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE) - int src_traced = savedvals[i].src; - int dst_traced = savedvals[i].dst; - int is_wait_for_receive = savedvals[i].recv; - if (is_wait_for_receive) { - if(src_traced==MPI_ANY_SOURCE) - src_traced = (status != MPI_STATUSES_IGNORE) ? savedvals[i].comm->group()->rank(status[i].MPI_SOURCE) - : savedvals[i].src; - TRACE_smpi_recv(src_traced, dst_traced,savedvals[i].tag); - } - } + trace_smpi_recv_helper(&requests[i], &status[i]); } - TRACE_smpi_ptp_out(rank_traced, -1, __FUNCTION__); - xbt_free(savedvals); + TRACE_smpi_comm_out(rank_traced); smpi_bench_begin(); return retval;