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 4f97779716a487b66b301e16c2cb9b75dccdff8e (commit) via 0743c396ecfc07cef7769970a4f02edc612f5fba (commit) from 57e54ea330798e1b2817eccb683ad4476b03fcfc (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/4f97779716a487b66b301e16c2cb9b75dc... commit 4f97779716a487b66b301e16c2cb9b75dccdff8e Author: Pavan Balaji <[email protected]> Date: Fri Jan 3 12:52:04 2014 -0600 Make SMP-awareness in MPI_Barrier consistent. The current implementation of SMP-awareness in MPI_Barrier was in MPIR_Barrier_impl. This makes the default implementation of barrier SMP-aware. However, if a device overrides barrier and then calls back the default implementation through MPIR_Barrier, it can no longer take advantage of SMP-awareness. This patch moves the SMP-aware implementation to MPIR_Barrier_intra, which is called by MPIR_Barrier_impl through MPIR_Barrier, in the default implementation. See #1957. Signed-off-by: Michael Blocksome <[email protected]> diff --git a/src/mpi/coll/barrier.c b/src/mpi/coll/barrier.c index d81e201..2583a75 100644 --- a/src/mpi/coll/barrier.c +++ b/src/mpi/coll/barrier.c @@ -33,8 +33,6 @@ cvars: #endif /* -- End Profiling Symbol Block */ -PMPI_LOCAL int MPIR_Barrier_or_coll_fn(MPID_Comm *comm_ptr, int *errflag ); - /* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build the MPI routines */ #ifndef MPICH_MPI_FROM_PMPI @@ -63,6 +61,66 @@ PMPI_LOCAL int MPIR_Barrier_or_coll_fn(MPID_Comm *comm_ptr, int *errflag ); This is an intracommunicator barrier only! */ +#undef FUNCNAME +#define FUNCNAME barrier_smp_intra +#undef FCNAME +#define FCNAME MPIU_QUOTE(FUNCNAME) +static int barrier_smp_intra(MPID_Comm *comm_ptr, int *errflag) +{ + int mpi_errno=MPI_SUCCESS; + int mpi_errno_ret = MPI_SUCCESS; + + MPIU_Assert(MPIR_CVAR_ENABLE_SMP_COLLECTIVES && MPIR_CVAR_ENABLE_SMP_BARRIER && + MPIR_Comm_is_node_aware(comm_ptr)); + + /* do the intranode barrier on all nodes */ + if (comm_ptr->node_comm != NULL) + { + mpi_errno = MPIR_Barrier_impl(comm_ptr->node_comm, errflag); + if (mpi_errno) { + /* for communication errors, just record the error but continue */ + *errflag = TRUE; + MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail"); + MPIU_ERR_ADD(mpi_errno_ret, mpi_errno); + } + } + + /* do the barrier across roots of all nodes */ + if (comm_ptr->node_roots_comm != NULL) { + mpi_errno = MPIR_Barrier_impl(comm_ptr->node_roots_comm, errflag); + if (mpi_errno) { + /* for communication errors, just record the error but continue */ + *errflag = TRUE; + MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail"); + MPIU_ERR_ADD(mpi_errno_ret, mpi_errno); + } + } + + /* release the local processes on each node with a 1-byte + broadcast (0-byte broadcast just returns without doing + anything) */ + if (comm_ptr->node_comm != NULL) + { + int i=0; + mpi_errno = MPIR_Bcast_impl(&i, 1, MPI_BYTE, 0, comm_ptr->node_comm, errflag); + if (mpi_errno) { + /* for communication errors, just record the error but continue */ + *errflag = TRUE; + MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail"); + MPIU_ERR_ADD(mpi_errno_ret, mpi_errno); + } + } + + fn_exit: + if (mpi_errno_ret) + mpi_errno = mpi_errno_ret; + else if (*errflag) + MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail"); + return mpi_errno; + fn_fail: + goto fn_exit; +} + /* not declared static because it is called in ch3_comm_connect/accept */ #undef FUNCNAME #define FUNCNAME MPIR_Barrier_intra @@ -82,6 +140,18 @@ int MPIR_Barrier_intra( MPID_Comm *comm_ptr, int *errflag ) /* Trivial barriers return immediately */ if (size == 1) goto fn_exit; + if (MPIR_CVAR_ENABLE_SMP_COLLECTIVES && MPIR_CVAR_ENABLE_SMP_BARRIER && + MPIR_Comm_is_node_aware(comm_ptr)) { + mpi_errno = barrier_smp_intra(comm_ptr, errflag); + if (mpi_errno) { + /* for communication errors, just record the error but continue */ + *errflag = TRUE; + MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail"); + MPIU_ERR_ADD(mpi_errno_ret, mpi_errno); + } + goto fn_exit; + } + rank = comm_ptr->rank; comm = comm_ptr->handle; @@ -113,37 +183,6 @@ int MPIR_Barrier_intra( MPID_Comm *comm_ptr, int *errflag ) goto fn_exit; } -/* A simple utility function to that calls the comm_ptr->coll_fns->Barrier -override if it exists or else it calls MPIR_Barrier_intra with the same arguments. */ -/* Note that this function must *not* be inline - if weak symbols are not - available, this function must be a global symbol. */ -#undef FUNCNAME -#define FUNCNAME MPIR_Barrier_or_coll_fn -#undef FCNAME -#define FCNAME MPIU_QUOTE(FUNCNAME) -PMPI_LOCAL int MPIR_Barrier_or_coll_fn(MPID_Comm *comm_ptr, int *errflag ) -{ - int mpi_errno = MPI_SUCCESS; - - if (comm_ptr->coll_fns != NULL && comm_ptr->coll_fns->Barrier != NULL) - { - /* --BEGIN USEREXTENSION-- */ - mpi_errno = comm_ptr->coll_fns->Barrier(comm_ptr, errflag); - if (mpi_errno) MPIU_ERR_POP(mpi_errno); - /* --END USEREXTENSION-- */ - } - else { - mpi_errno = MPIR_Barrier_intra(comm_ptr, errflag); - if (mpi_errno) MPIU_ERR_POP(mpi_errno); - } - - fn_exit: - return mpi_errno; - fn_fail: - goto fn_exit; -} - - /* not declared static because a machine-specific function may call this one in some cases */ #undef FUNCNAME @@ -285,57 +324,8 @@ int MPIR_Barrier_impl(MPID_Comm *comm_ptr, int *errflag) } else { - if (comm_ptr->comm_kind == MPID_INTRACOMM) { - if (MPIR_CVAR_ENABLE_SMP_COLLECTIVES && MPIR_CVAR_ENABLE_SMP_BARRIER && - MPIR_Comm_is_node_aware(comm_ptr)) { - - /* do the intranode barrier on all nodes */ - if (comm_ptr->node_comm != NULL) - { - mpi_errno = MPIR_Barrier_or_coll_fn(comm_ptr->node_comm, errflag); - if (mpi_errno) { - /* for communication errors, just record the error but continue */ - *errflag = TRUE; - MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail"); - MPIU_ERR_ADD(mpi_errno_ret, mpi_errno); - } - } - - /* do the barrier across roots of all nodes */ - if (comm_ptr->node_roots_comm != NULL) { - mpi_errno = MPIR_Barrier_or_coll_fn(comm_ptr->node_roots_comm, errflag); - if (mpi_errno) { - /* for communication errors, just record the error but continue */ - *errflag = TRUE; - MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail"); - MPIU_ERR_ADD(mpi_errno_ret, mpi_errno); - } - } - - /* release the local processes on each node with a 1-byte broadcast - (0-byte broadcast just returns without doing anything) */ - if (comm_ptr->node_comm != NULL) - { - int i=0; - mpi_errno = MPIR_Bcast_impl(&i, 1, MPI_BYTE, 0, comm_ptr->node_comm, errflag); - if (mpi_errno) { - /* for communication errors, just record the error but continue */ - *errflag = TRUE; - MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail"); - MPIU_ERR_ADD(mpi_errno_ret, mpi_errno); - } - } - } - else { - mpi_errno = MPIR_Barrier_intra( comm_ptr, errflag ); - if (mpi_errno) MPIU_ERR_POP(mpi_errno); - } - } - else { - /* intercommunicator */ - mpi_errno = MPIR_Barrier_inter( comm_ptr, errflag ); - if (mpi_errno) MPIU_ERR_POP(mpi_errno); - } + mpi_errno = MPIR_Barrier(comm_ptr, errflag); + if (mpi_errno) MPIU_ERR_POP(mpi_errno); } fn_exit: http://git.mpich.org/mpich.git/commitdiff/0743c396ecfc07cef7769970a4f02edc61... commit 0743c396ecfc07cef7769970a4f02edc612f5fba Author: Pavan Balaji <[email protected]> Date: Fri Jan 3 12:37:32 2014 -0600 Remove duplicate code. Use MPIR_Bcast as an inline function, and let the compiler do its job, instead of duplicating the code. Signed-off-by: Michael Blocksome <[email protected]> diff --git a/src/mpi/coll/bcast.c b/src/mpi/coll/bcast.c index 5860876..ce3be85 100644 --- a/src/mpi/coll/bcast.c +++ b/src/mpi/coll/bcast.c @@ -1454,19 +1454,8 @@ int MPIR_Bcast_impl(void *buffer, int count, MPI_Datatype datatype, int root, MP } else { - if (comm_ptr->comm_kind == MPID_INTRACOMM) - { - /* intracommunicator */ - mpi_errno = MPIR_Bcast_intra( buffer, count, datatype, root, comm_ptr, errflag ); - if (mpi_errno) MPIU_ERR_POP(mpi_errno); - - } - else - { - /* intercommunicator */ - mpi_errno = MPIR_Bcast_inter( buffer, count, datatype, root, comm_ptr, errflag ); - if (mpi_errno) MPIU_ERR_POP(mpi_errno); - } + mpi_errno = MPIR_Bcast(buffer, count, datatype, root, comm_ptr, errflag); + if (mpi_errno) MPIU_ERR_POP(mpi_errno); } @@ -1483,7 +1472,7 @@ int MPIR_Bcast_impl(void *buffer, int count, MPI_Datatype datatype, int root, MP #define FUNCNAME MPIR_Bcast #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) -int MPIR_Bcast(void *buffer, int count, MPI_Datatype datatype, int root, MPID_Comm *comm_ptr, int *errflag) +inline int MPIR_Bcast(void *buffer, int count, MPI_Datatype datatype, int root, MPID_Comm *comm_ptr, int *errflag) { int mpi_errno = MPI_SUCCESS; ----------------------------------------------------------------------- Summary of changes: src/mpi/coll/barrier.c | 158 ++++++++++++++++++++++------------------------- src/mpi/coll/bcast.c | 17 +---- 2 files changed, 77 insertions(+), 98 deletions(-) hooks/post-receive -- MPICH primary repository