changes to all manual prefetch benchmarks

diff --git a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/2DConv/Makefile b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/2DConv/Makefile
index aa5c4fdd8a38e953cb7d74db536d9c7de7cb1670..ddcdb87252146e75309296906a3f5a5cd799dabc 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/2DConv/Makefile
+++ b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/2DConv/Makefile
@@ -1,13 +1,13 @@
 MAINCLASS=Convolution
 SRC2=${MAINCLASS}Rect.java
-FLAGS =-dsm -dsmcaching -transstats -rangeprefetch -optimize -trueprob 0.95 -mainclass ${MAINCLASS}
-FLAGS1=-dsm -transstats -optimize -mainclass ${MAINCLASS}
-FLAGS2=-dsm -optimize -transstats -dsmcaching -mainclass ${MAINCLASS}
+FLAGS =-dsm -dsmcaching -rangeprefetch -optimize -trueprob 0.95 -mainclass ${MAINCLASS}
+FLAGS1=-dsm -optimize -mainclass ${MAINCLASS}
+FLAGS2=-dsm -optimize -dsmcaching -mainclass ${MAINCLASS}
 
 default:
        ../../../../buildscript ${FLAGS} ${SRC2} -o ${MAINCLASS}RangeN
-#      ../../../../buildscript ${FLAGS1} ${SRC2} -o ${MAINCLASS}NPNC
-#      ../../../../buildscript ${FLAGS2} ${SRC2} -o ${MAINCLASS}NPC
+       ../../../../buildscript ${FLAGS1} ${SRC2} -o ${MAINCLASS}NPNC
+       ../../../../buildscript ${FLAGS2} ${SRC2} -o ${MAINCLASS}NPC
 
 clean:
        rm -rf tmpbuilddirectory

diff --git a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/2DFFT/makefile b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/2DFFT/makefile
index f4316d6fadb72fcdcf434c01ea092aa5a5b72a96..7186dfdcfb96e25f49362e7d7b2ebc9cc0ffc759 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/2DFFT/makefile
+++ b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/2DFFT/makefile
@@ -3,9 +3,9 @@ SRC=${MAINCLASS}N.java \
        fft1dN.java \
        MatrixN.java \
        ../../../../ClassLibrary/JavaDSM/Barrier.java
-FLAGS =-dsm -dsmcaching -transstats -rangeprefetch -optimize -trueprob 0.90 -mainclass ${MAINCLASS}
-FLAGS2 =-dsm -dsmcaching -transstats -optimize -trueprob 0.90 -mainclass ${MAINCLASS}
-FLAGS3 =-dsm -optimize -transstats -trueprob 0.90 -mainclass ${MAINCLASS}
+FLAGS =-dsm -dsmcaching -rangeprefetch -optimize -trueprob 0.90 -mainclass ${MAINCLASS}
+FLAGS2 =-dsm -dsmcaching -optimize -trueprob 0.90 -mainclass ${MAINCLASS}
+FLAGS3 =-dsm -optimize -trueprob 0.90 -mainclass ${MAINCLASS}
 
 default:
        ../../../../buildscript ${FLAGS} ${SRC} -o ${MAINCLASS}RangeN

diff --git a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/Array/makefile b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/Array/makefile
index 14848e4cadd945ccca7c94c9b9ae78779e06cf36..41258e057bcea2b3d14006562e736d13e4816aff 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/Array/makefile
+++ b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/Array/makefile
@@ -1,8 +1,10 @@
 MAINCLASS=Array
 SRC1=${MAINCLASS}.java
 FLAGS=-dsm -rangeprefetch -dsmcaching -optimize -excprefetch Array.Array -mainclass ${MAINCLASS} -trueprob 0.98
+FLAGS1=-dsm -optimize -excprefetch Array.Array -mainclass ${MAINCLASS} -trueprob 0.98
 default:
        ../../../../buildscript ${FLAGS} -o ${MAINCLASS}RangeN ${SRC1}
+       ../../../../buildscript ${FLAGS1} -o ${MAINCLASS}NPNC ${SRC1}
 
 clean:
        rm -rf tmpbuilddirectory

