July 2015 - commits - mailman3.cels.anl.gov

[mpich] MPICH primary repository branch, master, updated. v3.2b3-284-g5e791c1
by noreply＠mpich.org 22 Jul '15

22 Jul '15

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 5e791c1d151812036d15459205e87693ceac67df (commit) from defc9d25d88e14e9191db9a1baa4b2498d34b426 (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/5e791c1d151812036d15459205e87693c… commit 5e791c1d151812036d15459205e87693ceac67df Author: Pavan Balaji <balaji(a)anl.gov> Date: Wed Jul 22 12:40:40 2015 -0500 Setup a configure option to disable comm_overlap tests. These tests fail with ch3:sock. We are not planning to support such capability. This configure option gives us an easy way to disable those tests in our testing for that configuration. Refs #2108 Signed-off-by: Huiwei Lu <huiweilu(a)mcs.anl.gov> diff --git a/test/mpi/configure.ac b/test/mpi/configure.ac index acc04bf..785423e 100644 --- a/test/mpi/configure.ac +++ b/test/mpi/configure.ac @@ -174,6 +174,11 @@ AC_ARG_ENABLE(ft-tests, [Include tests for fault tolerance (default)])],, [enable_ft_tests=yes]) +AC_ARG_ENABLE(comm-overlap-tests, + [AC_HELP_STRING([--enable-comm-overlap-tests], + [Include tests for communicator overlap (default)])],, + [enable_comm_overlap_tests=yes]) + AC_ARG_ENABLE(checkfaults, [AC_HELP_STRING([--enable-checkfaults], [Add some tests for checking on handling of faults in user programs])],, @@ -370,6 +375,15 @@ if test "$first_pm" = "hydra" -a "$enable_strictmpi" = "no" -a "$enable_ft_test fi AC_SUBST(ftdir) +# Setup "comm_overlap" variable based on whether comm_overlap tests +# are enabled or not +if test "${enable_comm_overlap_tests}" = "yes" ; then + comm_overlap="" +else + comm_overlap="#" +fi +AC_SUBST(comm_overlap) + # # Only run the threads tests if multiple is specified if test "$enable_threads" = "multiple" -o "$enable_threads" = "runtime" ; then @@ -1620,11 +1634,13 @@ AC_OUTPUT(maint/testmerge \ threads/pt2pt/Makefile \ threads/util/Makefile \ threads/comm/Makefile \ + threads/comm/testlist \ threads/init/Makefile \ threads/mpi_t/Makefile \ threads/spawn/Makefile \ threads/rma/Makefile \ threads/coll/Makefile \ + threads/coll/testlist \ errors/Makefile \ errors/attr/Makefile \ errors/basic/Makefile \ diff --git a/test/mpi/threads/coll/Makefile.am b/test/mpi/threads/coll/Makefile.am index 82c994e..70549f6 100644 --- a/test/mpi/threads/coll/Makefile.am +++ b/test/mpi/threads/coll/Makefile.am @@ -7,7 +7,7 @@ include $(top_srcdir)/threads/Makefile_threads.mtest -EXTRA_DIST = testlist +EXTRA_DIST = testlist.in noinst_PROGRAMS = iallred allred diff --git a/test/mpi/threads/coll/testlist b/test/mpi/threads/coll/testlist deleted file mode 100644 index ef60079..0000000 --- a/test/mpi/threads/coll/testlist +++ /dev/null @@ -1,2 +0,0 @@ -allred 2 xfail=ticket2108 -iallred 2 mpiversion=3.0 xfail=ticket2108 diff --git a/test/mpi/threads/coll/testlist.in b/test/mpi/threads/coll/testlist.in new file mode 100644 index 0000000..885434c --- /dev/null +++ b/test/mpi/threads/coll/testlist.in @@ -0,0 +1,2 @@ +@comm_overlap@ allred 2 xfail=ticket2108 +@comm_overlap@ iallred 2 mpiversion=3.0 xfail=ticket2108 diff --git a/test/mpi/threads/comm/Makefile.am b/test/mpi/threads/comm/Makefile.am index 38831f2..efc7545 100644 --- a/test/mpi/threads/comm/Makefile.am +++ b/test/mpi/threads/comm/Makefile.am @@ -7,7 +7,7 @@ include $(top_srcdir)/threads/Makefile_threads.mtest -EXTRA_DIST = testlist +EXTRA_DIST = testlist.in noinst_PROGRAMS = ctxdup dup_leak_test comm_dup_deadlock comm_create_threads comm_create_group_threads comm_idup ctxidup idup_nb idup_comm_gen diff --git a/test/mpi/threads/comm/testlist b/test/mpi/threads/comm/testlist.in similarity index 61% rename from test/mpi/threads/comm/testlist rename to test/mpi/threads/comm/testlist.in index a29993d..9378505 100644 --- a/test/mpi/threads/comm/testlist +++ b/test/mpi/threads/comm/testlist.in @@ -3,7 +3,7 @@ dup_leak_test 2 comm_dup_deadlock 4 comm_create_threads 4 comm_create_group_threads 4 -comm_idup 4 mpiversion=3.0 xfail=ticket2108 -ctxidup 4 mpiversion=3.0 xfail=ticket2108 +@comm_overlap@ comm_idup 4 mpiversion=3.0 xfail=ticket2108 +@comm_overlap@ ctxidup 4 mpiversion=3.0 xfail=ticket2108 idup_nb 4 mpiversion=3.0 xfail=ticket2283 idup_comm_gen 4 mpiversion=3.0 xfail=ticket2286 ----------------------------------------------------------------------- Summary of changes: test/mpi/configure.ac | 16 ++++++++++++++++ test/mpi/threads/coll/Makefile.am | 2 +- test/mpi/threads/coll/testlist | 2 -- test/mpi/threads/coll/testlist.in | 2 ++ test/mpi/threads/comm/Makefile.am | 2 +- test/mpi/threads/comm/{testlist => testlist.in} | 4 ++-- 6 files changed, 22 insertions(+), 6 deletions(-) delete mode 100644 test/mpi/threads/coll/testlist create mode 100644 test/mpi/threads/coll/testlist.in rename test/mpi/threads/comm/{testlist => testlist.in} (61%) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b3-283-gdefc9d2
by noreply＠mpich.org 22 Jul '15

22 Jul '15

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 defc9d25d88e14e9191db9a1baa4b2498d34b426 (commit) from 995022474ca93f07095ea0c0585c589559205fe0 (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/defc9d25d88e14e9191db9a1baa4b2498… commit defc9d25d88e14e9191db9a1baa4b2498d34b426 Author: Sangmin Seo <sseo(a)anl.gov> Date: Wed Jul 22 14:44:50 2015 -0500 Fix wrong xfail usages. xfail should be used like 'xfail=ticket####'. No reviewer. diff --git a/test/mpi/ft/testlist b/test/mpi/ft/testlist index 944be13..445bf90 100644 --- a/test/mpi/ft/testlist +++ b/test/mpi/ft/testlist @@ -1,21 +1,21 @@ -die 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup timeLimit=10 strict=false resultTest=TestStatusNoErrors xfail=2237 +die 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup timeLimit=10 strict=false resultTest=TestStatusNoErrors xfail=ticket2237 abort 2 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup timeLimit=10 strict=false resultTest=TestStatus -sendalive 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup timeLimit=10 strict=false resultTest=TestStatusNoErrors xfail=2237 -isendalive 3 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false xfail=2237 -multi_isendalive 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false xfail=2203 +sendalive 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup timeLimit=10 strict=false resultTest=TestStatusNoErrors xfail=ticket2237 +isendalive 3 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false xfail=ticket2237 +multi_isendalive 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false xfail=ticket2203 senddead 2 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 recvdead 2 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 isenddead 2 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 irecvdead 2 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 -barrier 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=2237 -gather 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=2237 -reduce 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=2237 -bcast 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=2237 -scatter 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=2237 -anysource 3 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=2237 -revoke_nofail 2 env=MPIR_CVAR_ENABLE_FT=1 strict=false timeLimit=10 xfail=2237 -shrink 8 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=2237 -agree 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=2289 +barrier 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket2237 +gather 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket2237 +reduce 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket2237 +bcast 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket2237 +scatter 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket2237 +anysource 3 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket2237 +revoke_nofail 2 env=MPIR_CVAR_ENABLE_FT=1 strict=false timeLimit=10 xfail=ticket2237 +shrink 8 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket2237 +agree 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket2289 agree_shrink 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 -revoke_shrink 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=2198 -nbccoll 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=2237 +revoke_shrink 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket2198 +nbccoll 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket2237 diff --git a/test/mpi/spawn/testlist.in b/test/mpi/spawn/testlist.in index 083d47f..af042a2 100644 --- a/test/mpi/spawn/testlist.in +++ b/test/mpi/spawn/testlist.in @@ -26,4 +26,4 @@ disconnect3 3 concurrent_spawns 1 pgroup_connect_test 4 pgroup_intercomm_test 4 -spawn-rootargs 10 xfail=2282 +spawn-rootargs 10 xfail=ticket2282 ----------------------------------------------------------------------- Summary of changes: test/mpi/ft/testlist | 30 +++++++++++++++--------------- test/mpi/spawn/testlist.in | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b3-282-g9950224
by noreply＠mpich.org 22 Jul '15

22 Jul '15

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 995022474ca93f07095ea0c0585c589559205fe0 (commit) from b2770c7e195d091f5710c8016cff5b39c4496832 (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/995022474ca93f07095ea0c0585c58955… commit 995022474ca93f07095ea0c0585c589559205fe0 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Wed Jun 24 14:45:40 2015 -0500 Test case for segfault in spawn Ref: #2282 Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/test/mpi/spawn/Makefile.am b/test/mpi/spawn/Makefile.am index 938271d..ce96518 100644 --- a/test/mpi/spawn/Makefile.am +++ b/test/mpi/spawn/Makefile.am @@ -39,6 +39,7 @@ noinst_PROGRAMS = \ disconnect3 \ pgroup_connect_test \ pgroup_intercomm_test \ - concurrent_spawns + concurrent_spawns \ + spawn-rootargs join_LDADD = $(LDADD) @socklib@ @nslib@ diff --git a/test/mpi/spawn/spawn-rootargs.c b/test/mpi/spawn/spawn-rootargs.c new file mode 100644 index 0000000..abcf5b3 --- /dev/null +++ b/test/mpi/spawn/spawn-rootargs.c @@ -0,0 +1,38 @@ +#include <mpi.h> +#include <stdio.h> + +/* Derived from mpi4py test case. This test that tries to follow what the MPI + * standard says about spawning processes with arguments that should be + * relevant only at the root process. See + * https://bitbucket.org/mpi4py/mpi4py/issues/19/unit-tests-fail-with-mpich-ma… + * and + * https://trac.mpich.org/projects/mpich/ticket/2282 + */ + +int main(int argc, char *argv[]) +{ + char *args[] = { "a", "b", "c", (char *) 0 }; + int rank; + MPI_Comm master, worker; + + MPI_Init(&argc, &argv); + MPI_Comm_get_parent(&master); + + if (master == MPI_COMM_NULL) { + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + MPI_Comm_spawn("./spawn-nullargs", args, /*MPI_ARGV_NULL, */ + 5, MPI_INFO_NULL, 0, MPI_COMM_SELF, &worker, MPI_ERRCODES_IGNORE); + MPI_Barrier(worker); + MPI_Comm_disconnect(&worker); + if (!rank) + printf(" No Errors\n"); + } + else { + MPI_Barrier(master); + MPI_Comm_disconnect(&master); + } + + MPI_Finalize(); + + return 0; +} diff --git a/test/mpi/spawn/testlist.in b/test/mpi/spawn/testlist.in index 94c4d5b..083d47f 100644 --- a/test/mpi/spawn/testlist.in +++ b/test/mpi/spawn/testlist.in @@ -26,3 +26,4 @@ disconnect3 3 concurrent_spawns 1 pgroup_connect_test 4 pgroup_intercomm_test 4 +spawn-rootargs 10 xfail=2282 ----------------------------------------------------------------------- Summary of changes: test/mpi/spawn/Makefile.am | 3 ++- test/mpi/spawn/spawn-rootargs.c | 38 ++++++++++++++++++++++++++++++++++++++ test/mpi/spawn/testlist.in | 1 + 3 files changed, 41 insertions(+), 1 deletions(-) create mode 100644 test/mpi/spawn/spawn-rootargs.c hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b3-281-gb2770c7
by noreply＠mpich.org 22 Jul '15

22 Jul '15

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 b2770c7e195d091f5710c8016cff5b39c4496832 (commit) via 17992398fc238f5c35aee493628b61c8d40414b4 (commit) via abe0e7b6abb59046a520067ee9aa76a3b6203dea (commit) via 47a8a8113c9d2ef26c276ce59a8faf5f628faebb (commit) from 9acdb05448288f3bc26559edec91b5904746b8b1 (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/b2770c7e195d091f5710c8016cff5b39c… commit b2770c7e195d091f5710c8016cff5b39c4496832 Author: Pavan Balaji <balaji(a)anl.gov> Date: Wed Jul 22 13:34:59 2015 -0500 nb_test is incorrect, not an xfail. No reviewer. diff --git a/test/mpi/rma/testlist.in b/test/mpi/rma/testlist.in index 8d24f0b..c824afd 100644 --- a/test/mpi/rma/testlist.in +++ b/test/mpi/rma/testlist.in @@ -164,4 +164,4 @@ cas_flush_get 3 mpiversion=3.0 ## specified by the standard and might not be true. Commenting this ## out till be find a better way to test the original problem with ## MPI_Test. -# nb_test 2 mpiversion=3.0 xfail=ticket1910 +# nb_test 2 mpiversion=3.0 http://git.mpich.org/mpich.git/commitdiff/17992398fc238f5c35aee493628b61c8d… commit 17992398fc238f5c35aee493628b61c8d40414b4 Author: Pavan Balaji <balaji(a)anl.gov> Date: Thu Jul 16 02:40:50 2015 -0500 Remove unnecessary macro. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/include/mpimem.h b/src/include/mpimem.h index e1478a5..9bd5a8f 100644 --- a/src/include/mpimem.h +++ b/src/include/mpimem.h @@ -282,15 +282,12 @@ extern char *strdup( const char * ); /* Memory allocation macros. See document. */ -/* You can redefine this to indicate whether memory allocation errors - are fatal. Recoverable by default */ -#define MPIU_CHKMEM_ISFATAL MPIR_ERR_RECOVERABLE - -/* Standard macro for generating error codes. */ +/* Standard macro for generating error codes. We set the error to be + * recoverable by default, but this can be changed. */ #ifdef HAVE_ERROR_CHECKING #define MPIU_CHKMEM_SETERR(rc_,nbytes_,name_) \ rc_=MPIR_Err_create_code( MPI_SUCCESS, \ - MPIU_CHKMEM_ISFATAL, FCNAME, __LINE__, \ + MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, \ MPI_ERR_OTHER, "**nomem2", "**nomem2 %d %s", nbytes_, name_ ) #else #define MPIU_CHKMEM_SETERR(rc_,nbytes_,name_) rc_=MPI_ERR_OTHER http://git.mpich.org/mpich.git/commitdiff/abe0e7b6abb59046a520067ee9aa76a3b… commit abe0e7b6abb59046a520067ee9aa76a3b6203dea Author: Pavan Balaji <balaji(a)anl.gov> Date: Thu Jul 16 02:29:22 2015 -0500 Get rid of MPIUI_Memcpy. MPIU_ functions are not meant to be device-overridable functions. If we want to do that, we need to expose an additional MPID_ function and use that everywhere. The device might simply map the MPID_ function to the MPIU_ equivalent if it does not have anything special to do. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index d975d6b..02d29c0 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -143,16 +143,6 @@ int usleep(useconds_t usec); /* FIXME: ... to do ... */ #include "mpitypedefs.h" -/* This is the default implementation of MPIU_Memcpy. We define this - before including mpidpre.h so that it can be used when a device or - channel can use it if it's overriding MPIU_Memcpy. */ -MPIU_DBG_ATTRIBUTE_NOINLINE -ATTRIBUTE((unused)) -static MPIU_DBG_INLINE_KEYWORD void MPIUI_Memcpy(void * dst, const void * src, size_t len) -{ - memcpy(dst, src, len); -} - /* Include definitions from the device which must exist before items in this file (mpiimpl.h) can be defined. mpidpre.h must be included before any files that allow the device to override or extend any terms; this includes @@ -162,18 +152,16 @@ static MPIU_DBG_INLINE_KEYWORD void MPIUI_Memcpy(void * dst, const void * src, s /* ------------------------------------------------------------------------- */ /* Overriding memcpy: - Devices and channels can override the default implementation of - MPIU_Memcpy by defining the MPIU_Memcpy macro. The implementation - can call MPIUI_Memcpy for the default memcpy implementation. - Note that MPIU_Memcpy and MPIUI_Memcpy return void rather than a - pointer to the destination buffer. This is different from C89 - memcpy. + This is a utility function for memory copy. The device might use + this directly or override it with a different device-specific + mechanism to provide an MPID_Memcpy function. However, we + currently do not provide such an ADI function. */ #ifndef MPIU_Memcpy #define MPIU_Memcpy(dst, src, len) \ do { \ MPIU_MEM_CHECK_MEMCPY((dst),(src),(len)); \ - MPIUI_Memcpy((dst), (src), (len)); \ + memcpy((dst), (src), (len)); \ } while (0) #endif diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c b/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c index 5639213..337fa4e 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c @@ -180,8 +180,8 @@ static int alloc_sc_plfd_tbls (void) if (mpi_errno != MPI_SUCCESS) MPIU_ERR_POP (mpi_errno); MPIU_Assert(0 == idx); /* assumed in other parts of this file */ - MPIUI_Memcpy (&g_sc_tbl[idx], &MPID_nem_tcp_g_lstn_sc, sizeof(MPID_nem_tcp_g_lstn_sc)); - MPIUI_Memcpy (&MPID_nem_tcp_plfd_tbl[idx], &MPID_nem_tcp_g_lstn_plfd, sizeof(MPID_nem_tcp_g_lstn_plfd)); + MPIU_Memcpy (&g_sc_tbl[idx], &MPID_nem_tcp_g_lstn_sc, sizeof(MPID_nem_tcp_g_lstn_sc)); + MPIU_Memcpy (&MPID_nem_tcp_plfd_tbl[idx], &MPID_nem_tcp_g_lstn_plfd, sizeof(MPID_nem_tcp_g_lstn_plfd)); MPIU_Assert(MPID_nem_tcp_plfd_tbl[idx].fd == g_sc_tbl[idx].fd); MPIU_Assert(MPID_nem_tcp_plfd_tbl[idx].events == POLLIN); http://git.mpich.org/mpich.git/commitdiff/47a8a8113c9d2ef26c276ce59a8faf5f6… commit 47a8a8113c9d2ef26c276ce59a8faf5f628faebb Author: Pavan Balaji <balaji(a)anl.gov> Date: Thu Jul 16 02:16:06 2015 -0500 Move default PMI version to the device. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index d90f8de..d975d6b 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -114,10 +114,6 @@ int usleep(useconds_t usec); #define MAX_HOSTNAME_LEN MAXHOSTNAMELEN #endif -/* Default PMI version to use */ -#define MPIU_DEFAULT_PMI_VERSION 1 -#define MPIU_DEFAULT_PMI_SUBVERSION 1 - /* This allows us to keep names local to a single file when we can use weak symbols */ #ifdef USE_WEAK_SYMBOLS diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h index 8db9b56..8f6c7e3 100644 --- a/src/mpid/ch3/include/mpidimpl.h +++ b/src/mpid/ch3/include/mpidimpl.h @@ -45,6 +45,10 @@ int gethostname(char *name, size_t len); # endif +/* Default PMI version to use */ +#define MPIDI_CH3I_DEFAULT_PMI_VERSION 1 +#define MPIDI_CH3I_DEFAULT_PMI_SUBVERSION 1 + /* group of processes detected to have failed. This is a subset of comm_world group. */ extern MPID_Group *MPIDI_Failed_procs_group; diff --git a/src/mpid/ch3/src/mpid_vc.c b/src/mpid/ch3/src/mpid_vc.c index 1fad710..4715fdb 100644 --- a/src/mpid/ch3/src/mpid_vc.c +++ b/src/mpid/ch3/src/mpid_vc.c @@ -1077,7 +1077,8 @@ int MPIDI_Populate_vc_node_ids(MPIDI_PG_t *pg, int our_pg_rank) char *node_name_buf; int no_local = 0; int odd_even_cliques = 0; - int pmi_version = MPIU_DEFAULT_PMI_VERSION, pmi_subversion = MPIU_DEFAULT_PMI_SUBVERSION; + int pmi_version = MPIDI_CH3I_DEFAULT_PMI_VERSION; + int pmi_subversion = MPIDI_CH3I_DEFAULT_PMI_SUBVERSION; MPIU_CHKLMEM_DECL(4); /* See if the user wants to override our default values */ ----------------------------------------------------------------------- Summary of changes: src/include/mpiimpl.h | 26 ++++----------------- src/include/mpimem.h | 9 ++----- src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c | 4 +- src/mpid/ch3/include/mpidimpl.h | 4 +++ src/mpid/ch3/src/mpid_vc.c | 3 +- test/mpi/rma/testlist.in | 2 +- 6 files changed, 17 insertions(+), 31 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b3-277-g9acdb05
by noreply＠mpich.org 22 Jul '15

22 Jul '15

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 9acdb05448288f3bc26559edec91b5904746b8b1 (commit) via c267eb4cb975a9c6d2ad4ecd4dfe002870cff394 (commit) via 03e2d6431764a7b25e4971b4040a3a15d424889b (commit) from 970a6f4d051372b5af02cff890f41c9539c627e3 (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/9acdb05448288f3bc26559edec91b5904… commit 9acdb05448288f3bc26559edec91b5904746b8b1 Author: Lena Oden <loden(a)anl.gov> Date: Wed Jul 22 12:31:23 2015 -0500 Remove xfail for test/mpi/comm/comm_idup_comm Remove xfail because it was fixed with [03e2d643]. No reviewer diff --git a/test/mpi/comm/testlist b/test/mpi/comm/testlist index 562a193..31140cc 100644 --- a/test/mpi/comm/testlist +++ b/test/mpi/comm/testlist @@ -32,7 +32,7 @@ comm_idup_overlap 2 mpiversion=3.0 comm_idup_iallreduce 6 mpiversion=3.0 comm_idup_nb 6 mpiversion=3.0 comm_idup_isend 6 mpiversion=3.0 -comm_idup_comm 6 mpiversion=3.0 xfail=ticket2286 +comm_idup_comm 6 mpiversion=3.0 dup_with_info 2 mpiversion=3.0 dup_with_info 4 mpiversion=3.0 dup_with_info 9 mpiversion=3.0 http://git.mpich.org/mpich.git/commitdiff/c267eb4cb975a9c6d2ad4ecd4dfe00287… commit c267eb4cb975a9c6d2ad4ecd4dfe002870cff394 Author: Lena Oden <loden(a)anl.gov> Date: Tue Jul 21 17:31:36 2015 -0500 Add initialization for own_mask. The variable own_mask was not initialized and in some cases will have a wrong value. This leads to a failure that two threads think they own the same mask at the same time. Refs #2283 Signed-off-by: Huiwei Lu <huiweilu(a)mcs.anl.gov> diff --git a/src/mpi/comm/commutil.c b/src/mpi/comm/commutil.c index 242bcca..978e936 100644 --- a/src/mpi/comm/commutil.c +++ b/src/mpi/comm/commutil.c @@ -1612,7 +1612,7 @@ static int sched_get_cid_nonblock(MPID_Comm *comm_ptr, MPIR_Context_id_t *ctx0, * idup_curr_seqnum gives each duplication operation a priority */ st->comm_ptr->idup_count++; st->seqnum = st->comm_ptr->idup_curr_seqnum++; - + st->own_mask = 0; if (eager_nelem < 0) { /* Ensure that at least one word of deadlock-free context IDs is always set aside for the base protocol */ http://git.mpich.org/mpich.git/commitdiff/03e2d6431764a7b25e4971b4040a3a15d… commit 03e2d6431764a7b25e4971b4040a3a15d424889b Author: Lena Oden <loden(a)anl.gov> Date: Mon Jul 20 14:37:52 2015 -0500 Fixes test/mpi/comm/comm_idup_comm This patch fixes the mixing use of MPI_Comm_idup and blocking communicator creation-functions when they are all using the same parent communicator. We will need a way to correctly order these duplication operations. In [2b219dfe4ca8], a counter was added to the parent communicator to correctly order multiple MPI_Comm_idup's. We need to do the same between MPI_Comm_idup and MPI_Comm_dup. Otherwise, test/mpi/comm/comm_idup_comm will run into deadlock because MPI_Comm_dup may break the order of those MPI_Comm_idup’s. Refs #2286 Signed-off-by: Huiwei Lu <huiweilu(a)mcs.anl.gov> diff --git a/src/mpi/comm/commutil.c b/src/mpi/comm/commutil.c index 0cf32e5..242bcca 100644 --- a/src/mpi/comm/commutil.c +++ b/src/mpi/comm/commutil.c @@ -1104,6 +1104,7 @@ int MPIR_Get_contextid_sparse_group(MPID_Comm *comm_ptr, MPID_Group *group_ptr, int own_eager_mask = 0; mpir_errflag_t errflag = MPIR_ERR_NONE; int first_iter = 1; + int seqnum; MPID_MPI_STATE_DECL(MPID_STATE_MPIR_GET_CONTEXTID); MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_GET_CONTEXTID); @@ -1149,6 +1150,9 @@ int MPIR_Get_contextid_sparse_group(MPID_Comm *comm_ptr, MPID_Group *group_ptr, else if (first_iter) { memset(local_mask, 0, MPIR_MAX_CONTEXT_MASK * sizeof(int)); own_eager_mask = 0; + if(comm_ptr->idup_count) + seqnum = comm_ptr->idup_curr_seqnum++; + /* Attempt to reserve the eager mask segment */ if (!eager_in_use && eager_nelem > 0) { @@ -1170,7 +1174,8 @@ int MPIR_Get_contextid_sparse_group(MPID_Comm *comm_ptr, MPID_Group *group_ptr, lowestTag = tag; } - if (mask_in_use || ! (comm_ptr->context_id == lowestContextId && tag == lowestTag)) { + if (mask_in_use || ! (comm_ptr->context_id == lowestContextId && tag == lowestTag) || + (comm_ptr->idup_count && seqnum != comm_ptr->idup_next_seqnum)) { memset(local_mask, 0, MPIR_MAX_CONTEXT_MASK * sizeof(int)); own_mask = 0; MPIU_DBG_MSG_D(COMM, VERBOSE, "In in-use, set lowestContextId to %d", lowestContextId); @@ -1259,6 +1264,7 @@ int MPIR_Get_contextid_sparse_group(MPID_Comm *comm_ptr, MPID_Group *group_ptr, lowestTag = -1; /* Else leave it alone; there is another thread waiting */ } + comm_ptr->idup_curr_seqnum++; } else { /* else we did not find a context id. Give up the mask in case @@ -1490,11 +1496,6 @@ static int sched_cb_gcn_copy_mask(MPID_Comm *comm, int tag, void *state) } st->first_iter = 0; - /* idup_count > 1 means there are multiple communicators duplicating - * from the current communicator at the same time. And - * idup_curr_seqnum gives each duplication operation a priority */ - st->comm_ptr->idup_count++; - st->seqnum = st->comm_ptr->idup_curr_seqnum++; } else { if (st->comm_ptr->context_id < lowestContextId) { lowestContextId = st->comm_ptr->context_id; @@ -1606,6 +1607,12 @@ static int sched_get_cid_nonblock(MPID_Comm *comm_ptr, MPIR_Context_id_t *ctx0, *(st->ctx0) = 0; st->own_eager_mask = 0; st->first_iter = 1; + /* idup_count > 1 means there are multiple communicators duplicating + * from the current communicator at the same time. And + * idup_curr_seqnum gives each duplication operation a priority */ + st->comm_ptr->idup_count++; + st->seqnum = st->comm_ptr->idup_curr_seqnum++; + if (eager_nelem < 0) { /* Ensure that at least one word of deadlock-free context IDs is always set aside for the base protocol */ ----------------------------------------------------------------------- Summary of changes: src/mpi/comm/commutil.c | 19 +++++++++++++------ test/mpi/comm/testlist | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b3-274-g970a6f4
by noreply＠mpich.org 21 Jul '15

21 Jul '15

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 970a6f4d051372b5af02cff890f41c9539c627e3 (commit) from 637cf86f6f7dd3c444133e69874a0739640d2dfc (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/970a6f4d051372b5af02cff890f41c953… commit 970a6f4d051372b5af02cff890f41c9539c627e3 Author: Pavan Balaji <balaji(a)anl.gov> Date: Tue Jul 21 23:45:55 2015 -0500 Minor correction to the git-conflicts script. The probability of conflict for the next commit is more relevant than that of all the commits. No reviewer. diff --git a/maint/git-conflicts.bash b/maint/git-conflicts.bash index e61f0f9..780c535 100755 --- a/maint/git-conflicts.bash +++ b/maint/git-conflicts.bash @@ -23,9 +23,9 @@ done ## echo -echo "Probability of Collision:" +echo "Probability of collision on your next commit:" echo "Format: [abbrev length]: probability of collision" for ((; x <= ${max_abbrev} ; x++)) ; do - percent=`echo "scale=8 ; 100 * ($total ^ 2) / (16 ^ $x)" | bc | awk '{ printf("%1.2f\n", $0); }'` + percent=`echo "scale=8 ; 100 * ($total) / (16 ^ $x)" | bc | awk '{ printf("%1.4f\n", $0); }'` echo " [$x]: $percent %" done ----------------------------------------------------------------------- Summary of changes: maint/git-conflicts.bash | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b3-273-g637cf86
by noreply＠mpich.org 21 Jul '15

21 Jul '15

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 637cf86f6f7dd3c444133e69874a0739640d2dfc (commit) from 7ca8ec3fc9421261dcab47af36a9f5e4ef6c2e28 (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/637cf86f6f7dd3c444133e69874a07396… commit 637cf86f6f7dd3c444133e69874a0739640d2dfc Author: Pavan Balaji <balaji(a)anl.gov> Date: Tue Jul 21 12:03:47 2015 -0500 Remove unnecessary patch that was carried forward. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/pm/hydra/tools/topo/hwloc/hwloc/src/topology.c b/src/pm/hydra/tools/topo/hwloc/hwloc/src/topology.c index 4465c00..1636730 100644 --- a/src/pm/hydra/tools/topo/hwloc/hwloc/src/topology.c +++ b/src/pm/hydra/tools/topo/hwloc/hwloc/src/topology.c @@ -3038,7 +3038,7 @@ hwloc__check_children(struct hwloc_obj *parent) */ if (parent->complete_cpuset) { int firstchild; - int prev_firstchild __hwloc_attribute_unused = -1; /* -1 works fine with first comparisons below */ + int prev_firstchild = -1; /* -1 works fine with first comparisons below */ for(j=0; j<parent->arity; j++) { if (!parent->children[j]->complete_cpuset || hwloc_bitmap_iszero(parent->children[j]->complete_cpuset)) ----------------------------------------------------------------------- Summary of changes: src/pm/hydra/tools/topo/hwloc/hwloc/src/topology.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b3-272-g7ca8ec3
by noreply＠mpich.org 21 Jul '15

21 Jul '15

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 7ca8ec3fc9421261dcab47af36a9f5e4ef6c2e28 (commit) via aceee6d924abce30a14da0f1bb53ddedd841c99c (commit) from 3ad0e71d9232c84d2b3eae9d72f1b2198c379f71 (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/7ca8ec3fc9421261dcab47af36a9f5e4e… commit 7ca8ec3fc9421261dcab47af36a9f5e4ef6c2e28 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Tue Jul 21 21:15:32 2015 -0500 Modify comments about request completion callback. Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index cab4045..d90f8de 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -1547,9 +1547,28 @@ typedef struct MPID_Request { /* Errflag for NBC requests. Not used by other requests. */ mpir_errflag_t errflag; - /* request_completed_cb: the callback function triggered when this request - * is completed, i.e. CC is set to 0. Inside request_completed_cb, progress - * engine should not be called. */ + /* Notes about request_completed_cb: + * + * 1. The callback function is triggered when this requests + * completion count reaches 0. + * + * 2. The callback function should be nonblocking. + * + * 3. The callback function should not poke the progress engine, + * or call any function that pokes the progress engine. + * + * 4. The callback function can complete other requests, thus + * calling those requests' callback functions. However, the + * recursion depth of request completion function is limited. + * If we ever need deeper recurisve calls, we need to change + * to an iterative design instead of a recursive design for + * request completion. + * + * 5. In multithreaded programs, since the callback function is + * nonblocking and never calls the progress engine, it would + * never yield the lock to other threads. So the recursion + * should be multithreading-safe. + */ int (*request_completed_cb)(struct MPID_Request *); /* Other, device-specific information */ http://git.mpich.org/mpich.git/commitdiff/aceee6d924abce30a14da0f1bb53ddedd… commit aceee6d924abce30a14da0f1bb53ddedd841c99c Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Tue Jul 21 21:14:41 2015 -0500 Add an assert to check the recursion depth of MPID_Request_complete. We allow a depth of up to 2 for recursive calls of MPID_Request_complete. Arbitrary levels of recursion can cause weird failures that might be hard to debug. For now, a level of two is sufficient. Currently this only happens when completing the user request in request-based RMA operations. Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/mpid/ch3/src/ch3u_request.c b/src/mpid/ch3/src/ch3u_request.c index 63e444c..53230f1 100644 --- a/src/mpid/ch3/src/ch3u_request.c +++ b/src/mpid/ch3/src/ch3u_request.c @@ -21,6 +21,9 @@ #define MPID_REQUEST_PREALLOC 8 #endif +/* Max depth of recursive calls of MPID_Request_complete */ +#define REQUEST_CB_DEPTH 2 + MPID_Request MPID_Request_direct[MPID_REQUEST_PREALLOC] = {{0}}; MPIU_Object_alloc_t MPID_Request_mem = { 0, 0, 0, 0, MPID_REQUEST, sizeof(MPID_Request), MPID_Request_direct, @@ -611,6 +614,10 @@ int MPID_Request_complete(MPID_Request *req) { int incomplete; int mpi_errno = MPI_SUCCESS; + static int called_cnt = 0; + + MPIU_Assert(called_cnt <= REQUEST_CB_DEPTH); + called_cnt++; MPIDI_CH3U_Request_decrement_cc(req, &incomplete); if (!incomplete) { @@ -627,6 +634,7 @@ int MPID_Request_complete(MPID_Request *req) } fn_exit: + called_cnt--; return mpi_errno; fn_fail: goto fn_exit; ----------------------------------------------------------------------- Summary of changes: src/include/mpiimpl.h | 25 ++++++++++++++++++++++--- src/mpid/ch3/src/ch3u_request.c | 8 ++++++++ 2 files changed, 30 insertions(+), 3 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b3-270-g3ad0e71
by noreply＠mpich.org 21 Jul '15

21 Jul '15

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 3ad0e71d9232c84d2b3eae9d72f1b2198c379f71 (commit) via ae124660032c666b0547a04791ed33a9c127e27b (commit) via f9439f76a38f8837147c44236328e6e319c4b939 (commit) via 225141c377295a2c4c0176faa10bd1156098b28e (commit) from 83747734d96ae918c1841b3ab920b33e42302741 (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/3ad0e71d9232c84d2b3eae9d72f1b2198… commit 3ad0e71d9232c84d2b3eae9d72f1b2198c379f71 Author: Pavan Balaji <balaji(a)anl.gov> Date: Tue Jul 21 17:49:48 2015 -0500 Remove unnecessary initialization. Signed-off-by: Xin Zhao <xinzhao3(a)illinois.edu> diff --git a/src/mpid/ch3/src/ch3u_rma_progress.c b/src/mpid/ch3/src/ch3u_rma_progress.c index 41058c4..da604d4 100644 --- a/src/mpid/ch3/src/ch3u_rma_progress.c +++ b/src/mpid/ch3/src/ch3u_rma_progress.c @@ -938,7 +938,7 @@ int MPIDI_CH3I_RMA_Make_progress_win(MPID_Win * win_ptr, int *made_progress) #define FCNAME MPIU_QUOTE(FUNCNAME) int MPIDI_CH3I_RMA_Make_progress_global(int *made_progress) { - MPIDI_RMA_Win_list_t *win_elem = MPIDI_RMA_Win_list_head; + MPIDI_RMA_Win_list_t *win_elem; int mpi_errno = MPI_SUCCESS; (*made_progress) = 0; http://git.mpich.org/mpich.git/commitdiff/ae124660032c666b0547a04791ed33a9c… commit ae124660032c666b0547a04791ed33a9c127e27b Author: Pavan Balaji <balaji(a)anl.gov> Date: Tue Jul 21 17:48:57 2015 -0500 Use MPIDI_RMA_Win_list_head instead of MPIDI_RMA_Win_list. Keep list names consistent. Signed-off-by: Xin Zhao <xinzhao3(a)illinois.edu> diff --git a/src/mpid/ch3/include/mpid_rma_types.h b/src/mpid/ch3/include/mpid_rma_types.h index c384a9d..ba664b1 100644 --- a/src/mpid/ch3/include/mpid_rma_types.h +++ b/src/mpid/ch3/include/mpid_rma_types.h @@ -109,7 +109,7 @@ typedef struct MPIDI_RMA_Win_list { struct MPIDI_RMA_Win_list *prev; } MPIDI_RMA_Win_list_t; -extern MPIDI_RMA_Win_list_t *MPIDI_RMA_Win_list; +extern MPIDI_RMA_Win_list_t *MPIDI_RMA_Win_list_head; typedef struct MPIDI_RMA_Target_lock_entry { struct MPIDI_RMA_Target_lock_entry *next; diff --git a/src/mpid/ch3/src/ch3u_rma_progress.c b/src/mpid/ch3/src/ch3u_rma_progress.c index 7c3d393..41058c4 100644 --- a/src/mpid/ch3/src/ch3u_rma_progress.c +++ b/src/mpid/ch3/src/ch3u_rma_progress.c @@ -938,7 +938,7 @@ int MPIDI_CH3I_RMA_Make_progress_win(MPID_Win * win_ptr, int *made_progress) #define FCNAME MPIU_QUOTE(FUNCNAME) int MPIDI_CH3I_RMA_Make_progress_global(int *made_progress) { - MPIDI_RMA_Win_list_t *win_elem = MPIDI_RMA_Win_list; + MPIDI_RMA_Win_list_t *win_elem = MPIDI_RMA_Win_list_head; int mpi_errno = MPI_SUCCESS; (*made_progress) = 0; @@ -946,7 +946,7 @@ int MPIDI_CH3I_RMA_Make_progress_global(int *made_progress) if (MPIDI_CH3I_num_active_issued_win == 0 && MPIDI_CH3I_num_passive_win == 0) goto fn_exit; - for (win_elem = MPIDI_RMA_Win_list; win_elem; win_elem = win_elem->next) { + for (win_elem = MPIDI_RMA_Win_list_head; win_elem; win_elem = win_elem->next) { int temp_progress = 0; int is_able_to_issue = 0; diff --git a/src/mpid/ch3/src/mpid_rma.c b/src/mpid/ch3/src/mpid_rma.c index b4e5595..e426c3c 100644 --- a/src/mpid/ch3/src/mpid_rma.c +++ b/src/mpid/ch3/src/mpid_rma.c @@ -41,7 +41,7 @@ cvars: MPIU_THREADSAFE_INIT_DECL(initRMAoptions); -MPIDI_RMA_Win_list_t *MPIDI_RMA_Win_list = NULL; +MPIDI_RMA_Win_list_t *MPIDI_RMA_Win_list_head = NULL; static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, MPID_Info * info, MPID_Comm * comm_ptr, MPID_Win ** win_ptr); @@ -358,12 +358,12 @@ static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, "Window list element"); win_elem->win_ptr = *win_ptr; - if (MPIDI_RMA_Win_list == NULL) { + if (MPIDI_RMA_Win_list_head == NULL) { mpi_errno = MPID_Progress_register_hook(MPIDI_CH3I_RMA_Make_progress_global); if (mpi_errno) MPIU_ERR_POP(mpi_errno); } - MPL_DL_APPEND(MPIDI_RMA_Win_list, win_elem); + MPL_DL_APPEND(MPIDI_RMA_Win_list_head, win_elem); if (MPIDI_CH3U_Win_hooks.win_init != NULL) { mpi_errno = diff --git a/src/mpid/ch3/src/mpidi_rma.c b/src/mpid/ch3/src/mpidi_rma.c index a62db0f..4a01f90 100644 --- a/src/mpid/ch3/src/mpidi_rma.c +++ b/src/mpid/ch3/src/mpidi_rma.c @@ -201,13 +201,13 @@ int MPID_Win_free(MPID_Win ** win_ptr) } /* dequeue window from the global list */ - for (win_elem = MPIDI_RMA_Win_list; win_elem && win_elem->win_ptr != *win_ptr; + for (win_elem = MPIDI_RMA_Win_list_head; win_elem && win_elem->win_ptr != *win_ptr; win_elem = win_elem->next); MPIU_ERR_CHKANDJUMP(win_elem == NULL, mpi_errno, MPI_ERR_RMA_SYNC, "**rmasync"); - MPL_DL_DELETE(MPIDI_RMA_Win_list, win_elem); + MPL_DL_DELETE(MPIDI_RMA_Win_list_head, win_elem); MPIU_Free(win_elem); - if (MPIDI_RMA_Win_list == NULL) + if (MPIDI_RMA_Win_list_head == NULL) MPID_Progress_deregister_hook(MPIDI_CH3I_RMA_Make_progress_global); comm_ptr = (*win_ptr)->comm_ptr; http://git.mpich.org/mpich.git/commitdiff/f9439f76a38f8837147c44236328e6e31… commit f9439f76a38f8837147c44236328e6e319c4b939 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Fri Jul 17 06:14:24 2015 -0500 use double direction linked list for RMA related lists. Using a doubly-linked list makes deletion faster when you have a direct pointer to the object that needs to be deleted. The following lists were modified: - issue/pending operation lists - target list - operation pool - target pool - target lock entry list - window list Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/mpid/ch3/include/mpid_rma_lockqueue.h b/src/mpid/ch3/include/mpid_rma_lockqueue.h index f0509c5..6811494 100644 --- a/src/mpid/ch3/include/mpid_rma_lockqueue.h +++ b/src/mpid/ch3/include/mpid_rma_lockqueue.h @@ -28,8 +28,7 @@ static inline MPIDI_RMA_Target_lock_entry_t *MPIDI_CH3I_Win_target_lock_entry_al if (win_ptr->target_lock_entry_pool_head != NULL) { new_ptr = win_ptr->target_lock_entry_pool_head; - MPL_LL_DELETE(win_ptr->target_lock_entry_pool_head, win_ptr->target_lock_entry_pool_tail, - new_ptr); + MPL_DL_DELETE(win_ptr->target_lock_entry_pool_head, new_ptr); } if (new_ptr != NULL) { @@ -63,8 +62,7 @@ static inline int MPIDI_CH3I_Win_target_lock_entry_free(MPID_Win * win_ptr, /* use PREPEND when return objects back to the pool * in order to improve cache performance */ - MPL_LL_PREPEND(win_ptr->target_lock_entry_pool_head, win_ptr->target_lock_entry_pool_tail, - target_lock_entry); + MPL_DL_PREPEND(win_ptr->target_lock_entry_pool_head, target_lock_entry); return mpi_errno; } diff --git a/src/mpid/ch3/include/mpid_rma_oplist.h b/src/mpid/ch3/include/mpid_rma_oplist.h index fa60ab2..5d84d6f 100644 --- a/src/mpid/ch3/include/mpid_rma_oplist.h +++ b/src/mpid/ch3/include/mpid_rma_oplist.h @@ -16,9 +16,8 @@ int MPIDI_CH3I_RMA_Cleanup_target_aggressive(MPID_Win * win_ptr, MPIDI_RMA_Targe int MPIDI_CH3I_RMA_Make_progress_target(MPID_Win * win_ptr, int target_rank, int *made_progress); int MPIDI_CH3I_RMA_Make_progress_win(MPID_Win * win_ptr, int *made_progress); -extern MPIDI_RMA_Op_t *global_rma_op_pool_head, *global_rma_op_pool_tail, *global_rma_op_pool_start; -extern MPIDI_RMA_Target_t *global_rma_target_pool_head, *global_rma_target_pool_tail, - *global_rma_target_pool_start; +extern MPIDI_RMA_Op_t *global_rma_op_pool_head, *global_rma_op_pool_start; +extern MPIDI_RMA_Target_t *global_rma_target_pool_head, *global_rma_target_pool_start; MPIR_T_PVAR_DOUBLE_TIMER_DECL_EXTERN(RMA, rma_rmaqueue_alloc); @@ -58,12 +57,12 @@ static inline MPIDI_RMA_Op_t *MPIDI_CH3I_Win_op_alloc(MPID_Win * win_ptr) return NULL; else { e = global_rma_op_pool_head; - MPL_LL_DELETE(global_rma_op_pool_head, global_rma_op_pool_tail, e); + MPL_DL_DELETE(global_rma_op_pool_head, e); } } else { e = win_ptr->op_pool_head; - MPL_LL_DELETE(win_ptr->op_pool_head, win_ptr->op_pool_tail, e); + MPL_DL_DELETE(win_ptr->op_pool_head, e); } e->single_req = NULL; @@ -95,9 +94,9 @@ static inline int MPIDI_CH3I_Win_op_free(MPID_Win * win_ptr, MPIDI_RMA_Op_t * e) /* use PREPEND when return objects back to the pool * in order to improve cache performance */ if (e->pool_type == MPIDI_RMA_POOL_WIN) - MPL_LL_PREPEND(win_ptr->op_pool_head, win_ptr->op_pool_tail, e); + MPL_DL_PREPEND(win_ptr->op_pool_head, e); else - MPL_LL_PREPEND(global_rma_op_pool_head, global_rma_op_pool_tail, e); + MPL_DL_PREPEND(global_rma_op_pool_head, e); return mpi_errno; } @@ -118,18 +117,18 @@ static inline MPIDI_RMA_Target_t *MPIDI_CH3I_Win_target_alloc(MPID_Win * win_ptr return NULL; else { e = global_rma_target_pool_head; - MPL_LL_DELETE(global_rma_target_pool_head, global_rma_target_pool_tail, e); + MPL_DL_DELETE(global_rma_target_pool_head, e); } } else { e = win_ptr->target_pool_head; - MPL_LL_DELETE(win_ptr->target_pool_head, win_ptr->target_pool_tail, e); + MPL_DL_DELETE(win_ptr->target_pool_head, e); } - e->issued_read_op_list_head = e->issued_read_op_list_tail = NULL; - e->issued_write_op_list_head = e->issued_write_op_list_tail = NULL; - e->issued_dt_op_list_head = e->issued_dt_op_list_tail = NULL; - e->pending_op_list_head = e->pending_op_list_tail = NULL; + e->issued_read_op_list_head = NULL; + e->issued_write_op_list_head = NULL; + e->issued_dt_op_list_head = NULL; + e->pending_op_list_head = NULL; e->next_op_to_issue = NULL; e->target_rank = -1; @@ -167,9 +166,9 @@ static inline int MPIDI_CH3I_Win_target_free(MPID_Win * win_ptr, MPIDI_RMA_Targe /* use PREPEND when return objects back to the pool * in order to improve cache performance */ if (e->pool_type == MPIDI_RMA_POOL_WIN) - MPL_LL_PREPEND(win_ptr->target_pool_head, win_ptr->target_pool_tail, e); + MPL_DL_PREPEND(win_ptr->target_pool_head, e); else - MPL_LL_PREPEND(global_rma_target_pool_head, global_rma_target_pool_tail, e); + MPL_DL_PREPEND(global_rma_target_pool_head, e); return mpi_errno; } @@ -205,7 +204,7 @@ static inline int MPIDI_CH3I_Win_create_target(MPID_Win * win_ptr, int target_ra win_ptr->non_empty_slots++; /* Enqueue target into target list. */ - MPL_LL_APPEND(slot->target_list_head, slot->target_list_tail, t); + MPL_DL_APPEND(slot->target_list_head, t); assert(t != NULL); @@ -291,7 +290,7 @@ static inline int MPIDI_CH3I_Win_enqueue_op(MPID_Win * win_ptr, MPIDI_RMA_Op_t * } /* Enqueue operation into pending list. */ - MPL_LL_APPEND(target->pending_op_list_head, target->pending_op_list_tail, op); + MPL_DL_APPEND(target->pending_op_list_head, op); if (target->next_op_to_issue == NULL) target->next_op_to_issue = op; @@ -319,7 +318,7 @@ static inline int MPIDI_CH3I_Win_target_dequeue_and_free(MPID_Win * win_ptr, MPI else slot = &(win_ptr->slots[target_rank]); - MPL_LL_DELETE(slot->target_list_head, slot->target_list_tail, e); + MPL_DL_DELETE(slot->target_list_head, e); mpi_errno = MPIDI_CH3I_Win_target_free(win_ptr, e); if (mpi_errno != MPI_SUCCESS) @@ -342,7 +341,7 @@ static inline int MPIDI_CH3I_Win_target_dequeue_and_free(MPID_Win * win_ptr, MPI static inline int MPIDI_CH3I_RMA_Cleanup_ops_target(MPID_Win * win_ptr, MPIDI_RMA_Target_t * target) { MPIDI_RMA_Op_t *curr_op = NULL; - MPIDI_RMA_Op_t **op_list_head = NULL, **op_list_tail = NULL; + MPIDI_RMA_Op_t **op_list_head = NULL; int read_flag = 0, write_flag = 0; int mpi_errno = MPI_SUCCESS; int i; @@ -367,7 +366,6 @@ static inline int MPIDI_CH3I_RMA_Cleanup_ops_target(MPID_Win * win_ptr, MPIDI_RM /* go over issued_read_op_list, issued_write_op_list, * issued_dt_op_list, start from issued_read_op_list. */ op_list_head = &(target->issued_read_op_list_head); - op_list_tail = &(target->issued_read_op_list_tail); read_flag = 1; curr_op = *op_list_head; @@ -443,7 +441,7 @@ static inline int MPIDI_CH3I_RMA_Cleanup_ops_target(MPID_Win * win_ptr, MPIDI_RM curr_op->reqs_size = 0; /* dequeue the operation and free it */ - MPL_LL_DELETE(*op_list_head, *op_list_tail, curr_op); + MPL_DL_DELETE(*op_list_head, curr_op); MPIDI_CH3I_Win_op_free(win_ptr, curr_op); } else @@ -454,13 +452,11 @@ static inline int MPIDI_CH3I_RMA_Cleanup_ops_target(MPID_Win * win_ptr, MPIDI_RM if (read_flag == 1) { read_flag = 0; op_list_head = &(target->issued_write_op_list_head); - op_list_tail = &(target->issued_write_op_list_tail); write_flag = 1; } else if (write_flag == 1) { write_flag = 0; op_list_head = &(target->issued_dt_op_list_head); - op_list_tail = &(target->issued_dt_op_list_tail); } else { /* we reach the tail of the last operation list (dt_op_list), @@ -611,11 +607,9 @@ static inline int MPIDI_CH3I_Win_get_op(MPID_Win * win_ptr, MPIDI_RMA_Op_t ** e) #define FUNCNAME MPIDI_CH3I_RMA_Ops_append #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) -static inline void MPIDI_CH3I_RMA_Ops_append(MPIDI_RMA_Ops_list_t * list, - MPIDI_RMA_Ops_list_t * list_tail, - MPIDI_RMA_Op_t * elem) +static inline void MPIDI_CH3I_RMA_Ops_append(MPIDI_RMA_Ops_list_t * list, MPIDI_RMA_Op_t * elem) { - MPL_LL_APPEND(*list, *list_tail, elem); + MPL_DL_APPEND(*list, elem); } @@ -628,11 +622,9 @@ static inline void MPIDI_CH3I_RMA_Ops_append(MPIDI_RMA_Ops_list_t * list, #define FUNCNAME MPIDI_CH3I_RMA_Ops_unlink #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) -static inline void MPIDI_CH3I_RMA_Ops_unlink(MPIDI_RMA_Ops_list_t * list, - MPIDI_RMA_Ops_list_t * list_tail, - MPIDI_RMA_Op_t * elem) +static inline void MPIDI_CH3I_RMA_Ops_unlink(MPIDI_RMA_Ops_list_t * list, MPIDI_RMA_Op_t * elem) { - MPL_LL_DELETE(*list, *list_tail, elem); + MPL_DL_DELETE(*list, elem); } @@ -646,14 +638,13 @@ static inline void MPIDI_CH3I_RMA_Ops_unlink(MPIDI_RMA_Ops_list_t * list, #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) static inline void MPIDI_CH3I_RMA_Ops_free_elem(MPID_Win * win_ptr, MPIDI_RMA_Ops_list_t * list, - MPIDI_RMA_Ops_list_t * list_tail, MPIDI_RMA_Op_t * curr_ptr) { MPIDI_RMA_Op_t *tmp_ptr = curr_ptr; MPIU_Assert(curr_ptr != NULL); - MPL_LL_DELETE(*list, *list_tail, curr_ptr); + MPL_DL_DELETE(*list, curr_ptr); MPIDI_CH3I_Win_op_free(win_ptr, tmp_ptr); } diff --git a/src/mpid/ch3/include/mpid_rma_types.h b/src/mpid/ch3/include/mpid_rma_types.h index cdb2897..c384a9d 100644 --- a/src/mpid/ch3/include/mpid_rma_types.h +++ b/src/mpid/ch3/include/mpid_rma_types.h @@ -31,6 +31,7 @@ typedef enum MPIDI_RMA_Pool_type { /* for keeping track of RMA ops, which will be executed at the next sync call */ typedef struct MPIDI_RMA_Op { struct MPIDI_RMA_Op *next; /* pointer to next element in list */ + struct MPIDI_RMA_Op *prev; /* pointer to prev element in list */ void *origin_addr; int origin_count; @@ -62,12 +63,13 @@ typedef struct MPIDI_RMA_Op { } MPIDI_RMA_Op_t; typedef struct MPIDI_RMA_Target { - struct MPIDI_RMA_Op *issued_read_op_list_head, *issued_read_op_list_tail; - struct MPIDI_RMA_Op *issued_write_op_list_head, *issued_write_op_list_tail; - struct MPIDI_RMA_Op *issued_dt_op_list_head, *issued_dt_op_list_tail; - struct MPIDI_RMA_Op *pending_op_list_head, *pending_op_list_tail; + struct MPIDI_RMA_Op *issued_read_op_list_head; + struct MPIDI_RMA_Op *issued_write_op_list_head; + struct MPIDI_RMA_Op *issued_dt_op_list_head; + struct MPIDI_RMA_Op *pending_op_list_head; struct MPIDI_RMA_Op *next_op_to_issue; struct MPIDI_RMA_Target *next; + struct MPIDI_RMA_Target *prev; int target_rank; enum MPIDI_RMA_states access_state; int lock_type; /* NONE, SHARED, EXCLUSIVE */ @@ -99,18 +101,19 @@ typedef struct MPIDI_RMA_Target { typedef struct MPIDI_RMA_Slot { struct MPIDI_RMA_Target *target_list_head; - struct MPIDI_RMA_Target *target_list_tail; } MPIDI_RMA_Slot_t; typedef struct MPIDI_RMA_Win_list { MPID_Win *win_ptr; struct MPIDI_RMA_Win_list *next; + struct MPIDI_RMA_Win_list *prev; } MPIDI_RMA_Win_list_t; -extern MPIDI_RMA_Win_list_t *MPIDI_RMA_Win_list, *MPIDI_RMA_Win_list_tail; +extern MPIDI_RMA_Win_list_t *MPIDI_RMA_Win_list; typedef struct MPIDI_RMA_Target_lock_entry { struct MPIDI_RMA_Target_lock_entry *next; + struct MPIDI_RMA_Target_lock_entry *prev; MPIDI_CH3_Pkt_t pkt; /* all information for this request packet */ MPIDI_VC_t *vc; void *data; /* for queued PUTs / ACCs / GACCs, data is copied here */ diff --git a/src/mpid/ch3/include/mpidpre.h b/src/mpid/ch3/include/mpidpre.h index e6bdadc..2f7d3ea 100644 --- a/src/mpid/ch3/include/mpidpre.h +++ b/src/mpid/ch3/include/mpidpre.h @@ -316,17 +316,13 @@ typedef struct MPIDI_Win_basic_info { * (none, shared, exclusive) */ \ volatile int shared_lock_ref_cnt; \ struct MPIDI_RMA_Target_lock_entry volatile *target_lock_queue_head; /* list of unsatisfied locks */ \ - struct MPIDI_RMA_Target_lock_entry volatile *target_lock_queue_tail; /* tail of unstaisfied locks. */ \ - \ struct MPIDI_Win_info_args info_args; \ int shm_allocated; /* flag: TRUE iff this window has a shared memory \ region associated with it */ \ struct MPIDI_RMA_Op *op_pool_start; /* start pointer used for freeing */\ struct MPIDI_RMA_Op *op_pool_head; /* pool of operations */ \ - struct MPIDI_RMA_Op *op_pool_tail; /* tail pointer to pool of operations. */ \ struct MPIDI_RMA_Target *target_pool_start; /* start pointer used for freeing */\ struct MPIDI_RMA_Target *target_pool_head; /* pool of targets */ \ - struct MPIDI_RMA_Target *target_pool_tail; /* tail pointer to pool of targets */\ struct MPIDI_RMA_Slot *slots; \ int num_slots; \ struct { \ @@ -348,7 +344,6 @@ typedef struct MPIDI_Win_basic_info { of number of locks not being granted yet. */ \ struct MPIDI_RMA_Target_lock_entry *target_lock_entry_pool_start; \ struct MPIDI_RMA_Target_lock_entry *target_lock_entry_pool_head; \ - struct MPIDI_RMA_Target_lock_entry *target_lock_entry_pool_tail; \ int current_target_lock_data_bytes; \ int dangling_request_cnt; /* This counter tracks number of \ ibarrier requests (used in \ diff --git a/src/mpid/ch3/include/mpidrma.h b/src/mpid/ch3/include/mpidrma.h index a05b2ff..4f86910 100644 --- a/src/mpid/ch3/include/mpidrma.h +++ b/src/mpid/ch3/include/mpidrma.h @@ -333,7 +333,9 @@ static inline int enqueue_lock_origin(MPID_Win * win_ptr, MPIDI_VC_t * vc, new_ptr = MPIDI_CH3I_Win_target_lock_entry_alloc(win_ptr, pkt); if (new_ptr != NULL) { - MPL_LL_APPEND(win_ptr->target_lock_queue_head, win_ptr->target_lock_queue_tail, new_ptr); + MPIDI_RMA_Target_lock_entry_t **head_ptr = + (MPIDI_RMA_Target_lock_entry_t **) (&(win_ptr->target_lock_queue_head)); + MPL_DL_APPEND((*head_ptr), new_ptr); new_ptr->vc = vc; } else { @@ -645,15 +647,13 @@ static inline int adjust_op_piggybacked_with_lock(MPID_Win * win_ptr, if (op->reqs_size == 0) { MPIU_Assert(op->single_req == NULL && op->multi_reqs == NULL); - MPIDI_CH3I_RMA_Ops_free_elem(win_ptr, &(target->pending_op_list_head), - &(target->pending_op_list_tail), op); + MPIDI_CH3I_RMA_Ops_free_elem(win_ptr, &(target->pending_op_list_head), op); } else { MPI_Datatype target_datatype; int is_derived = FALSE; - MPIDI_CH3I_RMA_Ops_unlink(&(target->pending_op_list_head), - &(target->pending_op_list_tail), op); + MPIDI_CH3I_RMA_Ops_unlink(&(target->pending_op_list_head), op); MPIDI_CH3_PKT_RMA_GET_TARGET_DATATYPE(op->pkt, target_datatype, mpi_errno); @@ -667,19 +667,16 @@ static inline int adjust_op_piggybacked_with_lock(MPID_Win * win_ptr, } if (is_derived) { - MPIDI_CH3I_RMA_Ops_append(&(target->issued_dt_op_list_head), - &(target->issued_dt_op_list_tail), op); + MPIDI_CH3I_RMA_Ops_append(&(target->issued_dt_op_list_head), op); } else if (op->pkt.type == MPIDI_CH3_PKT_PUT || op->pkt.type == MPIDI_CH3_PKT_PUT_IMMED || op->pkt.type == MPIDI_CH3_PKT_ACCUMULATE || op->pkt.type == MPIDI_CH3_PKT_ACCUMULATE_IMMED) { - MPIDI_CH3I_RMA_Ops_append(&(target->issued_write_op_list_head), - &(target->issued_write_op_list_tail), op); + MPIDI_CH3I_RMA_Ops_append(&(target->issued_write_op_list_head), op); } else { - MPIDI_CH3I_RMA_Ops_append(&(target->issued_read_op_list_head), - &(target->issued_read_op_list_tail), op); + MPIDI_CH3I_RMA_Ops_append(&(target->issued_read_op_list_head), op); } } } @@ -753,6 +750,8 @@ static inline int acquire_local_lock(MPID_Win * win_ptr, int lock_type) MPIDI_CH3_Pkt_lock_t *lock_pkt = &pkt.lock; MPIDI_RMA_Target_lock_entry_t *new_ptr = NULL; MPIDI_VC_t *my_vc; + MPIDI_RMA_Target_lock_entry_t **head_ptr = + (MPIDI_RMA_Target_lock_entry_t **) (&(win_ptr->target_lock_queue_head)); MPIDI_Pkt_init(lock_pkt, MPIDI_CH3_PKT_LOCK); lock_pkt->flags = MPIDI_CH3_PKT_FLAG_NONE; @@ -771,7 +770,7 @@ static inline int acquire_local_lock(MPID_Win * win_ptr, int lock_type) MPIU_ERR_POP(mpi_errno); goto fn_exit; } - MPL_LL_APPEND(win_ptr->target_lock_queue_head, win_ptr->target_lock_queue_tail, new_ptr); + MPL_DL_APPEND((*head_ptr), new_ptr); MPIDI_Comm_get_vc_set_active(win_ptr->comm_ptr, win_ptr->comm_ptr->rank, &my_vc); new_ptr->vc = my_vc; diff --git a/src/mpid/ch3/src/ch3u_handle_recv_req.c b/src/mpid/ch3/src/ch3u_handle_recv_req.c index a1f13e3..5b3923e 100644 --- a/src/mpid/ch3/src/ch3u_handle_recv_req.c +++ b/src/mpid/ch3/src/ch3u_handle_recv_req.c @@ -1950,8 +1950,7 @@ int MPIDI_CH3I_Release_lock(MPID_Win * win_ptr) } if (MPIDI_CH3I_Try_acquire_win_lock(win_ptr, requested_lock) == 1) { /* dequeue entry from lock queue */ - MPL_LL_DELETE(win_ptr->target_lock_queue_head, - win_ptr->target_lock_queue_tail, target_lock_entry); + MPL_DL_DELETE(win_ptr->target_lock_queue_head, target_lock_entry); /* perform this OP */ mpi_errno = perform_op_in_lock_queue(win_ptr, target_lock_entry); @@ -2052,8 +2051,7 @@ int MPIDI_CH3_ReqHandler_PiggybackLockOpRecvComplete(MPIDI_VC_t * vc, if (MPIDI_CH3I_Try_acquire_win_lock(win_ptr, requested_lock) == 1) { /* dequeue entry from lock queue */ - MPL_LL_DELETE(win_ptr->target_lock_queue_head, win_ptr->target_lock_queue_tail, - target_lock_queue_entry); + MPL_DL_DELETE(win_ptr->target_lock_queue_head, target_lock_queue_entry); /* perform this OP */ mpi_errno = perform_op_in_lock_queue(win_ptr, target_lock_queue_entry); diff --git a/src/mpid/ch3/src/ch3u_rma_progress.c b/src/mpid/ch3/src/ch3u_rma_progress.c index 66a2611..7c3d393 100644 --- a/src/mpid/ch3/src/ch3u_rma_progress.c +++ b/src/mpid/ch3/src/ch3u_rma_progress.c @@ -439,8 +439,7 @@ static inline int issue_ops_target(MPID_Win * win_ptr, MPIDI_RMA_Target_t * targ if (curr_op->reqs_size == 0) { MPIU_Assert(curr_op->single_req == NULL && curr_op->multi_reqs == NULL); /* Sending is completed immediately. */ - MPIDI_CH3I_RMA_Ops_free_elem(win_ptr, &(target->pending_op_list_head), - &(target->pending_op_list_tail), curr_op); + MPIDI_CH3I_RMA_Ops_free_elem(win_ptr, &(target->pending_op_list_head), curr_op); } else { MPI_Datatype target_datatype; @@ -448,8 +447,7 @@ static inline int issue_ops_target(MPID_Win * win_ptr, MPIDI_RMA_Target_t * targ /* Sending is not completed immediately. */ - MPIDI_CH3I_RMA_Ops_unlink(&(target->pending_op_list_head), - &(target->pending_op_list_tail), curr_op); + MPIDI_CH3I_RMA_Ops_unlink(&(target->pending_op_list_head), curr_op); MPIDI_CH3_PKT_RMA_GET_TARGET_DATATYPE(curr_op->pkt, target_datatype, mpi_errno); @@ -463,19 +461,16 @@ static inline int issue_ops_target(MPID_Win * win_ptr, MPIDI_RMA_Target_t * targ } if (is_derived) { - MPIDI_CH3I_RMA_Ops_append(&(target->issued_dt_op_list_head), - &(target->issued_dt_op_list_tail), curr_op); + MPIDI_CH3I_RMA_Ops_append(&(target->issued_dt_op_list_head), curr_op); } else if (curr_op->pkt.type == MPIDI_CH3_PKT_PUT || curr_op->pkt.type == MPIDI_CH3_PKT_PUT_IMMED || curr_op->pkt.type == MPIDI_CH3_PKT_ACCUMULATE || curr_op->pkt.type == MPIDI_CH3_PKT_ACCUMULATE_IMMED) { - MPIDI_CH3I_RMA_Ops_append(&(target->issued_write_op_list_head), - &(target->issued_write_op_list_tail), curr_op); + MPIDI_CH3I_RMA_Ops_append(&(target->issued_write_op_list_head), curr_op); } else { - MPIDI_CH3I_RMA_Ops_append(&(target->issued_read_op_list_head), - &(target->issued_read_op_list_tail), curr_op); + MPIDI_CH3I_RMA_Ops_append(&(target->issued_read_op_list_head), curr_op); } @@ -569,7 +564,7 @@ int MPIDI_CH3I_RMA_Free_ops_before_completion(MPID_Win * win_ptr) { MPIDI_RMA_Op_t *curr_op = NULL; MPIDI_RMA_Target_t *curr_target = NULL; - MPIDI_RMA_Op_t **op_list_head = NULL, **op_list_tail = NULL; + MPIDI_RMA_Op_t **op_list_head = NULL; int read_flag = 0; int i, made_progress = 0; int mpi_errno = MPI_SUCCESS; @@ -620,7 +615,6 @@ int MPIDI_CH3I_RMA_Free_ops_before_completion(MPID_Win * win_ptr) curr_target->sync.upgrade_flush_local = 1; op_list_head = &curr_target->issued_read_op_list_head; - op_list_tail = &curr_target->issued_read_op_list_tail; read_flag = 1; curr_op = *op_list_head; @@ -650,12 +644,11 @@ int MPIDI_CH3I_RMA_Free_ops_before_completion(MPID_Win * win_ptr) curr_op->multi_reqs = NULL; curr_op->reqs_size = 0; } - MPIDI_CH3I_RMA_Ops_free_elem(win_ptr, op_list_head, op_list_tail, curr_op); + MPIDI_CH3I_RMA_Ops_free_elem(win_ptr, op_list_head, curr_op); } else { if (read_flag == 1) { op_list_head = &curr_target->issued_write_op_list_head; - op_list_tail = &curr_target->issued_write_op_list_tail; read_flag = 0; } else { diff --git a/src/mpid/ch3/src/mpid_rma.c b/src/mpid/ch3/src/mpid_rma.c index 65dce1b..b4e5595 100644 --- a/src/mpid/ch3/src/mpid_rma.c +++ b/src/mpid/ch3/src/mpid_rma.c @@ -41,7 +41,7 @@ cvars: MPIU_THREADSAFE_INIT_DECL(initRMAoptions); -MPIDI_RMA_Win_list_t *MPIDI_RMA_Win_list = NULL, *MPIDI_RMA_Win_list_tail = NULL; +MPIDI_RMA_Win_list_t *MPIDI_RMA_Win_list = NULL; static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, MPID_Info * info, MPID_Comm * comm_ptr, MPID_Win ** win_ptr); @@ -286,7 +286,6 @@ static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, (*win_ptr)->current_lock_type = MPID_LOCK_NONE; (*win_ptr)->shared_lock_ref_cnt = 0; (*win_ptr)->target_lock_queue_head = NULL; - (*win_ptr)->target_lock_queue_tail = NULL; (*win_ptr)->shm_allocated = FALSE; (*win_ptr)->states.access_state = MPIDI_RMA_NONE; (*win_ptr)->states.exposure_state = MPIDI_RMA_NONE; @@ -320,11 +319,9 @@ static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, sizeof(MPIDI_RMA_Op_t) * MPIR_CVAR_CH3_RMA_OP_WIN_POOL_SIZE, mpi_errno, "RMA op pool"); (*win_ptr)->op_pool_head = NULL; - (*win_ptr)->op_pool_tail = NULL; for (i = 0; i < MPIR_CVAR_CH3_RMA_OP_WIN_POOL_SIZE; i++) { (*win_ptr)->op_pool_start[i].pool_type = MPIDI_RMA_POOL_WIN; - MPL_LL_APPEND((*win_ptr)->op_pool_head, (*win_ptr)->op_pool_tail, - &((*win_ptr)->op_pool_start[i])); + MPL_DL_APPEND((*win_ptr)->op_pool_head, &((*win_ptr)->op_pool_start[i])); } win_target_pool_size = @@ -333,11 +330,9 @@ static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, sizeof(MPIDI_RMA_Target_t) * win_target_pool_size, mpi_errno, "RMA target pool"); (*win_ptr)->target_pool_head = NULL; - (*win_ptr)->target_pool_tail = NULL; for (i = 0; i < win_target_pool_size; i++) { (*win_ptr)->target_pool_start[i].pool_type = MPIDI_RMA_POOL_WIN; - MPL_LL_APPEND((*win_ptr)->target_pool_head, (*win_ptr)->target_pool_tail, - &((*win_ptr)->target_pool_start[i])); + MPL_DL_APPEND((*win_ptr)->target_pool_head, &((*win_ptr)->target_pool_start[i])); } (*win_ptr)->num_slots = MPIR_MIN(MPIR_CVAR_CH3_RMA_SLOTS_SIZE, MPIR_Comm_size(win_comm_ptr)); @@ -345,7 +340,6 @@ static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, sizeof(MPIDI_RMA_Slot_t) * (*win_ptr)->num_slots, mpi_errno, "RMA slots"); for (i = 0; i < (*win_ptr)->num_slots; i++) { (*win_ptr)->slots[i].target_list_head = NULL; - (*win_ptr)->slots[i].target_list_tail = NULL; } MPIU_CHKPMEM_MALLOC((*win_ptr)->target_lock_entry_pool_start, @@ -354,10 +348,8 @@ static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, MPIR_CVAR_CH3_RMA_TARGET_LOCK_ENTRY_WIN_POOL_SIZE, mpi_errno, "RMA lock entry pool"); (*win_ptr)->target_lock_entry_pool_head = NULL; - (*win_ptr)->target_lock_entry_pool_tail = NULL; for (i = 0; i < MPIR_CVAR_CH3_RMA_TARGET_LOCK_ENTRY_WIN_POOL_SIZE; i++) { - MPL_LL_APPEND((*win_ptr)->target_lock_entry_pool_head, - (*win_ptr)->target_lock_entry_pool_tail, + MPL_DL_APPEND((*win_ptr)->target_lock_entry_pool_head, &((*win_ptr)->target_lock_entry_pool_start[i])); } @@ -371,7 +363,7 @@ static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, if (mpi_errno) MPIU_ERR_POP(mpi_errno); } - MPL_LL_APPEND(MPIDI_RMA_Win_list, MPIDI_RMA_Win_list_tail, win_elem); + MPL_DL_APPEND(MPIDI_RMA_Win_list, win_elem); if (MPIDI_CH3U_Win_hooks.win_init != NULL) { mpi_errno = diff --git a/src/mpid/ch3/src/mpidi_rma.c b/src/mpid/ch3/src/mpidi_rma.c index 3182cfe..a62db0f 100644 --- a/src/mpid/ch3/src/mpidi_rma.c +++ b/src/mpid/ch3/src/mpidi_rma.c @@ -79,10 +79,8 @@ cvars: */ -MPIDI_RMA_Op_t *global_rma_op_pool_head = NULL, *global_rma_op_pool_tail = - NULL, *global_rma_op_pool_start = NULL; -MPIDI_RMA_Target_t *global_rma_target_pool_head = NULL, *global_rma_target_pool_tail = - NULL, *global_rma_target_pool_start = NULL; +MPIDI_RMA_Op_t *global_rma_op_pool_head = NULL, *global_rma_op_pool_start = NULL; +MPIDI_RMA_Target_t *global_rma_target_pool_head = NULL, *global_rma_target_pool_start = NULL; #undef FUNCNAME #define FUNCNAME MPIDI_RMA_init @@ -103,8 +101,7 @@ int MPIDI_RMA_init(void) mpi_errno, "RMA op pool"); for (i = 0; i < MPIR_CVAR_CH3_RMA_OP_GLOBAL_POOL_SIZE; i++) { global_rma_op_pool_start[i].pool_type = MPIDI_RMA_POOL_GLOBAL; - MPL_LL_APPEND(global_rma_op_pool_head, global_rma_op_pool_tail, - &(global_rma_op_pool_start[i])); + MPL_DL_APPEND(global_rma_op_pool_head, &(global_rma_op_pool_start[i])); } MPIU_CHKPMEM_MALLOC(global_rma_target_pool_start, MPIDI_RMA_Target_t *, @@ -112,8 +109,7 @@ int MPIDI_RMA_init(void) mpi_errno, "RMA target pool"); for (i = 0; i < MPIR_CVAR_CH3_RMA_TARGET_GLOBAL_POOL_SIZE; i++) { global_rma_target_pool_start[i].pool_type = MPIDI_RMA_POOL_GLOBAL; - MPL_LL_APPEND(global_rma_target_pool_head, global_rma_target_pool_tail, - &(global_rma_target_pool_start[i])); + MPL_DL_APPEND(global_rma_target_pool_head, &(global_rma_target_pool_start[i])); } fn_exit: @@ -208,7 +204,7 @@ int MPID_Win_free(MPID_Win ** win_ptr) for (win_elem = MPIDI_RMA_Win_list; win_elem && win_elem->win_ptr != *win_ptr; win_elem = win_elem->next); MPIU_ERR_CHKANDJUMP(win_elem == NULL, mpi_errno, MPI_ERR_RMA_SYNC, "**rmasync"); - MPL_LL_DELETE(MPIDI_RMA_Win_list, MPIDI_RMA_Win_list_tail, win_elem); + MPL_DL_DELETE(MPIDI_RMA_Win_list, win_elem); MPIU_Free(win_elem); if (MPIDI_RMA_Win_list == NULL) http://git.mpich.org/mpich.git/commitdiff/225141c377295a2c4c0176faa10bd1156… commit 225141c377295a2c4c0176faa10bd1156098b28e Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Mon Jul 20 10:35:58 2015 -0500 fix name in state decl Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/mpid/ch3/include/mpid_rma_issue.h b/src/mpid/ch3/include/mpid_rma_issue.h index c2f8834..c9e01a3 100644 --- a/src/mpid/ch3/include/mpid_rma_issue.h +++ b/src/mpid/ch3/include/mpid_rma_issue.h @@ -107,8 +107,8 @@ static int init_accum_ext_pkt(MPIDI_CH3_Pkt_flags_t flags, void *dataloop_ptr = NULL; int mpi_errno = MPI_SUCCESS; - MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_INIT_ACCUM_EXT_PKT); - MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_CH3_INIT_ACCUM_EXT_PKT); + MPIDI_STATE_DECL(MPID_STATE_INIT_ACCUM_EXT_PKT); + MPIDI_FUNC_ENTER(MPID_STATE_INIT_ACCUM_EXT_PKT); if ((flags & MPIDI_CH3_PKT_FLAG_RMA_STREAM) && target_dtp != NULL) { MPIDI_CH3_Ext_pkt_accum_stream_derived_t *_ext_hdr_ptr = NULL; @@ -168,7 +168,7 @@ static int init_accum_ext_pkt(MPIDI_CH3_Pkt_flags_t flags, (*ext_hdr_sz) = _total_sz; fn_exit: - MPIDI_FUNC_EXIT(MPID_STATE_MPIDI_CH3_INIT_ACCUM_EXT_PKT); + MPIDI_FUNC_EXIT(MPID_STATE_INIT_ACCUM_EXT_PKT); return mpi_errno; fn_fail: if ((*ext_hdr_ptr)) @@ -188,8 +188,8 @@ static int init_get_accum_ext_pkt(MPIDI_CH3_Pkt_flags_t flags, { int mpi_errno = MPI_SUCCESS; - MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_INIT_GET_ACCUM_EXT_PKT); - MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_CH3_INIT_GET_ACCUM_EXT_PKT); + MPIDI_STATE_DECL(MPID_STATE_INIT_GET_ACCUM_EXT_PKT); + MPIDI_FUNC_ENTER(MPID_STATE_INIT_GET_ACCUM_EXT_PKT); /* Check if get_accum still reuses accum' extended packet header. */ MPIU_Assert(sizeof(MPIDI_CH3_Ext_pkt_accum_stream_derived_t) == @@ -201,7 +201,7 @@ static int init_get_accum_ext_pkt(MPIDI_CH3_Pkt_flags_t flags, mpi_errno = init_accum_ext_pkt(flags, target_dtp, stream_offset, ext_hdr_ptr, ext_hdr_sz); - MPIDI_FUNC_EXIT(MPID_STATE_MPIDI_CH3_INIT_GET_ACCUM_EXT_PKT); + MPIDI_FUNC_EXIT(MPID_STATE_INIT_GET_ACCUM_EXT_PKT); return mpi_errno; } ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/include/mpid_rma_issue.h | 12 +++--- src/mpid/ch3/include/mpid_rma_lockqueue.h | 6 +-- src/mpid/ch3/include/mpid_rma_oplist.h | 57 ++++++++++++----------------- src/mpid/ch3/include/mpid_rma_types.h | 15 +++++--- src/mpid/ch3/include/mpidpre.h | 5 --- src/mpid/ch3/include/mpidrma.h | 23 ++++++------ src/mpid/ch3/src/ch3u_handle_recv_req.c | 6 +-- src/mpid/ch3/src/ch3u_rma_progress.c | 25 +++++-------- src/mpid/ch3/src/mpid_rma.c | 20 +++------- src/mpid/ch3/src/mpidi_rma.c | 18 ++++------ 10 files changed, 76 insertions(+), 111 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b3-266-g8374773
by noreply＠mpich.org 21 Jul '15

21 Jul '15

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 83747734d96ae918c1841b3ab920b33e42302741 (commit) from 23cbd296968427e4359d9ebd72fd273968fc431d (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/83747734d96ae918c1841b3ab920b33e4… commit 83747734d96ae918c1841b3ab920b33e42302741 Author: Pavan Balaji <balaji(a)anl.gov> Date: Tue Jul 21 19:23:57 2015 -0500 Revert "Added a note about the hwloc build issue with PGI." This reverts commit 8f940e4ab26b7d2c2673b9812b60469f9ea2ab58. diff --git a/RELEASE_NOTES b/RELEASE_NOTES index a6a7841..b3d7b1e 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -11,13 +11,6 @@ https://trac.mpich.org/projects/mpich/ticket/2105 -### PGI compilers - - * Compilation on 32-bit x86 platforms with the PGI compiler suite (as - of 13.9) will fail to build due to an error in the hwloc - implementation. To workaround this issue, you can disable hwloc by - passing the configure option --without-hydra-topolib. - ### PathScale compilers * Due to bugs in the PathScale compiler suite, some configurations of MPICH do not build correctly. ----------------------------------------------------------------------- Summary of changes: RELEASE_NOTES | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) hooks/post-receive -- MPICH primary repository

1 0