X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a4bfdd468a73680e604a041d9a4b7dd5a939e7ac..db4c52ba4d7aeefa36639a0907b76609dd24abe0:/src/smpi/smpi_base.c diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c index 012cc39396..d98b98af9a 100644 --- a/src/smpi/smpi_base.c +++ b/src/smpi/smpi_base.c @@ -10,17 +10,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_base, smpi, "Logging specific to SMPI (base)"); -XBT_LOG_EXTERNAL_CATEGORY(smpi_base); -XBT_LOG_EXTERNAL_CATEGORY(smpi_bench); -XBT_LOG_EXTERNAL_CATEGORY(smpi_kernel); -XBT_LOG_EXTERNAL_CATEGORY(smpi_mpi); -XBT_LOG_EXTERNAL_CATEGORY(smpi_mpi_dt); -XBT_LOG_EXTERNAL_CATEGORY(smpi_coll); -XBT_LOG_EXTERNAL_CATEGORY(smpi_receiver); -XBT_LOG_EXTERNAL_CATEGORY(smpi_sender); -XBT_LOG_EXTERNAL_CATEGORY(smpi_util); - -static int match_recv(void* a, void* b) { + +static int match_recv(void* a, void* b, smx_action_t ignored) { MPI_Request ref = (MPI_Request)a; MPI_Request req = (MPI_Request)b; @@ -30,7 +21,7 @@ static int match_recv(void* a, void* b) { && (ref->tag == MPI_ANY_TAG || req->tag == ref->tag); } -static int match_send(void* a, void* b) { +static int match_send(void* a, void* b,smx_action_t ignored) { MPI_Request ref = (MPI_Request)a; MPI_Request req = (MPI_Request)b; @@ -63,6 +54,12 @@ static MPI_Request build_request(void *buf, int count, return request; } +static void smpi_mpi_request_free_voidp(void* request) +{ + MPI_Request req = request; + smpi_mpi_request_free(&req); +} + /* MPI Low level calls */ MPI_Request smpi_mpi_send_init(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) @@ -87,30 +84,50 @@ MPI_Request smpi_mpi_recv_init(void *buf, int count, MPI_Datatype datatype, void smpi_mpi_start(MPI_Request request) { smx_rdv_t mailbox; + int detached = 0; xbt_assert(!request->action, "Cannot (re)start a non-finished communication"); if(request->flags & RECV) { print_request("New recv", request); mailbox = smpi_process_mailbox(); - // FIXME: SIMIX does not yet support don-contiguous datatypes - request->action = SIMIX_req_comm_irecv(mailbox, request->buf, &request->size, &match_recv, request); + // FIXME: SIMIX does not yet support non-contiguous datatypes + request->action = simcall_comm_irecv(mailbox, request->buf, &request->size, &match_recv, request); } else { print_request("New send", request); mailbox = smpi_process_remote_mailbox( - smpi_group_index(smpi_comm_group(request->comm), request->dst)); - // FIXME: SIMIX does not yet support don-contiguous datatypes - request->action = SIMIX_req_comm_isend(mailbox, request->size, -1.0, - request->buf, request->size, &match_send, request, 0); + smpi_group_index(smpi_comm_group(request->comm), request->dst)); + // FIXME: SIMIX does not yet support non-contiguous datatypes + + if (request->size < 64*1024 ) { // eager mode => detached send (FIXME: this limit should be configurable) + void *oldbuf = request->buf; + detached = 1; + request->buf = 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); + } else { + XBT_DEBUG("Send request %p is not detached (buf: %p)",request,request->buf); + } + request->action = + simcall_comm_isend(mailbox, request->size, -1.0, + request->buf, request->size, + &match_send, + &smpi_mpi_request_free_voidp, // how to free the userdata if a detached send fails + request, + // detach if msg size < eager/rdv switch limit + detached); + #ifdef HAVE_TRACING - SIMIX_req_set_category (request->action, TRACE_internal_smpi_get_category()); + /* FIXME: detached sends are not traceable (request->action == NULL) */ + if (request->action) + simcall_set_category(request->action, TRACE_internal_smpi_get_category()); #endif } } void smpi_mpi_startall(int count, MPI_Request * requests) { - int i; + int i; for(i = 0; i < count; i++) { smpi_mpi_start(requests[i]); @@ -226,14 +243,17 @@ static void finish_wait(MPI_Request * request, MPI_Status * status) } } -int smpi_mpi_test(MPI_Request * request, MPI_Status * status) -{ - int flag = SIMIX_req_comm_test((*request)->action); +int smpi_mpi_test(MPI_Request * request, MPI_Status * status) { +int flag; + if ((*request)->action == NULL) + flag = 1; + else + flag = simcall_comm_test((*request)->action); if(flag) { - smpi_mpi_wait(request, status); - } - return flag; + smpi_mpi_wait(request, status); + } + return flag; } int smpi_mpi_testany(int count, MPI_Request requests[], int *index, @@ -257,7 +277,7 @@ int smpi_mpi_testany(int count, MPI_Request requests[], int *index, } } if(size > 0) { - i = SIMIX_req_comm_testany(comms); + i = simcall_comm_testany(comms); // FIXME: MPI_UNDEFINED or does SIMIX have a return code? if(i != MPI_UNDEFINED) { *index = map[i]; @@ -274,8 +294,11 @@ int smpi_mpi_testany(int count, MPI_Request requests[], int *index, void smpi_mpi_wait(MPI_Request * request, MPI_Status * status) { print_request("Waiting", *request); - SIMIX_req_comm_wait((*request)->action, -1.0); - finish_wait(request, status); + if ((*request)->action != NULL) { // this is not a detached send + simcall_comm_wait((*request)->action, -1.0); + finish_wait(request, status); + } + // FIXME for a detached send, finish_wait is not called: } int smpi_mpi_waitany(int count, MPI_Request requests[], @@ -293,7 +316,7 @@ int smpi_mpi_waitany(int count, MPI_Request requests[], size = 0; XBT_DEBUG("Wait for one of"); for(i = 0; i < count; i++) { - if(requests[i] != MPI_REQUEST_NULL) { + if((requests[i] != MPI_REQUEST_NULL) && (requests[i]->action != NULL)) { print_request(" ", requests[i]); xbt_dynar_push(comms, &requests[i]->action); map[size] = i; @@ -301,7 +324,7 @@ int smpi_mpi_waitany(int count, MPI_Request requests[], } } if(size > 0) { - i = SIMIX_req_comm_waitany(comms); + i = simcall_comm_waitany(comms); // FIXME: MPI_UNDEFINED or does SIMIX have a return code? if (i != MPI_UNDEFINED) { index = map[i]; @@ -384,13 +407,13 @@ void smpi_mpi_gather(void *sendbuf, int sendcount, MPI_Datatype sendtype, smpi_datatype_extent(recvtype, &lb, &recvext); // Local copy from root smpi_datatype_copy(sendbuf, sendcount, sendtype, - recvbuf + root * recvcount * recvext, recvcount, recvtype); + (char *)recvbuf + root * recvcount * recvext, recvcount, recvtype); // Receive buffers from senders requests = xbt_new(MPI_Request, size - 1); index = 0; for(src = 0; src < size; src++) { if(src != root) { - requests[index] = smpi_irecv_init(recvbuf + src * recvcount * recvext, + requests[index] = smpi_irecv_init((char *)recvbuf + src * recvcount * recvext, recvcount, recvtype, src, system_tag, comm); index++; @@ -422,7 +445,7 @@ void smpi_mpi_gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, smpi_datatype_extent(recvtype, &lb, &recvext); // Local copy from root smpi_datatype_copy(sendbuf, sendcount, sendtype, - recvbuf + displs[root] * recvext, + (char *)recvbuf + displs[root] * recvext, recvcounts[root], recvtype); // Receive buffers from senders requests = xbt_new(MPI_Request, size - 1); @@ -430,8 +453,8 @@ void smpi_mpi_gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, for(src = 0; src < size; src++) { if(src != root) { requests[index] = - smpi_irecv_init(recvbuf + displs[src] * recvext, recvcounts[src], - recvtype, src, system_tag, comm); + smpi_irecv_init((char *)recvbuf + displs[src] * recvext, + recvcounts[src], recvtype, src, system_tag, comm); index++; } } @@ -458,7 +481,8 @@ void smpi_mpi_allgather(void *sendbuf, int sendcount, smpi_datatype_extent(recvtype, &lb, &recvext); // Local copy from self smpi_datatype_copy(sendbuf, sendcount, sendtype, - recvbuf + rank * recvcount * recvext, recvcount, recvtype); + (char *)recvbuf + rank * recvcount * recvext, recvcount, + recvtype); // Send/Recv buffers to/from others; requests = xbt_new(MPI_Request, 2 * (size - 1)); index = 0; @@ -468,7 +492,7 @@ void smpi_mpi_allgather(void *sendbuf, int sendcount, smpi_isend_init(sendbuf, sendcount, sendtype, other, system_tag, comm); index++; - requests[index] = smpi_irecv_init(recvbuf + other * recvcount * recvext, + requests[index] = smpi_irecv_init((char *)recvbuf + other * recvcount * recvext, recvcount, recvtype, other, system_tag, comm); index++; @@ -496,7 +520,7 @@ void smpi_mpi_allgatherv(void *sendbuf, int sendcount, smpi_datatype_extent(recvtype, &lb, &recvext); // Local copy from self smpi_datatype_copy(sendbuf, sendcount, sendtype, - recvbuf + displs[rank] * recvext, + (char *)recvbuf + displs[rank] * recvext, recvcounts[rank], recvtype); // Send buffers to others; requests = xbt_new(MPI_Request, 2 * (size - 1)); @@ -508,7 +532,7 @@ void smpi_mpi_allgatherv(void *sendbuf, int sendcount, comm); index++; requests[index] = - smpi_irecv_init(recvbuf + displs[other] * recvext, recvcounts[other], + smpi_irecv_init((char *)recvbuf + displs[other] * recvext, recvcounts[other], recvtype, other, system_tag, comm); index++; } @@ -538,14 +562,14 @@ void smpi_mpi_scatter(void *sendbuf, int sendcount, MPI_Datatype sendtype, // FIXME: check for errors smpi_datatype_extent(sendtype, &lb, &sendext); // Local copy from root - smpi_datatype_copy(sendbuf + root * sendcount * sendext, + smpi_datatype_copy((char *)sendbuf + root * sendcount * sendext, sendcount, sendtype, recvbuf, recvcount, recvtype); // Send buffers to receivers requests = xbt_new(MPI_Request, size - 1); index = 0; for(dst = 0; dst < size; dst++) { if(dst != root) { - requests[index] = smpi_isend_init(sendbuf + dst * sendcount * sendext, + requests[index] = smpi_isend_init((char *)sendbuf + dst * sendcount * sendext, sendcount, sendtype, dst, system_tag, comm); index++; @@ -577,7 +601,7 @@ void smpi_mpi_scatterv(void *sendbuf, int *sendcounts, int *displs, // FIXME: check for errors smpi_datatype_extent(sendtype, &lb, &sendext); // Local copy from root - smpi_datatype_copy(sendbuf + displs[root] * sendext, sendcounts[root], + smpi_datatype_copy((char *)sendbuf + displs[root] * sendext, sendcounts[root], sendtype, recvbuf, recvcount, recvtype); // Send buffers to receivers requests = xbt_new(MPI_Request, size - 1); @@ -585,7 +609,7 @@ void smpi_mpi_scatterv(void *sendbuf, int *sendcounts, int *displs, for(dst = 0; dst < size; dst++) { if(dst != root) { requests[index] = - smpi_isend_init(sendbuf + displs[dst] * sendext, sendcounts[dst], + smpi_isend_init((char *)sendbuf + displs[dst] * sendext, sendcounts[dst], sendtype, dst, system_tag, comm); index++; }