latest files and new changes to the script for collected non-cache and

non-prefetch data

diff --git a/Robust/src/Benchmarks/Prefetch/Array/Array.java b/Robust/src/Benchmarks/Prefetch/Array/Array.java
index 9d9e262c031454fdc2911eb0de2a67d82903ad81..1ec984f211df266c5836ee1b8f5cb6121f0bcbce 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/Array/Array.java
+++ b/Robust/src/Benchmarks/Prefetch/Array/Array.java
@@ -17,7 +17,7 @@ public class Array extends Thread {
        atomic {
            a=global new Array();
        }
-       a.start((128<<24)|(195<<16)|(175<<8)|71);
+       a.start((128<<24)|(195<<16)|(175<<8)|79);
        a.join();
     }
     

diff --git a/Robust/src/Benchmarks/Prefetch/Array/makefile b/Robust/src/Benchmarks/Prefetch/Array/makefile
index 4ea4c33df1d9f519994324a867b95f5269279f36..4bb745fd6ebe30c2afd0431183ee61b8d1b2ac51 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/Array/makefile
+++ b/Robust/src/Benchmarks/Prefetch/Array/makefile
@@ -1,10 +1,13 @@
 MAINCLASS=Array
 SRC1=${MAINCLASS}.java
-FLAGS=-dsm -prefetch -optimize -debug -excprefetch Array.Array -mainclass ${MAINCLASS} -trueprob 0.98
-FLAGS2=-dsm -optimize -debug -excprefetch Array.Array -mainclass ${MAINCLASS}
+FLAGS=-dsm -prefetch -dsmcaching -optimize -excprefetch Array.Array -mainclass ${MAINCLASS} -trueprob 0.98
+FLAGS1=-dsm -dsmcaching -optimize -mainclass ${MAINCLASS} -trueprob 0.98
+FLAGS2=-dsm -optimize -mainclass ${MAINCLASS}
 default:
-       ../../../buildscript ${FLAGS2} -o ${MAINCLASS}NP ${SRC1}
+       ../../../buildscript ${FLAGS2} -o ${MAINCLASS}NPNC ${SRC1}
+       ../../../buildscript ${FLAGS1} -o ${MAINCLASS}NP ${SRC1}
        ../../../buildscript ${FLAGS} -o ${MAINCLASS}P ${SRC1}
+       cp ${MAINCLASS}NPNC.bin ${MAINCLASS}1NPNC.bin
        cp ${MAINCLASS}NP.bin ${MAINCLASS}1NP.bin
        cp ${MAINCLASS}P.bin ${MAINCLASS}1.bin
 

diff --git a/Robust/src/Benchmarks/Prefetch/Chase/Chase.java b/Robust/src/Benchmarks/Prefetch/Chase/Chase.java
index d402eab8e796a8257b0adf5301ad1457c7db6087..a56b9eb52717b0ff130db6e79ad7764c870bf3d4 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/Chase/Chase.java
+++ b/Robust/src/Benchmarks/Prefetch/Chase/Chase.java
@@ -24,7 +24,7 @@ public class Chase extends Thread {
            
            c=global new Chase(fold);
        }
-       c.start((128<<24)|(195<<16)|(175<<8)|71);
+       c.start((128<<24)|(195<<16)|(175<<8)|79);
        c.join();
     }
     

diff --git a/Robust/src/Benchmarks/Prefetch/Chase/makefile b/Robust/src/Benchmarks/Prefetch/Chase/makefile
index 89d610d825e26e211762e1e781d94c2357e16faa..9256297774eb51ca3ff0cfa6ccc2036aa91723ed 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/Chase/makefile
+++ b/Robust/src/Benchmarks/Prefetch/Chase/makefile
@@ -1,12 +1,15 @@
 MAINCLASS=Chase
 SRC1=${MAINCLASS}.java
