modified run script and bm.txt file to work on all benchmarks and java single files

diff --git a/Robust/src/Benchmarks/Prefetch/bm.txt b/Robust/src/Benchmarks/Prefetch/bm.txt
index 1d20a6a7fc141a628a09e032feafc973f4ba98fe..883a93775a51f60c0b4c52ff508f908f8bcc1eb8 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/bm.txt
+++ b/Robust/src/Benchmarks/Prefetch/bm.txt
@@ -3,9 +3,8 @@ JGFSORBenchSizeD:SOR/dsm:1:2:3:4:5:6:7:8:sorverD
 JGFMolDynBenchSizeA:Moldyn/dsm:1:2:3:4:5:6:7:8:moldynverA
 JGFMolDynBenchSizeD:Moldyn/dsm:1:2:3:4:5:6:7:8:moldynverD
 JGFLUFactBenchSizeA:LUFact/dsm:1:2:3:4:5:6:7:8:lufactverA
-MatrixMultiply:MM200:1 200 30:2 200 30:3 200 30:4 200 30:5 200 30:6 200 30:7 200 30:8 200 30:200mmver
-MatrixMultiply:MatrixMultiply:1 800:2 800:3 800:4 800:5 800:6 800:7 800:8 800:800mmver
-MatrixMultiply:MatrixMultiply:1 600:2 600:3 600:4 600:5 600:6 600:7 600:8 600:600mmver
+MatrixMultiply:MatrixMultiply/dsm:1 800:2 800:3 800:4 800:5 800:6 800:7 800:8 800:800mmver
+MatrixMultiply:MatrixMultiply/dsm:1 600:2 600:3 600:4 600:5 600:6 600:7 600:8 600:600mmver
 Em3d:Em3d/dsm:-T 1 -N 4000 -d 130 -p -i 6:-T 2 -N 4000 -d 130 -p -i 6:-T 3 -N 4000 -d 130 -p -i 6:-T 4 -N 4000 -d 130 -p -i 6:-T 5 -N 4000 -d 130 -p -i 6:-T 6 -N 4000 -d 130 -p -i 6:-T 7 -N 4000 -d 130 -p -i 6:-T 8 -N 4000 -d 130 -p -i 6:em3dver40001306
 Em3d:Em3d/dsm:-T 1 -N 6000 -d 200 -p -i 10:-T 2 -N 6000 -d 200 -p -i 10:-T 3 -N 6000 -d 200 -p -i 10:-T 4 -N 6000 -d 200 -p -i 10:-T 5 -N 6000 -d 200 -p -i 10:-T 6 -N 6000 -d 200 -p -i 10:-T 7 -N 6000 -d 200 -p -i 10:-T 8 -N 6000 -d 200 -p -i 10:em3dver600020010
 Em3d:Em3d/dsm:-T 1 -N 10000 -d 1000 -i 15:-T 2 -N 10000 -d 1000 -i 15:-T 3 -N 10000 -d 1000 -i 15:-T 4 -N 10000 -d 1000 -i 15:-T 5 -N 10000 -d 1000 -i 15:-T 6 -N 10000 -d 1000 -i 15:-T 7 -N 10000 -d 1000 -i 15:-T 8 -N 10000 -d 1000 -i 15:em3dver10000100015

