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 cd0d41776875ad95fc9ec16fd76aa52f80deb8ee (commit) from 1db6b019ed9a9181092ed1168b2cdfa5af65c44b (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/cd0d41776875ad95fc9ec16fd76aa52f80... commit cd0d41776875ad95fc9ec16fd76aa52f80deb8ee Author: Xin Zhao <[email protected]> Date: Wed Aug 20 16:31:23 2014 -0500 Add a failed test for RMA on SHM. The added test mutex_bench_shm_ordered causes deadlock when MPIR_PARAM_CH3_ODD_EVEN_CLIQUES is set to 1. It is modified from mutex_bench_shm by changing the work distribution pattern from odd/even ranks to continuous ranks. See #2127. Signed-off-by: Pavan Balaji <[email protected]> diff --git a/test/mpi/rma/Makefile.am b/test/mpi/rma/Makefile.am index b2bf942..67a99b1 100644 --- a/test/mpi/rma/Makefile.am +++ b/test/mpi/rma/Makefile.am @@ -120,6 +120,7 @@ noinst_PROGRAMS = \ mutex_bench \ mutex_bench_shared \ mutex_bench_shm \ + mutex_bench_shm_ordered\ rma-contig \ badrma \ nb_test \ @@ -176,6 +177,8 @@ mutex_bench_shared_CPPFLAGS = -DUSE_WIN_SHARED $(AM_CPPFLAGS) mutex_bench_shared_SOURCES = mutex_bench.c mcs-mutex.c mcs-mutex.h mutex_bench_shm_CPPFLAGS = -DUSE_WIN_ALLOC_SHM $(AM_CPPFLAGS) mutex_bench_shm_SOURCES = mutex_bench.c mcs-mutex.c mcs-mutex.h +mutex_bench_shm_ordered_CPPFLAGS = -DUSE_WIN_ALLOC_SHM -DUSE_CONTIGUOUS_RANK $(AM_CPPFLAGS) +mutex_bench_shm_ordered_SOURCES = mutex_bench.c mcs-mutex.c mcs-mutex.h linked_list_bench_lock_shr_nocheck_SOURCES = linked_list_bench_lock_shr.c linked_list_bench_lock_shr_nocheck_CPPFLAGS = -DUSE_MODE_NOCHECK $(AM_CPPFLAGS) diff --git a/test/mpi/rma/mutex_bench.c b/test/mpi/rma/mutex_bench.c index 3d2c846..d8a65e8 100644 --- a/test/mpi/rma/mutex_bench.c +++ b/test/mpi/rma/mutex_bench.c @@ -45,7 +45,11 @@ int main(int argc, char ** argv) { for (i = 0; i < NUM_ITER; i++) { /* Combining trylock and lock here is helpful for testing because it makes * CAS and Fetch-and-op contend for the tail pointer. */ +#ifdef USE_CONTIGUOUS_RANK + if (rank < nproc / 2) { +#else if (rank % 2) { +#endif int success = 0; while (!success) { MCS_Mutex_trylock(mcs_mtx, &success); diff --git a/test/mpi/rma/testlist.in b/test/mpi/rma/testlist.in index c1acd24..9e9d3b7 100644 --- a/test/mpi/rma/testlist.in +++ b/test/mpi/rma/testlist.in @@ -104,6 +104,7 @@ linked_list_bench_lock_shr_nocheck 4 mpiversion=3.0 mutex_bench 4 mpiversion=3.0 mutex_bench_shared 4 mpiversion=3.0 mutex_bench_shm 4 mpiversion=3.0 +mutex_bench_shm_ordered 4 mpiversion=3.0 xfail=ticket2127 rma-contig 2 mpiversion=3.0 timeLimit=600 badrma 2 mpiversion=3.0 acc-loc 4 ----------------------------------------------------------------------- Summary of changes: test/mpi/rma/Makefile.am | 3 +++ test/mpi/rma/mutex_bench.c | 4 ++++ test/mpi/rma/testlist.in | 1 + 3 files changed, 8 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository