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 3fb9d0f32b240a35afc527ae35eecf4a01b6b8c2 (commit) via 340954f56169722f4e8f0046526fd3060ee73c5d (commit) via 27ab84a533c4231a7b32c0621839e934045ede55 (commit) via b4ce3c996a69c5d42263e3d42a1991fe41c77fc7 (commit) from 8cbe30954638ad995cc8332a560426f5be4742f0 (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/3fb9d0f32b240a35afc527ae35eecf4a01... commit 3fb9d0f32b240a35afc527ae35eecf4a01b6b8c2 Author: Pavan Balaji <[email protected]> Date: Sat Feb 1 16:32:52 2014 -0600 Bug-fix: bad declaration when error checking is disabled. Signed-off-by: Wesley Bland <[email protected]> diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c b/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c index 3427fcd..8baada1 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c @@ -1903,16 +1903,13 @@ int MPID_nem_tcp_state_listening_handler(struct pollfd *const unused_1, sockconn len = sizeof(SA_IN); MPIU_DBG_MSG_FMT(NEM_SOCK_DET, VERBOSE, (MPIU_DBG_FDEST, "before accept")); if ((connfd = accept(l_sc->fd, (SA *) &rmt_addr, &len)) < 0) { -#ifdef HAVE_ERROR_CHECKING - int save_errno = errno; -#endif - MPIU_DBG_MSG_FMT(NEM_SOCK_DET, VERBOSE, (MPIU_DBG_FDEST, "after accept, l_sc=%p lstnfd=%d connfd=%d, errno=%d:%s ", l_sc, l_sc->fd, connfd, errno, MPIU_Strerror(save_errno))); + MPIU_DBG_MSG_FMT(NEM_SOCK_DET, VERBOSE, (MPIU_DBG_FDEST, "after accept, l_sc=%p lstnfd=%d connfd=%d, errno=%d:%s ", l_sc, l_sc->fd, connfd, errno, MPIU_Strerror(errno))); if (errno == EINTR) continue; else if (errno == EWOULDBLOCK || errno == EAGAIN) break; /* no connection in the listen queue. get out of here.(N1) */ - MPIU_ERR_SETANDJUMP1(mpi_errno, MPI_ERR_OTHER, "**sock_accept", "**sock_accept %s", MPIU_Strerror(save_errno)); + MPIU_ERR_SETANDJUMP1(mpi_errno, MPI_ERR_OTHER, "**sock_accept", "**sock_accept %s", MPIU_Strerror(errno)); } else { int idx = -1; http://git.mpich.org/mpich.git/commitdiff/340954f56169722f4e8f0046526fd3060e... commit 340954f56169722f4e8f0046526fd3060ee73c5d Author: Pavan Balaji <[email protected]> Date: Fri Jan 31 22:30:10 2014 -0600 Remove MPICH_FAST usage from the test suite. The test suite already recognizes --disable-error-checking which is the right way to tell it to not enable error checking tests. Signed-off-by: Wesley Bland <[email protected]> diff --git a/test/mpi/configure.ac b/test/mpi/configure.ac index 6407b61..c1c51d8 100644 --- a/test/mpi/configure.ac +++ b/test/mpi/configure.ac @@ -123,7 +123,7 @@ AC_ARG_ENABLE(long-double, AC_ARG_ENABLE(checkerrors, [AC_HELP_STRING([--enable-checkerrors], [Add some tests for checking for errors in user programs])],, - [enable_checkerrors=default]) + [enable_checkerrors=yes]) AC_ARG_ENABLE(perftest, [AC_HELP_STRING([--enable-perftest], @@ -309,24 +309,6 @@ elif test "$enable_threads" = default ; then fi fi -if test "$enable_fast" = "yes" ; then - if test "$enable_checkerrors" = "default" ; then - enable_checkerrors=no - fi -fi -# default for MPICH is to check error handling; for other cases it -# is to only check correct programs. -if test "$FROM_MPICH" = "yes" ; then - if test "$enable_checkerrors" = "default" -a "$MPICH_FAST" != "YES" ; then - enable_checkerrors=yes - else - enable_checkerrors=no - fi -else - if test "$enable_checkerrors" = "default" ; then - enable_checkerrors=no - fi -fi # errordir is substituted into the testlist file as errors when the # tests should check error handling and as a comment (#) otherwise. errordir="#" http://git.mpich.org/mpich.git/commitdiff/27ab84a533c4231a7b32c0621839e93404... commit 27ab84a533c4231a7b32c0621839e934045ede55 Author: Pavan Balaji <[email protected]> Date: Fri Jan 31 22:28:45 2014 -0600 Update README to tell users how to do performance testing. Signed-off-by: Wesley Bland <[email protected]> diff --git a/README.vin b/README.vin index 036cc0f..a343d0f 100644 --- a/README.vin +++ b/README.vin @@ -359,6 +359,11 @@ Or to disable all compiler optimizations, one can do: For more details of --enable-fast, see the output of "configure --help". +For performance testing, we recommend the following flags: + + ./configure --enable-fast=O3,ndebug --disable-error-checking --without-timing \ + --without-mpit-pvars + Examples -------- http://git.mpich.org/mpich.git/commitdiff/b4ce3c996a69c5d42263e3d42a1991fe41... commit b4ce3c996a69c5d42263e3d42a1991fe41c77fc7 Author: Pavan Balaji <[email protected]> Date: Fri Jan 31 18:14:05 2014 -0600 Revamp how enable-fast is used. 1. enable-fast=all|none should really reflect "all"/"none", not "some". We were enable some of the optimizations, but not all, e.g., mpit pvars disabling. 2. Making naming consistent and move related checks closer to each other, so they are easier to verify. 3. Don't control enable-timing, enable-mpit-pvars, and enable-error-checking from enable-fast. They have their own configure options. enable-fast is kind of weird in that it sets some of its own configure variables, but also resets variables set by other configure options making it very confusing for users. Instead we should point out in the README what users should do for performance tests. 4. Allow optimization levels like O3 to be used with other enable-fast options, such as ndebug. 5. Remove some incorrect and/or unnecessary comments. 6. Don't force default compiler optimizations with --disable-fast is given. Signed-off-by: Wesley Bland <[email protected]> diff --git a/configure.ac b/configure.ac index 71ee3cc..f6d30ee 100644 --- a/configure.ac +++ b/configure.ac @@ -393,22 +393,13 @@ AC_ARG_ENABLE(fast, [ --enable-fast=option - Control the level of fast execution in the MPICH implementation. option is a list of comma separated names including - defopt - Default compiler optimization -O2 for all language bindings, - i.e. --enable-fast=O2, when neither --enable-fast - nor --disable-fast is specified. (default) O<n> - Appends default optimization flags, -O<n>, to all internal compiler flags, i.e. MPICHLIB_CFLAGS, MPICHLIB_CXXFLAGS, - MPICHLIB_FFLAGS, and MPICHLIB_FCFLAGS. - nochkmsg - No error checking, i.e. --disable-error-checking - notiming - No timing collection, i.e. --disable-timing. + MPICHLIB_FFLAGS, and MPICHLIB_FCFLAGS. (default is -O2) ndebug - Appends -DNDEBUG to MPICHLIB_CFLAGS. - nompit - Equivalent to "--disable-mpit-pvars". - all|yes - "defopt", "nochkmsg", "notiming" and "ndebug" are enabled - when --enable-fast is specified without any option. - none - None of above options, i.e. --disable-fast. Note that - --enable-strict will add the -O2 option even if - --enable-fast=none is given. -],,enable_fast=defopt) + all|yes - "O2" and "ndebug" are enabled + none - None of above options, i.e. --disable-fast +],,enable_fast=O2) AC_ARG_ENABLE(check-compiler-flags, AC_HELP_STRING([--enable-check-compiler-flags], [enable the checks for all compiler @@ -831,68 +822,25 @@ AC_SUBST(MPICXXLIBNAME) # We'll set FORTRAN_BINDING to 1 if we support Fortran FORTRAN_BINDING=0 -# Set up default compiler optimization -MPI_DEFAULT_COPTS="-O2" -MPI_DEFAULT_CXXOPTS="-O2" -MPI_DEFAULT_FOPTS="-O2" -MPI_DEFAULT_FCOPTS="-O2" - # enable-fast # strip off multiple options, separated by commas save_IFS="$IFS" IFS="," for option in $enable_fast ; do case "$option" in - defopt) - enable_default_optimize=yes - ;; - nochkmsg) - enable_fast_nochkmsg=yes - ;; - notiming) - enable_timing=no + O*) + enable_fast_opts=$option ;; ndebug) - enable_append_ndebug=yes - ;; - nompit) - enable_mpit_pvars=no + enable_fast_ndebug=yes ;; -# -# [BRT] removed the reseting of enable_g so that --with-enable=dbg,meminit -# can be specified with -enable-fast. This change was largely made for the -# PETSc folks who want to use --enable-fast to eliminate parameter checking -# overhead, but also wish to use meminit to eliminate initialization -# warnings from valgrind. -# all|yes) - enable_default_optimize=yes - enable_fast_nochkmsg=yes - # Disable timing/logging stuffs - enable_timing=no - enable_append_ndebug=yes - ;; - O*) - # Allows O<n> where <n> can be [0-9] or ' '. - opt_flags=`echo $option | sed -e 's%\(O[0-9] \)%\1%g'` - if test -n "$opt_flags" ; then - enable_default_optimize=yes - MPI_DEFAULT_COPTS="-$option" - MPI_DEFAULT_CXXOPTS="-$option" - MPI_DEFAULT_FOPTS="-$option" - MPI_DEFAULT_FCOPTS="-$option" - else - IFS="$save_IFS" - AC_MSG_WARN([Unknown value $option for --enable-fast]) - IFS="," - fi + enable_fast_ndebug=yes + enable_fast_opts=O2 ;; none|no) - enable_default_optimize=no - enable_fast_nochkmsg=no - # Reset timing/logging stuffs to when --enable-timing isn't specified. - enable_timing=default - enable_append_ndebug=no + enable_fast_ndebug=no + enable_fast_opts=O0 ;; *) IFS="$save_IFS" @@ -903,19 +851,25 @@ for option in $enable_fast ; do done IFS="$save_IFS" -# ---------------------------------------------------------------------------- -# Process any enable or with values -# We must do enable-fast first, because it changes the other enable values -if test "$enable_fast_nochkmsg" = "yes" ; then - # - if test "$enable_error_checking" != "default" -a "$enable_error_checking" != "no" ; then - AC_MSG_ERROR([enable-fast overrides enable-error-checking; error-checking option $enable_error_checking ignored]) - fi - enable_error_checking=no - # Export a variable that will allow the test suite to detect that - # MPICH has no error testing - MPICH_FAST=yes - export MPICH_FAST +if test -n "$enable_fast_opts" ; then + # Allows O<n> where <n> can be [0-9] or ' '. + opt_flags=`echo $enable_fast_opts | sed -e 's%\(O[0-9] \)%\1%g'` + if test -n "$opt_flags" ; then + MPI_DEFAULT_COPTS="-$enable_fast_opts" + MPI_DEFAULT_CXXOPTS="-$enable_fast_opts" + MPI_DEFAULT_FOPTS="-$enable_fast_opts" + MPI_DEFAULT_FCOPTS="-$enable_fast_opts" + else + AC_MSG_WARN([Unknown value $enable_fast_opts for --enable-fast]) + fi +fi + +if test "$enable_fast_ndebug" = "yes" ; then + CFLAGS="$CFLAGS -DNDEBUG -DNVALGRIND" + CXXFLAGS="$CXXFLAGS -DNDEBUG -DNVALGRIND" + # MPICH does NOT assume any preprocessing support from the Fortran compiler, + # so no Fortran files contain any preprocessing statements. + # Don't set FFLAGS or FCFLAGS with any -D. fi # error-checking @@ -1479,13 +1433,6 @@ if test "$enable_append_g" = "yes" ; then FFLAGS="$FFLAGS -g" FCFLAGS="$FCFLAGS -g" fi -if test "$enable_append_ndebug" = "yes" ; then - CFLAGS="$CFLAGS -DNDEBUG -DNVALGRIND" - CXXFLAGS="$CXXFLAGS -DNDEBUG -DNVALGRIND" - # MPICH does NOT assume any preprocessing support from the Fortran compiler, - # so no Fortran files contain any preprocessing statements. - # Don't set FFLAGS or FCFLAGS with any -D. -fi if test -n "$perform_meminit" ; then AC_DEFINE(MPICH_DEBUG_MEMINIT,1,[Define to enable preinitialization of memory used by structures and unions]) fi @@ -1761,8 +1708,7 @@ done PAC_CC_FUNCTION_NAME_SYMBOL # Check if $MPI_DEFAULT_COPTS is valid with $CC -if test "$enable_default_optimize" = "yes" \ - -a -n "$MPI_DEFAULT_COPTS" ; then +if test -n "$MPI_DEFAULT_COPTS" ; then if test "$enable_check_compiler_flags" = "yes" ; then PAC_C_CHECK_COMPILER_OPTION( [$MPI_DEFAULT_COPTS], [ CFLAGS="$CFLAGS $MPI_DEFAULT_COPTS" @@ -1898,8 +1844,7 @@ fi if test "$enable_f77" = yes ; then # Check if $MPI_DEFAULT_FOPTS is valid with $F77 - if test "$enable_default_optimize" = "yes" \ - -a -n "$MPI_DEFAULT_FOPTS" ; then + if test -n "$MPI_DEFAULT_FOPTS" ; then if test "$enable_check_compiler_flags" = "yes" ; then PAC_F77_CHECK_COMPILER_OPTION( [$MPI_DEFAULT_FOPTS], [ FFLAGS="$FFLAGS $MPI_DEFAULT_FOPTS" ----------------------------------------------------------------------- Summary of changes: README.vin | 5 + configure.ac | 119 ++++++--------------- src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c | 7 +- test/mpi/configure.ac | 20 +---- 4 files changed, 40 insertions(+), 111 deletions(-) hooks/post-receive -- MPICH primary repository