X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/79a0e7d2c82c1d2220c1c82165beef46a4cf67ce..46a70e098d1d50876b9cf0576cac2357725cf54f:/src/smpi/smpi_base.c diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c index 9e48e3cd50..84c53dc403 100644 --- a/src/smpi/smpi_base.c +++ b/src/smpi/smpi_base.c @@ -12,7 +12,7 @@ #include "simix/smx_private.h" #include "surf/surf.h" #include "simgrid/sg_config.h" - +#include "colls/colls.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_base, smpi, "Logging specific to SMPI (base)"); @@ -119,10 +119,10 @@ static xbt_dynar_t parse_factor(const char *smpi_coef_string) static double smpi_os(double size) { - if (!smpi_os_values) - smpi_os_values = - parse_factor(sg_cfg_get_string("smpi/os")); - + if (!smpi_os_values) { + smpi_os_values = parse_factor(sg_cfg_get_string("smpi/os")); + smpi_register_static(smpi_os_values, xbt_dynar_free_voidp); + } unsigned int iter = 0; s_smpi_factor_t fact; double current=0.0; @@ -141,10 +141,10 @@ static double smpi_os(double size) static double smpi_ois(double size) { - if (!smpi_ois_values) - smpi_ois_values = - parse_factor(sg_cfg_get_string("smpi/ois")); - + if (!smpi_ois_values) { + smpi_ois_values = parse_factor(sg_cfg_get_string("smpi/ois")); + smpi_register_static(smpi_ois_values, xbt_dynar_free_voidp); + } unsigned int iter = 0; s_smpi_factor_t fact; double current=0.0; @@ -163,10 +163,10 @@ static double smpi_ois(double size) static double smpi_or(double size) { - if (!smpi_or_values) - smpi_or_values = - parse_factor(sg_cfg_get_string("smpi/or")); - + if (!smpi_or_values) { + smpi_or_values = parse_factor(sg_cfg_get_string("smpi/or")); + smpi_register_static(smpi_or_values, xbt_dynar_free_voidp); + } unsigned int iter = 0; s_smpi_factor_t fact; double current=0.0; @@ -197,7 +197,7 @@ static MPI_Request build_request(void *buf, int count, if(datatype->has_subtype == 1){ // This part handles the problem of non-contiguous memory old_buf = buf; - buf = xbt_malloc(count*smpi_datatype_size(datatype)); + buf = count==0 ? NULL : xbt_malloc(count*smpi_datatype_size(datatype)); if (flags & SEND) { subtype->serialize(old_buf, buf, count, datatype->substruct); } @@ -234,11 +234,13 @@ static MPI_Request build_request(void *buf, int count, } -void smpi_empty_status(MPI_Status * status) { +void smpi_empty_status(MPI_Status * status) +{ if(status != MPI_STATUS_IGNORE) { - status->MPI_SOURCE=MPI_ANY_SOURCE; - status->MPI_TAG=MPI_ANY_TAG; - status->count=0; + status->MPI_SOURCE = MPI_ANY_SOURCE; + status->MPI_TAG = MPI_ANY_TAG; + status->MPI_ERROR = MPI_SUCCESS; + status->count=0; } } @@ -282,7 +284,7 @@ MPI_Request smpi_mpi_send_init(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { MPI_Request request = - build_request(buf, count, datatype, smpi_comm_rank(comm), dst, tag, + build_request(buf, count, datatype, smpi_process_index(), smpi_group_index(smpi_comm_group(comm), dst), tag, comm, PERSISTENT | SEND); request->refcount++; return request; @@ -292,7 +294,7 @@ MPI_Request smpi_mpi_ssend_init(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { MPI_Request request = - build_request(buf, count, datatype, smpi_comm_rank(comm), dst, tag, + build_request(buf, count, datatype, smpi_process_index(), smpi_group_index(smpi_comm_group(comm), dst), tag, comm, PERSISTENT | SSEND | SEND); request->refcount++; return request; @@ -302,7 +304,7 @@ MPI_Request smpi_mpi_recv_init(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm) { MPI_Request request = - build_request(buf, count, datatype, src, smpi_comm_rank(comm), tag, + build_request(buf, count, datatype, src == MPI_ANY_SOURCE ? MPI_ANY_SOURCE : smpi_group_index(smpi_comm_group(comm), src), smpi_process_index(), tag, comm, PERSISTENT | RECV); request->refcount++; return request; @@ -325,7 +327,8 @@ void smpi_mpi_start(MPI_Request request) smpi_datatype_use(request->old_type); request->action = simcall_comm_irecv(mailbox, request->buf, &request->real_size, &match_recv, request); - double sleeptime = smpi_or(request->size); + //integrate pseudo-timing for buffering of small messages, do not bother to execute the simcall if 0 + double sleeptime = request->detached ? smpi_or(request->size) : 0.0; if(sleeptime!=0.0){ simcall_process_sleep(sleeptime); XBT_DEBUG("receiving size of %zu : sleep %lf ", request->size, smpi_or(request->size)); @@ -333,7 +336,15 @@ void smpi_mpi_start(MPI_Request request) } else { - int receiver = smpi_group_index(smpi_comm_group(request->comm), request->dst); + + int receiver = request->dst;//smpi_group_index(smpi_comm_group(request->comm), request->dst); + + #ifdef HAVE_TRACING + int rank = smpi_process_index(); + if (TRACE_smpi_view_internals()) { + TRACE_smpi_send(rank, rank, receiver); + } + #endif /* if(receiver == MPI_UNDEFINED) {*/ /* XBT_WARN("Trying to send a message to a wrong rank");*/ /* return;*/ @@ -351,28 +362,30 @@ void smpi_mpi_start(MPI_Request request) request->refcount++; if(request->old_type->has_subtype == 0){ oldbuf = request->buf; - if (oldbuf){ + if (oldbuf && request->size!=0){ request->buf = xbt_malloc(request->size); memcpy(request->buf,oldbuf,request->size); } } XBT_DEBUG("Send request %p is detached; buf %p copied into %p",request,oldbuf,request->buf); } + // we make a copy here, as the size is modified by simix, and we may reuse the request in another receive later request->real_size=request->size; smpi_datatype_use(request->old_type); //if we are giving back the control to the user without waiting for completion, we have to inject timings double sleeptime =0.0; - if(request->detached && !(request->flags & ISEND)) - sleeptime = smpi_os(request->size); - else - sleeptime = smpi_ois(request->size); + if(request->detached || (request->flags & (ISEND|SSEND))){// issend should be treated as isend + //isend and send timings may be different + sleeptime = (request->flags & ISEND)? smpi_ois(request->size) : smpi_os(request->size); + } if(sleeptime!=0.0){ simcall_process_sleep(sleeptime); XBT_DEBUG("sending size of %zu : sleep %lf ", request->size, smpi_os(request->size)); } + request->action = simcall_comm_isend(mailbox, request->size, -1.0, request->buf, request->real_size, @@ -386,6 +399,7 @@ void smpi_mpi_start(MPI_Request request) /* FIXME: detached sends are not traceable (request->action == NULL) */ if (request->action) simcall_set_category(request->action, TRACE_internal_smpi_get_category()); + #endif } @@ -409,8 +423,12 @@ void smpi_mpi_request_free(MPI_Request * request) if((*request)->refcount<0) xbt_die("wrong refcount"); if((*request)->refcount==0){ + print_request("Destroying", (*request)); xbt_free(*request); *request = MPI_REQUEST_NULL; + }else{ + print_request("Decrementing", (*request)); + } }else{ xbt_die("freeing an already free request"); @@ -421,7 +439,7 @@ MPI_Request smpi_isend_init(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { MPI_Request request = - build_request(buf, count, datatype, smpi_comm_rank(comm), dst, tag, + build_request(buf, count, datatype, smpi_process_index(), smpi_group_index(smpi_comm_group(comm), dst), tag, comm, NON_PERSISTENT | SEND); return request; @@ -431,7 +449,7 @@ MPI_Request smpi_mpi_isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { MPI_Request request = - build_request(buf, count, datatype, smpi_comm_rank(comm), dst, tag, + build_request(buf, count, datatype, smpi_process_index(), smpi_group_index(smpi_comm_group(comm), dst), tag, comm, NON_PERSISTENT | ISEND | SEND); smpi_mpi_start(request); @@ -442,7 +460,7 @@ MPI_Request smpi_mpi_issend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { MPI_Request request = - build_request(buf, count, datatype, smpi_comm_rank(comm), dst, tag, + build_request(buf, count, datatype, smpi_process_index(), smpi_group_index(smpi_comm_group(comm), dst), tag, comm, NON_PERSISTENT | ISEND | SSEND | SEND); smpi_mpi_start(request); return request; @@ -454,7 +472,7 @@ MPI_Request smpi_irecv_init(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm) { MPI_Request request = - build_request(buf, count, datatype, src, smpi_comm_rank(comm), tag, + build_request(buf, count, datatype, src == MPI_ANY_SOURCE ? MPI_ANY_SOURCE : smpi_group_index(smpi_comm_group(comm), src), smpi_process_index(), tag, comm, NON_PERSISTENT | RECV); return request; } @@ -463,7 +481,7 @@ MPI_Request smpi_mpi_irecv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm) { MPI_Request request = - build_request(buf, count, datatype, src, smpi_comm_rank(comm), tag, + build_request(buf, count, datatype, src == MPI_ANY_SOURCE ? MPI_ANY_SOURCE : smpi_group_index(smpi_comm_group(comm), src), smpi_process_index(), tag, comm, NON_PERSISTENT | RECV); smpi_mpi_start(request); @@ -483,8 +501,10 @@ void smpi_mpi_recv(void *buf, int count, MPI_Datatype datatype, int src, void smpi_mpi_send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { - MPI_Request request; - request = smpi_mpi_isend(buf, count, datatype, dst, tag, comm); + MPI_Request request = + build_request(buf, count, datatype, smpi_process_index(), smpi_group_index(smpi_comm_group(comm), dst), tag, + comm, NON_PERSISTENT | SEND); + smpi_mpi_start(request); smpi_mpi_wait(&request, MPI_STATUS_IGNORE); } @@ -492,7 +512,11 @@ void smpi_mpi_send(void *buf, int count, MPI_Datatype datatype, int dst, void smpi_mpi_ssend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { - MPI_Request request = smpi_mpi_issend(buf, count, datatype, dst, tag, comm); + MPI_Request request = + build_request(buf, count, datatype, smpi_process_index(), smpi_group_index(smpi_comm_group(comm), dst), tag, + comm, NON_PERSISTENT | SSEND | SEND); + + smpi_mpi_start(request); smpi_mpi_wait(&request, MPI_STATUS_IGNORE); } @@ -503,7 +527,12 @@ void smpi_mpi_sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype, { MPI_Request requests[2]; MPI_Status stats[2]; - + int myid=smpi_process_index(); + if ((dst == myid) && (src == myid)) { + smpi_datatype_copy(sendbuf, sendcount, sendtype, + recvbuf, recvcount, recvtype); + return; + } requests[0] = smpi_isend_init(sendbuf, sendcount, sendtype, dst, sendtag, comm); requests[1] = @@ -512,7 +541,7 @@ void smpi_mpi_sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype, smpi_mpi_waitall(2, requests, stats); if(status != MPI_STATUS_IGNORE) { // Copy receive status - memcpy(status, &stats[1], sizeof(MPI_Status)); + *status = stats[1]; } } @@ -524,13 +553,15 @@ int smpi_mpi_get_count(MPI_Status * status, MPI_Datatype datatype) static void finish_wait(MPI_Request * request, MPI_Status * status) { MPI_Request req = *request; + if(status != MPI_STATUS_IGNORE) + smpi_empty_status(status); + if(!(req->detached && req->flags & SEND)){ if(status != MPI_STATUS_IGNORE) { - status->MPI_SOURCE = req->src == MPI_ANY_SOURCE ? req->real_src : req->src; + int src = req->src == MPI_ANY_SOURCE ? req->real_src : req->src; + status->MPI_SOURCE = smpi_group_rank(smpi_comm_group(req->comm), src); status->MPI_TAG = req->tag == MPI_ANY_TAG ? req->real_tag : req->tag; - if(req->truncated) - status->MPI_ERROR = MPI_ERR_TRUNCATE; - else status->MPI_ERROR = MPI_SUCCESS ; + status->MPI_ERROR = req->truncated ? MPI_ERR_TRUNCATE : MPI_SUCCESS; // this handles the case were size in receive differs from size in send // FIXME: really this should just contain the count of receive-type blocks, // right? @@ -550,8 +581,19 @@ static void finish_wait(MPI_Request * request, MPI_Status * status) if(req->detached == 0) free(req->buf); } smpi_datatype_unuse(datatype); + } +#ifdef HAVE_TRACING + if (TRACE_smpi_view_internals()) { + if(req->flags & RECV){ + int rank = smpi_process_index(); + int src_traced = smpi_group_index(smpi_comm_group(req->comm), req->src == MPI_ANY_SOURCE ? req->real_src : req->src); + TRACE_smpi_recv(rank, src_traced, rank); + } + } +#endif + if(req->detached_sender!=NULL){ smpi_mpi_request_free(&(req->detached_sender)); } @@ -572,8 +614,8 @@ int smpi_mpi_test(MPI_Request * request, MPI_Status * status) { else flag = simcall_comm_test((*request)->action); if(flag) { - (*request)->refcount++; finish_wait(request, status); + request=MPI_REQUEST_NULL; }else{ smpi_empty_status(status); } @@ -637,7 +679,7 @@ int smpi_mpi_testall(int count, MPI_Request requests[], smpi_empty_status(pstat); } if(status != MPI_STATUSES_IGNORE) { - memcpy(&status[i], pstat, sizeof(*pstat)); + status[i] = *pstat; } } return flag; @@ -650,16 +692,21 @@ void smpi_mpi_probe(int source, int tag, MPI_Comm comm, MPI_Status* status){ while(flag==0){ smpi_mpi_iprobe(source, tag, comm, &flag, status); XBT_DEBUG("Busy Waiting on probing : %d", flag); - if(!flag) { - simcall_process_sleep(0.0001); - } } } void smpi_mpi_iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status* status){ - MPI_Request request =build_request(NULL, 0, MPI_CHAR, source, smpi_comm_rank(comm), tag, + + MPI_Request request =build_request(NULL, 0, MPI_CHAR, source == MPI_ANY_SOURCE ? MPI_ANY_SOURCE : smpi_group_index(smpi_comm_group(comm), source), smpi_comm_rank(comm), tag, comm, NON_PERSISTENT | RECV); + //to avoid deadlock, we have to sleep some time here, or the timer won't advance and we will only do iprobe simcalls + double sleeptime= sg_cfg_get_double("smpi/iprobe"); + //multiplier to the sleeptime, to increase speed of execution, each failed iprobe will increase it + static int nsleeps = 1; + + simcall_process_sleep(sleeptime); + // behave like a receive, but don't do it smx_rdv_t mailbox; @@ -680,13 +727,17 @@ void smpi_mpi_iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status* MPI_Request req = (MPI_Request)SIMIX_comm_get_src_data(request->action); *flag = 1; if(status != MPI_STATUS_IGNORE) { - status->MPI_SOURCE = req->src; + status->MPI_SOURCE = smpi_group_rank(smpi_comm_group(comm), req->src); status->MPI_TAG = req->tag; status->MPI_ERROR = MPI_SUCCESS; status->count = req->real_size; } + nsleeps=1;//reset the number of sleeps we will do next time + } + else { + *flag = 0; + nsleeps++; } - else *flag = 0; smpi_mpi_request_free(&request); return; @@ -759,33 +810,32 @@ int smpi_mpi_waitall(int count, MPI_Request requests[], int index, c; MPI_Status stat; MPI_Status *pstat = status == MPI_STATUSES_IGNORE ? MPI_STATUS_IGNORE : &stat; - int retvalue=MPI_SUCCESS; + int retvalue = MPI_SUCCESS; //tag invalid requests in the set - for(c = 0; c < count; c++) { - if(requests[c]==MPI_REQUEST_NULL || requests[c]->dst == MPI_PROC_NULL ){ - if(status != MPI_STATUSES_IGNORE) + if (status != MPI_STATUSES_IGNORE) { + for (c = 0; c < count; c++) { + if (requests[c] == MPI_REQUEST_NULL || requests[c]->dst == MPI_PROC_NULL) { smpi_empty_status(&status[c]); - }else if(requests[c]->src == MPI_PROC_NULL ){ - if(status != MPI_STATUSES_IGNORE) { + } else if (requests[c]->src == MPI_PROC_NULL) { smpi_empty_status(&status[c]); - status[c].MPI_SOURCE=MPI_PROC_NULL; + status[c].MPI_SOURCE = MPI_PROC_NULL; } } } for(c = 0; c < count; c++) { - if(MC_is_active()) { - smpi_mpi_wait(&requests[c], pstat); - index = c; - } else { - index = smpi_mpi_waitany(count, requests, pstat); - if(index == MPI_UNDEFINED) { - break; - } - if(status != MPI_STATUSES_IGNORE) { - memcpy(&status[index], pstat, sizeof(*pstat)); - if(status[index].MPI_ERROR==MPI_ERR_TRUNCATE)retvalue=MPI_ERR_IN_STATUS; - - } + if (MC_is_active()) { + smpi_mpi_wait(&requests[c], pstat); + index = c; + } else { + index = smpi_mpi_waitany(count, requests, pstat); + if (index == MPI_UNDEFINED) + break; + requests[index]=MPI_REQUEST_NULL; + } + if (status != MPI_STATUSES_IGNORE) { + status[index] = *pstat; + if (status[index].MPI_ERROR == MPI_ERR_TRUNCATE) + retvalue = MPI_ERR_IN_STATUS; } } @@ -807,8 +857,9 @@ int smpi_mpi_waitsome(int incount, MPI_Request requests[], int *indices, indices[count] = index; count++; if(status != MPI_STATUSES_IGNORE) { - memcpy(&status[index], pstat, sizeof(*pstat)); + status[index] = *pstat; } + requests[index]=MPI_REQUEST_NULL; }else{ return MPI_UNDEFINED; } @@ -831,8 +882,10 @@ int smpi_mpi_testsome(int incount, MPI_Request requests[], int *indices, indices[count] = i; count++; if(status != MPI_STATUSES_IGNORE) { - memcpy(&status[i], pstat, sizeof(*pstat)); + status[i] = *pstat; } + requests[i]=MPI_REQUEST_NULL; + } }else{ count_dead++; @@ -893,6 +946,31 @@ void smpi_mpi_gather(void *sendbuf, int sendcount, MPI_Datatype sendtype, } } + +void smpi_mpi_reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, + MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) +{ + int i, size, count; + int *displs; + int rank = smpi_process_index(); + void *tmpbuf; + + /* arbitrarily choose root as rank 0 */ + size = smpi_comm_size(comm); + count = 0; + displs = xbt_new(int, size); + for (i = 0; i < size; i++) { + displs[i] = count; + count += recvcounts[i]; + } + tmpbuf=(void*)xbt_malloc(count*smpi_datatype_get_extent(datatype)); + mpi_coll_reduce_fun(sendbuf, tmpbuf, count, datatype, op, 0, comm); + smpi_mpi_scatterv(tmpbuf, recvcounts, displs, datatype, recvbuf, + recvcounts[rank], datatype, 0, comm); + xbt_free(displs); + xbt_free(tmpbuf); +} + void smpi_mpi_gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int *recvcounts, int *displs, MPI_Datatype recvtype, int root, MPI_Comm comm) @@ -1098,17 +1176,29 @@ void smpi_mpi_reduce(void *sendbuf, void *recvbuf, int count, MPI_Request *requests; void **tmpbufs; + char* sendtmpbuf = (char*) sendbuf; + if( sendbuf == MPI_IN_PLACE ) { + sendtmpbuf = (char *)recvbuf; + } + rank = smpi_comm_rank(comm); size = smpi_comm_size(comm); + //non commutative case, use a working algo from openmpi + if(!smpi_op_is_commute(op)){ + smpi_coll_tuned_reduce_ompi_basic_linear(sendtmpbuf, recvbuf, count, + datatype, op, root, comm); + return; + } + if(rank != root) { // Send buffer to root - smpi_mpi_send(sendbuf, count, datatype, root, system_tag, comm); + smpi_mpi_send(sendtmpbuf, count, datatype, root, system_tag, comm); } else { // FIXME: check for errors smpi_datatype_extent(datatype, &lb, &dataext); // Local copy from root - if (sendbuf && recvbuf) - smpi_datatype_copy(sendbuf, count, datatype, recvbuf, count, datatype); + if (sendtmpbuf && recvbuf) + smpi_datatype_copy(sendtmpbuf, count, datatype, recvbuf, count, datatype); // Receive buffers from senders //TODO: make a MPI_barrier here ? requests = xbt_new(MPI_Request, size - 1);