update theta regression tests (dynamic build)

- set env variable for GNI provider to work alongside MPI
- add bandwidth tests

(need to make similar updates for static build version)

tests/perf-regression/theta/margo-p2p-latency.qsub → tests/perf-regression/theta/margo-regression.qsub

 #!/bin/bash
 #COBALT -n 2
-#COBALT -t 10
+#COBALT -t 20
 #COBALT --mode script
 #COBALT -A radix-io
 #COBALT -q debug-flat-quad
@@ -9,16 +9,33 @@
 # XXX xalt module currently eating '-M' flag for mercury-runner...disabling for now
 module unload xalt
 
+# NOTE: needed as of January 2018 to avoid conflicts between MPI and 
+#       libfabric GNI provider
+# NOTE: doing this with -e option to aprun
+# export MPICH_GNI_NDREG_MAX_ENTRIES=2000
+
 echo "## MPI (one way, double the latency for round trip):"
 aprun -n 2 -N 1 ./osu_latency
 
-echo "## Margo OFI/GNI (round trip):"
-aprun -n 2 -N 1 ./margo-p2p-latency -i 100000 -n ofi+gni://ipogif0:5000
+echo "## Margo OFI/GNI (round trip, busy spin):"
+aprun -e MPICH_GNI_NDREG_ENTRIES=2000 -n 2 -N 1 ./margo-p2p-latency -i 100000 -n ofi+gni://ipogif0:5000 -t 0,0
+echo "## Margo OFI/GNI (bw, busy spin):"
+aprun -e MPICH_GNI_NDREG_ENTRIES=2000 -n 2 -N 1 ./margo-p2p-bw -x 1048576 -n ofi+gni://ipogif0:5000 -c 1 -D 20 -t 0,0
+echo "## Margo OFI/GNI (bw, 8x concurrency, busy spin):"
+aprun -e MPICH_GNI_NDREG_ENTRIES=2000 -n 2 -N 1 ./margo-p2p-bw -x 1048576 -n ofi+gni://ipogif0:5000 -c 8 -D 20 -t 0,0
+
+
 echo "## Margo BMI/TCP (round trip):"
-aprun -n 2 -N 1 ./margo-p2p-latency -i 100000 -n bmi+tcp://
+aprun -e MPICH_GNI_NDREG_ENTRIES=2000 -n 2 -N 1 ./margo-p2p-latency -i 100000 -n bmi+tcp://
+echo "## Margo BMI/TCP (bw):"
+aprun -e MPICH_GNI_NDREG_ENTRIES=2000 -n 2 -N 1 ./margo-p2p-bw -x 1048576 -n bmi+tcp:// -c 1 -D 20
+echo "## Margo BMI/TCP (bw, 8x concurrency):"
+aprun -e MPICH_GNI_NDREG_ENTRIES=2000 -n 2 -N 1 ./margo-p2p-bw -x 1048576 -n bmi+tcp:// -c 8 -D 20
+
 # echo "## WARNING: Margo OFI/TCP (disabled because it hangs as of 8/10/2017)"
 # aprun -n 2 -N 1 ./margo-p2p-latency -i 100000 -n ofi+tcp://ipogif0:5000
 
+
 # figure out nodes and hostnames for use with fi_
 declare -a nodes=($(python /home/carns/bin/run_on_all_nids.py));
 server_hostname=$(printf "nid%05d\n" ${nodes[0]})
@@ -36,4 +53,4 @@ cat $COBALT_JOBID.fi_pingpong_client.log
 # aprun -n 2 -N 1 ./margo-p2p-latency -i 100000 -n ofi+gni://ipogif0:5000 -d $COBALT_JOBID.diag
 
 echo "## Mercury-runner OFI/GNI (round trip):"
-aprun -n 2 -N 1 ./mercury-runner -q -c 100000 -l 1 -m c -M -d `pwd` 1 h0=ofi+gni://ipogif0:5000 h1
+aprun -e MPICH_GNI_NDREG_ENTRIES=2000 -n 2 -N 1 ./mercury-runner -q -c 100000 -l 1 -m c -M -d `pwd` 1 h0=ofi+gni://ipogif0:5000 h1

tests/perf-regression/theta/run-regression.sh

@@ -30,7 +30,7 @@ mkdir $SANDBOX
 
 # scratch area for job submission
 mkdir $JOBDIR
-cp margo-p2p-latency.qsub $JOBDIR
+cp margo-regression.qsub $JOBDIR
 
 cd $SANDBOX
 git clone https://github.com/ofiwg/libfabric.git
@@ -148,18 +148,19 @@ make install
 # 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/fi_pingpong $JOBDIR
 cp $PREFIX/libexec/osu-micro-benchmarks/mpi/pt2pt/osu_latency $JOBDIR
 cp $PREFIX/bin/mercury-runner $JOBDIR
 cd $JOBDIR
-JOBID=`qsub ./margo-p2p-latency.qsub`
+JOBID=`qsub ./margo-regression.qsub`
 cqwait $JOBID
 
 echo "=== JOB DONE, COLLECTING AND SENDING RESULTS ==="
 # gather output, strip out funny characters, mail
 cat $JOBID.* > combined.$JOBID.txt
 dos2unix combined.$JOBID.txt
-mailx -s "margo-p2p-latency (theta dynamic)" sds-commits@lists.mcs.anl.gov < combined.$JOBID.txt
+mailx -s "margo-regression (theta dynamic)" sds-commits@lists.mcs.anl.gov < combined.$JOBID.txt
 
 cd /tmp
 echo sandbox: $SANDBOX