update static regression build on theta

tests/perf-regression/theta/margo-p2p-latency-static.qsub → tests/perf-regression/theta/margo-regression-static.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,11 +9,21 @@
 # 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_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 "## 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
 

tests/perf-regression/theta/margo-regression.qsub

@@ -12,7 +12,7 @@ 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
+# export MPICH_GNI_NDREG_ENTRIES=2000
 
 echo "## MPI (one way, double the latency for round trip):"
 aprun -n 2 -N 1 ./osu_latency

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

@@ -29,7 +29,7 @@ mkdir $SANDBOX
 
 # scratch area for job submission
 mkdir $JOBDIR
-cp margo-p2p-latency-static.qsub $JOBDIR
+cp margo-regression-static.qsub $JOBDIR
 
 cd $SANDBOX
 git clone https://github.com/ofiwg/libfabric.git
@@ -153,18 +153,19 @@ make tests
 # set up job to run
 echo "=== SUBMITTING AND WAITING FOR JOB ==="
 cp $SANDBOX/ssg/build/tests/perf-regression/margo-p2p-latency $JOBDIR
+cp $SANDBOX/ssg/build/tests/perf-regression/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-static.qsub`
+JOBID=`qsub ./margo-regression-static.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 static)" sds-commits@lists.mcs.anl.gov < combined.$JOBID.txt
+mailx -s "margo-regression (theta static)" sds-commits@lists.mcs.anl.gov < combined.$JOBID.txt
 
 cd /tmp
 echo sandbox: $SANDBOX