bug fixes for LookUpServerThread.java

compile error fixes for MatrixMultiplyN.java
small changes to script
changes to JGFMolDynBenchSizeC.java for new parameter for Moldyn

diff --git a/Robust/src/Benchmarks/Distributed/LookUpService/dsm/makefile b/Robust/src/Benchmarks/Distributed/LookUpService/dsm/makefile
index f31b9b6c1eb572a912cc3c0e617f91cc01fb4328..857dc84383dbabc005b8072d2f6b7abb29e357c4 100644 (file)
--- a/Robust/src/Benchmarks/Distributed/LookUpService/dsm/makefile
+++ b/Robust/src/Benchmarks/Distributed/LookUpService/dsm/makefile
@@ -6,8 +6,8 @@ FLAGS3=-dsm -optimize -mainclass ${MAINCLASS}
 FLAGS4=-dsm -dsmcaching -optimize -mainclass ${MAINCLASS}
 default:
        ../../../../buildscript ${FLAGS3} -o ${MAINCLASS}NPNC ${SRC1}
-       ../../../../buildscript ${FLAGS2} -o ${MAINCLASS}N ${SRC1}
        ../../../../buildscript ${FLAGS4} -o ${MAINCLASS}NPC ${SRC1}
+#../../../../buildscript ${FLAGS2} -o ${MAINCLASS}N ${SRC1}
 clean:
        rm -rf tmpbuilddirectory
        rm *.bin

