Merge branch 'carns/dev-bake-bench'

configure.ac

@@ -53,6 +53,18 @@ AC_CHECK_HEADERS(ssg-mpi.h,[],
   [AC_MSG_ERROR([Could not find ssg-mpi.h for MPI support in
   SSG])])
 
+PKG_CHECK_MODULES([BAKESERVER],[bake-server],[],
+        AC_MSG_ERROR([Could not find working BAKE server installation!]) )
+LIBS="$BAKESERVER_LIBS $LIBS"
+CPPFLAGS="$BAKESERVER_CFLAGS $CPPFLAGS"
+CFLAGS="$BAKESERVER_CFLAGS $CFLAGS"
+
+PKG_CHECK_MODULES([BAKECLIENT],[bake-client],[],
+        AC_MSG_ERROR([Could not find working BAKE client installation!]) )
+LIBS="$BAKECLIENT_LIBS $LIBS"
+CPPFLAGS="$BAKECLIENT_CFLAGS $CPPFLAGS"
+CFLAGS="$BAKECLIENT_CFLAGS $CFLAGS"
+
 AC_MSG_CHECKING([If MPI programs can be compiled])
 AC_LINK_IFELSE(
     [AC_LANG_PROGRAM([[#include<mpi.h>]], [[MPI_Init(0,0);]])],

perf-regression/Makefile.subdir

-bin_PROGRAMS += perf-regression/margo-p2p-latency perf-regression/margo-p2p-bw
+bin_PROGRAMS += perf-regression/margo-p2p-latency perf-regression/margo-p2p-bw perf-regression/bake-p2p-bw
 

perf-regression/bebop/bake-regression.sbatch

+#!/bin/bash
+#SBATCH -N 2
+#SBATCH -A startup-carns
+#SBATCH --ntasks-per-node=1
+#SBATCH --time=15:00
+#SBATCH -p bdwall
+
+# example of running benchmarks with spack-compiled software stack
+
+export LMOD_PAGER=none
+
+module load numactl boost cmake
+
+. /home/carns/working/src/spack/share/spack/setup-env.sh
+
+spack load -r ssg
+spack load -r bake
+
+module list
+
+# force Intel MPI to use Infiniband instead of Omnipath/PSM2.  If we let 
+# Intel MPI use it's preferred PSM2 path then Mercury can't open interface
+# because of apparent MR_SCALABLE/MR_BASIC conflict
+# we should also try MR_SCALABLE in Mercury NA as a possible workaround
+export I_MPI_FABRICS=shm:ofa
+
+echo "## Bake OFI/PSM2 (bdw):"
+rm -f /dev/shm/foo.dat
+bake-mkpool -s 60G /dev/shm/foo.dat
+mpirun /home/carns/working/install-bebop/bin/bake-p2p-bw -x 16777216 -m 34359738368 -n psm2://enp6s0f0:5000 -p /dev/shm/foo.dat -c 1 
+
+echo "## Bake OFI/PSM2 (8x concurrency, bdw):"
+rm -f /dev/shm/foo.dat
+bake-mkpool -s 60G /dev/shm/foo.dat
+mpirun /home/carns/working/install-bebop/bin/bake-p2p-bw -x 16777216 -m 34359738368 -n psm2://enp6s0f0:5000 -p /dev/shm/foo.dat -c 8
+
+echo "## Bake OFI/PSM2 (bdw, Hg busy spin):"
+rm -f /dev/shm/foo.dat
+bake-mkpool -s 60G /dev/shm/foo.dat
+mpirun /home/carns/working/install-bebop/bin/bake-p2p-bw -x 16777216 -m 34359738368 -n psm2://enp6s0f0:5000 -p /dev/shm/foo.dat -c 1 -t 0,0
+
+echo "## Bake OFI/PSM2 (8x concurrency, bdw, Hg busy spin):"
+rm -f /dev/shm/foo.dat
+bake-mkpool -s 60G /dev/shm/foo.dat
+mpirun /home/carns/working/install-bebop/bin/bake-p2p-bw -x 16777216 -m 34359738368 -n psm2://enp6s0f0:5000 -p /dev/shm/foo.dat -c 8 -t 0,0
+

perf-regression/bebop/run-regression.sh

@@ -21,6 +21,7 @@ cp packages.yaml $SANDBOX/
 # scratch area for job submission
 mkdir -p $JOBDIR
 cp margo-regression.sbatch $JOBDIR
+cp bake-regression.sbatch $JOBDIR
 
 cd $SANDBOX
 git clone https://github.com/spack/spack.git
@@ -42,12 +43,14 @@ cp $SANDBOX/packages.yaml $SPACK_ROOT/etc/spack
 #    CI environments
 echo "repos:" > $SPACK_ROOT/etc/spack/repos.yaml
 echo "- ${SANDBOX}/sds-repo" >> $SPACK_ROOT/etc/spack/repos.yaml
-spack uninstall -R -y argobots mercury opa-psm2 || true
+spack uninstall -R -y argobots mercury opa-psm2 bake || true
 spack install --dirty ssg ^mercury@develop
+spack install --dirty bake ^mercury@develop
 # deliberately repeat setup-env step after building modules to ensure
 #   that we pick up the right module paths
 . $SANDBOX/spack/share/spack/setup-env.sh
 spack load -r ssg
+spack load -r bake
 
 export CFLAGS="-O3"
 
@@ -89,6 +92,7 @@ cp $PREFIX/libexec/osu-micro-benchmarks/mpi/pt2pt/osu_latency $JOBDIR
 cd $JOBDIR
 export SANDBOX
 sbatch --wait --export=ALL ./margo-regression.sbatch
+sbatch --wait --export=ALL ./bake-regression.sbatch
 
 echo "=== JOB DONE, COLLECTING AND SENDING RESULTS ==="
 # gather output, strip out funny characters, mail