diff --git a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/Chase/Chase.java b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/Chase/Chase.java
index 99553e95b441c2c0036d8a4aabe98b6e1adbd444..361ce774deb61b70f62d32690ec65115282898fb 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/Chase/Chase.java
+++ b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/Chase/Chase.java
@@ -13,7 +13,7 @@ public class Chase extends Thread {
     
     public static void main(String [] argv) {
        Chase c;
-       int numTraverse = 10000;
+       int numTraverse = 1000000;
        if (argv.length>0)
            numTraverse=Integer.parseInt(argv[0]);
 

diff --git a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/Chase/makefile b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/Chase/makefile
index 9920e86ff9b3ec324ba3a27266ad58f0446e8877..37b10f9f864f4defe0f443923c06495b3e4373b6 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/Chase/makefile
+++ b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/Chase/makefile
@@ -1,10 +1,12 @@
 MAINCLASS=Chase
 SRC1=${MAINCLASS}.java
-FLAGS1=-dsm -rangeprefetch -dsmcaching -optimize -mainclass ${MAINCLASS} -trueprob 0.99 -transstats
+FLAGS1=-dsm -rangeprefetch -dsmcaching -optimize -mainclass ${MAINCLASS} -trueprob 0.99
+FLAGS2=-dsm -optimize -mainclass ${MAINCLASS} -trueprob 0.99
 #for testing no java option
 #FLAGS=-dsm -prefetch -optimize -debug -excprefetch Chase.main -excprefetch Chase.Chase -mainclass ${MAINCLASS} -trueprob 0.99 -nojava
 default:
        ../../../../buildscript ${FLAGS1} -o ${MAINCLASS}RangeN ${SRC1}
+       ../../../../buildscript ${FLAGS2} -o ${MAINCLASS}NPNC ${SRC1}
 
 clean:
        rm -rf tmpbuilddirectory

diff --git a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/LookUpService/makefile b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/LookUpService/makefile
index f1924cd16f9ab27c7d5e40f214af111f79f1f79c..3b091b2ae9f77b04d23b98a4f4878beb053019cf 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/LookUpService/makefile
+++ b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/LookUpService/makefile
@@ -2,8 +2,14 @@ MAINCLASS=LookUpService
 SRC1=${MAINCLASS}.java \
      DistributedHashMap.java
 FLAGS=-dsm -dsmcaching -rangeprefetch -optimize -mainclass ${MAINCLASS} -trueprob 0.95
+FLAGS2=-dsm -dsmcaching -optimize -mainclass ${MAINCLASS} -trueprob 0.95
+FLAGS3=-dsm -optimize -mainclass ${MAINCLASS} -trueprob 0.95
+
 default:
        ../../../../buildscript ${FLAGS} -o ${MAINCLASS}RangeN ${SRC1}
+       ../../../../buildscript ${FLAGS2} -o ${MAINCLASS}NPC ${SRC1}
+       ../../../../buildscript ${FLAGS3} -o ${MAINCLASS}NPNC ${SRC1}
+
 clean:
        rm -rf tmpbuilddirectory
        rm *.bin

diff --git a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/Moldyn/makefile b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/Moldyn/makefile
index 0a6c03c80615400c3e5811198ccf78d84686d5e4..df8f985c9359372148db38ba2bd7949137d4329f 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/Moldyn/makefile
+++ b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/Moldyn/makefile
@@ -8,9 +8,13 @@ SRC=${MAINCLASS}.java \
        MDWrap.java \
        ../../../../ClassLibrary/JavaDSM/Barrier.java
 FLAGS=-dsm -dsmcaching -rangeprefetch -optimize -mainclass ${MAINCLASS} -trueprob 0.75
+FLAGS1=-dsm -dsmcaching -optimize -mainclass ${MAINCLASS} -trueprob 0.75
+FLAGS2=-dsm -optimize -mainclass ${MAINCLASS} -trueprob 0.75
 
 default:
        ../../../../buildscript ${FLAGS} -o ${MAINCLASS}RangeN  ${SRC}
+       ../../../../buildscript ${FLAGS1} -o ${MAINCLASS}NPC  ${SRC}
+       ../../../../buildscript ${FLAGS2} -o ${MAINCLASS}NPNC  ${SRC}
 
 clean:
        rm -rf tmpbuilddirectory/

diff --git a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/RainForest/RainForest.java b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/RainForest/RainForest.java
index eb5febf3239f0cdce2f238797f417d13000d3245..cd940912b12eced559ac7f0d4124d65d8d8d3a54 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/RainForest/RainForest.java
+++ b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/RainForest/RainForest.java
@@ -1,6 +1,6 @@
-#define ROW                 100   /* columns in the map */
+#define ROW                 400   /* columns in the map */
 #define COLUMN              100   /* rows of in the map */
-#define ROUNDS              256  /* Number of moves by each player */
+#define ROUNDS              512  /* Number of moves by each player */
 #define PLAYERS             20    /* Number of Players when num Players != num of client machines */
 #define RATI0               0.5   /* Number of lumberjacks to number of planters */
 #define BLOCK               3     /* Area around the gamer to consider */

diff --git a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/RainForest/makefile b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/RainForest/makefile
index f8d15a21bf0f835f308b548043455cecebeaf661..3f5098092c38fef5e5ebdfe7c32204ee0d09c26c 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/RainForest/makefile
+++ b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/RainForest/makefile
@@ -11,11 +11,15 @@ SRC=tmp${MAINCLASS}.java \
        AStarPathFinder.java 
 
 FLAGS=-dsm -dsmcaching -rangeprefetch -optimize -mainclass ${MAINCLASS} -trueprob 0.90
+FLAGS2=-dsm -dsmcaching -optimize -mainclass ${MAINCLASS} -trueprob 0.90
+FLAGS3=-dsm -optimize -mainclass ${MAINCLASS} -trueprob 0.90
 
 default:
        cpp ${MAINCLASS}.java > tmp1${MAINCLASS}.java
        ./extractLines
        ../../../../buildscript ${FLAGS} -o ${MAINCLASS}RangeN ${SRC}
+       ../../../../buildscript ${FLAGS2} -o ${MAINCLASS}NPC ${SRC}
+       ../../../../buildscript ${FLAGS3} -o ${MAINCLASS}NPNC ${SRC}
 
 clean:
        rm tmp1RainForest.java

diff --git a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/SOR/makefile b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/SOR/makefile
index 0af410a0e0420e179fbf065a6e047b82be3d9e87..20d5a27e79f8baa75ba1efd9a3a19b899328e247 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/SOR/makefile
+++ b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/SOR/makefile
@@ -7,9 +7,9 @@ SRC=${MAINCLASS}.java \
        SORWrap.java \
     ../../../../ClassLibrary/JavaDSM/Barrier.java
 
-FLAGS=-dsm -transstats -rangeprefetch -dsmcaching -builddir tmpbuilddirectory2 -optimize -excprefetch JGFSORBench.JGFSORBench -excprefetch JGFSORBenchSizeA.main -excprefetch JGFSORBench.RandomMatrix -excprefetch JGFSORBench.init_sync -excprefetch JGFSORBench.JGFkernel -trueprob 0.72
-FLAGS1=-dsm -dsmcaching -transstats -optimize -builddir tmpbuilddirectory1 -mainclass ${MAINCLASS} 
-FLAGS2=-dsm -optimize -transstats
+FLAGS=-dsm -rangeprefetch -dsmcaching -builddir tmpbuilddirectory2 -optimize -excprefetch JGFSORBench.JGFSORBench -excprefetch JGFSORBenchSizeA.main -excprefetch JGFSORBench.RandomMatrix -excprefetch JGFSORBench.init_sync -excprefetch JGFSORBench.JGFkernel -trueprob 0.72
+FLAGS1=-dsm -dsmcaching -optimize -builddir tmpbuilddirectory1 -mainclass ${MAINCLASS} 
+FLAGS2=-dsm -optimize 
 
 FLAGSP=-dsm -prefetch -dsmcaching -optimize -builddir tmpbuilddirectory2 -excprefetch JGFSORBench.JGFSORBench -excprefetch JGFSORBenchSizeA.main -excprefetch JGFSORBench.RandomMatrix -excprefetch JGFSORBench.init_sync -excprefetch JGFSORBench.JGFkernel -trueprob 0.72
 FLAGSNPC=-dsm -dsmcaching -optimize -builddir tmpbuilddirectory1 -mainclass ${MAINCLASS} 

diff --git a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/SpamFilter/SpamFilter.java b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/SpamFilter/SpamFilter.java
index 50e2940895fb45099f2201e9a7fadcef75de3c81..fa4db2bce3011ea7f7f7cafa5530a694771ad6c1 100755 (executable)
--- a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/SpamFilter/SpamFilter.java
+++ b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/SpamFilter/SpamFilter.java
@@ -42,9 +42,6 @@ public class SpamFilter extends Thread {
       thid = id;
     }
 
-    if(thid == 0)
-      return;
-
     Random rand = new Random(thid);
     int i;
 
@@ -183,7 +180,7 @@ public class SpamFilter extends Thread {
     short[] offsets = new short[2];
     offsets[0] = getoffset{DistributedHashMap, table};
     offsets[1] = (short) 0;
-    System.rangePrefetch(this.mydhmap, offsets);
+    System.rangePrefetch(mydhmap, offsets);
 
     int numparts = signatures.size();
 
@@ -303,60 +300,70 @@ public class SpamFilter extends Thread {
         //         testhe.array.next.key.signature,value);
 
         //prefetch testhe.array.next.key.stats.userstat[userid]
-        short[] offsets4 = new short[10];
-        offsets4[0]= getoffset{DHashEntry, next};
+        short[] offsets4 = new short[12];
+        offsets4[0]= getoffset{DistributedHashEntry, array};
         offsets4[1]=(short) 0;
-        offsets4[2] = getoffset{DHashEntry, key};
-        offsets4[3] = (short)0;
-        offsets4[4] = getoffset{HashEntry, stats};
+        offsets4[2]= getoffset{DHashEntry, next};
+        offsets4[3]=(short) 0;
+        offsets4[4] = getoffset{DHashEntry, key};
         offsets4[5] = (short)0;
-        offsets4[6] = getoffset{HashStat, userstat};
+        offsets4[6] = getoffset{HashEntry, stats};
         offsets4[7] = (short)0;
-        offsets4[8] = (short) userid;
+        offsets4[8] = getoffset{HashStat, userstat};
         offsets4[9] = (short)0;
-        System.rangePrefetch(testhe.array, offsets4);
+        offsets4[10] = (short) userid;
+        offsets4[11] = (short)0;
+        System.rangePrefetch(testhe, offsets4);
 
         //prefetch testhe.array.next.key.engine.value
-        short[] offsets5 = new short[8];
-        offsets5[0]= getoffset{DHashEntry, next};
+        short[] offsets5 = new short[10];
+        offsets5[0]= getoffset{DistributedHashEntry, array};
         offsets5[1]=(short) 0;
-        offsets5[2] = getoffset{DHashEntry, key};
-        offsets5[3] = (short)0;
-        offsets5[4] = getoffset{HashEntry, engine};
+        offsets5[2]= getoffset{DHashEntry, next};
+        offsets5[3]=(short) 0;
+        offsets5[4] = getoffset{DHashEntry, key};
         offsets5[5] = (short)0;
-        offsets5[6] = getoffset{GString, value};
+        offsets5[6] = getoffset{HashEntry, engine};
         offsets5[7] = (short)0;
-        System.rangePrefetch(testhe.array, offsets5);
+        offsets5[8] = getoffset{GString, value};
+        offsets5[9] = (short)0;
+        System.rangePrefetch(testhe, offsets5);
 
         //prefetch testhe.array.next.key.signature.value
-        offsets5[0]= getoffset{DHashEntry, next};
+        offsets5[0]= getoffset{DistributedHashEntry, array};
         offsets5[1]=(short) 0;
-        offsets5[2] = getoffset{DHashEntry, key};
-        offsets5[3] = (short)0;
-        offsets5[4] = getoffset{HashEntry, signature};
+        offsets5[2]= getoffset{DHashEntry, next};
+        offsets5[3]=(short) 0;
+        offsets5[4] = getoffset{DHashEntry, key};
         offsets5[5] = (short)0;
-        offsets5[6] = getoffset{GString, value};
+        offsets5[6] = getoffset{HashEntry, signature};
         offsets5[7] = (short)0;
-        System.rangePrefetch(testhe.array, offsets5);
+        offsets5[8] = getoffset{GString, value};
+        offsets5[9] = (short)0;
+        System.rangePrefetch(testhe, offsets5);
 
         //prefetch testhe.array.next.key.stats.userid
-        offsets5[0]= getoffset{DHashEntry, next};
+        offsets5[0]= getoffset{DistributedHashEntry, array};
         offsets5[1]=(short) 0;
-        offsets5[2] = getoffset{DHashEntry, key};
-        offsets5[3] = (short)0;
-        offsets5[4] = getoffset{HashEntry, stats};
+        offsets5[2]= getoffset{DHashEntry, next};
+        offsets5[3]=(short) 0;
+        offsets5[4] = getoffset{DHashEntry, key};
         offsets5[5] = (short)0;
-        offsets5[6] = getoffset{HashStat, userid};
+        offsets5[6] = getoffset{HashEntry, stats};
         offsets5[7] = (short)0;
-        System.rangePrefetch(testhe.array, offsets5);
+        offsets5[8] = getoffset{HashStat, userid};
+        offsets5[9] = (short)0;
+        System.rangePrefetch(testhe, offsets5);
 
         //prefetch testhe.array.next.value
-        short[] offsets6 = new short[4];
-        offsets6[0]= getoffset{DHashEntry, next};
-        offsets6[1]=(short) 0;
-        offsets6[2] = getoffset{DHashEntry, value};
-        offsets6[3] = (short)0;
-        System.rangePrefetch(testhe.array, offsets6);
+        short[] offsets6 = new short[6];
+        offsets5[0]= getoffset{DistributedHashEntry, array};
+        offsets5[1]=(short) 0;
+        offsets6[2]= getoffset{DHashEntry, next};
+        offsets6[3]=(short) 0;
+        offsets6[4] = getoffset{DHashEntry, value};
+        offsets6[5] = (short)0;
+        System.rangePrefetch(testhe, offsets6);
 
 
         ptr=testhe.array;
@@ -385,60 +392,70 @@ public class SpamFilter extends Thread {
           //         ptr.next.next.value);
 
           //prefetch ptr.next(2).key.stats.userstat[userid]
-          short[] offsets10 = new short[10];
+          short[] offsets10 = new short[12];
           offsets10[0] = getoffset{DHashEntry, next};
           offsets10[1] = (short)0;
-          offsets10[2] = getoffset{DHashEntry, key};
+          offsets10[2] = getoffset{DHashEntry, next};
           offsets10[3] = (short)0;
-          offsets10[4] = getoffset{HashEntry, stats};
+          offsets10[4] = getoffset{DHashEntry, key};
           offsets10[5] = (short)0;
-          offsets10[6] = getoffset{HashStat, userstat};
+          offsets10[6] = getoffset{HashEntry, stats};
           offsets10[7] = (short)0;
-          offsets10[8] = (short) userid;
+          offsets10[8] = getoffset{HashStat, userstat};
           offsets10[9] = (short)0;
-          System.rangePrefetch(ptr.next, offsets10);
+          offsets10[10] = (short) userid;
+          offsets10[11] = (short)0;
+          System.rangePrefetch(ptr, offsets10);
 
           //prefetch ptr.next(2).key.engine.value
-          short[] offsets11 = new short[8];
+          short[] offsets11 = new short[10];
           offsets11[0] = getoffset{DHashEntry, next};
           offsets11[1] = (short)0;
-          offsets11[2] = getoffset{DHashEntry, key};
+          offsets11[2] = getoffset{DHashEntry, next};
           offsets11[3] = (short)0;
-          offsets11[4] = getoffset{HashEntry, engine};
+          offsets11[4] = getoffset{DHashEntry, key};
           offsets11[5] = (short)0;
-          offsets11[6] = getoffset{GString, value};
+          offsets11[6] = getoffset{HashEntry, engine};
           offsets11[7] = (short)0;
-          System.rangePrefetch(ptr.next, offsets11);
+          offsets11[8] = getoffset{GString, value};
+          offsets11[9] = (short)0;
+          System.rangePrefetch(ptr, offsets11);
 
           //prefetch ptr.next(2).key.signature.value
           offsets11[0] = getoffset{DHashEntry, next};
           offsets11[1] = (short)0;
-          offsets11[2] = getoffset{DHashEntry, key};
+          offsets11[2] = getoffset{DHashEntry, next};
           offsets11[3] = (short)0;
-          offsets11[4] = getoffset{HashEntry, signature};
+          offsets11[4] = getoffset{DHashEntry, key};
           offsets11[5] = (short)0;
-          offsets11[6] = getoffset{GString, value};
+          offsets11[6] = getoffset{HashEntry, signature};
           offsets11[7] = (short)0;
-          System.rangePrefetch(ptr.next, offsets11);
+          offsets11[8] = getoffset{GString, value};
+          offsets11[9] = (short)0;
+          System.rangePrefetch(ptr, offsets11);
 
           //prefetch ptr.next(2).key.stats.userid
           offsets11[0] = getoffset{DHashEntry, next};
           offsets11[1] = (short)0;
-          offsets11[2] = getoffset{DHashEntry, key};
+          offsets11[2] = getoffset{DHashEntry, next};
           offsets11[3] = (short)0;
-          offsets11[4] = getoffset{HashEntry, stats};
+          offsets11[4] = getoffset{DHashEntry, key};
           offsets11[5] = (short)0;
-          offsets11[6] = getoffset{HashStat, userid};
+          offsets11[6] = getoffset{HashEntry, stats};
           offsets11[7] = (short)0;
-          System.rangePrefetch(ptr.next, offsets11);
+          offsets11[8] = getoffset{HashStat, userid};
+          offsets11[9] = (short)0;
+          System.rangePrefetch(ptr, offsets11);
 
           //prefetch ptr.next(2).value
-          short[] offsets12 = new short[4];
+          short[] offsets12 = new short[6];
           offsets12[0] = getoffset{DHashEntry, next};
           offsets12[1] = (short)0;
-          offsets12[2] = getoffset{DHashEntry, value};
+          offsets12[2] = getoffset{DHashEntry, next};
           offsets12[3] = (short)0;
-          System.rangePrefetch(ptr.next, offsets12);
+          offsets12[4] = getoffset{DHashEntry, value};
+          offsets12[5] = (short)0;
+          System.rangePrefetch(ptr, offsets12);
 
           ptr=ptr.next;
         }

diff --git a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/SpamFilter/emails/gen.c b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/SpamFilter/emails/gen.c
index 0b21fbae5e3ab0f3322e02853b3a3e2b4c643c4c..ef70923f8f015f3e46df293ebf8f0c13ed83421f 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/SpamFilter/emails/gen.c
+++ b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/SpamFilter/emails/gen.c
@@ -7,7 +7,7 @@
 #define URL_FILE  "URLList"
 #define ACCOUNT_FILE "accountList"
 #define FILE_NAME "email"
-#define NUM_EMAIL 500
+#define NUM_EMAIL 5000
 
 char** readList(char* fileName,int* num);
 void generateEmails(int,char**,int,char**,int,char**,int,char*);

diff --git a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/SpamFilter/makefile b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/SpamFilter/makefile
index 23dbc19447a5130df5c66d129bfcc0627d01d64d..9a28ceb092a4683cdb9e61af613ce9104d25fd7f 100755 (executable)
--- a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/SpamFilter/makefile
+++ b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/SpamFilter/makefile
@@ -11,16 +11,16 @@ SRC=${MAINCLASS}.java \
      GString.java \
      WhiplashSignature.java
 
-FLAGS1=-dsm -transstats -optimize -builddir tmpbuilddirectory3 -mainclass ${MAINCLASS}
-FLAGS2=-dsm -dsmcaching -builddir tmpbuilddirectory1 -transstats -optimize -mainclass ${MAINCLASS}
-FLAGS3=-dsm -dsmcaching -rangeprefetch -builddir tmpbuilddirectory2 -transstats -optimize -mainclass ${MAINCLASS} -trueprob 0.98
+FLAGS1=-dsm -optimize -builddir tmpbuilddirectory3 -mainclass ${MAINCLASS}
+FLAGS2=-dsm -dsmcaching -builddir tmpbuilddirectory1 -optimize -mainclass ${MAINCLASS}
+FLAGS3=-dsm -dsmcaching -rangeprefetch -optimize -mainclass ${MAINCLASS} -trueprob 0.98
 
 FLAGSNPNC=-dsm -optimize -mainclass ${MAINCLASS}
 FLAGSNPC=-dsm -dsmcaching -optimize -mainclass ${MAINCLASS}
 FLAGSP=-dsm -dsmcaching -rangeprefetch -optimize -mainclass ${MAINCLASS} -trueprob 0.98
 
 default:
-#      ../../../../buildscript ${FLAGS1} -o ${MAINCLASS}NPNC ${SRC}
+       ../../../../buildscript ${FLAGS1} -o ${MAINCLASS}NPNC ${SRC}
        ../../../../buildscript ${FLAGS2} -o ${MAINCLASS}NPC ${SRC}
        ../../../../buildscript ${FLAGS3} -o ${MAINCLASS}RangeN ${SRC}
 #      ../../../buildscript ${FLAGSNPNC} -o ${MAINCLASS}NPNC ${SRC}