From: adash <adash>
Date: Thu, 13 Nov 2008 00:23:24 +0000 (+0000)
Subject: bug fix in 2DConv and other small changes to makefile
X-Git-Tag: buildscript^7~33
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;ds=sidebyside;h=ae13501e07352c68cada7c9390f52c87c9399044;p=IRC.git

bug fix in 2DConv and other small changes to makefile
---

diff --git a/Robust/src/Benchmarks/Prefetch/2DConv/dsm/Convolution.java b/Robust/src/Benchmarks/Prefetch/2DConv/dsm/Convolution.java
index edcf3e6f..5e3fb1e8 100644
--- a/Robust/src/Benchmarks/Prefetch/2DConv/dsm/Convolution.java
+++ b/Robust/src/Benchmarks/Prefetch/2DConv/dsm/Convolution.java
@@ -20,24 +20,23 @@ public class Convolution extends Thread {
       double tempinput[][] = img.inputImage;
       double tempout[][] = img.outputImage;
 
-      double tinput0[] = tempinput[x0];
-      double tinput1[] = tempinput[x0+1];
-      double tinput2[] = tempinput[x0+2];
-      double tinput3[] = tempinput[x0+3];
-      double tinput4[] = tempinput[x0+4];
-
-      for(int i=x0;i<x1;++i){
-        double tout[] = tempout[x0];
+      double tinput1[] = tempinput[x0];
+      double tinput2[] = tempinput[x0+1];
+      double tinput3[] = tempinput[x0+2];
+      double tinput4[] = tempinput[x0+3];
+      double tinput0[] = tinput1;
+
+      int l=x0+4;
+      for(int i=x0;i<x1;i++,l++){
+        double tout[] = tempout[i];
+        tinput0 = tinput1; tinput1=tinput2; tinput2=tinput3; tinput3=tinput4; tinput4=tempinput[l];
         for(int j=y0;j<y1;++j){
-          tout[y0] = 0;
+          tout[j] = 0;
           for(int b=0;b<kernelHeight;++b){
-            tout[y0] = tout[y0] + (tinput0[j+b] * kernel[0][b] + tinput1[j+b] * kernel[1][b] + tinput2[j+b]*kernel[2][b] +
+            tout[j] = tout[j] + (tinput0[j+b] * kernel[0][b] + tinput1[j+b] * kernel[1][b] + tinput2[j+b]*kernel[2][b] +
                 tinput3[j+b]*kernel[3][b] + tinput4[j+b]*kernel[4][b]);
           }
         }
-        if(i != 4095) {
-          tinput0 = tinput1; tinput1=tinput2; tinput2=tinput3; tinput3=tinput4; tinput4=tempinput[i+5];
-        }
       }
     }
   }
@@ -82,6 +81,13 @@ public class Convolution extends Thread {
       }
     }
 
