fix operator precedence + options for makefile

diff --git a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/2DConv/ConvolutionSizeC.java b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/2DConv/ConvolutionSizeC.java
index e3eab9ad4a337765e7d235c34653185fdb914bb2..5d8f12e24351f9dedc32e7d35db8db1a98778c6d 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/2DConv/ConvolutionSizeC.java
+++ b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/2DConv/ConvolutionSizeC.java
@@ -73,7 +73,7 @@ public class Convolution extends Thread {
 
       int l=x0+14;
       for(int i=x0;i<x1;i++,l++){
-        if(i&31 == 0) {  //prefetch every 16th iteration
+        if((i&31) == 0) {  //prefetch every 16th iteration
           //Prefetch this.img.inputImage[] 
           Object o2 = img;
           short[] offsets2 = new short[4];

diff --git a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/2DConv/Makefile b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/2DConv/Makefile
index afe85a3445d5153c50d508852b94795f84e66933..d456774b62e39078b1bcbc65daf76e6927c5bc79 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/ManualPrefetch/2DConv/Makefile
+++ b/Robust/src/Benchmarks/Prefetch/ManualPrefetch/2DConv/Makefile
@@ -1,6 +1,6 @@
 MAINCLASS=Convolution
 SRC2=${MAINCLASS}SizeC.java
-FLAGS =-dsm -dsmcaching -rangeprefetch -nooptimize -debug -trueprob 0.95 -mainclass ${MAINCLASS}
+FLAGS =-dsm -dsmcaching -rangeprefetch -optimize -trueprob 0.95 -mainclass ${MAINCLASS}
 
 default:
        ../../../../buildscript ${FLAGS} ${SRC2} -o ${MAINCLASS}RangeN