updates to bebop regression tests

- better packages.yaml example to leverage existing modules
- use sds-tests instead of ssg benchmarks

perf-regression/bebop/README.spack.md

@@ -11,9 +11,6 @@ module load numactl
 ```
 git clone https://github.com/spack/spack.git
 cd spack
-# as of 2018-08-13, need to patch to bump libfabric to 1.6.1 so it will
-# build with Intel compiler
-patch -p0 < spack-libfabric-1.6.1.patch
 . share/spack/setup-env.sh
 # do not bootstrap; we will use existing lmod install on Bebop
 
@@ -29,6 +26,26 @@ packages:
         compiler: [intel, gcc]
         providers:
             mpi: [intel-mpi]
+    m4:
+        paths:
+            m4@1.4.16: /usr
+        buildable: False
+    libtool:
+        paths:
+            libtool@2.4.2: /usr
+        buildable: False
+    pkg-config:
+        paths:
+            pkg-config@0.27.1: /usr
+        buildable: False
+    cmake:
+        modules:
+            cmake@3.9.4: cmake/3.9.4-3tixtqt
+        buildable: False
+    numactl:
+        modules:
+            numactl@2.0.11-tggunqu: numactl/2.0.11-tggunqu
+        buildable: False
     openssl:
         paths:
             openssl@1.0.2k: /usr
@@ -82,8 +99,8 @@ packages:
             ncurses@5.9: /usr
         buildable: False
     intel-mpi:
-        paths:
-            intel-mpi@2017.3: /blues/gpfs/home/software/spack-0.10.1/opt/spack/linux-centos7-x86_64/intel-17.0.4/intel-mpi-2017.3-dfphq6kavje2olnichisvjjndtridrok
+        modules:
+            intel-mpi@2017.3: intel-mpi/2017.3-dfphq6k
         buildable: False
     ssg:
         variants: +mpi

perf-regression/bebop/run-regression.sh

@@ -26,7 +26,7 @@ cp margo-regression.sbatch $JOBDIR
 cd $SANDBOX
 git clone https://github.com/spack/spack.git
 git clone https://xgitlab.cels.anl.gov/sds/sds-repo.git
-git clone https://xgitlab.cels.anl.gov/sds/ssg.git
+git clone https://xgitlab.cels.anl.gov/sds/sds-tests.git
 wget http://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-5.3.2.tar.gz
 tar -xvzf osu-micro-benchmarks-5.3.2.tar.gz
 git clone https://github.com/pdlfs/mercury-runner.git
@@ -54,16 +54,16 @@ cd build
 make -j 3
 make install
 
-# ssg
-echo "=== BUILDING SSG TEST PROGRAMS ==="
-cd $SANDBOX/ssg
+# sds-tests
+echo "=== BUILDING SDS TEST PROGRAMS ==="
+cd $SANDBOX/sds-tests
 libtoolize
 ./prepare.sh
 mkdir build
 cd build
 ../configure --prefix=$PREFIX CC=mpicc
 make -j 3
-make tests
+make install
 
 # mercury-runner benchmark
 # echo "=== BUILDING MERCURY-RUNNER BENCHMARK ==="
@@ -76,8 +76,8 @@ make tests
 
 # set up job to run
 echo "=== SUBMITTING AND WAITING FOR JOB ==="
-cp $SANDBOX/ssg/build/tests/perf-regression/.libs/margo-p2p-latency $JOBDIR
-cp $SANDBOX/ssg/build/tests/perf-regression/.libs/margo-p2p-bw $JOBDIR
+cp $PREFIX/bin/margo-p2p-latency $JOBDIR
+cp $PREFIX/bin/margo-p2p-bw $JOBDIR
 cp $PREFIX/libexec/osu-micro-benchmarks/mpi/pt2pt/osu_latency $JOBDIR
 # cp $PREFIX/bin/mercury-runner $JOBDIR
 cd $JOBDIR