-FLAGS=-dsm -prefetch -optimize -debug -excprefetch Chase.main -excprefetch Chase.Chase -mainclass ${MAINCLASS} -trueprob 0.7
-FLAGS2=-dsm -optimize -debug -mainclass ${MAINCLASS} -trueprob 0.7
+FLAGS=-dsm -prefetch -dsmcaching -optimize -excprefetch Chase.main -excprefetch Chase.Chase -mainclass ${MAINCLASS} -trueprob 0.7
+FLAGS1=-dsm -dsmcaching -optimize -mainclass ${MAINCLASS} -trueprob 0.7
+FLAGS2=-dsm -optimize -mainclass ${MAINCLASS} -trueprob 0.7
 #for testing no java option
 #FLAGS=-dsm -prefetch -optimize -debug -excprefetch Chase.main -excprefetch Chase.Chase -mainclass ${MAINCLASS} -trueprob 0.99 -nojava
 default:
-       ../../../buildscript ${FLAGS2} -o ${MAINCLASS}NP ${SRC1}
+       ../../../buildscript ${FLAGS2} -o ${MAINCLASS}NPNC ${SRC1}
+       ../../../buildscript ${FLAGS1} -o ${MAINCLASS}NP ${SRC1}
        ../../../buildscript ${FLAGS} -o ${MAINCLASS}P ${SRC1}
+       cp ${MAINCLASS}NPNC.bin ${MAINCLASS}1NPNC.bin
        cp ${MAINCLASS}NP.bin ${MAINCLASS}1NP.bin
        cp ${MAINCLASS}P.bin ${MAINCLASS}1.bin
 

