This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via f6277dbb69ee729c098f8ba811e4c39ad5c41bb0 (commit) from 7ab7ca15500191aaf3e38295fceefccf254cbb0f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/f6277dbb69ee729c098f8ba811e4c39ad5... commit f6277dbb69ee729c098f8ba811e4c39ad5c41bb0 Author: Charles J Archer <[email protected]> Date: Wed Jul 22 12:17:59 2015 -0700 Move fastpath static inline to appropriate location * MPIR_Request_complete_fastpath is only used by waitall.c Signed-off-by: Ken Raffenetti <[email protected]> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 02d29c0..d314fbc 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -4423,39 +4423,6 @@ int MPIR_Waitall_impl(int count, MPI_Request array_of_requests[], int MPIR_Comm_set_attr_impl(MPID_Comm *comm_ptr, int comm_keyval, void *attribute_val, MPIR_AttrType attrType); - -/* The "fastpath" version of MPIR_Request_complete. It only handles - * MPID_REQUEST_SEND and MPID_REQUEST_RECV kinds, and it does not attempt to - * deal with status structures under the assumption that bleeding fast code will - * pass either MPI_STATUS_IGNORE or MPI_STATUSES_IGNORE as appropriate. This - * routine (or some a variation of it) is an unfortunately necessary stunt to - * get high message rates on key benchmarks for high-end systems. - */ -#undef FUNCNAME -#define FUNCNAME MPIR_Request_complete_fastpath -#undef FCNAME -#define FCNAME MPIU_QUOTE(FUNCNAME) -static inline int MPIR_Request_complete_fastpath(MPI_Request *request, MPID_Request *request_ptr) -{ - int mpi_errno = MPI_SUCCESS; - - MPIU_Assert(request_ptr->kind == MPID_REQUEST_SEND || request_ptr->kind == MPID_REQUEST_RECV); - - if (request_ptr->kind == MPID_REQUEST_SEND) { - /* FIXME: are Ibsend requests added to the send queue? */ - MPIR_SENDQ_FORGET(request_ptr); - } - - /* the completion path for SEND and RECV is the same at this time, modulo - * the SENDQ hook above */ - mpi_errno = request_ptr->status.MPI_ERROR; - MPID_Request_release(request_ptr); - *request = MPI_REQUEST_NULL; - - /* avoid normal fn_exit/fn_fail jump pattern to reduce jumps and compiler confusion */ - return mpi_errno; -} - /* Pull the error status out of the tag space and put it into an errflag. */ #undef FUNCNAME #define FUNCNAME MPIR_process_status diff --git a/src/mpi/pt2pt/waitall.c b/src/mpi/pt2pt/waitall.c index 98cc267..15096e1 100644 --- a/src/mpi/pt2pt/waitall.c +++ b/src/mpi/pt2pt/waitall.c @@ -30,6 +30,39 @@ int MPI_Waitall(int count, MPI_Request array_of_requests[], MPI_Status array_of_ #undef MPI_Waitall #define MPI_Waitall PMPI_Waitall + +/* The "fastpath" version of MPIR_Request_complete. It only handles + * MPID_REQUEST_SEND and MPID_REQUEST_RECV kinds, and it does not attempt to + * deal with status structures under the assumption that bleeding fast code will + * pass either MPI_STATUS_IGNORE or MPI_STATUSES_IGNORE as appropriate. This + * routine (or some a variation of it) is an unfortunately necessary stunt to + * get high message rates on key benchmarks for high-end systems. + */ +#undef FUNCNAME +#define FUNCNAME request_complete_fastpath +#undef FCNAME +#define FCNAME MPIU_QUOTE(FUNCNAME) +static inline int request_complete_fastpath(MPI_Request *request, MPID_Request *request_ptr) +{ + int mpi_errno = MPI_SUCCESS; + + MPIU_Assert(request_ptr->kind == MPID_REQUEST_SEND || request_ptr->kind == MPID_REQUEST_RECV); + + if (request_ptr->kind == MPID_REQUEST_SEND) { + /* FIXME: are Ibsend requests added to the send queue? */ + MPIR_SENDQ_FORGET(request_ptr); + } + + /* the completion path for SEND and RECV is the same at this time, modulo + * the SENDQ hook above */ + mpi_errno = request_ptr->status.MPI_ERROR; + MPID_Request_release(request_ptr); + *request = MPI_REQUEST_NULL; + + /* avoid normal fn_exit/fn_fail jump pattern to reduce jumps and compiler confusion */ + return mpi_errno; +} + #undef FUNCNAME #define FUNCNAME MPIR_Waitall_impl #undef FCNAME @@ -144,7 +177,7 @@ int MPIR_Waitall_impl(int count, MPI_Request array_of_requests[], /* --END ERROR HANDLING-- */ } } - mpi_errno = MPIR_Request_complete_fastpath(&array_of_requests[i], request_ptrs[i]); + mpi_errno = request_complete_fastpath(&array_of_requests[i], request_ptrs[i]); if (mpi_errno) MPIU_ERR_POP(mpi_errno); } ----------------------------------------------------------------------- Summary of changes: src/include/mpiimpl.h | 33 --------------------------------- src/mpi/pt2pt/waitall.c | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 34 deletions(-) hooks/post-receive -- MPICH primary repository