September 2013 - commits - mailman3.cels.anl.gov

[mpich] MPICH primary repository branch, master, updated. v3.1b1-74-g2c27bbf
by noreply＠mpich.org 29 Sep '13

29 Sep '13

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 2c27bbf509fcd03c6bc4ab864442f9e3d337f713 (commit) from 5843db8395af2574ac43a9b063f5d8bff5abd748 (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/2c27bbf509fcd03c6bc4ab864442f9e3d… commit 2c27bbf509fcd03c6bc4ab864442f9e3d337f713 Author: William Gropp <wgropp(a)illinois.edu> Date: Tue Sep 24 12:51:14 2013 -0500 Check for other Testmpio locations Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/maint/checkbuilds.in b/maint/checkbuilds.in index f3ea30a..724dcfc 100644 --- a/maint/checkbuilds.in +++ b/maint/checkbuilds.in @@ -815,12 +815,21 @@ sub RunTestMPIOSuite { $rc = chdir $testmpio_test_dir; if (!$rc) { - #print STDERR "Cannot change to $testmpio_test_dir\n"; + print $OUTFD "Cannot change to $testmpio_test_dir\n"; return; } - # Switch to using the checked-in version of the Intel test - $config[$nargs++] = "$projects_dir/testmpio/configure"; + # Switch to using the checked-in version of the Testmpio test + if (-x "$projects_dir/testmpio/configure") { + $config[$nargs++] = "$projects_dir/testmpio/configure"; + } + elsif (-x "$projects_dir/Testmpio/configure") { + $config[$nargs++] = "$projects_dir/Testmpio/configure"; + } + else { + print $OUTFD "Cannot find testmpio source directory!"; + return; + } $config[$nargs++] = "--enable-xml"; $config[$nargs++] = "CC=$instdir/bin/mpicc"; $config[$nargs++] = "MPIEXEC=$instdir/bin/mpiexec"; ----------------------------------------------------------------------- Summary of changes: maint/checkbuilds.in | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1b1-73-g5843db8
by noreply＠mpich.org 28 Sep '13

28 Sep '13

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 5843db8395af2574ac43a9b063f5d8bff5abd748 (commit) from 5f797bdc858d00b54c58c6cd329e7516e5e58ca8 (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/5843db8395af2574ac43a9b063f5d8bff… commit 5843db8395af2574ac43a9b063f5d8bff5abd748 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sat Sep 28 15:57:49 2013 -0500 Check for BUILTIN kinds, not just predefined datatypes. Some builtin kinds (e.g., MPI_DOUBLE_INT), can have extra padding when a vector of them is copied. So we need to use the extent for such types, not just the size. In this commit, we just simplify the optimization to only work on BUILTIN types, which do not have this issue. Signed-off-by: Xin Zhao <xinzhao3(a)illinois.edu> diff --git a/src/mpi/coll/helper_fns.c b/src/mpi/coll/helper_fns.c index e54b797..89fbcf3 100644 --- a/src/mpi/coll/helper_fns.c +++ b/src/mpi/coll/helper_fns.c @@ -75,8 +75,9 @@ int MPIR_Localcopy(const void *sendbuf, int sendcount, MPI_Datatype sendtype, #endif /* HAVE_ERROR_CHECKING */ copy_sz = sdata_sz; - /* Predefined types is the common case; optimize for it */ - if (MPIR_DATATYPE_IS_PREDEFINED(sendtype) && MPIR_DATATYPE_IS_PREDEFINED(recvtype)) { + /* Builtin types is the common case; optimize for it */ + if ((HANDLE_GET_KIND(sendtype) == HANDLE_KIND_BUILTIN) && + HANDLE_GET_KIND(recvtype) == HANDLE_KIND_BUILTIN) { MPIU_Memcpy(recvbuf, sendbuf, copy_sz); goto fn_exit; } ----------------------------------------------------------------------- Summary of changes: src/mpi/coll/helper_fns.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1b1-72-g5f797bd
by noreply＠mpich.org 27 Sep '13

27 Sep '13

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 5f797bdc858d00b54c58c6cd329e7516e5e58ca8 (commit) from dc2ed6fa5905db2020940c5c3bb36335745401a5 (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/5f797bdc858d00b54c58c6cd329e7516e… commit 5f797bdc858d00b54c58c6cd329e7516e5e58ca8 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Fri Sep 27 18:31:05 2013 -0500 Update fault tolerance test params No reviewer. diff --git a/test/mpi/ft/testlist b/test/mpi/ft/testlist index e1f7905..584e20e 100644 --- a/test/mpi/ft/testlist +++ b/test/mpi/ft/testlist @@ -1,3 +1,3 @@ -die 4 mpiexecarg=-disable-auto-cleanup timeLimit=10 xfail=ticket1917 -abort 2 mpiexecarg=-disable-auto-cleanup timeLimit=10 xfail=ticket1917 -send 4 mpiexecarg=-disable-auto-cleanup timeLimit=10 xfail=ticket1917 +die 4 mpiexecarg=-disable-auto-cleanup timeLimit=10 strict=false +abort 2 mpiexecarg=-disable-auto-cleanup timeLimit=10 strict=false xfail=ticket1537 +send 4 mpiexecarg=-disable-auto-cleanup timeLimit=10 strict=false ----------------------------------------------------------------------- Summary of changes: test/mpi/ft/testlist | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1b1-71-gdc2ed6f
by noreply＠mpich.org 27 Sep '13

27 Sep '13

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 dc2ed6fa5905db2020940c5c3bb36335745401a5 (commit) from 59201bb2491d31a04ec3c3125928db348e36884e (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/dc2ed6fa5905db2020940c5c3bb363357… commit dc2ed6fa5905db2020940c5c3bb36335745401a5 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Thu Sep 26 21:10:33 2013 -0500 Optimization to the shared memory copy code. Optimize the case where the origin and target both use basic datatypes. In this case, we assume that the data is aligned correctly for the appropriate datatype and perform a direct assignment instead of a memory copy. Signed-off-by: Xin Zhao <xinzhao3(a)illinois.edu> diff --git a/src/mpid/ch3/include/mpidrma.h b/src/mpid/ch3/include/mpidrma.h index 3596dd5..54b8d7f 100644 --- a/src/mpid/ch3/include/mpidrma.h +++ b/src/mpid/ch3/include/mpidrma.h @@ -315,6 +315,237 @@ static inline MPIDI_RMA_Ops_list_t *MPIDI_CH3I_RMA_Get_ops_list(MPID_Win *win_pt */ /* ------------------------------------------------------------------------ */ +#define ASSIGN_COPY(src, dest, count, type) \ + { \ + type *src_ = (type *) src; \ + type *dest_ = (type *) dest; \ + int i; \ + for (i = 0; i < count; i++) \ + dest_[i] = src_[i]; \ + goto fn_exit; \ + } + +static inline int shm_copy(const void *src, int scount, MPI_Datatype stype, + void *dest, int dcount, MPI_Datatype dtype) +{ + int mpi_errno = MPI_SUCCESS; + + /* We use a threshold of operations under which a for loop of assignments is + * used. Even though this happens at smaller block lengths, making it + * potentially inefficient, it can take advantage of some vectorization + * available on most modern processors. */ +#define SHM_OPS_THRESHOLD (16) + + if (MPIR_DATATYPE_IS_PREDEFINED(stype) && MPIR_DATATYPE_IS_PREDEFINED(dtype) && + scount <= SHM_OPS_THRESHOLD) { + + /* FIXME: We currently only optimize a few predefined datatypes, which + * have a direct C datatype mapping. */ + + /* The below list of datatypes is based on those specified in the MPI-3 + * standard on page 665. */ + switch (stype) { + case MPI_CHAR: + ASSIGN_COPY(src, dest, scount, char); + + case MPI_SHORT: + ASSIGN_COPY(src, dest, scount, signed short int); + + case MPI_INT: + ASSIGN_COPY(src, dest, scount, signed int); + + case MPI_LONG: + ASSIGN_COPY(src, dest, scount, signed long int); + + case MPI_LONG_LONG_INT: /* covers MPI_LONG_LONG too */ + ASSIGN_COPY(src, dest, scount, signed long long int); + + case MPI_SIGNED_CHAR: + ASSIGN_COPY(src, dest, scount, signed char); + + case MPI_UNSIGNED_CHAR: + ASSIGN_COPY(src, dest, scount, unsigned char); + + case MPI_UNSIGNED_SHORT: + ASSIGN_COPY(src, dest, scount, unsigned short int); + + case MPI_UNSIGNED: + ASSIGN_COPY(src, dest, scount, unsigned int); + + case MPI_UNSIGNED_LONG: + ASSIGN_COPY(src, dest, scount, unsigned long int); + + case MPI_UNSIGNED_LONG_LONG: + ASSIGN_COPY(src, dest, scount, unsigned long long int); + + case MPI_FLOAT: + ASSIGN_COPY(src, dest, scount, float); + + case MPI_DOUBLE: + ASSIGN_COPY(src, dest, scount, double); + + case MPI_LONG_DOUBLE: + ASSIGN_COPY(src, dest, scount, long double); + +#if 0 + /* FIXME: we need a configure check to define HAVE_WCHAR_T before + * this can be enabled */ + case MPI_WCHAR: + ASSIGN_COPY(src, dest, scount, wchar_t); +#endif + +#if 0 + /* FIXME: we need a configure check to define HAVE_C_BOOL before + * this can be enabled */ + case MPI_C_BOOL: + ASSIGN_COPY(src, dest, scount, _Bool); +#endif + +#if HAVE_INT8_T + case MPI_INT8_T: + ASSIGN_COPY(src, dest, scount, int8_t); +#endif /* HAVE_INT8_T */ + +#if HAVE_INT16_T + case MPI_INT16_T: + ASSIGN_COPY(src, dest, scount, int16_t); +#endif /* HAVE_INT16_T */ + +#if HAVE_INT32_T + case MPI_INT32_T: + ASSIGN_COPY(src, dest, scount, int32_t); +#endif /* HAVE_INT32_T */ + +#if HAVE_INT64_T + case MPI_INT64_T: + ASSIGN_COPY(src, dest, scount, int64_t); +#endif /* HAVE_INT64_T */ + +#if HAVE_UINT8_T + case MPI_UINT8_T: + ASSIGN_COPY(src, dest, scount, uint8_t); +#endif /* HAVE_UINT8_T */ + +#if HAVE_UINT16_T + case MPI_UINT16_T: + ASSIGN_COPY(src, dest, scount, uint16_t); +#endif /* HAVE_UINT16_T */ + +#if HAVE_UINT32_T + case MPI_UINT32_T: + ASSIGN_COPY(src, dest, scount, uint32_t); +#endif /* HAVE_UINT32_T */ + +#if HAVE_UINT64_T + case MPI_UINT64_T: + ASSIGN_COPY(src, dest, scount, uint64_t); +#endif /* HAVE_UINT64_T */ + + case MPI_AINT: + ASSIGN_COPY(src, dest, scount, MPI_Aint); + + case MPI_COUNT: + ASSIGN_COPY(src, dest, scount, MPI_Count); + + case MPI_OFFSET: + ASSIGN_COPY(src, dest, scount, MPI_Offset); + +#if 0 + /* FIXME: we need a configure check to define HAVE_C_COMPLEX before + * this can be enabled */ + case MPI_C_COMPLEX: /* covers MPI_C_FLOAT_COMPLEX as well */ + ASSIGN_COPY(src, dest, scount, float _Complex); +#endif + +#if 0 + /* FIXME: we need a configure check to define HAVE_C_DOUPLE_COMPLEX + * before this can be enabled */ + case MPI_C_DOUBLE_COMPLEX: + ASSIGN_COPY(src, dest, scount, double _Complex); +#endif + +#if 0 + /* FIXME: we need a configure check to define + * HAVE_C_LONG_DOUPLE_COMPLEX before this can be enabled */ + case MPI_C_LONG_DOUBLE_COMPLEX: + ASSIGN_COPY(src, dest, scount, long double _Complex); +#endif + +#if 0 + /* Types that don't have a direct equivalent */ + case MPI_BYTE: + case MPI_PACKED: +#endif + +#if 0 /* Fortran types */ + case MPI_INTEGER: + case MPI_REAL: + case MPI_DOUBLE_PRECISION: + case MPI_COMPLEX: + case MPI_LOGICAL: + case MPI_CHARACTER: +#endif + +#if 0 /* C++ types */ + case MPI_CXX_BOOL: + case MPI_CXX_FLOAT_COMPLEX: + case MPI_CXX_DOUBLE_COMPLEX: + case MPI_CXX_LONG_DOUBLE_COMPLEX: +#endif + +#if 0 /* Optional Fortran types */ + case MPI_DOUBLE_COMPLEX: + case MPI_INTEGER1: + case MPI_INTEGER2: + case MPI_INTEGER4: + case MPI_INTEGER8: + case MPI_INTEGER16: + case MPI_REAL2: + case MPI_REAL4: + case MPI_REAL8: + case MPI_REAL16: + case MPI_COMPLEX4: + case MPI_COMPLEX8: + case MPI_COMPLEX16: + case MPI_COMPLEX32: +#endif + +#if 0 /* C datatypes for reduction functions */ + case MPI_FLOAT_INT: + case MPI_DOUBLE_INT: + case MPI_LONG_INT: + case MPI_2INT: + case MPI_LONG_DOUBLE_INT: +#endif + +#if 0 /* Fortran datatypes for reduction functions */ + case MPI_2REAL: + case MPI_2DOUBLE_PRECISION: + case MPI_2INTEGER: +#endif + +#if 0 /* Random types not present in the standard */ + case MPI_2COMPLEX: + case MPI_2DOUBLE_COMPLEX: +#endif + + default: + /* Just to make sure the switch statement is not empty */ + ; + } + } + + mpi_errno = MPIR_Localcopy(src, scount, stype, dest, dcount, dtype); + if (mpi_errno) { MPIU_ERR_POP(mpi_errno); } + + fn_exit: + return mpi_errno; + /* --BEGIN ERROR HANDLING-- */ + fn_fail: + goto fn_exit; + /* --END ERROR HANDLING-- */ +} + #undef FUNCNAME #define FUNCNAME MPIDI_CH3I_Shm_put_op #undef FCNAME @@ -340,9 +571,8 @@ static inline int MPIDI_CH3I_Shm_put_op(const void *origin_addr, int origin_coun disp_unit = win_ptr->disp_unit; } - mpi_errno = MPIR_Localcopy(origin_addr, origin_count, origin_datatype, - (char *) base + disp_unit * target_disp, - target_count, target_datatype); + mpi_errno = shm_copy(origin_addr, origin_count, origin_datatype, + (char *) base + disp_unit * target_disp, target_count, target_datatype); if (mpi_errno) { MPIU_ERR_POP(mpi_errno); } fn_exit: @@ -387,10 +617,8 @@ static inline int MPIDI_CH3I_Shm_acc_op(const void *origin_addr, int origin_coun if (op == MPI_REPLACE) { if (shm_op) MPIDI_CH3I_SHM_MUTEX_LOCK(win_ptr); - mpi_errno = MPIR_Localcopy(origin_addr, origin_count, - origin_datatype, - (char *) base + disp_unit * target_disp, - target_count, target_datatype); + mpi_errno = shm_copy(origin_addr, origin_count, origin_datatype, + (char *) base + disp_unit * target_disp, target_count, target_datatype); if (shm_op) MPIDI_CH3I_SHM_MUTEX_UNLOCK(win_ptr); if (mpi_errno) { MPIU_ERR_POP(mpi_errno); } goto fn_exit; @@ -534,9 +762,8 @@ static inline int MPIDI_CH3I_Shm_get_acc_op(const void *origin_addr, int origin_ } /* Perform the local get first, then the accumulate */ - mpi_errno = MPIR_Localcopy((char *) base + disp_unit * target_disp, - target_count, target_datatype, - result_addr, result_count, result_datatype); + mpi_errno = shm_copy((char *) base + disp_unit * target_disp, target_count, target_datatype, + result_addr, result_count, result_datatype); if (mpi_errno) { MPIU_ERR_POP(mpi_errno); } /* NO_OP: Don't perform the accumulate */ @@ -550,9 +777,8 @@ static inline int MPIDI_CH3I_Shm_get_acc_op(const void *origin_addr, int origin_ } if (op == MPI_REPLACE) { - mpi_errno = MPIR_Localcopy(origin_addr, origin_count, origin_datatype, - (char *) base + disp_unit * target_disp, - target_count, target_datatype); + mpi_errno = shm_copy(origin_addr, origin_count, origin_datatype, + (char *) base + disp_unit * target_disp, target_count, target_datatype); if (mpi_errno) { MPIU_ERR_POP(mpi_errno); } @@ -693,9 +919,8 @@ static inline int MPIDI_CH3I_Shm_get_op(void *origin_addr, int origin_count, MPI disp_unit = win_ptr->disp_unit; } - mpi_errno = MPIR_Localcopy((char *) base + disp_unit * target_disp, - target_count, target_datatype, origin_addr, - origin_count, origin_datatype); + mpi_errno = shm_copy((char *) base + disp_unit * target_disp, target_count, target_datatype, + origin_addr, origin_count, origin_datatype); if (mpi_errno) { MPIU_ERR_POP(mpi_errno); } fn_exit: ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/include/mpidrma.h | 257 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 241 insertions(+), 16 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1b1-70-g59201bb
by noreply＠mpich.org 27 Sep '13

27 Sep '13

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 59201bb2491d31a04ec3c3125928db348e36884e (commit) from 030ec52d60344d0d4851fdc08cbfa1009c3c49b8 (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/59201bb2491d31a04ec3c3125928db348… commit 59201bb2491d31a04ec3c3125928db348e36884e Author: Rob Latham <robl(a)mcs.anl.gov> Date: Fri Sep 27 09:54:42 2013 -0500 remove unused, undeclared variable i know the ft stuff is kind of broken but come on this didn't even compile! diff --git a/test/mpi/ft/send.c b/test/mpi/ft/send.c index 52545d4..963a066 100644 --- a/test/mpi/ft/send.c +++ b/test/mpi/ft/send.c @@ -16,7 +16,6 @@ int main(int argc, char **argv) { int rank, size, err; char buf[10]; - pid_t pid; MPI_Init(&argc, &argv); MPI_Comm_rank(MPI_COMM_WORLD, &rank); ----------------------------------------------------------------------- Summary of changes: test/mpi/ft/send.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1b1-69-g030ec52
by noreply＠mpich.org 26 Sep '13

26 Sep '13

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 030ec52d60344d0d4851fdc08cbfa1009c3c49b8 (commit) via fce42e26534f33bd9b08e46eae76c95623b42273 (commit) from f8e7f47f5712bde7af02800d73a3a9382e64fcfb (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/030ec52d60344d0d4851fdc08cbfa1009… commit 030ec52d60344d0d4851fdc08cbfa1009c3c49b8 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Thu Sep 26 17:57:39 2013 -0500 Optimize localcopy for predefined datatypes. In this case, we don't need to find the lower-bound. It's a simple copy. Signed-off-by: Xin Zhao <xinzhao3(a)illinois.edu> diff --git a/src/mpi/coll/helper_fns.c b/src/mpi/coll/helper_fns.c index 26e1798..e54b797 100644 --- a/src/mpi/coll/helper_fns.c +++ b/src/mpi/coll/helper_fns.c @@ -56,27 +56,34 @@ int MPIR_Localcopy(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_LOCALCOPY); - MPIR_Datatype_iscontig(sendtype, &sendtype_iscontig); - MPIR_Datatype_iscontig(recvtype, &recvtype_iscontig); - MPID_Datatype_get_size_macro(sendtype, sendsize); MPID_Datatype_get_size_macro(recvtype, recvsize); + sdata_sz = sendsize * sendcount; rdata_sz = recvsize * recvcount; + /* if there is no data to copy, bail out */ if (!sdata_sz || !rdata_sz) goto fn_exit; - - if (sdata_sz > rdata_sz) - { + +#if defined(HAVE_ERROR_CHECKING) + if (sdata_sz > rdata_sz) { MPIU_ERR_SET2(mpi_errno, MPI_ERR_TRUNCATE, "**truncate", "**truncate %d %d", sdata_sz, rdata_sz); copy_sz = rdata_sz; } else - { +#endif /* HAVE_ERROR_CHECKING */ copy_sz = sdata_sz; + + /* Predefined types is the common case; optimize for it */ + if (MPIR_DATATYPE_IS_PREDEFINED(sendtype) && MPIR_DATATYPE_IS_PREDEFINED(recvtype)) { + MPIU_Memcpy(recvbuf, sendbuf, copy_sz); + goto fn_exit; } + MPIR_Datatype_iscontig(sendtype, &sendtype_iscontig); + MPIR_Datatype_iscontig(recvtype, &recvtype_iscontig); + MPIR_Type_get_true_extent_impl(sendtype, &sendtype_true_lb, &true_extent); MPIR_Type_get_true_extent_impl(recvtype, &recvtype_true_lb, &true_extent); http://git.mpich.org/mpich.git/commitdiff/fce42e26534f33bd9b08e46eae76c9562… commit fce42e26534f33bd9b08e46eae76c95623b42273 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Thu Sep 26 17:21:37 2013 -0500 Move predefined datatype check to the MPI layer. The check was originally in the ch3 layer, but doesn't seem to use any ch3 specific information. This macro will be useful at the upper layers for optimizations, e.g., in the localcopy routine. Signed-off-by: Xin Zhao <xinzhao3(a)illinois.edu> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 48b6733..a14f57c 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -509,6 +509,12 @@ int MPIU_Handle_free( void *((*)[]), int ); #define MPID_Request_valid_ptr(ptr,err) MPID_Valid_ptr_class(Request,ptr,MPI_ERR_REQUEST,err) #define MPID_Keyval_valid_ptr(ptr,err) MPID_Valid_ptr_class(Keyval,ptr,MPI_ERR_KEYVAL,err) +#define MPIR_DATATYPE_IS_PREDEFINED(type) \ + ((HANDLE_GET_KIND(type) == HANDLE_KIND_BUILTIN) || \ + (type == MPI_FLOAT_INT) || (type == MPI_DOUBLE_INT) || \ + (type == MPI_LONG_INT) || (type == MPI_SHORT_INT) || \ + (type == MPI_LONG_DOUBLE_INT)) + /* FIXME: Generic pointer test. This is applied to any address, not just one from an MPI object. diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h index c78ee33..cb7b954 100644 --- a/src/mpid/ch3/include/mpidimpl.h +++ b/src/mpid/ch3/include/mpidimpl.h @@ -1219,14 +1219,6 @@ int MPIDI_CH3_Start_rma_op_target(MPID_Win *win_ptr, MPIDI_CH3_Pkt_flags_t flags int MPIDI_CH3_Finish_rma_op_target(MPIDI_VC_t *vc, MPID_Win *win_ptr, int is_rma_update, MPIDI_CH3_Pkt_flags_t flags, MPI_Win source_win_handle); -#define MPIDI_CH3I_DATATYPE_IS_PREDEFINED(type, predefined) \ - if ((HANDLE_GET_KIND(type) == HANDLE_KIND_BUILTIN) || \ - (type == MPI_FLOAT_INT) || (type == MPI_DOUBLE_INT) || \ - (type == MPI_LONG_INT) || (type == MPI_SHORT_INT) || \ - (type == MPI_LONG_DOUBLE_INT)) \ - predefined = 1; \ - else predefined = 0; - int MPIDI_CH3I_Progress_finalize(void); /*@ diff --git a/src/mpid/ch3/include/mpidrma.h b/src/mpid/ch3/include/mpidrma.h index c15fc83..3596dd5 100644 --- a/src/mpid/ch3/include/mpidrma.h +++ b/src/mpid/ch3/include/mpidrma.h @@ -366,7 +366,6 @@ static inline int MPIDI_CH3I_Shm_acc_op(const void *origin_addr, int origin_coun { void *base = NULL; int disp_unit, shm_op = 0; - int origin_predefined, target_predefined; MPI_User_function *uop = NULL; MPID_Datatype *dtp; int mpi_errno = MPI_SUCCESS; @@ -375,9 +374,6 @@ static inline int MPIDI_CH3I_Shm_acc_op(const void *origin_addr, int origin_coun MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_CH3I_SHM_ACC_OP); - MPIDI_CH3I_DATATYPE_IS_PREDEFINED(origin_datatype, origin_predefined); - MPIDI_CH3I_DATATYPE_IS_PREDEFINED(target_datatype, target_predefined); - if (win_ptr->shm_allocated == TRUE) { shm_op = 1; base = win_ptr->shm_base_addrs[target_rank]; @@ -407,7 +403,7 @@ static inline int MPIDI_CH3I_Shm_acc_op(const void *origin_addr, int origin_coun /* get the function by indexing into the op table */ uop = MPIR_OP_HDL_TO_FN(op); - if (origin_predefined && target_predefined) + if (MPIR_DATATYPE_IS_PREDEFINED(origin_datatype) && MPIR_DATATYPE_IS_PREDEFINED(target_datatype)) { /* Cast away const'ness for origin_address in order to * avoid changing the prototype for MPI_User_function */ @@ -450,7 +446,7 @@ static inline int MPIDI_CH3I_Shm_acc_op(const void *origin_addr, int origin_coun if (mpi_errno) { MPIU_ERR_POP(mpi_errno); } } - if (target_predefined) { + if (MPIR_DATATYPE_IS_PREDEFINED(target_datatype)) { /* target predefined type, origin derived datatype */ if (shm_op) MPIDI_CH3I_SHM_MUTEX_LOCK(win_ptr); @@ -520,19 +516,12 @@ static inline int MPIDI_CH3I_Shm_get_acc_op(const void *origin_addr, int origin_ void *base = NULL; MPI_User_function *uop = NULL; MPID_Datatype *dtp; - int origin_predefined, target_predefined; int mpi_errno = MPI_SUCCESS; MPIU_CHKLMEM_DECL(2); MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_SHM_GET_ACC_OP); MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_CH3I_SHM_GET_ACC_OP); - origin_predefined = TRUE; /* quiet uninitialized warnings (b/c goto) */ - if (op != MPI_NO_OP) { - MPIDI_CH3I_DATATYPE_IS_PREDEFINED(origin_datatype, origin_predefined); - } - MPIDI_CH3I_DATATYPE_IS_PREDEFINED(target_datatype, target_predefined); - if (win_ptr->shm_allocated == TRUE) { base = win_ptr->shm_base_addrs[target_rank]; disp_unit = win_ptr->disp_units[target_rank]; @@ -582,7 +571,8 @@ static inline int MPIDI_CH3I_Shm_get_acc_op(const void *origin_addr, int origin_ /* get the function by indexing into the op table */ uop = MPIR_OP_HDL_TO_FN(op); - if (origin_predefined && target_predefined) { + if ((op == MPI_NO_OP || MPIR_DATATYPE_IS_PREDEFINED(origin_datatype)) && + MPIR_DATATYPE_IS_PREDEFINED(target_datatype)) { /* Cast away const'ness for origin_address in order to * avoid changing the prototype for MPI_User_function */ (*uop)((void *) origin_addr, (char *) base + disp_unit*target_disp, @@ -620,7 +610,7 @@ static inline int MPIDI_CH3I_Shm_get_acc_op(const void *origin_addr, int origin_ if (mpi_errno) { MPIU_ERR_POP(mpi_errno); } } - if (target_predefined) { + if (MPIR_DATATYPE_IS_PREDEFINED(target_datatype)) { /* target predefined type, origin derived datatype */ (*uop)(tmp_buf, (char *) base + disp_unit * target_disp, diff --git a/src/mpid/ch3/src/ch3u_handle_recv_req.c b/src/mpid/ch3/src/ch3u_handle_recv_req.c index 3425aa5..1ea9b52 100644 --- a/src/mpid/ch3/src/ch3u_handle_recv_req.c +++ b/src/mpid/ch3/src/ch3u_handle_recv_req.c @@ -90,7 +90,7 @@ int MPIDI_CH3_ReqHandler_PutAccumRespComplete( MPIDI_VC_t *vc, /* Perform get in get-accumulate */ if (rreq->dev.resp_request_handle != MPI_REQUEST_NULL) { - int predefined, type_size; + int type_size; MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_get_accum_resp_t *get_accum_resp_pkt = &upkt.get_accum_resp; MPID_Request *resp_req; @@ -100,7 +100,6 @@ int MPIDI_CH3_ReqHandler_PutAccumRespComplete( MPIDI_VC_t *vc, get_accum_resp_pkt->request_handle = rreq->dev.resp_request_handle; MPID_Datatype_get_size_macro(rreq->dev.datatype, type_size); - MPIDI_CH3I_DATATYPE_IS_PREDEFINED(rreq->dev.datatype, predefined); /* Copy data into a temporary buffer */ resp_req = MPID_Request_create(); @@ -110,7 +109,7 @@ int MPIDI_CH3_ReqHandler_PutAccumRespComplete( MPIDI_VC_t *vc, MPIU_CHKPMEM_MALLOC(resp_req->dev.user_buf, void *, rreq->dev.user_count * type_size, mpi_errno, "GACC resp. buffer"); - if (predefined) { + if (MPIR_DATATYPE_IS_PREDEFINED(rreq->dev.datatype)) { MPIU_Memcpy(resp_req->dev.user_buf, rreq->dev.real_user_buf, rreq->dev.user_count * type_size); } else { @@ -778,7 +777,7 @@ static int create_derived_datatype(MPID_Request *req, MPID_Datatype **dtp) #define FCNAME MPIDI_QUOTE(FUNCNAME) static int do_accumulate_op(MPID_Request *rreq) { - int mpi_errno = MPI_SUCCESS, predefined; + int mpi_errno = MPI_SUCCESS; MPI_Aint true_lb, true_extent; MPI_User_function *uop; MPIDI_STATE_DECL(MPID_STATE_DO_ACCUMULATE_OP); @@ -812,8 +811,7 @@ static int do_accumulate_op(MPID_Request *rreq) /* --END ERROR HANDLING-- */ } - MPIDI_CH3I_DATATYPE_IS_PREDEFINED(rreq->dev.datatype, predefined); - if (predefined) + if (MPIR_DATATYPE_IS_PREDEFINED(rreq->dev.datatype)) { (*uop)(rreq->dev.user_buf, rreq->dev.real_user_buf, &(rreq->dev.user_count), &(rreq->dev.datatype)); diff --git a/src/mpid/ch3/src/ch3u_rma_acc_ops.c b/src/mpid/ch3/src/ch3u_rma_acc_ops.c index 3d441c9..ea6eb50 100644 --- a/src/mpid/ch3/src/ch3u_rma_acc_ops.c +++ b/src/mpid/ch3/src/ch3u_rma_acc_ops.c @@ -23,7 +23,7 @@ int MPIDI_Get_accumulate(const void *origin_addr, int origin_count, { int mpi_errno = MPI_SUCCESS; MPIDI_msg_sz_t data_sz; - int rank, origin_predefined, result_predefined, target_predefined; + int rank; int dt_contig ATTRIBUTE((unused)); MPI_Aint dt_true_lb ATTRIBUTE((unused)); MPID_Datatype *dtp; @@ -53,13 +53,6 @@ int MPIDI_Get_accumulate(const void *origin_addr, int origin_count, rank = win_ptr->comm_ptr->rank; - origin_predefined = TRUE; /* quiet uninitialized warnings (b/c goto) */ - if (op != MPI_NO_OP) { - MPIDI_CH3I_DATATYPE_IS_PREDEFINED(origin_datatype, origin_predefined); - } - MPIDI_CH3I_DATATYPE_IS_PREDEFINED(result_datatype, result_predefined); - MPIDI_CH3I_DATATYPE_IS_PREDEFINED(target_datatype, target_predefined); - if (win_ptr->shm_allocated == TRUE && target_rank != rank && win_ptr->create_flavor != MPI_WIN_FLAVOR_SHARED) { /* check if target is local and shared memory is allocated on window, if so, we directly perform this operation on shared memory region. */ @@ -115,15 +108,15 @@ int MPIDI_Get_accumulate(const void *origin_addr, int origin_count, /* if source or target datatypes are derived, increment their reference counts */ - if (!origin_predefined) { + if (op != MPI_NO_OP && !MPIR_DATATYPE_IS_PREDEFINED(origin_datatype)) { MPID_Datatype_get_ptr(origin_datatype, dtp); MPID_Datatype_add_ref(dtp); } - if (!result_predefined) { + if (!MPIR_DATATYPE_IS_PREDEFINED(result_datatype)) { MPID_Datatype_get_ptr(result_datatype, dtp); MPID_Datatype_add_ref(dtp); } - if (!target_predefined) { + if (!MPIR_DATATYPE_IS_PREDEFINED(target_datatype)) { MPID_Datatype_get_ptr(target_datatype, dtp); MPID_Datatype_add_ref(dtp); } diff --git a/src/mpid/ch3/src/ch3u_rma_ops.c b/src/mpid/ch3/src/ch3u_rma_ops.c index 0d2c37a..6c2a83c 100644 --- a/src/mpid/ch3/src/ch3u_rma_ops.c +++ b/src/mpid/ch3/src/ch3u_rma_ops.c @@ -120,7 +120,7 @@ int MPIDI_Put(const void *origin_addr, int origin_count, MPI_Datatype int target_count, MPI_Datatype target_datatype, MPID_Win *win_ptr) { int mpi_errno = MPI_SUCCESS; - int dt_contig ATTRIBUTE((unused)), rank, predefined; + int dt_contig ATTRIBUTE((unused)), rank; MPID_Datatype *dtp; MPI_Aint dt_true_lb ATTRIBUTE((unused)); MPIDI_msg_sz_t data_sz; @@ -199,14 +199,12 @@ int MPIDI_Put(const void *origin_addr, int origin_count, MPI_Datatype /* if source or target datatypes are derived, increment their reference counts */ - MPIDI_CH3I_DATATYPE_IS_PREDEFINED(origin_datatype, predefined); - if (!predefined) + if (!MPIR_DATATYPE_IS_PREDEFINED(origin_datatype)) { MPID_Datatype_get_ptr(origin_datatype, dtp); MPID_Datatype_add_ref(dtp); } - MPIDI_CH3I_DATATYPE_IS_PREDEFINED(target_datatype, predefined); - if (!predefined) + if (!MPIR_DATATYPE_IS_PREDEFINED(target_datatype)) { MPID_Datatype_get_ptr(target_datatype, dtp); MPID_Datatype_add_ref(dtp); @@ -235,7 +233,7 @@ int MPIDI_Get(void *origin_addr, int origin_count, MPI_Datatype { int mpi_errno = MPI_SUCCESS; MPIDI_msg_sz_t data_sz; - int dt_contig ATTRIBUTE((unused)), rank, predefined; + int dt_contig ATTRIBUTE((unused)), rank; MPI_Aint dt_true_lb ATTRIBUTE((unused)); MPID_Datatype *dtp; MPIDI_VC_t *orig_vc, *target_vc; @@ -310,14 +308,12 @@ int MPIDI_Get(void *origin_addr, int origin_count, MPI_Datatype /* if source or target datatypes are derived, increment their reference counts */ - MPIDI_CH3I_DATATYPE_IS_PREDEFINED(origin_datatype, predefined); - if (!predefined) + if (!MPIR_DATATYPE_IS_PREDEFINED(origin_datatype)) { MPID_Datatype_get_ptr(origin_datatype, dtp); MPID_Datatype_add_ref(dtp); } - MPIDI_CH3I_DATATYPE_IS_PREDEFINED(target_datatype, predefined); - if (!predefined) + if (!MPIR_DATATYPE_IS_PREDEFINED(target_datatype)) { MPID_Datatype_get_ptr(target_datatype, dtp); MPID_Datatype_add_ref(dtp); @@ -347,7 +343,7 @@ int MPIDI_Accumulate(const void *origin_addr, int origin_count, MPI_Datatype { int mpi_errno=MPI_SUCCESS; MPIDI_msg_sz_t data_sz; - int dt_contig ATTRIBUTE((unused)), rank, origin_predefined, target_predefined; + int dt_contig ATTRIBUTE((unused)), rank; MPI_Aint dt_true_lb ATTRIBUTE((unused)); MPID_Datatype *dtp; MPIDI_VC_t *orig_vc, *target_vc; @@ -376,9 +372,6 @@ int MPIDI_Accumulate(const void *origin_addr, int origin_count, MPI_Datatype rank = win_ptr->comm_ptr->rank; - MPIDI_CH3I_DATATYPE_IS_PREDEFINED(origin_datatype, origin_predefined); - MPIDI_CH3I_DATATYPE_IS_PREDEFINED(target_datatype, target_predefined); - if (win_ptr->shm_allocated == TRUE && target_rank != rank && win_ptr->create_flavor != MPI_WIN_FLAVOR_SHARED) { /* check if target is local and shared memory is allocated on window, if so, we directly perform this operation on shared memory region. */ @@ -414,7 +407,8 @@ int MPIDI_Accumulate(const void *origin_addr, int origin_count, MPI_Datatype if (mpi_errno) { MPIU_ERR_POP(mpi_errno); } /* If predefined and contiguous, use a simplified element */ - if (origin_predefined && target_predefined && enableShortACC) { + if (MPIR_DATATYPE_IS_PREDEFINED(origin_datatype) && + MPIR_DATATYPE_IS_PREDEFINED(target_datatype) && enableShortACC) { MPIU_INSTR_DURATION_START(rmaqueue_set); new_ptr->type = MPIDI_RMA_ACC_CONTIG; /* Only the information needed for the contig/predefined acc */ @@ -448,12 +442,12 @@ int MPIDI_Accumulate(const void *origin_addr, int origin_count, MPI_Datatype /* if source or target datatypes are derived, increment their reference counts */ - if (!origin_predefined) + if (!MPIR_DATATYPE_IS_PREDEFINED(origin_datatype)) { MPID_Datatype_get_ptr(origin_datatype, dtp); MPID_Datatype_add_ref(dtp); } - if (!target_predefined) + if (!MPIR_DATATYPE_IS_PREDEFINED(target_datatype)) { MPID_Datatype_get_ptr(target_datatype, dtp); MPID_Datatype_add_ref(dtp); diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c index c457350..da8ae8b 100644 --- a/src/mpid/ch3/src/ch3u_rma_sync.c +++ b/src/mpid/ch3/src/ch3u_rma_sync.c @@ -553,7 +553,7 @@ static int MPIDI_CH3I_Send_rma_msg(MPIDI_RMA_Op_t *rma_op, MPID_Win *win_ptr, MPIDI_CH3_Pkt_put_t *put_pkt = &upkt.put; MPIDI_CH3_Pkt_accum_t *accum_pkt = &upkt.accum; MPID_IOV iov[MPID_IOV_LIMIT]; - int mpi_errno=MPI_SUCCESS, predefined; + int mpi_errno=MPI_SUCCESS; int origin_dt_derived, target_dt_derived, origin_type_size, iovcnt; MPIDI_VC_t * vc; MPID_Comm *comm_ptr; @@ -598,8 +598,7 @@ static int MPIDI_CH3I_Send_rma_msg(MPIDI_RMA_Op_t *rma_op, MPID_Win *win_ptr, resp_req->dev.target_win_handle = target_win_handle; resp_req->dev.source_win_handle = source_win_handle; - MPIDI_CH3I_DATATYPE_IS_PREDEFINED(resp_req->dev.datatype, predefined); - if (!predefined) { + if (!MPIR_DATATYPE_IS_PREDEFINED(resp_req->dev.datatype)) { MPID_Datatype *result_dtp = NULL; MPID_Datatype_get_ptr(resp_req->dev.datatype, result_dtp); resp_req->dev.datatype_ptr = result_dtp; @@ -648,8 +647,7 @@ static int MPIDI_CH3I_Send_rma_msg(MPIDI_RMA_Op_t *rma_op, MPID_Win *win_ptr, comm_ptr = win_ptr->comm_ptr; MPIDI_Comm_get_vc_set_active(comm_ptr, rma_op->target_rank, &vc); - MPIDI_CH3I_DATATYPE_IS_PREDEFINED(rma_op->origin_datatype, predefined); - if (!predefined) + if (!MPIR_DATATYPE_IS_PREDEFINED(rma_op->origin_datatype)) { origin_dt_derived = 1; MPID_Datatype_get_ptr(rma_op->origin_datatype, origin_dtp); @@ -659,8 +657,7 @@ static int MPIDI_CH3I_Send_rma_msg(MPIDI_RMA_Op_t *rma_op, MPID_Win *win_ptr, origin_dt_derived = 0; } - MPIDI_CH3I_DATATYPE_IS_PREDEFINED(rma_op->target_datatype, predefined); - if (!predefined) + if (!MPIR_DATATYPE_IS_PREDEFINED(rma_op->target_datatype)) { target_dt_derived = 1; MPID_Datatype_get_ptr(rma_op->target_datatype, target_dtp); @@ -1135,7 +1132,7 @@ static int MPIDI_CH3I_Recv_rma_msg(MPIDI_RMA_Op_t *rma_op, MPID_Win *win_ptr, { MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_get_t *get_pkt = &upkt.get; - int mpi_errno=MPI_SUCCESS, predefined; + int mpi_errno=MPI_SUCCESS; MPIDI_VC_t * vc; MPID_Comm *comm_ptr; MPID_Request *req = NULL; @@ -1165,8 +1162,7 @@ static int MPIDI_CH3I_Recv_rma_msg(MPIDI_RMA_Op_t *rma_op, MPID_Win *win_ptr, req->dev.datatype = rma_op->origin_datatype; req->dev.target_win_handle = MPI_WIN_NULL; req->dev.source_win_handle = source_win_handle; - MPIDI_CH3I_DATATYPE_IS_PREDEFINED(req->dev.datatype, predefined); - if (!predefined) + if (!MPIR_DATATYPE_IS_PREDEFINED(req->dev.datatype)) { MPID_Datatype_get_ptr(req->dev.datatype, dtp); req->dev.datatype_ptr = dtp; @@ -1192,8 +1188,7 @@ static int MPIDI_CH3I_Recv_rma_msg(MPIDI_RMA_Op_t *rma_op, MPID_Win *win_ptr, comm_ptr = win_ptr->comm_ptr; MPIDI_Comm_get_vc_set_active(comm_ptr, rma_op->target_rank, &vc); - MPIDI_CH3I_DATATYPE_IS_PREDEFINED(rma_op->target_datatype, predefined); - if (predefined) + if (MPIR_DATATYPE_IS_PREDEFINED(rma_op->target_datatype)) { /* basic datatype on target. simply send the get_pkt. */ MPIU_THREAD_CS_ENTER(CH3COMM,vc); @@ -2046,18 +2041,16 @@ int MPIDI_Win_unlock(int dest, MPID_Win *win_ptr) * do an optimization where the lock and the RMA operation are * sent in a single packet. Otherwise, we send a separate lock * request first. */ - int type_size, predefined; + int type_size; MPIDI_VC_t *vc; MPIDI_RMA_Op_t *curr_op = rma_op; MPIDI_Comm_get_vc_set_active(win_ptr->comm_ptr, dest, &vc); MPID_Datatype_get_size_macro(curr_op->origin_datatype, type_size); - - MPIDI_CH3I_DATATYPE_IS_PREDEFINED(curr_op->target_datatype, predefined); /* msg_sz typically = 65480 */ - if ( predefined && + if (MPIR_DATATYPE_IS_PREDEFINED(curr_op->target_datatype) && (type_size * curr_op->origin_count <= vc->eager_max_msg_sz) ) { single_op_opt = 1; /* Set the lock granted flag to 1 */ @@ -2976,7 +2969,7 @@ static int MPIDI_CH3I_Send_lock_put_or_acc(MPID_Win *win_ptr, int target_rank) MPID_IOV iov[MPID_IOV_LIMIT]; MPID_Comm *comm_ptr; MPID_Datatype *origin_dtp=NULL; - int origin_type_size, predefined; + int origin_type_size; MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_lock_put_unlock_t *lock_put_unlock_pkt = &upkt.lock_put_unlock; @@ -3062,8 +3055,7 @@ static int MPIDI_CH3I_Send_lock_put_or_acc(MPID_Win *win_ptr, int target_rank) comm_ptr = win_ptr->comm_ptr; MPIDI_Comm_get_vc_set_active(comm_ptr, rma_op->target_rank, &vc); - MPIDI_CH3I_DATATYPE_IS_PREDEFINED(rma_op->origin_datatype, predefined); - if (!predefined) + if (!MPIR_DATATYPE_IS_PREDEFINED(rma_op->origin_datatype)) { origin_dt_derived = 1; MPID_Datatype_get_ptr(rma_op->origin_datatype, origin_dtp); @@ -3176,7 +3168,7 @@ static int MPIDI_CH3I_Send_lock_put_or_acc(MPID_Win *win_ptr, int target_rank) #define FCNAME MPIDI_QUOTE(FUNCNAME) static int MPIDI_CH3I_Send_lock_get(MPID_Win *win_ptr, int target_rank) { - int mpi_errno=MPI_SUCCESS, lock_type, predefined; + int mpi_errno=MPI_SUCCESS, lock_type; MPIDI_RMA_Op_t *rma_op; MPID_Request *rreq=NULL, *sreq=NULL; MPIDI_VC_t * vc; @@ -3211,8 +3203,7 @@ static int MPIDI_CH3I_Send_lock_get(MPID_Win *win_ptr, int target_rank) rreq->dev.target_win_handle = MPI_WIN_NULL; rreq->dev.source_win_handle = win_ptr->handle; - MPIDI_CH3I_DATATYPE_IS_PREDEFINED(rreq->dev.datatype, predefined); - if (!predefined) + if (!MPIR_DATATYPE_IS_PREDEFINED(rreq->dev.datatype)) { MPID_Datatype_get_ptr(rreq->dev.datatype, dtp); rreq->dev.datatype_ptr = dtp; @@ -3353,7 +3344,6 @@ int MPIDI_CH3_PktHandler_Put( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, { MPIDI_CH3_Pkt_put_t * put_pkt = &pkt->put; MPID_Request *req = NULL; - int predefined; int type_size; int complete = 0; char *data_buf = NULL; @@ -3398,8 +3388,7 @@ int MPIDI_CH3_PktHandler_Put( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, req->dev.source_win_handle = put_pkt->source_win_handle; req->dev.flags = put_pkt->flags; - MPIDI_CH3I_DATATYPE_IS_PREDEFINED(put_pkt->datatype, predefined); - if (predefined) + if (MPIR_DATATYPE_IS_PREDEFINED(put_pkt->datatype)) { MPIDI_Request_set_type(req, MPIDI_REQUEST_TYPE_PUT_RESP); req->dev.datatype = put_pkt->datatype; @@ -3520,7 +3509,6 @@ int MPIDI_CH3_PktHandler_Get( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPIDI_CH3_Pkt_get_t * get_pkt = &pkt->get; MPID_Request *req = NULL; MPID_IOV iov[MPID_IOV_LIMIT]; - int predefined; int complete; char *data_buf = NULL; MPIDI_msg_sz_t data_len; @@ -3545,8 +3533,7 @@ int MPIDI_CH3_PktHandler_Get( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, req->dev.source_win_handle = get_pkt->source_win_handle; req->dev.flags = get_pkt->flags; - MPIDI_CH3I_DATATYPE_IS_PREDEFINED(get_pkt->datatype, predefined); - if (predefined) + if (MPIR_DATATYPE_IS_PREDEFINED(get_pkt->datatype)) { /* basic datatype. send the data. */ MPIDI_CH3_Pkt_t upkt; @@ -3655,7 +3642,6 @@ int MPIDI_CH3_PktHandler_Accumulate( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPID_Request *req = NULL; MPI_Aint true_lb, true_extent, extent; void *tmp_buf = NULL; - int predefined; int complete = 0; char *data_buf = NULL; MPIDI_msg_sz_t data_len; @@ -3693,8 +3679,7 @@ int MPIDI_CH3_PktHandler_Accumulate( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, req->dev.resp_request_handle = MPI_REQUEST_NULL; } - MPIDI_CH3I_DATATYPE_IS_PREDEFINED(accum_pkt->datatype, predefined); - if (predefined) + if (MPIR_DATATYPE_IS_PREDEFINED(accum_pkt->datatype)) { MPIU_INSTR_DURATION_START(rmapkt_acc_predef); MPIDI_Request_set_type(req, MPIDI_REQUEST_TYPE_ACCUM_RESP); ----------------------------------------------------------------------- Summary of changes: src/include/mpiimpl.h | 6 ++++ src/mpi/coll/helper_fns.c | 21 +++++++++---- src/mpid/ch3/include/mpidimpl.h | 8 ----- src/mpid/ch3/include/mpidrma.h | 20 +++---------- src/mpid/ch3/src/ch3u_handle_recv_req.c | 10 ++---- src/mpid/ch3/src/ch3u_rma_acc_ops.c | 15 ++------- src/mpid/ch3/src/ch3u_rma_ops.c | 28 +++++++----------- src/mpid/ch3/src/ch3u_rma_sync.c | 47 ++++++++++-------------------- 8 files changed, 60 insertions(+), 95 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1b1-67-gf8e7f47
by noreply＠mpich.org 26 Sep '13

26 Sep '13

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 f8e7f47f5712bde7af02800d73a3a9382e64fcfb (commit) from 833f2e3e92c48a25b961ec2c8ebf9b9ca4931ea5 (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/f8e7f47f5712bde7af02800d73a3a9382… commit f8e7f47f5712bde7af02800d73a3a9382e64fcfb Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Thu Sep 26 13:08:56 2013 -0500 Simplify checks for shared memory windows. We already do a check for shared memory before calling the shared-memory specific functions. This patch simplifies some of those redundant checks. Signed-off-by: Xin Zhao <xinzhao3(a)illinois.edu> diff --git a/src/mpid/ch3/include/mpidrma.h b/src/mpid/ch3/include/mpidrma.h index 17162a7..c15fc83 100644 --- a/src/mpid/ch3/include/mpidrma.h +++ b/src/mpid/ch3/include/mpidrma.h @@ -327,20 +327,11 @@ static inline int MPIDI_CH3I_Shm_put_op(const void *origin_addr, int origin_coun int mpi_errno = MPI_SUCCESS; void *base = NULL; int disp_unit; - MPIDI_VC_t *orig_vc, *target_vc; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_SHM_PUT_OP); MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_CH3I_SHM_PUT_OP); - /* FIXME: Here we decide whether to perform SHM operations by checking if origin and target are on - the same node. However, in ch3:sock, even if origin and target are on the same node, they do - not within the same SHM region. Here we filter out ch3:sock by checking shm_allocated flag first, - which is only set to TRUE when SHM region is allocated in nemesis. - In future we need to figure out a way to check if origin and target are in the same "SHM comm". - */ - MPIDI_Comm_get_vc(win_ptr->comm_ptr, win_ptr->comm_ptr->rank, &orig_vc); - MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &target_vc); - if (win_ptr->shm_allocated == TRUE && orig_vc->node_id == target_vc->node_id) { + if (win_ptr->shm_allocated == TRUE) { base = win_ptr->shm_base_addrs[target_rank]; disp_unit = win_ptr->disp_units[target_rank]; } @@ -378,7 +369,6 @@ static inline int MPIDI_CH3I_Shm_acc_op(const void *origin_addr, int origin_coun int origin_predefined, target_predefined; MPI_User_function *uop = NULL; MPID_Datatype *dtp; - MPIDI_VC_t *orig_vc, *target_vc; int mpi_errno = MPI_SUCCESS; MPIU_CHKLMEM_DECL(2); MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_SHM_ACC_OP); @@ -388,10 +378,7 @@ static inline int MPIDI_CH3I_Shm_acc_op(const void *origin_addr, int origin_coun MPIDI_CH3I_DATATYPE_IS_PREDEFINED(origin_datatype, origin_predefined); MPIDI_CH3I_DATATYPE_IS_PREDEFINED(target_datatype, target_predefined); - /* FIXME: refer to FIXME in MPIDI_CH3I_Shm_put_op */ - MPIDI_Comm_get_vc(win_ptr->comm_ptr, win_ptr->comm_ptr->rank, &orig_vc); - MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &target_vc); - if (win_ptr->shm_allocated == TRUE && orig_vc->node_id == target_vc->node_id) { + if (win_ptr->shm_allocated == TRUE) { shm_op = 1; base = win_ptr->shm_base_addrs[target_rank]; disp_unit = win_ptr->disp_units[target_rank]; @@ -534,7 +521,6 @@ static inline int MPIDI_CH3I_Shm_get_acc_op(const void *origin_addr, int origin_ MPI_User_function *uop = NULL; MPID_Datatype *dtp; int origin_predefined, target_predefined; - MPIDI_VC_t *orig_vc, *target_vc; int mpi_errno = MPI_SUCCESS; MPIU_CHKLMEM_DECL(2); MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_SHM_GET_ACC_OP); @@ -547,10 +533,7 @@ static inline int MPIDI_CH3I_Shm_get_acc_op(const void *origin_addr, int origin_ } MPIDI_CH3I_DATATYPE_IS_PREDEFINED(target_datatype, target_predefined); - /* FIXME: refer to FIXME in MPIDI_CH3I_Shm_put_op */ - MPIDI_Comm_get_vc(win_ptr->comm_ptr, win_ptr->comm_ptr->rank, &orig_vc); - MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &target_vc); - if (win_ptr->shm_allocated == TRUE && orig_vc->node_id == target_vc->node_id) { + if (win_ptr->shm_allocated == TRUE) { base = win_ptr->shm_base_addrs[target_rank]; disp_unit = win_ptr->disp_units[target_rank]; MPIDI_CH3I_SHM_MUTEX_LOCK(win_ptr); @@ -706,16 +689,12 @@ static inline int MPIDI_CH3I_Shm_get_op(void *origin_addr, int origin_count, MPI { void *base = NULL; int disp_unit; - MPIDI_VC_t *orig_vc, *target_vc; int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_SHM_GET_OP); MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_CH3I_SHM_GET_OP); - /* FIXME: refer to FIXME in MPIDI_CH3I_Shm_put_op */ - MPIDI_Comm_get_vc(win_ptr->comm_ptr, win_ptr->comm_ptr->rank, &orig_vc); - MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &target_vc); - if (win_ptr->shm_allocated == TRUE && orig_vc->node_id == target_vc->node_id) { + if (win_ptr->shm_allocated == TRUE) { base = win_ptr->shm_base_addrs[target_rank]; disp_unit = win_ptr->disp_units[target_rank]; } @@ -751,15 +730,11 @@ static inline int MPIDI_CH3I_Shm_cas_op(const void *origin_addr, const void *com int disp_unit; int len, shm_locked = 0; int mpi_errno = MPI_SUCCESS; - MPIDI_VC_t *orig_vc, *target_vc; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_SHM_CAS_OP); MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_CH3I_SHM_CAS_OP); - /* FIXME: refer to FIXME in MPIDI_CH3I_Shm_put_op */ - MPIDI_Comm_get_vc(win_ptr->comm_ptr, win_ptr->comm_ptr->rank, &orig_vc); - MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &target_vc); - if (win_ptr->shm_allocated == TRUE && orig_vc->node_id == target_vc->node_id) { + if (win_ptr->shm_allocated == TRUE) { base = win_ptr->shm_base_addrs[target_rank]; disp_unit = win_ptr->disp_units[target_rank]; @@ -810,16 +785,12 @@ static inline int MPIDI_CH3I_Shm_fop_op(const void *origin_addr, void *result_ad MPI_User_function *uop = NULL; int disp_unit; int len, one, shm_locked = 0; - MPIDI_VC_t *orig_vc, *target_vc; int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_SHM_FOP_OP); MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_CH3I_SHM_FOP_OP); - /* FIXME: refer to FIXME in MPIDI_CH3I_Shm_put_op */ - MPIDI_Comm_get_vc(win_ptr->comm_ptr, win_ptr->comm_ptr->rank, &orig_vc); - MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &target_vc); - if (win_ptr->shm_allocated == TRUE && orig_vc->node_id == target_vc->node_id) { + if (win_ptr->shm_allocated == TRUE) { base = win_ptr->shm_base_addrs[target_rank]; disp_unit = win_ptr->disp_units[target_rank]; ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/include/mpidrma.h | 41 +++++---------------------------------- 1 files changed, 6 insertions(+), 35 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1b1-66-g833f2e3
by noreply＠mpich.org 26 Sep '13

26 Sep '13

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 833f2e3e92c48a25b961ec2c8ebf9b9ca4931ea5 (commit) via 242a9356db9389b1c2a310e58b9ca411214c37c7 (commit) via 231b2ce59ecaea86bb7cf1ca926e1bcaed92a717 (commit) via d0927f698a4ada598937d84141348d8f31dc71f1 (commit) via 2d1616687c5ca9e22146feb0196c148f3819f23b (commit) via 8f1b4bd29e5b4cc4a70ea3dd2f79ed5680f1135a (commit) from 441d189a37b158c44abeb84c4fd7c505402cfe96 (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/833f2e3e92c48a25b961ec2c8ebf9b9ca… commit 833f2e3e92c48a25b961ec2c8ebf9b9ca4931ea5 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Thu Sep 26 15:00:01 2013 -0500 fix bug:pass info to win_allocate and free info. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/test/mpi/rma/mcs-mutex.c b/test/mpi/rma/mcs-mutex.c index 0ef0b9e..52a3bbf 100644 --- a/test/mpi/rma/mcs-mutex.c +++ b/test/mpi/rma/mcs-mutex.c @@ -45,14 +45,12 @@ int MCS_Mutex_create(int tail_rank, MPI_Comm comm, MCS_Mutex * hdl_out) #ifdef USE_WIN_ALLOC_SHM MPI_Info_create(&hdl->win_info); MPI_Info_set(hdl->win_info, "alloc_shm", "true"); - MPI_Win_allocate(2*sizeof(int), sizeof(int), hdl->win_info, hdl->comm, - &hdl->base, &hdl->window); #else MPI_Info_create(&hdl->win_info); MPI_Info_set(hdl->win_info, "alloc_shm", "false"); - MPI_Win_allocate(2*sizeof(int), sizeof(int), MPI_INFO_NULL, hdl->comm, - &hdl->base, &hdl->window); #endif + MPI_Win_allocate(2*sizeof(int), sizeof(int), hdl->win_info, hdl->comm, + &hdl->base, &hdl->window); #endif MPI_Win_lock_all(0, hdl->window); @@ -82,7 +80,7 @@ int MCS_Mutex_free(MCS_Mutex * hdl_ptr) MPI_Win_free(&hdl->window); MPI_Comm_free(&hdl->comm); -#ifdef USE_WIN_ALLOC_SHM +#ifndef USE_WIN_SHARED MPI_Info_free(&hdl->win_info); #endif http://git.mpich.org/mpich.git/commitdiff/242a9356db9389b1c2a310e58b9ca4112… commit 242a9356db9389b1c2a310e58b9ca411214c37c7 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Thu Sep 26 01:59:11 2013 -0500 Do a memory barrier at the end of a flushall. The memory barrier ensures that all load/store operations issued directly to shared memory are complete. Signed-off-by: Xin Zhao <xinzhao3(a)illinois.edu> diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c index 47487d2..c457350 100644 --- a/src/mpid/ch3/src/ch3u_rma_sync.c +++ b/src/mpid/ch3/src/ch3u_rma_sync.c @@ -2177,6 +2177,12 @@ int MPIDI_Win_flush_all(MPID_Win *win_ptr) } } + /* Ensure that all shared memory operations are flushed out. The memory + * barriers in the flush are not sufficient since we skip calling flush + * when all operations are already completed. */ + if (win_ptr->shm_allocated == TRUE) + OPA_read_write_barrier(); + fn_exit: MPIDI_RMA_FUNC_EXIT(MPIDI_STATE_MPIDI_WIN_FLUSH_ALL); return mpi_errno; http://git.mpich.org/mpich.git/commitdiff/231b2ce59ecaea86bb7cf1ca926e1bcae… commit 231b2ce59ecaea86bb7cf1ca926e1bcaed92a717 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Thu Sep 26 14:36:48 2013 -0500 delete exit after do memory barrier. Because when SHM is allocated, it is possible that orig rank and target rank are on different nodes, in such situation operations are not done yet and win_flush cannot exit. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c index 20e4bf5..47487d2 100644 --- a/src/mpid/ch3/src/ch3u_rma_sync.c +++ b/src/mpid/ch3/src/ch3u_rma_sync.c @@ -2225,12 +2225,8 @@ int MPIDI_Win_flush(int rank, MPID_Win *win_ptr) terms of MPIDI_Win_flush. When this changes, those operations will also need to insert this read/write memory fence for shared memory windows. */ - /* For shared memory windows, all operations are done immediately, so there - is nothing to flush. Ensure ordering of load/store operations and - return. */ if (win_ptr->shm_allocated == TRUE) { OPA_read_write_barrier(); - goto fn_exit; } rma_op = MPIDI_CH3I_RMA_Ops_head(&win_ptr->targets[rank].rma_ops_list); http://git.mpich.org/mpich.git/commitdiff/d0927f698a4ada598937d84141348d8f3… commit d0927f698a4ada598937d84141348d8f31dc71f1 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Thu Sep 26 14:35:08 2013 -0500 Change FLAVOR to shared memory checks in win_flush. Check shm_allocated flag in win_flush to determine if do full memory barrier or not. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c index c0c1e78..20e4bf5 100644 --- a/src/mpid/ch3/src/ch3u_rma_sync.c +++ b/src/mpid/ch3/src/ch3u_rma_sync.c @@ -2228,7 +2228,7 @@ int MPIDI_Win_flush(int rank, MPID_Win *win_ptr) /* For shared memory windows, all operations are done immediately, so there is nothing to flush. Ensure ordering of load/store operations and return. */ - if (win_ptr->create_flavor == MPI_WIN_FLAVOR_SHARED) { + if (win_ptr->shm_allocated == TRUE) { OPA_read_write_barrier(); goto fn_exit; } http://git.mpich.org/mpich.git/commitdiff/2d1616687c5ca9e22146feb0196c148f3… commit 2d1616687c5ca9e22146feb0196c148f3819f23b Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Thu Sep 26 14:32:06 2013 -0500 Update FLAVOR checks with shared memory checks. Check both shm_allocated flag and VC's node_id for req-based operations. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpid/ch3/src/ch3u_rma_reqops.c b/src/mpid/ch3/src/ch3u_rma_reqops.c index 71335b3..e0af215 100644 --- a/src/mpid/ch3/src/ch3u_rma_reqops.c +++ b/src/mpid/ch3/src/ch3u_rma_reqops.c @@ -148,6 +148,7 @@ int MPIDI_Rput(const void *origin_addr, int origin_count, MPI_Aint dt_true_lb ATTRIBUTE((unused)); MPIDI_msg_sz_t data_sz; MPIDI_CH3I_Rma_req_state_t *req_state; + MPIDI_VC_t *orig_vc, *target_vc; MPIU_CHKPMEM_DECL(1); MPIDI_STATE_DECL(MPID_STATE_MPIDI_RPUT); @@ -178,11 +179,14 @@ int MPIDI_Rput(const void *origin_addr, int origin_count, if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } } + MPIDI_Comm_get_vc(win_ptr->comm_ptr, win_ptr->comm_ptr->rank, &orig_vc); + MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &target_vc); + /* If the operation is already complete, return a completed request. * Otherwise, generate a grequest. */ /* FIXME: We still may need to flush or sync for shared memory windows */ if (target_rank == MPI_PROC_NULL || target_rank == win_ptr->comm_ptr->rank || - win_ptr->create_flavor == MPI_WIN_FLAVOR_SHARED || data_sz == 0) + (win_ptr->shm_allocated == TRUE && orig_vc->node_id == target_vc->node_id) || data_sz == 0) { mpi_errno = MPIR_Grequest_start_impl(MPIDI_CH3I_Rma_req_query, MPIDI_CH3I_Rma_req_free, @@ -229,6 +233,7 @@ int MPIDI_Rget(void *origin_addr, int origin_count, MPI_Aint dt_true_lb ATTRIBUTE((unused)); MPIDI_msg_sz_t data_sz; MPIDI_CH3I_Rma_req_state_t *req_state; + MPIDI_VC_t *orig_vc, *target_vc; MPIU_CHKPMEM_DECL(1); MPIDI_STATE_DECL(MPID_STATE_MPIDI_RGET); @@ -259,11 +264,14 @@ int MPIDI_Rget(void *origin_addr, int origin_count, if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } } + MPIDI_Comm_get_vc(win_ptr->comm_ptr, win_ptr->comm_ptr->rank, &orig_vc); + MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &target_vc); + /* If the operation is already complete, return a completed request. * Otherwise, generate a grequest. */ /* FIXME: We still may need to flush or sync for shared memory windows */ if (target_rank == MPI_PROC_NULL || target_rank == win_ptr->comm_ptr->rank || - win_ptr->create_flavor == MPI_WIN_FLAVOR_SHARED || data_sz == 0) + (win_ptr->shm_allocated == TRUE && orig_vc->node_id == target_vc->node_id) || data_sz == 0) { mpi_errno = MPIR_Grequest_start_impl(MPIDI_CH3I_Rma_req_query, MPIDI_CH3I_Rma_req_free, @@ -310,6 +318,7 @@ int MPIDI_Raccumulate(const void *origin_addr, int origin_count, MPI_Aint dt_true_lb ATTRIBUTE((unused)); MPIDI_msg_sz_t data_sz; MPIDI_CH3I_Rma_req_state_t *req_state; + MPIDI_VC_t *orig_vc, *target_vc; MPIU_CHKPMEM_DECL(1); MPIDI_STATE_DECL(MPID_STATE_MPIDI_RACCUMULATE); @@ -339,11 +348,14 @@ int MPIDI_Raccumulate(const void *origin_addr, int origin_count, if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } } + MPIDI_Comm_get_vc(win_ptr->comm_ptr, win_ptr->comm_ptr->rank, &orig_vc); + MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &target_vc); + /* If the operation is already complete, return a completed request. * Otherwise, generate a grequest. */ /* FIXME: We still may need to flush or sync for shared memory windows */ if (target_rank == MPI_PROC_NULL || target_rank == win_ptr->comm_ptr->rank || - win_ptr->create_flavor == MPI_WIN_FLAVOR_SHARED || data_sz == 0) + (win_ptr->shm_allocated == TRUE && orig_vc->node_id == target_vc->node_id) || data_sz == 0) { mpi_errno = MPIR_Grequest_start_impl(MPIDI_CH3I_Rma_req_query, MPIDI_CH3I_Rma_req_free, @@ -391,6 +403,7 @@ int MPIDI_Rget_accumulate(const void *origin_addr, int origin_count, MPI_Aint dt_true_lb ATTRIBUTE((unused)); MPIDI_msg_sz_t data_sz, trg_data_sz; MPIDI_CH3I_Rma_req_state_t *req_state; + MPIDI_VC_t *orig_vc, *target_vc; MPIU_CHKPMEM_DECL(1); MPIDI_STATE_DECL(MPID_STATE_MPIDI_RGET_ACCUMULATE); @@ -425,11 +438,14 @@ int MPIDI_Rget_accumulate(const void *origin_addr, int origin_count, if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } } + MPIDI_Comm_get_vc(win_ptr->comm_ptr, win_ptr->comm_ptr->rank, &orig_vc); + MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &target_vc); + /* If the operation is already complete, return a completed request. * Otherwise, generate a grequest. */ /* FIXME: We still may need to flush or sync for shared memory windows */ if (target_rank == MPI_PROC_NULL || target_rank == win_ptr->comm_ptr->rank || - win_ptr->create_flavor == MPI_WIN_FLAVOR_SHARED || + (win_ptr->shm_allocated == TRUE && orig_vc->node_id == target_vc->node_id) || (data_sz == 0 && trg_data_sz == 0)) { mpi_errno = MPIR_Grequest_start_impl(MPIDI_CH3I_Rma_req_query, http://git.mpich.org/mpich.git/commitdiff/8f1b4bd29e5b4cc4a70ea3dd2f79ed568… commit 8f1b4bd29e5b4cc4a70ea3dd2f79ed5680f1135a Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Thu Sep 26 01:46:51 2013 -0500 Win_flush_all optimization. During a win_flush_all, if a target does not have any operations to flush out, don't call the win_flush function at all. This reduces the number of function calls on large systems where the RMA operations are sparsely issued. Signed-off-by: Xin Zhao <xinzhao3(a)illinois.edu> diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c index fbf609f..c0c1e78 100644 --- a/src/mpid/ch3/src/ch3u_rma_sync.c +++ b/src/mpid/ch3/src/ch3u_rma_sync.c @@ -2169,6 +2169,8 @@ int MPIDI_Win_flush_all(MPID_Win *win_ptr) * make asynchronous progress. Currently this is handled by Win_flush(). */ for (i = 0; i < MPIR_Comm_size(win_ptr->comm_ptr); i++) { + if (MPIDI_CH3I_RMA_Ops_head(&win_ptr->targets[i].rma_ops_list) == NULL) + continue; if (win_ptr->targets[i].remote_lock_state != MPIDI_CH3_WIN_LOCK_NONE) { mpi_errno = win_ptr->RMAFns.Win_flush(i, win_ptr); if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/src/ch3u_rma_reqops.c | 24 ++++++++++++++++++++---- src/mpid/ch3/src/ch3u_rma_sync.c | 14 +++++++++----- test/mpi/rma/mcs-mutex.c | 8 +++----- 3 files changed, 32 insertions(+), 14 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1b1-60-g441d189
by noreply＠mpich.org 26 Sep '13

26 Sep '13

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 441d189a37b158c44abeb84c4fd7c505402cfe96 (commit) via 8da3627817dc1c47d9001b2ef26e02edb79c8669 (commit) from 602ef5fc9420c6c0841cf3397dd3f80197ba3389 (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/441d189a37b158c44abeb84c4fd7c5054… commit 441d189a37b158c44abeb84c4fd7c505402cfe96 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Thu Sep 26 00:22:40 2013 -0500 Improve test to not rely on the default alloc_shm. We changed the default from FALSE to TRUE for the alloc_shm info flag for MPI_WIN_ALLOCATE. Signed-off-by: Xin Zhao <xinzhao3(a)illinois.edu> diff --git a/test/mpi/rma/mcs-mutex.c b/test/mpi/rma/mcs-mutex.c index 835bddf..0ef0b9e 100644 --- a/test/mpi/rma/mcs-mutex.c +++ b/test/mpi/rma/mcs-mutex.c @@ -48,6 +48,8 @@ int MCS_Mutex_create(int tail_rank, MPI_Comm comm, MCS_Mutex * hdl_out) MPI_Win_allocate(2*sizeof(int), sizeof(int), hdl->win_info, hdl->comm, &hdl->base, &hdl->window); #else + MPI_Info_create(&hdl->win_info); + MPI_Info_set(hdl->win_info, "alloc_shm", "false"); MPI_Win_allocate(2*sizeof(int), sizeof(int), MPI_INFO_NULL, hdl->comm, &hdl->base, &hdl->window); #endif http://git.mpich.org/mpich.git/commitdiff/8da3627817dc1c47d9001b2ef26e02edb… commit 8da3627817dc1c47d9001b2ef26e02edb79c8669 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Thu Sep 26 00:52:05 2013 -0500 Allocate shared memory by default for WIN_ALLOCATE Flip the default shared memory allocation info argument for MPI_WIN_ALLOCATE. We were alredy doing this for MPI_WIN_ALLOCATE_SHARED, but not for WIN_ALLOCATE. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpid/ch3/src/mpid_rma.c b/src/mpid/ch3/src/mpid_rma.c index 35c1b3c..3c0e86c 100644 --- a/src/mpid/ch3/src/mpid_rma.c +++ b/src/mpid/ch3/src/mpid_rma.c @@ -109,12 +109,15 @@ int MPID_Win_allocate(MPI_Aint size, int disp_unit, MPID_Info *info, mpi_errno = win_init(size, disp_unit, MPI_WIN_FLAVOR_ALLOCATE, MPI_WIN_UNIFIED, comm_ptr, win_ptr); if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } + /* FOR ALLOCATE, alloc_shm info is default to set to TRUE */ + (*win_ptr)->info_args.alloc_shm = TRUE; + if (info != NULL) { int alloc_shm_flag = 0; char shm_alloc_value[MPI_MAX_INFO_VAL+1]; MPIR_Info_get_impl(info, "alloc_shm", MPI_MAX_INFO_VAL, shm_alloc_value, &alloc_shm_flag); - if ((alloc_shm_flag == 1) && (!strncmp(shm_alloc_value, "true", sizeof("true")))) - (*win_ptr)->info_args.alloc_shm = TRUE; + if ((alloc_shm_flag == 1) && (!strncmp(shm_alloc_value, "false", sizeof("false")))) + (*win_ptr)->info_args.alloc_shm = FALSE; } mpi_errno = MPIDI_CH3U_Win_fns.allocate(size, disp_unit, info, comm_ptr, baseptr, win_ptr); ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/src/mpid_rma.c | 7 +++++-- test/mpi/rma/mcs-mutex.c | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1b1-58-g602ef5f
by noreply＠mpich.org 26 Sep '13

26 Sep '13

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 602ef5fc9420c6c0841cf3397dd3f80197ba3389 (commit) from cab15c5a4e3edd108064b2a53c3ac43cbbdee000 (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/602ef5fc9420c6c0841cf3397dd3f8019… commit 602ef5fc9420c6c0841cf3397dd3f80197ba3389 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Thu Sep 26 00:49:05 2013 -0500 Updated changes with RMA improvements. No reviewer. diff --git a/CHANGES b/CHANGES index d033542..dd35039 100644 --- a/CHANGES +++ b/CHANGES @@ -16,8 +16,10 @@ it is no longer necessary. # Improvements to MPI_WIN_ALLOCATE to internally allocate shared - memory between processes on the same node (the "alloc_shm" info - argument needs to be provided). + memory between processes on the same node. + + # Performance improvements for MPI RMA operations on shared memory + for MPI_WIN_ALLOCATE and MPI_WIN_ALLOCATE_SHARED. # Enable shared library builds by default. ----------------------------------------------------------------------- Summary of changes: CHANGES | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository

1 0