use HG_Init_opt() to set polling option

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

@@ -5,12 +5,12 @@
 #COBALT -A radix-io
 #COBALT -q ibleaf3-debug
 
-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, Hg busy spin):"
+mpirun -f $COBALT_NODEFILE -n 2 ./margo-p2p-latency -i 100000 -n verbs:// -t 0,0
 
 # 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

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/carns/mercury.git
+git clone https://github.com/mercury-hpc/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,7 +73,6 @@ make install
 # mercury
 echo "=== BUILDING MERCURY ==="
 cd $SANDBOX/mercury
-git checkout dev-hg-never-block-option
 git submodule update --init
 mkdir build
 cd build