From: adash <adash>
Date: Tue, 10 Mar 2009 07:10:34 +0000 (+0000)
Subject: fix operator precedence + options for makefile
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2ccc106425ee218258d4059ead7e23be33a74d87;p=IRC.git

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 e3eab9ad..5d8f12e2 100644
--- 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 afe85a34..d456774b 100644
--- 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