diff --git a/Robust/src/Benchmarks/Distributed/LookUpService/dsm2/DistributedHashMap.java b/Robust/src/Benchmarks/Distributed/LookUpService/dsm2/DistributedHashMap.java
index 0f147e5ac139febe7d26296cabbf426b7770c080..180945e405fa65e5e5750386e47ab6b357fb8e7b 100644 (file)
--- a/Robust/src/Benchmarks/Distributed/LookUpService/dsm2/DistributedHashMap.java
+++ b/Robust/src/Benchmarks/Distributed/LookUpService/dsm2/DistributedHashMap.java
@@ -59,7 +59,7 @@ public class DistributedHashMap {
     Object obj1 = dhe.array;
     short[] offsets1 = new short[4];
     offsets1[0] = getoffset {DHashEntry, next};
-    offsets1[1] = (short) 2;
+    offsets1[1] = (short) 5;
     offsets1[2] = getoffset {DHashEntry, key};
     offsets1[3] = (short) 0;
     System.rangePrefetch(obj1, offsets1);

diff --git a/Robust/src/Benchmarks/Distributed/LookUpService/java/LookUpServerThread.java b/Robust/src/Benchmarks/Distributed/LookUpService/java/LookUpServerThread.java
index 1e604653fc793066f18a72c63fd0013161b1b3c7..08bf708682859b86f5be2bc51ba4c61c8b9ceae1 100644 (file)
--- a/Robust/src/Benchmarks/Distributed/LookUpService/java/LookUpServerThread.java
+++ b/Robust/src/Benchmarks/Distributed/LookUpService/java/LookUpServerThread.java
@@ -29,7 +29,11 @@ public class LookUpServerThread extends Thread {
         if(str1.equalsIgnoreCase("r")) {
           Integer tmpval = doRead(this, keyitem);
           //Write object to socket for client
-          sock.write(tmpval.intToByteArray());
+          if(tmpval == null) { //If Object not found in hash map
+            sock.write(fillBytes(0));
+          } else {
+            sock.write(tmpval.intToByteArray());
+          }
         } else {
           /* update hashmap if opcode sent is "w" */
           doUpdate(r, this, keyitem);
@@ -60,6 +64,15 @@ public class LookUpServerThread extends Thread {
     return;
   }
 
+  byte[] fillBytes(int val) {
+    byte[] b = new byte[4];
+    for(int i = 0; i<4; i++) {
+      int offset = (3 - i) * 8;
+      b[i] = (byte) ((val >> offset) & 0xFF);
+    }
+    return b;
+  }
+
   /*
    * Convert byte array into int type
    **/

diff --git a/Robust/src/Benchmarks/Distributed/LookUpService/java/makefile b/Robust/src/Benchmarks/Distributed/LookUpService/java/makefile
index 53fc7253918d2a6c8223c5a68834d57042205332..dd63bef9aa560c3da105462569dfc74df03077f1 100644 (file)
--- a/Robust/src/Benchmarks/Distributed/LookUpService/java/makefile
+++ b/Robust/src/Benchmarks/Distributed/LookUpService/java/makefile
@@ -3,8 +3,8 @@ MAINCLASS2=LookUpClient
 SRC1=${MAINCLASS1}.java \
         LookUpServerThread.java
 SRC2=${MAINCLASS2}.java 
-FLAGS= -thread -nooptimize -debug -mainclass ${MAINCLASS1}
-FLAGS1= -thread -nooptimize -debug -mainclass ${MAINCLASS2}
+FLAGS= -thread -optimize -mainclass ${MAINCLASS1}
+FLAGS1= -thread -optimize -mainclass ${MAINCLASS2}
 
 default :
        ../../../../buildscript ${FLAGS} -o Server ${SRC1}

diff --git a/Robust/src/Benchmarks/Distributed/RainForest/dsm/makefile b/Robust/src/Benchmarks/Distributed/RainForest/dsm/makefile
index 6d30076fcdc33211f20f6855b42ed73bd41ff9c4..4fee60576e07b1c6522d5b2a864deff745afce2c 100644 (file)
--- a/Robust/src/Benchmarks/Distributed/RainForest/dsm/makefile
+++ b/Robust/src/Benchmarks/Distributed/RainForest/dsm/makefile
@@ -19,7 +19,7 @@ default:
        ./extractLines
        ../../../../buildscript ${FLAGS1} -o ${MAINCLASS}NPNC ${SRC}
        ../../../../buildscript ${FLAGS2} -o ${MAINCLASS}NPC ${SRC}
-       ../../../../buildscript ${FLAGS3} -o ${MAINCLASS}N ${SRC}
+#      ../../../../buildscript ${FLAGS3} -o ${MAINCLASS}N ${SRC}
 
 clean:
        rm tmp1RainForest.java

diff --git a/Robust/src/Benchmarks/Distributed/runall.sh b/Robust/src/Benchmarks/Distributed/runall.sh
index b064f7d0850c72f5a5686323d14bcaefe29e7dff..748f2a54c2557cf352b4c23f1473c9f3446a3b32 100755 (executable)
--- a/Robust/src/Benchmarks/Distributed/runall.sh
+++ b/Robust/src/Benchmarks/Distributed/runall.sh
@@ -1,2 +1,7 @@
 #!/bin/sh
+./runjava.sh 1
+./runjava.sh 2
+./runjava.sh 4
 ./runjava.sh 6
+./runjava.sh 8
+echo "done"

diff --git a/Robust/src/Benchmarks/Distributed/runjava.sh b/Robust/src/Benchmarks/Distributed/runjava.sh
index d9e9026280aa4b185acb0279b0d77e850d06fdcc..458414bba81cc3ae0643e1bec43d129f0284d435 100755 (executable)
--- a/Robust/src/Benchmarks/Distributed/runjava.sh
+++ b/Robust/src/Benchmarks/Distributed/runjava.sh
@@ -5,7 +5,16 @@ DSTM_CONFDIR=${HOME}/research/Robust/src
 JAVA_DIR=java
 JVM_DIR=jvm
 DSM_DIR=dsm
-ITERATIONS=1
+ITERATIONS=2
+TOPDIR=${HOME}/research/Robust/src/Prefetch
+
+function killclients {
+  i=1;
+  while [ $i -le $1 ]; do
+    ssh dc-${i}.calit2.uci.edu 'killall Client.bin;'
+    i=`expr $i + 1`
+  done
+}
 
 function runjava {
   # Run java version
@@ -22,6 +31,7 @@ function runjava {
    # Start the clients
    k=1;
    echo ${BASEDIR}/${BM_DIR} > ~/.tmpdir
+   perl -x${TOPDIR} ${TOPDIR}/switch/fetch_stat.pl clear_stats settings=switch/clearsettings.txt
    while [ $k -le $1 ]; do
      echo "SSH into dc-${k}"
      SEED=`expr $k \* 100`
@@ -34,7 +44,15 @@ function runjava {
      fi
      k=`expr $k + 1`
    done
-   sleep 20;
+   killclients $k
+   sleep 10;
+   perl -x${TOPDIR} ${TOPDIR}/switch/fetch_stat.pl settings=switch/settings.txt
+   cat ${LOGDIR}/tmp >> ${LOGDIR}/${BM_NAME}_${1}Thrd.txt
+   if [ $i -eq 0 ];then echo "<h3> Benchmark=${BM_NAME} Thread=${1}</h3><br>" > ${LOGDIR}/${BM_NAME}_${1}Thrd_a.html  ;fi
+   cat ${LOGDIR}/tmp >> ${LOGDIR}/${BM_NAME}_${1}Thrd_a.html
+   echo "<a href=\"${BM_NAME}_${1}Thrd_${j}.html\">Network Stats</a><br>" >> ${LOGDIR}/${BM_NAME}_${1}Thrd_a.html
+   mv ${TOPDIR}/html/dell.html ${LOGDIR}/${BM_NAME}_${1}Thrd_${j}.html
+
    j=`expr $j + 1`
    cd -
   done
@@ -72,6 +90,14 @@ function runjvm {
   done
 }
 
+function calcavg {
+  for file in `ls ${LOGDIR}/*.out`
+  do
+    echo -n $file
+    cat $file | awk '{sum += $1} END {print " "sum/NR}'
+  done
+}
+
 exec < bm_args.txt
 while read line
 do
@@ -95,3 +121,6 @@ do
   rm ~/.bmargs
   rm ~/.tmpdir
 done
+
+echo "------- Calculating Averages -------- "
+calcavg 

diff --git a/Robust/src/Benchmarks/Prefetch/2DConv/dsm/Makefile b/Robust/src/Benchmarks/Prefetch/2DConv/dsm/Makefile
index 2fbab3e066427ab10bdfcc365e3c9261d8bd3ca3..2d5dfe40d09cefd27b00c1924e0a43e319f778dd 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/2DConv/dsm/Makefile
+++ b/Robust/src/Benchmarks/Prefetch/2DConv/dsm/Makefile
@@ -13,7 +13,7 @@ default:
 #      ../../../../buildscript ${FLAGS} ${SRC1} -o ${MAINCLASS}N
        ../../../../buildscript ${FLAGS1} ${SRC2} -o ${MAINCLASS}NPNC
        ../../../../buildscript ${FLAGS2} ${SRC2} -o ${MAINCLASS}NPC
-       ../../../../buildscript ${FLAGS} ${SRC2} -o ${MAINCLASS}N
+#      ../../../../buildscript ${FLAGS} ${SRC2} -o ${MAINCLASS}N
 
 clean:
        rm -rf tmpbuilddirectory

diff --git a/Robust/src/Benchmarks/Prefetch/2DFFT/dsm/Makefile b/Robust/src/Benchmarks/Prefetch/2DFFT/dsm/Makefile
index 38963d9ff6ad785ebb4facbbde643397e5c55f9d..c4fdf13f2a0726f53bb5068894c94a47bef2de53 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/2DFFT/dsm/Makefile
+++ b/Robust/src/Benchmarks/Prefetch/2DFFT/dsm/Makefile
@@ -10,7 +10,7 @@ FLAGS2=-dsm -optimize -dsmcaching -mainclass ${MAINCLASS}
 default:
        ../../../../buildscript ${FLAGS1} ${SRC} -o ${MAINCLASS}NPNC
        ../../../../buildscript ${FLAGS2} ${SRC} -o ${MAINCLASS}NPC
-       ../../../../buildscript ${FLAGS} ${SRC} -o ${MAINCLASS}N
+#      ../../../../buildscript ${FLAGS} ${SRC} -o ${MAINCLASS}N
 
 clean:
        rm -rf tmpbuilddirectory

diff --git a/Robust/src/Benchmarks/Prefetch/Chase/Chase.java b/Robust/src/Benchmarks/Prefetch/Chase/Chase.java
index 378068758113ee4d67cd7f1b2948e490568f7837..24ed0cb28ce2d0e1b9f557968e57b048504da31e 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)|79);
+       c.start((128<<24)|(195<<16)|(136<<8)|162);
        c.join();
     }
     

diff --git a/Robust/src/Benchmarks/Prefetch/Chase/makefile b/Robust/src/Benchmarks/Prefetch/Chase/makefile
index b06f78076d47ab56852d211b5da080c0f52084f0..86fb422349d2af7590a8d596e8253a09f56f064b 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/Chase/makefile
+++ b/Robust/src/Benchmarks/Prefetch/Chase/makefile
@@ -1,7 +1,6 @@
 MAINCLASS=Chase
 SRC1=${MAINCLASS}.java
-FLAGS=-dsm -prefetch -dsmcaching -optimize -excprefetch Chase.main -excprefetch Chase.Chase -mainclass ${MAINCLASS} -trueprob 0.7
-FLAGS1=-dsm -rangeprefetch -dsmcaching -optimize -mainclass ${MAINCLASS} -trueprob 0.7
+#FLAGS=-dsm -prefetch -dsmcaching -optimize -excprefetch Chase.main -excprefetch Chase.Chase -mainclass ${MAINCLASS} -trueprob 0.7
 FLAGS2=-dsm -dsmcaching -optimize -mainclass ${MAINCLASS} -trueprob 0.7
 FLAGS3=-dsm -optimize -mainclass ${MAINCLASS} -trueprob 0.7
 #for testing no java option
@@ -9,7 +8,6 @@ FLAGS3=-dsm -optimize -mainclass ${MAINCLASS} -trueprob 0.7
 default:
        ../../../buildscript ${FLAGS3} -o ${MAINCLASS}NPNC ${SRC1}
        ../../../buildscript ${FLAGS} -o ${MAINCLASS}N ${SRC1}
-       ../../../buildscript ${FLAGS1} -o ${MAINCLASS}RangeP ${SRC1}
 
 clean:
        rm -rf tmpbuilddirectory

diff --git a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/2DConv/ConvolutionSizeC.java b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/2DConv/ConvolutionSizeC.java
index 241e89b2584cdc557fa94395da72c5aa398f5172..bf9b662a6d913455a3659177ac586ce443021656 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/2DConv/ConvolutionSizeC.java
+++ b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/2DConv/ConvolutionSizeC.java
@@ -21,9 +21,7 @@ public class Convolution extends Thread {
     }
 
     //
-    //Prefetch this.img.inputImage[] the first 32 objects
-    // Generates compiler error ???
-    Object o = this;
+    //Add manual prefetch this.img.inputImage[] the first 32 objects
     short[] offsets = new short[6];
     offsets[0] = getoffset{Convolution, img};
     offsets[1] = (short) 0;
@@ -31,19 +29,12 @@ public class Convolution extends Thread {
     offsets[3] = (short) 0;
     offsets[4] = (short) tempx0;
     offsets[5] = (short) 31;
-    System.rangePrefetch(o, offsets);
+    System.rangePrefetch(this, offsets);
 
     //Prefetch this.img.outputImage[] the first 32 objects 
-    // Generates compiler error ???
-    Object o1 = this;
-    short[] offsets1 = new short[6];
-    offsets1[0] = getoffset{Convolution, img};
-    offsets1[1] = (short) 0;
-    offsets1[2] = getoffset{Image, outputImage};
-    offsets1[3] = (short) 0;
-    offsets1[4] = (short) tempx0;
-    offsets1[5] = (short) 31;
-    System.rangePrefetch(o1, offsets1);
+    offsets[2] = getoffset{Image, outputImage};
+    offsets[3] = (short) 0;
+    System.rangePrefetch(this, offsets);
 
     int kernelHeight=15;
     int kernelWidth=15;

diff --git a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/MatrixMultiply/MatrixMultiplyN.java b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/MatrixMultiply/MatrixMultiplyN.java
index 2d08aba8c96cdca8904c05f1dc0a834ace895c57..1fc9b11570c1db196f27e29b1b6e04ed5cdf61e6 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/MatrixMultiply/MatrixMultiplyN.java
+++ b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/MatrixMultiply/MatrixMultiplyN.java
@@ -42,16 +42,16 @@ public class MatrixMultiply extends Thread{
                double a[]=la[i];
                double c[]=lc[i];
                if ((l&15)==0) {
-                   offsets2[0] = (short) x0+l;
+                   offsets2[0] = (short) (x0+l);
                    if ((x0+l+16)>x1) {
                        int x=x1-x0-l-1;
                        if (x>0) {
-                           offsets[1]=(short) x;
+                           offsets2[1]=(short) x;
                            System.rangePrefetch(la, offsets2);
                            System.rangePrefetch(lc, offsets2);
                        }
                    } else {
-                       offsets[1] = (short) 15;
+                       offsets2[1] = (short) 15;
                        System.rangePrefetch(la, offsets2);
                        System.rangePrefetch(lc, offsets2);
                    }

diff --git a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/MatrixMultiply/makefile b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/MatrixMultiply/makefile
index 9a893f214368bed288a29ed98af6073fdc26dd1a..a482a4f025ade02ac31400336829ccae385826bc 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/MatrixMultiply/makefile
+++ b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/MatrixMultiply/makefile
@@ -1,12 +1,8 @@
 MAINCLASS=MatrixMultiply
 SRC1=${MAINCLASS}N.java
-FLAGS=-dsm -dsmcaching -prefetch -optimize -excprefetch MatrixMultiply.main -excprefetch MMul.setValues -excprefetch MMul.transpose -mainclass ${MAINCLASS} -trueprob 0.98
 FLAGS1=-dsm -dsmcaching -rangeprefetch -optimize -mainclass ${MAINCLASS} -trueprob 0.98
-FLAGS2=-dsm -optimize -mainclass ${MAINCLASS}
 default:
-       ../../../../buildscript ${FLAGS2} -o ${MAINCLASS}NPNC ${SRC1}
-       ../../../../buildscript ${FLAGS} -o ${MAINCLASS}N ${SRC1}
-       ../../../../buildscript ${FLAGS1} -o ${MAINCLASS}RangePN ${SRC1}
+       ../../../../buildscript ${FLAGS1} -o ${MAINCLASS}RangeN ${SRC1}
 
 clean:
        rm -rf tmpbuilddirectory

diff --git a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/Moldyn/JGFInstrumentor.java b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/Moldyn/JGFInstrumentor.java
index 3f9f580c0b6a7207e074b20cf138fd4a9fd2b072..80db8282bb9a770cde70a6ab296f24cbfcd3b8a8 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/Moldyn/JGFInstrumentor.java
+++ b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/Moldyn/JGFInstrumentor.java
@@ -183,6 +183,8 @@ public class JGFInstrumentor{
         header = base + "3 - Size A";
       else if (size == 1)
         header = base + "3 - Size B";
+      else if (size == 2)
+        header = base + "3 - Size C";
     }
 
     System.printString(header + "\n"); 

diff --git a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/Moldyn/JGFMolDynBench.java b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/Moldyn/JGFMolDynBench.java
index 59b6e8a58118c1fe6ce0cf1cbae5fc13831a3420..9f88f52132609b232e9eb82a1a9b23fb3c480204 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/Moldyn/JGFMolDynBench.java
+++ b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/Moldyn/JGFMolDynBench.java
@@ -54,7 +54,7 @@ public class JGFMolDynBench {
     datasizes = global new int[3];
     datasizes[0] = 8;
     datasizes[1] = 13;
-    datasizes[2] = 18;
+    datasizes[2] = 11;
 
     mm = datasizes[size];
     PARTSIZE = mm*mm*mm*4;
@@ -421,9 +421,17 @@ class mdRunner extends Thread {
 
     for (int move=0;move<movemx;move++) {
       //PREFETCH: sh_force[0..2][0..mdsize]
-
-
       atomic {
+        /*
+        short[] offsets1 = new short[6];
+        offsets1[0] = getoffset{mdRunner, sh_force};
+        offsets1[1] = (short) 0;
+        offsets1[2] = (short) 0;
+        offsets1[3] = (short) 2;
+        offsets1[4] = (short) 0;
+        offsets1[5] = (short) (mdsize -1);
+        System.rangePrefetch(this, offsets1);
+        */
         /* move the particles and update velocities */
         for (int i=0;i<mdsize;i++) {
           one[i].domove(side,i);       
@@ -480,6 +488,16 @@ class mdRunner extends Thread {
 
       //PREFETCH: sh_force[0..2][0..mdsize]
       atomic {
+        /*
+        Object o = this.sh_force;
+        short[] offsets1 = new short[4];
+        offsets1[0] = (short) 0;
+        offsets1[1] = (short) 2;
+        offsets1[2] = (short) 0;
+        offsets1[3] = (short) (mdsize -1);
+        System.rangePrefetch(o, offsets1);
+        */
+
         /*scale forces, update velocities */
         sum = 0.0;
         for (int i=0;i<mdsize;i++) {

diff --git a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/Moldyn/makefile b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/Moldyn/makefile
index 0a6c03c80615400c3e5811198ccf78d84686d5e4..1641d7ce0c93848e93e87403a9c05da50f0e2186 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/Moldyn/makefile
+++ b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/Moldyn/makefile
@@ -1,4 +1,4 @@
-MAINCLASS=JGFMolDynBenchSizeB
+MAINCLASS=JGFMolDynBenchSizeC
 SRC=${MAINCLASS}.java \
        JGFInstrumentor.java \
        JGFTimer.java \

diff --git a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/bm.txt b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/bm.txt
index 3dee2030bf4e0ce157ec4f127c64dc7bb02e99e7..354440ac8896bf034e65d9c75a7ba65af7cba7b5 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/bm.txt
+++ b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/bm.txt
@@ -1,6 +1,9 @@
 RainForest:RainForest:-N 1:-N 2:-N 3:-N 4:-N 5:-N 6:-N 7:-N 8:rainforest
-LookUpService:LookUpService:-N 1 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 2 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 3 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 4 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 5 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 6 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 7 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 8 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:10lookup
+LookUpService:LookUpService/dsm2:-N 1 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 2 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 3 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 4 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 5 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 6 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 7 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 8 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:10lookup
 MatrixMultiply:MatrixMultiply:1 800:2 800:3 800:4 800:5 800:6 800:7 800:8 800:800mmver
+Convolution:2DConv:1 4096:2 4096:3 4096:4 4096:5 4096:6 4096:7 4096:8 4096:40962dconv
 Convolution:2DConv:1 2048:2 2048:3 2048:4 2048:5 2048:6 2048:7 2048:8 2048:20482dconv
-Convolution:2DConv:1 1024:2 1024:3 1024:4 1024:5 1024:6 1024:7 1024:8 1024:10242dconv
 JGFMolDynBenchSizeB:Moldyn:1:2:3:4:5:6:7:8:moldynverB
+JGFMolDynBenchSizeA:Moldyn:1:2:3:4:5:6:7:8:moldynverA
+fft2d:2DFFT:1 1600:2 1600:3 1600:4 1600:5 1600:6 1600:7 1600:8 1600:1600fft2d
+fft2d:2DFFT:1 1152:2 1152:3 1152:4 1152:5 1152:6 1152:7 1152:8 1152:1152fft2d

diff --git a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/run.sh b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/run.sh
index 1cb3bd0a5610d6c623c5c4fa0072bba8b3a013da..0ecd80b402e78a9dacdba662233fb243a6992d4c 100755 (executable)
--- a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/run.sh
+++ b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/run.sh
@@ -3,7 +3,7 @@
 #set -x
 MACHINELIST='dc-1.calit2.uci.edu dc-2.calit2.uci.edu dc-3.calit2.uci.edu dc-4.calit2.uci.edu dc-5.calit2.uci.edu dc-6.calit2.uci.edu dc-7.calit2.uci.edu dc-8.calit2.uci.edu'
 #benchmarks='40962dconv 1200mmver moldynverB'
-#benchmarks='10lookup'
+benchmarks='1152fft2d 40962dconv 10lookup 1200mmver moldynverB rainforest'
 
 LOGDIR=~/research/Robust/src/Benchmarks/Prefetch/ManualPrefetch/runlog
 TOPDIR=`pwd`
@@ -82,60 +82,21 @@ function run {
   done
 }
 
-function oneremote {
-  i=0;
-  DIR=`pwd` 
-  while [ $i -lt $1 ]; do
-    echo "$DIR" > ~/.tmpdir
-    echo "bin=$3" > ~/.tmpvars
-    echo "arg='$ARGS1'" > ~/.tmpargs
-    echo "logd=$LOGDIR" > ~/.tmplogdir
-    echo "ext=$EXTENSION" > ~/.tmpext
-    ./$3 &
-    ssh $MACHINES2 'cd `cat ~/.tmpdir`; source ~/.tmpvars; source ~/.tmpargs; source ~/.tmplogdir; source ~/.tmpext; /usr/bin/time -f "%e" ./$bin master $arg 2>> ${logd}/${bin}_remote_${ext}.txt'
-    echo "Terminating ... "
-    killall $3
-    sleep 2
-    i=`expr $i + 1`
-  done
-}
-
-function localrun {
-  rm dstm.conf
-  DSTMDIR=${HOME}/research/Robust/src/Benchmarks/Prefetch/config
-  ln -s ${DSTMDIR}/dstm_1.conf dstm.conf
-  i=0;
-  while [ $i -lt $1 ]; do
-    /usr/bin/time -f "%e" ./${MANUAL_PREFETCH} master $ARGS1 2> ${LOGDIR}/tmp
-    cat ${LOGDIR}/tmp >> ${LOGDIR}/${MANUAL_PREFETCH}_local_${EXTENSION}.txt
-#   if [ $i -eq 0 ];then echo "<h3> Benchmark=${NONPREFETCH_NONCACHE} Thread=1local Extension=${EXTENSION}</h3><br>" > ${LOGDIR}/${NONPREFETCH_NONCACHE}_${EXTENSION}_1local_a.html  ;fi
-#    cat ${LOGDIR}/tmp >> ${LOGDIR}/${NONPREFETCH_NONCACHE}_${EXTENSION}_1local_a.html
-#    echo "<br>" >> ${LOGDIR}/${NONPREFETCH_NONCACHE}_${EXTENSION}_1local_a.html
-    sleep 2
-    i=`expr $i + 1`
-  done
-}
-
 function callrun {
   MANUAL_PREFETCH=${BENCHMARK}RangeN.bin
   
   cd $BMDIR 
 
-  echo "---------- Running local $BMDIR non-prefetch on 1 machine ---------- "
-  # localrun 1
-
-for count in 2 4 6 8
-do
-echo "------- Running $count threads $BMDIR manual prefetch on $count machines -----"
-run 1 $count ${MANUAL_PREFETCH}
-done
+  for count in 2 4 6 8
+  do
+    echo "------- Running $count threads $BMDIR manual prefetch on $count machines -----"
+    run 1 $count ${MANUAL_PREFETCH}
+  done
 
-cd $TOPDIR
+  cd $TOPDIR
 }
 
 
-#benchmarks='rainforest'
-benchmarks='moldynverB'
 echo "---------- Clean old files ---------- "
 rm runlog/*
 for b in `echo $benchmarks`

diff --git a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/dsm/makefile b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/dsm/makefile
index 064683cb82a0baa1d13e122e24f65d3e52e8eb5b..d70a6d491a0ad2715e704fda05853f3c6c768168 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/dsm/makefile
+++ b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/dsm/makefile
@@ -7,7 +7,7 @@ FLAGS2=-dsm -optimize -mainclass ${MAINCLASS}
 default:
        ../../../../buildscript ${FLAGS2} -o ${MAINCLASS}NPNC ${SRC1}
        ../../../../buildscript ${FLAGS1} -o ${MAINCLASS}NPC ${SRC1}
-       ../../../../buildscript ${FLAGS} -o ${MAINCLASS}N ${SRC1}
+#      ../../../../buildscript ${FLAGS} -o ${MAINCLASS}N ${SRC1}
 #      ../../../../buildscript ${FLAGS2} -o ${MAINCLASS}NPNC200 ${SRC2}
 #      ../../../../buildscript ${FLAGS} -o ${MAINCLASS}N200 ${SRC2}
 

diff --git a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/javasingle/makefile b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/javasingle/makefile
index 67270f6a62aa53999b49d274e8c6660921c6b67b..bbc9c37d6efdaf5d95bf6f66fda594ce1c7ac320 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/javasingle/makefile
+++ b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/javasingle/makefile
@@ -3,7 +3,7 @@ SRC1=${MAINCLASS}N.java
 SRC2=${MAINCLASS}Nrun.java
 default:
        ../../../../buildscript -thread -optimize -mainclass ${MAINCLASS} ${SRC1} -o ${MAINCLASS}
-       ../../../../buildscript -thread -optimize -mainclass ${MAINCLASS} ${SRC2} -o ${MAINCLASS}N
+#      ../../../../buildscript -thread -optimize -mainclass ${MAINCLASS} ${SRC2} -o ${MAINCLASS}N
 
 clean:
        rm -rf tmpbuilddirectory

diff --git a/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/JGFInstrumentor.java b/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/JGFInstrumentor.java
index 3f9f580c0b6a7207e074b20cf138fd4a9fd2b072..80db8282bb9a770cde70a6ab296f24cbfcd3b8a8 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/JGFInstrumentor.java
+++ b/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/JGFInstrumentor.java
@@ -183,6 +183,8 @@ public class JGFInstrumentor{
         header = base + "3 - Size A";
       else if (size == 1)
         header = base + "3 - Size B";
+      else if (size == 2)
+        header = base + "3 - Size C";
     }
 
     System.printString(header + "\n"); 

diff --git a/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/JGFMolDynBench.java b/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/JGFMolDynBench.java
index 00852131a345d1cd2910bdf747eab29128088830..61fb1eb1579aebf63ba46b1169cabef18a3bd104 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/JGFMolDynBench.java
+++ b/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/JGFMolDynBench.java
@@ -54,7 +54,7 @@ public class JGFMolDynBench {
     datasizes = global new int[3];
     datasizes[0] = 8;
     datasizes[1] = 13;
-    datasizes[2] = 18;
+    datasizes[2] = 11;
 
     mm = datasizes[size];
     PARTSIZE = mm*mm*mm*4;

diff --git a/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/JGFMolDynBenchSizeC.java b/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/JGFMolDynBenchSizeC.java
index 04a0afccac5f7d7d037dadb685f7803d16e3480a..56f37eddc36368a484b483dba095b8055012e9ba 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/JGFMolDynBenchSizeC.java
+++ b/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/JGFMolDynBenchSizeC.java
@@ -30,7 +30,7 @@ public class JGFMolDynBenchSizeC {
     }
 
     JGFInstrumentor instr = new JGFInstrumentor();
-    JGFInstrumentor.printHeader(3,0,nthreads);
+    JGFInstrumentor.printHeader(3,2,nthreads);
 
     JGFMolDynBench mold;
     atomic {

diff --git a/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/makefile b/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/makefile
index 3668f47dd0bf3404074bb439d6619a1303e5725f..ee86c5595f8bdd0489761cdc926ae911070abfc8 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/makefile
+++ b/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/makefile
@@ -1,4 +1,4 @@
-MAINCLASS=JGFMolDynBenchSizeB
+MAINCLASS=JGFMolDynBenchSizeC
 SRC=${MAINCLASS}.java \
        JGFInstrumentor.java \
        JGFTimer.java \
@@ -14,7 +14,7 @@ FLAGS1=-dsm -dsmcaching -optimize -mainclass ${MAINCLASS} -trueprob 0.75
 default:
        ../../../../buildscript ${FLAGS2} -o ${MAINCLASS}NPNC ${SRC}
        ../../../../buildscript ${FLAGS1} -o ${MAINCLASS}NPC ${SRC}
-       ../../../../buildscript ${FLAGS} -o ${MAINCLASS}N  ${SRC}
+#      ../../../../buildscript ${FLAGS} -o ${MAINCLASS}N  ${SRC}
 
 clean:
        rm -rf tmpbuilddirectory/

diff --git a/Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/JGFInstrumentor.java b/Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/JGFInstrumentor.java
index 3f9f580c0b6a7207e074b20cf138fd4a9fd2b072..80db8282bb9a770cde70a6ab296f24cbfcd3b8a8 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/JGFInstrumentor.java
+++ b/Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/JGFInstrumentor.java
@@ -183,6 +183,8 @@ public class JGFInstrumentor{
         header = base + "3 - Size A";
       else if (size == 1)
         header = base + "3 - Size B";
+      else if (size == 2)
+        header = base + "3 - Size C";
     }
 
     System.printString(header + "\n"); 

diff --git a/Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/JGFMolDynBench.java b/Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/JGFMolDynBench.java
index 91ef8f2ca7ae48141be7cebf2d6c71b408f0ed0d..3ed4ae344719dc6d454ad24aeb5efe9c7a225979 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/JGFMolDynBench.java
+++ b/Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/JGFMolDynBench.java
@@ -54,7 +54,7 @@ public class JGFMolDynBench {
     datasizes = new int[3];
     datasizes[0] = 8;
     datasizes[1] = 13;
-    datasizes[2] = 18;
+    datasizes[2] = 11;
 
     mm = datasizes[size];
     PARTSIZE = mm*mm*mm*4;

diff --git a/Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/JGFMolDynBenchSizeC.java b/Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/JGFMolDynBenchSizeC.java
index 442491163698d09d6e2ad2c3289af05ead46c128..170dffb2c0c498e462c72500b8325deecb9d1280 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/JGFMolDynBenchSizeC.java
+++ b/Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/JGFMolDynBenchSizeC.java
@@ -30,7 +30,7 @@ public class JGFMolDynBenchSizeC {
     }
 
     JGFInstrumentor instr = new JGFInstrumentor();
-    JGFInstrumentor.printHeader(3,0,nthreads);
+    JGFInstrumentor.printHeader(3,2,nthreads);
 
     JGFMolDynBench mold;
     mold = new JGFMolDynBench(nthreads); 

diff --git a/Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/makefile b/Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/makefile
index 85d65c076874ed3ede091fa758c4586987e3b85b..521f09eaf0e6f2a6d18b197aea4ed5bb23a12afd 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/makefile
+++ b/Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/makefile
@@ -1,4 +1,4 @@
-MAINCLASS=JGFMolDynBenchSizeB
+MAINCLASS=JGFMolDynBenchSizeC
 SRC=${MAINCLASS}.java \
 JGFInstrumentor.java \
 JGFTimer.java \

diff --git a/Robust/src/Benchmarks/Prefetch/bm.txt b/Robust/src/Benchmarks/Prefetch/bm.txt
index 51ea672ba4ea39d591c29faea8d6dd4aadb68cb2..a09cf18469520421c0b9284d07364c299cc297dd 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/bm.txt
+++ b/Robust/src/Benchmarks/Prefetch/bm.txt
@@ -2,6 +2,7 @@ JGFSORBenchSizeA:SOR/dsm:1:2:3:4:5:6:7:8:sorverA
 JGFSORBenchSizeD:SOR/dsm:1:2:3:4:5:6:7:8:sorverD
 JGFMolDynBenchSizeA:Moldyn/dsm:1:2:3:4:5:6:7:8:moldynverA
 JGFMolDynBenchSizeB:Moldyn/dsm:1:2:3:4:5:6:7:8:moldynverB
+JGFMolDynBenchSizeC:Moldyn/dsm:1:2:3:4:5:6:7:8:moldynverC
 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:MatrixMultiply/dsm:1 800:2 800:3 800:4 800:5 800:6 800:7 800:8 800:800mmver
@@ -15,6 +16,7 @@ Array:Array:::::array
 fft2d:2DFFT/dsm:1 1600:2 1600:3 1600:4 1600:5 1600:6 1600:7 1600:8 1600:1600fft2d
 fft2d:2DFFT/dsm:1 1152:2 1152:3 1152:4 1152:5 1152:6 1152:7 1152:8 1152:1152fft2d
 fft2d:2DFFT/dsm:1 3200:2 3200:3 3200:4 3200:5 3200:6 3200:7 3200:8 3200:3200fft2d
+fft2d:2DFFT/dsm:1 2500:2 2500:3 2500:4 2500:5 2500:6 2500:7 2500:8 2500:2500fft2d
 Heat:HeatFlow/dsm:1 200:2 200:3 200:4 200:5 200:6 200:7 200:8 200:heatflow
 Convolution:2DConv/dsm:1 4096:2 4096:3 4096:4 4096:5 4096:6 4096:7 4096:8 4096:40962dconv
 Convolution:2DConv/dsm:1 8192:2 8192:3 8192:4 8192:5 8192:6 8192:7 8192:8 8192:81922dconv
@@ -22,6 +24,6 @@ Convolution:2DConv/dsm:1 16000:2 16000:3 16000:4 16000:5 16000:6 16000:7 16000:8
 Convolution:2DConv/dsm:1 2048:2 2048:3 2048:4 2048:5 2048:6 2048:7 2048:8 2048:20482dconv
 Convolution:2DConv/dsm:1 1024:2 1024:3 1024:4 1024:5 1024:6 1024:7 1024:8 1024:10242dconv
 Convolution:2DConv/dsm:1 6000:2 6000:3 6000:4 6000:5 6000:6 6000:7 6000:8 6000:60002dconv
-LookUpService:../Distributed/LookUpService/dsm:-N 1 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 2 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 3 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 4 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 5 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 6 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 7 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 8 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:10lookup
+LookUpService:../Distributed/LookUpService/dsm2:-N 1 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 2 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 3 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 4 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 5 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 6 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 7 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 8 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:10lookup
 LookUpService:../Distributed/LookUpService/dsm:-N 1 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 15:-N 2 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 15:-N 3 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 15:-N 4 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 15:-N 5 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 15:-N 6 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 15:-N 7 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 15:-N 8 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 15:15lookup
 RainForest:../Distributed/RainForest/dsm:-N 1:-N 2:-N 3:-N 4:-N 5:-N 6:-N 7:-N 8:rainforest

diff --git a/Robust/src/Benchmarks/Prefetch/run.sh b/Robust/src/Benchmarks/Prefetch/run.sh
index a7680d007539ba4bf7620ff5decf68227ce819f0..45865a8a7bdbe5d13e157b4df804b7dc41077e9d 100755 (executable)
--- a/Robust/src/Benchmarks/Prefetch/run.sh
+++ b/Robust/src/Benchmarks/Prefetch/run.sh
@@ -5,7 +5,10 @@ MACHINELIST='dc-1.calit2.uci.edu dc-2.calit2.uci.edu dc-3.calit2.uci.edu dc-4.ca
 #benchmarks='40962dconv 1200mmver moldynverB 1600fft2d 1152fft2d 10lookup rainforest'
 #benchmarks='40962dconv'
 #benchmarks='10lookup'
-benchmarks='rainforest'
+#benchmarks='rainforest'
+#benchmarks='1152fft2d'
+benchmarks='moldynverC'
+#benchmarks='40962dconv 1200mmver 1152fft2d moldynverA 10lookup rainforest'
 
 LOGDIR=~/research/Robust/src/Benchmarks/Prefetch/runlog
 TOPDIR=`pwd`
@@ -212,7 +215,7 @@ function callrun {
   cd $BMDIR 
 
   echo "---------- Running local $BMDIR non-prefetch on 1 machine ---------- "
-#  localrun 1
+  localrun 1
 
 #  echo "---------- Running single thread remote $BMDIR non-prefetch + non-cache on 2 machines ---------- "
 #  oneremote 1 1 $NONPREFETCH_NONCACHE
@@ -222,26 +225,26 @@ function callrun {
 #  oneremote 1 1 $PREFETCH
 
 
-for count in 8
+for count in 2 4 6 8
 do
-#echo "------- Running $count threads $BMDIR non-prefetch + non-cache on $count machines -----"
-#run 1 $count $NONPREFETCH_NONCACHE
-#echo "------- Running $count threads $BMDIR non-prefetch on $count machines -----"
-#run 1 $count $NONPREFETCH
+echo "------- Running $count threads $BMDIR non-prefetch + non-cache on $count machines -----"
+run 1 $count $NONPREFETCH_NONCACHE
+echo "------- Running $count threads $BMDIR non-prefetch on $count machines -----"
+run 1 $count $NONPREFETCH
 #echo "------- Running $count threads $BMDIR normal prefetch on $count machines -----"
 #run 1 $count $PREFETCH
-#echo "------- Running $count threads $BMDIR manual prefetch on $count machines -----"
-#run 1 $count $MANUAL_PREFETCH
+echo "------- Running $count threads $BMDIR manual prefetch on $count machines -----"
+run 1 $count $MANUAL_PREFETCH
 
 ###########
-echo "------- Running $count threads $BMDIR non-prefetch + non-cache on $count machines -----"
-runallstats 1 $count $NONPREFETCH_NONCACHE
-echo "------- Running $count threads $BMDIR non-prefetch on $count machines -----"
-runallstats 1 $count $NONPREFETCH
-echo "------- Running $count threads $BMDIR normal prefetch on $count machines -----"
-runallstats 1 $count $PREFETCH
-echo "------- Running $count threads $BMDIR manual prefetch on $count machines -----"
-runallstats 1 $count $MANUAL_PREFETCH
+#echo "------- Running $count threads $BMDIR non-prefetch + non-cache on $count machines -----"
+#runallstats 1 $count $NONPREFETCH_NONCACHE
+#echo "------- Running $count threads $BMDIR non-prefetch on $count machines -----"
+#runallstats 1 $count $NONPREFETCH
+#echo "------- Running $count threads $BMDIR normal prefetch on $count machines -----"
+#runallstats 1 $count $PREFETCH
+#echo "------- Running $count threads $BMDIR manual prefetch on $count machines -----"
+#runallstats 1 $count $MANUAL_PREFETCH
 #############
 
 done
@@ -311,7 +314,7 @@ do
   callmicrorun
   else
   callrun
-  #callrunjavasingle
+  callrunjavasingle
   fi
 done