+    /*
+    atomic{
+      System.printString("img.outputImage[10][20] = " +(int) img.outputImage[10][20] + "\n");
+      System.printString("img.outputImage[256][890] = " +(int) img.outputImage[256][890] + "\n");
+    }
+    */
+
     for(int i = 0; i <NUM_THREADS; i++) {
       atomic {
         tmp = conv[i];
@@ -96,6 +102,13 @@ public class Convolution extends Thread {
       tmp.join();
     }
     System.printString("Done!");
+
+    /*
+    atomic{
+      System.printString("img.outputImage[10][20] = " +(int) img.outputImage[10][20] + "\n");
+      System.printString("img.outputImage[256][890] = " +(int) img.outputImage[256][890] + "\n");
+    }
+    */
   }
 
   //define 5X5 Gaussian kernel
diff --git a/Robust/src/Benchmarks/Prefetch/2DConv/javasingle/Convolution.java b/Robust/src/Benchmarks/Prefetch/2DConv/javasingle/Convolution.java
index dcb3c871..77c52d18 100644
--- a/Robust/src/Benchmarks/Prefetch/2DConv/javasingle/Convolution.java
+++ b/Robust/src/Benchmarks/Prefetch/2DConv/javasingle/Convolution.java
@@ -14,29 +14,27 @@ public class Convolution {
     int kernelHeight = 5;
     int kernelWidth = 5;
     double[][] kernel = new double[kernelHeight][kernelWidth];
-
     initKernel(kernel);
     double tempinput[][] = img.inputImage;
     double tempout[][] = img.outputImage;
 
-    double tinput0[] = tempinput[x0];
-    double tinput1[] = tempinput[x0+1];
-    double tinput2[] = tempinput[x0+2];
-    double tinput3[] = tempinput[x0+3];
-    double tinput4[] = tempinput[x0+4];
+    double tinput1[] = tempinput[x0];
+    double tinput2[] = tempinput[x0+1];
+    double tinput3[] = tempinput[x0+2];
+    double tinput4[] = tempinput[x0+3];
+    double tinput0[] = tinput1;
 
-    for(int i=x0;i<x1;++i){
-      double tout[] = tempout[x0];
+    int l=x0+4;
+    for(int i=x0;i<x1;i++,l++){
+      double tout[] = tempout[i];
+      tinput0 = tinput1; tinput1=tinput2; tinput2=tinput3; tinput3=tinput4; tinput4=tempinput[l];
       for(int j=y0;j<y1;++j){
-        tout[y0] = 0;
+        tout[j] = 0;
         for(int b=0;b<kernelHeight;++b){
-          tout[y0] = tout[y0] + (tinput0[j+b] * kernel[0][b] + tinput1[j+b] * kernel[1][b] + tinput2[j+b]*kernel[2][b] +
+          tout[j] = tout[j] + (tinput0[j+b] * kernel[0][b] + tinput1[j+b] * kernel[1][b] + tinput2[j+b]*kernel[2][b] +
               tinput3[j+b]*kernel[3][b] + tinput4[j+b]*kernel[4][b]);
         }
       }
-      if(i != 8191) {
-        tinput0 = tinput1; tinput1=tinput2; tinput2=tinput3; tinput3=tinput4; tinput4=tempinput[i+5];
-      }
     }
   }
 
@@ -68,11 +66,15 @@ public class Convolution {
       base+=increment;
     }
 
+    //System.printString("img.outputImage[10][20] = " +(int) img.outputImage[10][20] + "\n");
+    //System.printString("img.outputImage[256][890] = " +(int) img.outputImage[256][890] + "\n");
     for(int i = 0; i <NUM_THREADS; i++) {
       tmp = conv[i];
       tmp.run();
     }
 
+    //System.printString("img.outputImage[10][20] = " +(int) img.outputImage[10][20] + "\n");
+    //System.printString("img.outputImage[256][890] = " +(int) img.outputImage[256][890] + "\n");
     System.printString("Done!");
   }
 
diff --git a/Robust/src/Benchmarks/Prefetch/2DConv/javasingle/makefile b/Robust/src/Benchmarks/Prefetch/2DConv/javasingle/makefile
index 15c03979..df608250 100644
--- a/Robust/src/Benchmarks/Prefetch/2DConv/javasingle/makefile
+++ b/Robust/src/Benchmarks/Prefetch/2DConv/javasingle/makefile
@@ -1,7 +1,7 @@
 MAINCLASS=Convolution
 SRC=${MAINCLASS}.java 
 default:
-	../../../../buildscript -nooptimize -debug -mainclass ${MAINCLASS} ${SRC} -o ${MAINCLASS}
+	../../../../buildscript -optimize -mainclass ${MAINCLASS} ${SRC} -o ${MAINCLASS}
 
 clean:
 	rm -rf tmpbuilddirectory
diff --git a/Robust/src/Benchmarks/Prefetch/2DFFT/dsm/Makefile b/Robust/src/Benchmarks/Prefetch/2DFFT/dsm/Makefile
index 2305c2cb..78ec58bb 100644
--- a/Robust/src/Benchmarks/Prefetch/2DFFT/dsm/Makefile
+++ b/Robust/src/Benchmarks/Prefetch/2DFFT/dsm/Makefile
@@ -2,7 +2,7 @@ MAINCLASS=fft2d
 SRC=${MAINCLASS}.java \
 	fft1d.java \
 	Matrix.java
-FLAGS =-dsm -dsmcaching -prefetch -optimize -excprefetch fft2d.main -excprefetch fft2d.twiddle -excprefetch fft1d.factorize -excprefetch fft1d.printFactors -excprefetch Matrix.setValues -excprefetch Matrix.setZeros -trueprob 0.90 -mainclass ${MAINCLASS}
+FLAGS =-dsm -dsmcaching -prefetch -optimize -excprefetch fft2d.main -excprefetch fft2d.twiddle -excprefetch fft1d.factorize -excprefetch fft1d.printFactors -excprefetch Matrix.setValues -excprefetch Matrix.setZeros -excprefetch fft2d.transpose -trueprob 0.90 -mainclass ${MAINCLASS}
 FLAGS1=-dsm -optimize -mainclass ${MAINCLASS}
 
 default:
diff --git a/Robust/src/Benchmarks/Prefetch/avg.sh b/Robust/src/Benchmarks/Prefetch/avg.sh
index 0ad9d4e1..29c8517d 100755
--- a/Robust/src/Benchmarks/Prefetch/avg.sh
+++ b/Robust/src/Benchmarks/Prefetch/avg.sh
@@ -3,5 +3,5 @@
 for file in `ls runlog/*.txt`
 do
   echo -n $file 
-  cat $file | awk '{sum += $1} END {print " "sum/NR}' 
+  cat $file | grep -v "^Command" | awk '{sum += $1} END {print " "sum/NR}' 
 done