diff --git a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java
index 374599d32c138024c315895f66a7d7a8eea9bd1b..20edbdf3926af52960cba86c48d0236abae6c476 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java
+++ b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java
@@ -139,10 +139,10 @@ public class Em3d extends Thread {
     long start0 = System.currentTimeMillis();
     int numThreads = em.numThreads;
     int[] mid = new int[4];
-    mid[0] = (128<<24)|(195<<16)|(175<<8)|79;//dw-1
-    mid[1] = (128<<24)|(195<<16)|(175<<8)|73;//dw-2
-    mid[2] = (128<<24)|(195<<16)|(175<<8)|78;
-    mid[3] = (128<<24)|(195<<16)|(175<<8)|69;
+    mid[0] = (128<<24)|(195<<16)|(175<<8)|79;//dw-8
+    mid[1] = (128<<24)|(195<<16)|(175<<8)|80;//dw-9
+    mid[2] = (128<<24)|(195<<16)|(175<<8)|78;//dw-7
+    mid[3] = (128<<24)|(195<<16)|(175<<8)|73;//dw-5
 
     System.printString("DEBUG -> numThreads = " + numThreads+"\n");
     BarrierServer mybarr;

diff --git a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/makefile b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/makefile
index f0304c52f227996a75b6b7c8fa500752dfddae78..856233213e3a660b44fcf322bbec069e6c906836 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/makefile
+++ b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/makefile
@@ -15,7 +15,7 @@ SRC3=${MAINCLASS}2.java \
 
 FLAGS=-dsm -prefetch -optimize -excprefetch Em3d.main -excprefetch BiGraph.create -excprefetch Node.Node -excprefetch Node.fillTable -excprefetch Node.makeUniqueNeighbors -excprefetch Node.makeFromNodes -excprefetch Node.updateFromNodes -debug -mainclass ${MAINCLASS} -trueprob 0.91
 FLAGS1=-dsm -prefetch -dsmcaching -optimize -excprefetch Node.makeUniqueNeighbors -excprefetch EVector.ensureCapacity -excprefetch EVector.addElement -excprefetch BiGraph.makeFromNodes -excprefetch EVector.elementAt -excprefetch BiGraph.initializeNodes -excprefetch BiGraph.allocateNodes -mainclass ${MAINCLASS} -trueprob 0.91
-FLAGS2=-dsm -dsmcaching -optimize -excprefetch Node.makeUniqueNeighbors -excprefetch EVector.ensureCapacity -excprefetch EVector.addElement -excprefetch BiGraph.makeFromNodes -excprefetch EVector.elementAt -excprefetch BiGraph.initializeNodes -excprefetch BiGraph.allocateNodes -mainclass ${MAINCLASS} -trueprob 0.91
+FLAGS2=-dsm -dsmcaching -optimize -mainclass ${MAINCLASS} -trueprob 0.91
 FLAGS3=-dsm -optimize -mainclass ${MAINCLASS}
 
 default:
@@ -33,9 +33,9 @@ default:
        cp ${MAINCLASS}NPNC.bin ${MAINCLASS}3NPNC.bin
        cp ${MAINCLASS}NP.bin ${MAINCLASS}3NP.bin
        cp ${MAINCLASS}N.bin ${MAINCLASS}3.bin
-       cp ${MAINCLASS}NPNC.bin ${MAINCLASS}3NPNC.bin
-       cp ${MAINCLASS}NP.bin ${MAINCLASS}3NP.bin
-       cp ${MAINCLASS}N.bin ${MAINCLASS}3.bin
+       cp ${MAINCLASS}NPNC.bin ${MAINCLASS}4NPNC.bin
+       cp ${MAINCLASS}NP.bin ${MAINCLASS}4NP.bin
+       cp ${MAINCLASS}N.bin ${MAINCLASS}4.bin
 
 clean:
        rm -rf tmpbuilddirectory

diff --git a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiplyN.java b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiplyN.java
index fdb02c40b6b2a76e4cf40e7797ef368e5d231a62..236592c6e760bd39ca0e14b101e71c1dc2fe97c9 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiplyN.java
+++ b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiplyN.java
@@ -43,9 +43,9 @@ public class MatrixMultiply extends Thread{
        
        int[] mid = new int[4];
        mid[0] = (128<<24)|(195<<16)|(175<<8)|79; //dw-8
-       mid[1] = (128<<24)|(195<<16)|(175<<8)|73; //dw-5
+       mid[1] = (128<<24)|(195<<16)|(175<<8)|80; //dw-9
        mid[2] = (128<<24)|(195<<16)|(175<<8)|78; //dw-7
-       mid[3] = (128<<24)|(195<<16)|(175<<8)|69; //dw-1
+       mid[3] = (128<<24)|(195<<16)|(175<<8)|73; //dw-5
        int p, q, r;
        MatrixMultiply[] mm;
        MatrixMultiply tmp;

diff --git a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiplyNrun.java b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiplyNrun.java
index 5f487204da2c1665f325d158b7fd2c6e3798bf9a..21400e490afff7012c006f6f5c58fede69f473f5 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiplyNrun.java
+++ b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiplyNrun.java
@@ -53,9 +53,9 @@ public class MatrixMultiply extends Thread{
        
        int[] mid = new int[4];
        mid[0] = (128<<24)|(195<<16)|(175<<8)|79;
-       mid[1] = (128<<24)|(195<<16)|(175<<8)|73;
+       mid[1] = (128<<24)|(195<<16)|(175<<8)|80;
        mid[2] = (128<<24)|(195<<16)|(175<<8)|78;
-       mid[3] = (128<<24)|(195<<16)|(175<<8)|69;
+       mid[3] = (128<<24)|(195<<16)|(175<<8)|73;
        int p, q, r;
        MatrixMultiply[] mm;
        MatrixMultiply tmp;

diff --git a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/makefile b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/makefile
index 8dfc9c6c3aa00904d3f2357f6db6b5f860dbbc48..d6d8bbcb621d60ebd6e615cf48692ceaccfd852b 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/makefile
+++ b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/makefile
@@ -1,21 +1,40 @@
 MAINCLASS=MatrixMultiply
 SRC1=${MAINCLASS}N.java
 SRC2=${MAINCLASS}Nrun.java
-FLAGS=-dsm -prefetch -optimize -excprefetch MatrixMultiply.main -excprefetch MMul.setValues -excprefetch MMul.transpose -mainclass ${MAINCLASS} -trueprob 0.90
-FLAGS2=-dsm -optimize -excprefetch MatrixMultiply.main -excprefetch MMul.setValues -excprefetch MMul.transpose -mainclass ${MAINCLASS}
+FLAGS=-dsm -dsmcaching -prefetch -optimize -excprefetch MatrixMultiply.main -excprefetch MMul.setValues -excprefetch MMul.transpose -mainclass ${MAINCLASS} -trueprob 0.90
+FLAGS1=-dsm -optimize -dsmcaching -mainclass ${MAINCLASS}
+FLAGS2=-dsm -optimize -mainclass ${MAINCLASS}
 default:
-       ../../../buildscript ${FLAGS2} -o ${MAINCLASS}NNP ${SRC1}
+       ../../../buildscript ${FLAGS2} -o ${MAINCLASS}NPNC ${SRC1}
+       ../../../buildscript ${FLAGS1} -o ${MAINCLASS}NNP ${SRC1}
        ../../../buildscript ${FLAGS} -o ${MAINCLASS}N ${SRC1}
-#      ../../../buildscript ${FLAGS2} -o ${MAINCLASS}NNP ${SRC2}
-#      ../../../buildscript ${FLAGS} -o ${MAINCLASS}N ${SRC2}
+       ../../../buildscript ${FLAGS2} -o ${MAINCLASS}NPNC200 ${SRC2}
+       ../../../buildscript ${FLAGS1} -o ${MAINCLASS}NNP200 ${SRC2}
+       ../../../buildscript ${FLAGS} -o ${MAINCLASS}N200 ${SRC2}
+       cp ${MAINCLASS}NPNC.bin ${MAINCLASS}1NPNC.bin
        cp ${MAINCLASS}NNP.bin ${MAINCLASS}1NP.bin
        cp ${MAINCLASS}N.bin ${MAINCLASS}1.bin
+       cp ${MAINCLASS}NPNC.bin ${MAINCLASS}2NPNC.bin
        cp ${MAINCLASS}NNP.bin ${MAINCLASS}2NP.bin
        cp ${MAINCLASS}N.bin ${MAINCLASS}2.bin
+       cp ${MAINCLASS}NPNC.bin ${MAINCLASS}3NPNC.bin
        cp ${MAINCLASS}NNP.bin ${MAINCLASS}3NP.bin
        cp ${MAINCLASS}N.bin ${MAINCLASS}3.bin
+       cp ${MAINCLASS}NPNC.bin ${MAINCLASS}4NPNC.bin
        cp ${MAINCLASS}NNP.bin ${MAINCLASS}4NP.bin
        cp ${MAINCLASS}N.bin ${MAINCLASS}4.bin
+       cp ${MAINCLASS}NPNC200.bin ../MM200/${MAINCLASS}1NPNC.bin
+       cp ${MAINCLASS}NNP200.bin ../MM200/${MAINCLASS}1NP.bin
+       cp ${MAINCLASS}N200.bin ../MM200/${MAINCLASS}1.bin
+       cp ${MAINCLASS}NPNC200.bin ../MM200/${MAINCLASS}2NPNC.bin
+       cp ${MAINCLASS}NNP200.bin ../MM200/${MAINCLASS}2NP.bin
+       cp ${MAINCLASS}N200.bin ../MM200/${MAINCLASS}2.bin
+       cp ${MAINCLASS}NPNC200.bin ../MM200/${MAINCLASS}3NPNC.bin
+       cp ${MAINCLASS}NNP200.bin ../MM200/${MAINCLASS}3NP.bin
+       cp ${MAINCLASS}N200.bin ../MM200/${MAINCLASS}3.bin
+       cp ${MAINCLASS}NPNC200.bin ../MM200/${MAINCLASS}4NPNC.bin
+       cp ${MAINCLASS}NNP200.bin ../MM200/${MAINCLASS}4NP.bin
+       cp ${MAINCLASS}N200.bin ../MM200/${MAINCLASS}4.bin
 
 clean:
        rm -rf tmpbuilddirectory

diff --git a/Robust/src/Benchmarks/Prefetch/SOR/dsm/JGFSORBench.java b/Robust/src/Benchmarks/Prefetch/SOR/dsm/JGFSORBench.java
index f24ed37d92f79b252cd9f45e44a9de7fe0963864..35e7fdd4d4e76235cb1949bd7f885ccedb1f9167 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/SOR/dsm/JGFSORBench.java
+++ b/Robust/src/Benchmarks/Prefetch/SOR/dsm/JGFSORBench.java
@@ -32,7 +32,7 @@ public class JGFSORBench {
     datasizes[0] = 1000;
     datasizes[1] = 1500;
     datasizes[2] = 2000;
-    datasizes[3] = 4000;
+    datasizes[3] = 8000;
     JACOBI_NUM_ITER = 100;
     RANDOM_SEED = 10101010;
     Gtotal = 0.0;
@@ -47,10 +47,10 @@ public class JGFSORBench {
     BarrierServer mybarr;
 
     int[] mid = new int[4];
-    mid[0] = (128<<24)|(195<<16)|(175<<8)|79;
-    mid[1] = (128<<24)|(195<<16)|(175<<8)|73;
-    mid[2] = (128<<24)|(195<<16)|(175<<8)|78;
-    mid[3] = (128<<24)|(195<<16)|(175<<8)|69;
+    mid[0] = (128<<24)|(195<<16)|(175<<8)|79;//dw-8
+    mid[1] = (128<<24)|(195<<16)|(175<<8)|80;//dw-9
+    mid[2] = (128<<24)|(195<<16)|(175<<8)|78;//dw-7
+    mid[3] = (128<<24)|(195<<16)|(175<<8)|73;//dw-5
 
     double[][] G;
     int num_iterations;

diff --git a/Robust/src/Benchmarks/Prefetch/SOR/dsm/makefile b/Robust/src/Benchmarks/Prefetch/SOR/dsm/makefile
index 50e71223f31b49c2673efc7559316e95b24dbad7..8c048ac2238cfa71910070ce0d2878489ba0cff8 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/SOR/dsm/makefile
+++ b/Robust/src/Benchmarks/Prefetch/SOR/dsm/makefile
@@ -7,18 +7,24 @@ SRC=${MAINCLASS}.java \
        JGFTimer.java \
        SORRunner.java \
        SORWrap.java
-FLAGS=-dsm -prefetch -optimize -excprefetch JGFSORBench.JGFSORBench -excprefetch JGFSORBenchSizeA.main -excprefetch JGFSORBench.RandomMatrix -excprefetch JGFSORBench.init_sync -excprefetch JGFSORBench.JGFkernel -mainclass ${MAINCLASS} -trueprob 0.73
+FLAGS=-dsm -prefetch -dsmcaching -optimize -excprefetch JGFSORBench.JGFSORBench -excprefetch JGFSORBenchSizeA.main -excprefetch JGFSORBench.RandomMatrix -excprefetch JGFSORBench.init_sync -excprefetch JGFSORBench.JGFkernel -mainclass ${MAINCLASS} -trueprob 0.73
+FLAGS1=-dsm -dsmcaching -optimize -mainclass ${MAINCLASS} 
 FLAGS2=-dsm -optimize -mainclass ${MAINCLASS}
 
 default:
-       ../../../../buildscript ${FLAGS2} -o ${MAINCLASS}NP ${SRC}
+       ../../../../buildscript ${FLAGS2} -o ${MAINCLASS}NPNC ${SRC}
+       ../../../../buildscript ${FLAGS1} -o ${MAINCLASS}NP  ${SRC}
        ../../../../buildscript ${FLAGS} -o ${MAINCLASS}P  ${SRC}
+       cp ${MAINCLASS}NPNC.bin ${MAINCLASS}1NPNC.bin
        cp ${MAINCLASS}NP.bin ${MAINCLASS}1NP.bin
        cp ${MAINCLASS}P.bin ${MAINCLASS}1.bin
+       cp ${MAINCLASS}NPNC.bin ${MAINCLASS}2NPNC.bin
        cp ${MAINCLASS}NP.bin ${MAINCLASS}2NP.bin
        cp ${MAINCLASS}P.bin ${MAINCLASS}2.bin
+       cp ${MAINCLASS}NPNC.bin ${MAINCLASS}3NPNC.bin
        cp ${MAINCLASS}NP.bin ${MAINCLASS}3NP.bin
        cp ${MAINCLASS}P.bin ${MAINCLASS}3.bin
+       cp ${MAINCLASS}NPNC.bin ${MAINCLASS}4NPNC.bin
        cp ${MAINCLASS}NP.bin ${MAINCLASS}4NP.bin
        cp ${MAINCLASS}P.bin ${MAINCLASS}4.bin
 

diff --git a/Robust/src/Benchmarks/Prefetch/bm.txt b/Robust/src/Benchmarks/Prefetch/bm.txt
index fbee3ceebf4c73c64efb37342b1c73a595163dee..8c9249a46ae3abba41b6ea747dff9ce6a1a14348 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/bm.txt
+++ b/Robust/src/Benchmarks/Prefetch/bm.txt
@@ -3,7 +3,7 @@ JGFSORBenchSizeC:SOR/dsm:1:2:3:4:sorverC
 JGFSORBenchSizeD:SOR/dsm:1:2:3:4:sorverD
 JGFMolDynBenchSizeA:Moldyn/dsm:1:2:3:4:moldynverA
 JGFLUFactBenchSizeA:LUFact/dsm:1:2:3:4:lufactverA
-MatrixMultiply:MatrixMultiply:1 200 30:2 200 30:3 200 30:4 200 30:mmver200
+MatrixMultiply:MM200:1 200 30:2 200 30:3 200 30:4 200 30:mmver200
 MatrixMultiply:MatrixMultiply:1 600:2 600:3 600:4 600:mmver600
 Em3d:Em3d/dsm:-T 1 -N 4000 -d 130 -p -i 3:-T 2 -N 4000 -d 130 -p -i 3:-T 3 -N 4000 -d 130 -p -i 3:-T 4 -N 4000 -d 130 -p -i 3:em3dver40001303
 Em3d:Em3d/dsm:-T 1 -N 4000 -d 130 -p -i 100000:-T 2 -N 4000 -d 130 -p -i 100000:-T 3 -N 4000 -d 130 -p -i 100000:-T 4 -N 4000 -d 130 -p -i 100000:em3dver4000130100000

diff --git a/Robust/src/Benchmarks/Prefetch/run.sh b/Robust/src/Benchmarks/Prefetch/run.sh
index f0bf7635c40e1f16d734a73e11b2d4f6e43a00c4..bbd224db1f9a2603b8910e8931d5c520d12c7e87 100755 (executable)
--- a/Robust/src/Benchmarks/Prefetch/run.sh
+++ b/Robust/src/Benchmarks/Prefetch/run.sh
@@ -1,8 +1,9 @@
 #!/bin/sh 
 
+#set -x
 MACHINES2='dw-9.eecs.uci.edu'
-MACHINES3='dw-9.eecs.uci.edu dw-5.eecs.uci.edu'
-MACHINES4='dw-9.eecs.uci.edu dw-5.eecs.uci.edu dw-7.eecs.uci.edu'
+MACHINES3='dw-9.eecs.uci.edu dw-7.eecs.uci.edu'
+MACHINES4='dw-9.eecs.uci.edu dw-7.eecs.uci.edu dw-5.eecs.uci.edu'
 LOGDIR=/home/adash/research/Robust/src/Benchmarks/Prefetch/runlog
 TOPDIR=`pwd`
 
@@ -30,7 +31,7 @@ function run {
       ssh ${machine} 'cd `cat ~/.tmpdir`; source ~/.tmpvars; ./$bin' &
       echo ""
     done
-    sleep 5
+    sleep 2
     /usr/bin/time -f "%e" ./$3 master $arg 2>> ${LOGDIR}/${3}_${EXTENSION}.txt
     echo "Terminating ... "
     for machine in `echo $MACHINES`
@@ -67,41 +68,59 @@ function localrun {
     sleep 4
     i=`expr $i + 1`
   done
+  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
+    i=`expr $i + 1`
+  done
 }
 
 function callrun {
   PREFETCH=${BENCHMARK}1.bin
   NONPREFETCH=${BENCHMARK}1NP.bin
+  NONPREFETCH_NONCACHE=${BENCHMARK}1NPNC.bin
   PREFETCH2=${BENCHMARK}2.bin
   NONPREFETCH2=${BENCHMARK}2NP.bin
+  NONPREFETCH_NONCACHE2=${BENCHMARK}2NPNC.bin
   PREFETCH3=${BENCHMARK}3.bin
   NONPREFETCH3=${BENCHMARK}3NP.bin
+  NONPREFETCH_NONCACHE3=${BENCHMARK}3NPNC.bin
   PREFETCH4=${BENCHMARK}4.bin
   NONPREFETCH4=${BENCHMARK}4NP.bin
+  NONPREFETCH_NONCACHE4=${BENCHMARK}4NPNC.bin
   cd $BMDIR 
 
   echo "---------- Running local $BMDIR non-prefetch on 1 machine ---------- "
-  localrun 10
+  localrun 3
 
+  echo "---------- Running single thread remote $BMDIR non-prefetch + non-cache on 2 machines ---------- "
+  oneremote 3 1 $NONPREFETCH_NONCACHE
   echo "---------- Running single thread remote $BMDIR non-prefetch on 2 machines ---------- "
-  oneremote 10 1 $NONPREFETCH
+  oneremote 3 1 $NONPREFETCH
   echo "---------- Running single thread remote $BMDIR prefetch on 2 machines ---------- "
-  oneremote 10 1 $PREFETCH
+  oneremote 3 1 $PREFETCH
 
+  echo "---------- Running two threads $BMDIR non-prefetch + non-cache on 2 machines ---------- "
+  run 3 2 $NONPREFETCH_NONCACHE2 
   echo "---------- Running two threads $BMDIR non-prefetch on 2 machines ---------- "
-  run 10 2 $NONPREFETCH2 
+  run 3 2 $NONPREFETCH2 
   echo "---------- Running two threads $BMDIR prefetch on 2 machines ---------- "
-  run 10 2 $PREFETCH2 
+  run 3 2 $PREFETCH2 
 
+  echo "---------- Running three threads $BMDIR non-prefetch + non-cache on 3 machines ---------- "
+  run 3 3 $NONPREFETCH_NONCACHE3 
   echo "---------- Running three threads $BMDIR non-prefetch on 3 machines ---------- "
-  run 10 3 $NONPREFETCH3 
+  run 3 3 $NONPREFETCH3 
   echo "---------- Running three threads $BMDIR prefetch on 3 machines ---------- "
-  run 10 3 $PREFETCH3 
+  run 3 3 $PREFETCH3 
 
+  echo "---------- Running four threads $BMDIR non-prefetch + non-cache on 4 machines ---------- "
+  run 3 4 $NONPREFETCH_NONCACHE4 
   echo "---------- Running four threads $BMDIR non-prefetch on 4 machines ---------- "
-  run 10 4 $NONPREFETCH4 
+  run 3 4 $NONPREFETCH4 
   echo "---------- Running four threads $BMDIR prefetch on 4 machines ---------- "
-  run 10 4 $PREFETCH4 
+  run 3 4 $PREFETCH4 
 
   cd $TOPDIR
 }
@@ -109,9 +128,12 @@ function callrun {
 function callmicrorun {
   PREFETCH=${BENCHMARK}1.bin
   NONPREFETCH=${BENCHMARK}1NP.bin
+  NONPREFETCH_NONCACHE=${BENCHMARK}1NPNC.bin
   cd $BMDIR 
   echo "---------- Running local $BMDIR non-prefetch on 1 machine ---------- "
-  localrun 10
+#  localrun 10
+  echo "---------- Running single thread remote $BMDIR non-prefetch + non-cache on 2 machines ---------- "
+  oneremote 10 1 $NONPREFETCH_NONCACHE
   echo "---------- Running single thread remote $BMDIR non-prefetch on 2 machines ---------- "
   oneremote 10 1 $NONPREFETCH
   echo "---------- Running single thread remote $BMDIR prefetch on 2 machines ---------- "
@@ -119,7 +141,8 @@ function callmicrorun {
   cd $TOPDIR
 }
 
-benchmarks='array chase mmver200 mmver600 em3dver40001303 sorverA'
+benchmarks='array chase mmver200 mmver600'
+#benchmarks='em3dver40001303 sorverD'
 
 echo "---------- Clean old files ---------- "
 rm runlog/*