revise tests to avoid blocking

- use fork of mercury
- set run time option to prevent it from blocking (or initializing cci
  in a way that allows blocking)
- re-enable HG_Finalize calls in tests

tests/perf-regression/cooley/margo-p2p-latency.qsub

@@ -5,14 +5,16 @@
 #COBALT -A radix-io
 #COBALT -q ibleaf3-debug
 
-# NOTE: remmeber to uncomment some stuff in ~/.bashrc for library paths
+export HG_NEVER_BLOCK=1
 
 echo "## MPI (one way, double the latency for round trip):"
 mpirun -f $COBALT_NODEFILE -n 2 ./osu_latency
 echo "## Margo CCI/VERBS (round trip):"
 mpirun -f $COBALT_NODEFILE -n 2 ./margo-p2p-latency -i 100000 -n verbs://
-echo "## Margo CCI/VERBS (round trip) with diagnostics:"
-mpirun -f $COBALT_NODEFILE -n 2 ./margo-p2p-latency -i 100000 -n verbs:// -d $COBALT_JOBID.diag
+
+# echo "## Margo CCI/VERBS (round trip) with diagnostics:"
+# mpirun -f $COBALT_NODEFILE -n 2 ./margo-p2p-latency -i 100000 -n verbs:// -d $COBALT_JOBID.diag
+
 # TODO: mercury-runner freezes at shutdown w/ cci+verbs -- commenting out mercury finalize routines doesn't seem to help
 #echo "## Mercury-runner CCI/VERBS (round trip):"
 #mpirun -f $COBALT_NODEFILE -n 2 ./mercury-runner -q -c 100000 -l 1 -m c -M -d `pwd` 1 h0=verbs:// h1

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

@@ -27,7 +27,7 @@ cp margo-p2p-latency.qsub $JOBDIR
 cd $SANDBOX
 git clone https://github.com/carns/argobots.git
 git clone https://github.com/carns/cci.git
-git clone https://github.com/mercury-hpc/mercury.git
+git clone https://github.com/carns/mercury.git
 wget http://dist.schmorp.de/libev/libev-4.24.tar.gz
 tar -xvzf libev-4.24.tar.gz
 git clone https://xgitlab.cels.anl.gov/sds/abt-snoozer.git
@@ -73,6 +73,7 @@ make install
 # mercury
 echo "=== BUILDING MERCURY ==="
 cd $SANDBOX/mercury
+git checkout dev-hg-never-block-option
 git submodule update --init
 mkdir build
 cd build

tests/perf-regression/margo-p2p-latency.c

@@ -198,10 +198,7 @@ int main(int argc, char **argv)
 
     margo_finalize(mid);
     HG_Context_destroy(hg_context);
-/* TODO: we currently get hangs in HG_Finalzie with cci+verbs */
-#if 0
     HG_Finalize(hg_class);
-#endif
     MPI_Finalize();
     ABT_finalize();