diff --git a/Robust/src/Benchmarks/Prefetch/run.sh b/Robust/src/Benchmarks/Prefetch/run.sh
index 7ee5a3bf8a2b1cdc1e44c048e21715e9c23e30db..abdb5a02ca201131ece81db7d9492628bf186bf9 100755 (executable)
--- a/Robust/src/Benchmarks/Prefetch/run.sh
+++ b/Robust/src/Benchmarks/Prefetch/run.sh
@@ -9,6 +9,7 @@ TOPDIR=`pwd`
 function run {
   i=0;
   DIR=`pwd`
+  HOSTNAME=`hostname`
   while [ $i -lt $1 ]; do
     echo "$DIR" > ~/.tmpdir
     echo "bin=$3" > ~/.tmpvars
@@ -16,7 +17,9 @@ function run {
     MACHINES=''
     for j in $MACHINELIST; do
       if [ $ct -lt $2 ]; then
-         MACHINES='$MACHINES $j'
+        if [ "$j" != "$HOSTNAME" ]; then
+          MACHINES="$MACHINES $j"
+        fi
       fi
       let ct=$ct+1
     done
@@ -49,7 +52,7 @@ function run {
       echo ""
     done
     sleep 2
-    /usr/bin/time -f "%e" ./$3 master $arg 2>> ${LOGDIR}/${3}_${EXTENSION}.txt
+    /usr/bin/time -f "%e" ./$3 master $arg 2>> ${LOGDIR}/${2}Thrd_${3}_${EXTENSION}.txt
     echo "Terminating ... "
     for machine in `echo $MACHINES`
     do
@@ -88,7 +91,7 @@ function localrun {
   i=0;
   while [ $i -lt $1 ]; do
     /usr/bin/time -f "%e" ./${NONPREFETCH_NONCACHE} master $ARGS1 2>> ${LOGDIR}/${NONPREFETCH_NONCACHE}_local_${EXTENSION}.txt
-    sleep 4
+    sleep 2
     i=`expr $i + 1`
   done
 }
@@ -101,7 +104,7 @@ function callrun {
   cd $BMDIR 
 
   echo "---------- Running local $BMDIR non-prefetch on 1 machine ---------- "
-  localrun 10
+  localrun 1
 
   echo "---------- Running single thread remote $BMDIR non-prefetch + non-cache on 2 machines ---------- "
 #  oneremote 1 1 $NONPREFETCH_NONCACHE
@@ -114,14 +117,33 @@ function callrun {
 for count in 2 3 4 5 6 7 8
 do
 echo "------- Running $count threads $BMDIR non-prefetch + non-cache on $count machines -----"
-run 10 $count $NONREFETCH_NONCACHE
+run 1 $count $NONPREFETCH_NONCACHE
 echo "------- Running $count threads $BMDIR prefetch on $count machines -----"
-run 10 $count $PREFETCH
+run 1 $count $PREFETCH
 done
 
 cd $TOPDIR
 }
 
+function callrunjavasingle {
+  JAVASINGLE=${BENCHMARK}.bin
+  cd $BMDIR
+  cd ../javasingle
+
+  echo "-----------Running javasingle for ${BENCHMARK} version ${EXTENSION} on 1 machines ------------"
+  javasinglerun 1
+  cd $TOPDIR
+}
+
+function javasinglerun {
+  i=0;
+  while [ $i -lt $1 ]; do
+    /usr/bin/time -f "%e" ./${BENCHMARK}.bin $ARGS1 2>> ${LOGDIR}/${BENCHMARK}_javasingle_${EXTENSION}.txt
+    sleep 2
+    i=`expr $i + 1`
+  done
+}
+
 function callmicrorun {
   PREFETCH=${BENCHMARK}1.bin
   NONPREFETCH=${BENCHMARK}1NP.bin
@@ -138,13 +160,10 @@ function callmicrorun {
   cd $TOPDIR
 }
 
-#benchmarks='em3dver10000100015'
-#benchmarks='sorverD'
-#benchmarks='10242dconv'
-benchmarks='1152fft2d 1600fft2d 40962dconv 20482dconv mmver600 moldynverA'
+benchmarks='1152fft2d 40962dconv 20482dconv 600mmver moldynverA'
 
 echo "---------- Clean old files ---------- "
-#rm runlog/*
+rm runlog/*
 for b in `echo $benchmarks`
 do
   bm=`grep $b bm.txt`
@@ -165,6 +184,7 @@ do
   callmicrorun
   else
   callrun
+  callrunjavasingle
   fi
 done