new makefile for running 1, 2 and 4 threads

diff --git a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiply.java b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiply.java
index c288be2ec6a3a9201064585b99db7ce30d6c8f6a..6a75c0f694948adb1cb282cf26f5cdca50dcbc8c 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiply.java
+++ b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiply.java
@@ -44,10 +44,14 @@ public class MatrixMultiply extends Thread{
        }
 
        public static void main(String[] args) {
-               int mid1 = (128<<24)|(195<<16)|(175<<8)|69;
-               int mid2 = (128<<24)|(195<<16)|(175<<8)|69;
-               int mid3 = (128<<24)|(195<<16)|(175<<8)|71;
-               int NUM_THREADS = 2;
+      int NUM_THREADS = 4;
+      int[] mid = new int[NUM_THREADS];
+      mid[0] = (128<<24)|(195<<16)|(175<<8)|69;
+      mid[1] = (128<<24)|(195<<16)|(175<<8)|73;
+      mid[2] = (128<<24)|(195<<16)|(175<<8)|78;
+      mid[3] = (128<<24)|(195<<16)|(175<<8)|79;
+               //int mid1 = (128<<24)|(195<<16)|(175<<8)|69;
+               //int mid2 = (128<<24)|(195<<16)|(175<<8)|73;
                int p, q, r;
                MatrixMultiply[] mm;
                MatrixMultiply tmp;
@@ -64,8 +68,10 @@ public class MatrixMultiply extends Thread{
                }
 
                atomic {
-                       mm[0] = global new MatrixMultiply(matrix,0,0,399,200);
-                       mm[1] = global new MatrixMultiply(matrix,0,201,399,399);
+                       mm[0] = global new MatrixMultiply(matrix,0,0,200,200);
+                       mm[1] = global new MatrixMultiply(matrix,0,201,200,399);
+                       mm[2] = global new MatrixMultiply(matrix,201,0,399,200);
+                       mm[3] = global new MatrixMultiply(matrix,201,201,399,399);
                }
 
                atomic {
@@ -91,7 +97,7 @@ public class MatrixMultiply extends Thread{
                        atomic {
                                tmp = mm[i];
                        }
-                       tmp.start(mid1);
+                       tmp.start(mid[i]);
                }
 
                // wait for them to finish

diff --git a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiply1.java b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiply1.java
new file mode 100644 (file)
index 0000000..dc3b4bc
--- /dev/null
+++ b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiply1.java
@@ -0,0 +1,174 @@
+public class MatrixMultiply extends Thread{
+       MMul mmul;
+       public int x0, y0, x1, y1;
+
+       public MatrixMultiply(MMul mmul, int x0, int y0, int x1, int y1) {
+               this.mmul = mmul;
+               this.x0 = x0;
+               this.y0 = y0;
+               this.x1 = x1;
+               this.y1 = y1;
+       }
+
+       public void run() {
+               double localresults[][];
+
+               atomic {
+                   //compute the results
+                   localresults=new double[1+x1-x0][1+y1-y0];
+               
+                   //Use b transpose for cache performance
+                   for(int i = x0; i<= x1; i++){
+                       double a[]=mmul.a[i];
+                       int M=mmul.M;
+                       for (int j = y0; j <= y1; j++) {
+                           double innerProduct=0;
+                           double b[] = mmul.btranspose[j];
+                           for(int k = 0; k < M; k++) {
+                               innerProduct += a[k] *b[k];
+                           }
+                           localresults[i-x0][j-y0]=innerProduct;
+                       }
+                   }
+               }
+
+               atomic {
+                   //write the results
+                   for(int i=x0;i<=x1;i++) {
+                       double c[]=mmul.c[i];
+                       for(int j=y0;j<=y1;j++) {
+                           c[j]=localresults[i-x0][j-y0];
+                       }
+                   }
+               }
+       }
+
+    public static void main(String[] args) {
+      int NUM_THREADS = 1;
+      int[] mid = new int[NUM_THREADS];
+      mid[0] = (128<<24)|(195<<16)|(175<<8)|79;
+      int p, q, r;
+      MatrixMultiply[] mm;
+      MatrixMultiply tmp;
+      MMul matrix;
+
+      atomic {
+        matrix = global new MMul(600, 600, 600);
+        matrix.setValues();
+        matrix.transpose();
+      }
+
+      atomic{
+        mm = global new MatrixMultiply[NUM_THREADS];
+      }
+
+      atomic {
+        mm[0] = global new MatrixMultiply(matrix,0,0,599,599);
+      }
+
+      atomic {
+        p = matrix.L;
+        q = matrix.M;
+        r = matrix.N;
+      }
+
+      // print out the matrices to be multiplied
+      System.printString("\n");
+      System.printString("MatrixMultiply: L=");
+      System.printInt(p);
+      System.printString("\t");
+      System.printString("M=");
+      System.printInt(q);
+      System.printString("\t");
+      System.printString("N=");
+      System.printInt(r);
+      System.printString("\n");
+
+      // start a thread to compute each c[l,n]
+      for (int i = 0; i < NUM_THREADS; i++) {
+        atomic {
+          tmp = mm[i];
+        }
+        tmp.start(mid[i]);
+      }
+
+      // wait for them to finish
+      for (int i = 0; i < NUM_THREADS; i++) {
+        atomic {
+          tmp = mm[i];
+        }
+        tmp.join();
+      }
+
+      // print out the result of the matrix multiply
+      System.printString("Starting\n");
+      System.printString("Matrix Product c =\n");
+      double val;
+      atomic {
+        for (int i = 0; i < p; i++) {
+          double c[]=matrix.c[i];
+          for (int j = 0; j < r; j++) {
+            val = c[j];
+          }
+        }
+      }
+      System.printString("Finished\n");
+    }
+}
+
+public class MMul{
+
+  public int L, M, N;
+  public double[][] a;
+  public double[][] b;
+  public double[][] c;
+  public double[][] btranspose;
+
+  public MMul(int L, int M, int N) {
+    this.L = L;
+    this.M = M;
+    this.N = N;
+    a = global new double[L][M];  
+    b = global new double[M][N]; 
+    c = global new double[L][N]; 
+    btranspose = global new double[N][M];
+  }
+
+  public void setValues() {
+    for(int i = 0; i < L; i++) {
+      double ai[] = a[i];
+      for(int j = 0; j < M; j++) {
+        ai[j] = j+1;
+      }
+    }
+
+    for(int i = 0; i < M; i++) {
+      double bi[] = b[i];
+      for(int j = 0; j < N; j++) {
+        bi[j] = j+1;
+      }
+    }
+
+    for(int i = 0; i < L; i++) {
+      double ci[] = c[i];
+      for(int j = 0; j < N; j++) {
+        ci[j] = 0;
+      }
+    }
+    for(int i = 0; i < N; i++) {
+      double btransposei[] = btranspose[i];
+      for(int j = 0; j < M; j++) {
+        btransposei[j] = 0;
+      }
+    }
+  }
+
+  public void transpose() {
+    for(int row = 0; row < M; row++) {
+      double brow[] = b[row];
+      for(int col = 0; col < N; col++) {
+        btranspose[col][row] = brow[col];
+      }
+    }
+  }
+}

diff --git a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiply2.java b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiply2.java
new file mode 100644 (file)
index 0000000..1b17dd8
--- /dev/null
+++ b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiply2.java
@@ -0,0 +1,176 @@
+public class MatrixMultiply extends Thread{
+       MMul mmul;
+       public int x0, y0, x1, y1;
+
+       public MatrixMultiply(MMul mmul, int x0, int y0, int x1, int y1) {
+               this.mmul = mmul;
+               this.x0 = x0;
+               this.y0 = y0;
+               this.x1 = x1;
+               this.y1 = y1;
+       }
+
+       public void run() {
+               double localresults[][];
+
+               atomic {
+                   //compute the results
+                   localresults=new double[1+x1-x0][1+y1-y0];
+               
+                   //Use b transpose for cache performance
+                   for(int i = x0; i<= x1; i++){
+                       double a[]=mmul.a[i];
+                       int M=mmul.M;
+                       for (int j = y0; j <= y1; j++) {
+                           double innerProduct=0;
+                           double b[] = mmul.btranspose[j];
+                           for(int k = 0; k < M; k++) {
+                               innerProduct += a[k] *b[k];
+                           }
+                           localresults[i-x0][j-y0]=innerProduct;
+                       }
+                   }
+               }
+
+               atomic {
+                   //write the results
+                   for(int i=x0;i<=x1;i++) {
+                       double c[]=mmul.c[i];
+                       for(int j=y0;j<=y1;j++) {
+                           c[j]=localresults[i-x0][j-y0];
+                       }
+                   }
+               }
+       }
+
+    public static void main(String[] args) {
+      int NUM_THREADS = 2;
+      int[] mid = new int[NUM_THREADS];
+      mid[0] = (128<<24)|(195<<16)|(175<<8)|79;
+      mid[1] = (128<<24)|(195<<16)|(175<<8)|78;
+      int p, q, r;
+      MatrixMultiply[] mm;
+      MatrixMultiply tmp;
+      MMul matrix;
+
+      atomic {
+        matrix = global new MMul(600, 600, 600);
+        matrix.setValues();
+        matrix.transpose();
+      }
+
+      atomic{
+        mm = global new MatrixMultiply[NUM_THREADS];
+      }
+
+      atomic {
+        mm[0] = global new MatrixMultiply(matrix,0,0,599,300);
+        mm[1] = global new MatrixMultiply(matrix,0,301,599,599);
+      }
+
+      atomic {
+        p = matrix.L;
+        q = matrix.M;
+        r = matrix.N;
+      }
+
+      // print out the matrices to be multiplied
+      System.printString("\n");
+      System.printString("MatrixMultiply: L=");
+      System.printInt(p);
+      System.printString("\t");
+      System.printString("M=");
+      System.printInt(q);
+      System.printString("\t");
+      System.printString("N=");
+      System.printInt(r);
+      System.printString("\n");
+
+      // start a thread to compute each c[l,n]
+      for (int i = 0; i < NUM_THREADS; i++) {
+        atomic {
+          tmp = mm[i];
+        }
+        tmp.start(mid[i]);
+      }
+
+      // wait for them to finish
+      for (int i = 0; i < NUM_THREADS; i++) {
+        atomic {
+          tmp = mm[i];
+        }
+        tmp.join();
+      }
+
+      // print out the result of the matrix multiply
+      System.printString("Starting\n");
+      System.printString("Matrix Product c =\n");
+      double val;
+      atomic {
+        for (int i = 0; i < p; i++) {
+          double c[]=matrix.c[i];
+          for (int j = 0; j < r; j++) {
+            val = c[j];
+          }
+        }
+      }
+      System.printString("Finished\n");
+    }
+}
+
+public class MMul{
+
+  public int L, M, N;
+  public double[][] a;
+  public double[][] b;
+  public double[][] c;
+  public double[][] btranspose;
+
+  public MMul(int L, int M, int N) {
+    this.L = L;
+    this.M = M;
+    this.N = N;
+    a = global new double[L][M];  
+    b = global new double[M][N]; 
+    c = global new double[L][N]; 
+    btranspose = global new double[N][M];
+  }
+
+  public void setValues() {
+    for(int i = 0; i < L; i++) {
+      double ai[] = a[i];
+      for(int j = 0; j < M; j++) {
+        ai[j] = j+1;
+      }
+    }
+
+    for(int i = 0; i < M; i++) {
+      double bi[] = b[i];
+      for(int j = 0; j < N; j++) {
+        bi[j] = j+1;
+      }
+    }
+
+    for(int i = 0; i < L; i++) {
+      double ci[] = c[i];
+      for(int j = 0; j < N; j++) {
+        ci[j] = 0;
+      }
+    }
+    for(int i = 0; i < N; i++) {
+      double btransposei[] = btranspose[i];
+      for(int j = 0; j < M; j++) {
+        btransposei[j] = 0;
+      }
+    }
+  }
+
+  public void transpose() {
+    for(int row = 0; row < M; row++) {
+      double brow[] = b[row];
+      for(int col = 0; col < N; col++) {
+        btranspose[col][row] = brow[col];
+      }
+    }
+  }
+}

diff --git a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiply4.java b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiply4.java
new file mode 100644 (file)
index 0000000..029ead4
--- /dev/null
+++ b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiply4.java
@@ -0,0 +1,182 @@
+public class MatrixMultiply extends Thread{
+       MMul mmul;
+       public int x0, y0, x1, y1;
+
+       public MatrixMultiply(MMul mmul, int x0, int y0, int x1, int y1) {
+               this.mmul = mmul;
+               this.x0 = x0;
+               this.y0 = y0;
+               this.x1 = x1;
+               this.y1 = y1;
+       }
+
+       public void run() {
+               double localresults[][];
+
+               atomic {
+                   //compute the results
+                   localresults=new double[1+x1-x0][1+y1-y0];
+               
+                   //Use b transpose for cache performance
+                   for(int i = x0; i<= x1; i++){
+                       double a[]=mmul.a[i];
+                       int M=mmul.M;
+                       for (int j = y0; j <= y1; j++) {
+                           double innerProduct=0;
+                           double b[] = mmul.btranspose[j];
+                           for(int k = 0; k < M; k++) {
+                               innerProduct += a[k] *b[k];
+                           }
+                           localresults[i-x0][j-y0]=innerProduct;
+                       }
+                   }
+               }
+
+               atomic {
+                   //write the results
+                   for(int i=x0;i<=x1;i++) {
+                       double c[]=mmul.c[i];
+                       for(int j=y0;j<=y1;j++) {
+                           c[j]=localresults[i-x0][j-y0];
+                       }
+                   }
+               }
+       }
+
+       public static void main(String[] args) {
+      int NUM_THREADS = 4;
+      int[] mid = new int[NUM_THREADS];
+      mid[0] = (128<<24)|(195<<16)|(175<<8)|80;
+      mid[1] = (128<<24)|(195<<16)|(175<<8)|73;
+      mid[2] = (128<<24)|(195<<16)|(175<<8)|78;
+      mid[3] = (128<<24)|(195<<16)|(175<<8)|79;
+               //int mid1 = (128<<24)|(195<<16)|(175<<8)|69;
+               //int mid2 = (128<<24)|(195<<16)|(175<<8)|73;
+               int p, q, r;
+               MatrixMultiply[] mm;
+               MatrixMultiply tmp;
+               MMul matrix;
+
+               atomic {
+                       matrix = global new MMul(600, 600, 600);
+                       matrix.setValues();
+                       matrix.transpose();
+               }
+
+               atomic{
+                       mm = global new MatrixMultiply[NUM_THREADS];
+               }
+
+               atomic {
+                       mm[0] = global new MatrixMultiply(matrix,0,0,300,300);
+                       mm[1] = global new MatrixMultiply(matrix,0,301,300,599);
+                       mm[2] = global new MatrixMultiply(matrix,301,0,599,300);
+                       mm[3] = global new MatrixMultiply(matrix,301,301,599,599);
+               }
+
+               atomic {
+                       p = matrix.L;
+                       q = matrix.M;
+                       r = matrix.N;
+               }
+
+               // print out the matrices to be multiplied
+               System.printString("\n");
+               System.printString("MatrixMultiply: L=");
+               System.printInt(p);
+               System.printString("\t");
+               System.printString("M=");
+               System.printInt(q);
+               System.printString("\t");
+               System.printString("N=");
+               System.printInt(r);
+               System.printString("\n");
+
+               // start a thread to compute each c[l,n]
+               for (int i = 0; i < NUM_THREADS; i++) {
+                       atomic {
+                               tmp = mm[i];
+                       }
+                       tmp.start(mid[i]);
+               }
+
+               // wait for them to finish
+               for (int i = 0; i < NUM_THREADS; i++) {
+                       atomic {
+                               tmp = mm[i];
+                       }
+                       tmp.join();
+               }
+
+               // print out the result of the matrix multiply
+               System.printString("Starting\n");
+               System.printString("Matrix Product c =\n");
+               double val;
+               atomic {
+                       for (int i = 0; i < p; i++) {
+                               double c[]=matrix.c[i];
+                               for (int j = 0; j < r; j++) {
+                                       val = c[j];
+                               }
+                       }
+               }
+               System.printString("Finished\n");
+       }
+}
+
+public class MMul{
+
+       public int L, M, N;
+       public double[][] a;
+       public double[][] b;
+       public double[][] c;
+       public double[][] btranspose;
+
+       public MMul(int L, int M, int N) {
+               this.L = L;
+               this.M = M;
+               this.N = N;
+               a = global new double[L][M];  
+               b = global new double[M][N]; 
+               c = global new double[L][N]; 
+               btranspose = global new double[N][M];
+       }
+
+       public void setValues() {
+               for(int i = 0; i < L; i++) {
+            double ai[] = a[i];
+                       for(int j = 0; j < M; j++) {
+                               ai[j] = j+1;
+                       }
+               }
+
+               for(int i = 0; i < M; i++) {
+            double bi[] = b[i];
+                       for(int j = 0; j < N; j++) {
+                               bi[j] = j+1;
+                       }
+               }
+
+               for(int i = 0; i < L; i++) {
+            double ci[] = c[i];
+                       for(int j = 0; j < N; j++) {
+                               ci[j] = 0;
+                       }
+               }
+               for(int i = 0; i < N; i++) {
+            double btransposei[] = btranspose[i];
+                       for(int j = 0; j < M; j++) {
+                               btransposei[j] = 0;
+                       }
+               }
+       }
+
+       public void transpose() {
+               for(int row = 0; row < M; row++) {
+            double brow[] = b[row];
+                       for(int col = 0; col < N; col++) {
+                               btranspose[col][row] = brow[col];
+                       }
+               }
+       }
+}

diff --git a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/makefile b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/makefile
index f37a045996bd5ec30d7b67e2db1b931ae38db834..d8af9eb5291ae99a5b50932493f3e0d14854d0a8 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/makefile
+++ b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/makefile
@@ -1,10 +1,16 @@
 MAINCLASS=MatrixMultiply
-SRC=${MAINCLASS}.java
-FLAGS=-dsm -prefetch -optimize -printflat -profile -debug -excprefetch MatrixMultiply.main -excprefetch MMul.setValues -excprefetch MMul.transpose -mainclass ${MAINCLASS} -o ${MAINCLASS} -trueprob 0.8
-FLAGS2=-dsm -optimize -printflat -profile -debug -excprefetch MatrixMultiply.main -excprefetch MMul.setValues -excprefetch MMul.transpose -mainclass ${MAINCLASS} -o ${MAINCLASS}NP
+SRC1=${MAINCLASS}1.java
+SRC2=${MAINCLASS}2.java
+SRC4=${MAINCLASS}4.java
+FLAGS=-dsm -prefetch -optimize -profile -debug -excprefetch MatrixMultiply.main -excprefetch MMul.setValues -excprefetch MMul.transpose -mainclass ${MAINCLASS} -trueprob 0.8
+FLAGS2=-dsm -optimize -profile -debug -excprefetch MatrixMultiply.main -excprefetch MMul.setValues -excprefetch MMul.transpose -mainclass ${MAINCLASS}
 default:
-       ../../../buildscript ${FLAGS2} ${SRC}
-       ../../../buildscript ${FLAGS} ${SRC}
+       ../../../buildscript ${FLAGS2} -o ${MAINCLASS}1NP ${SRC1}
+       ../../../buildscript ${FLAGS} -o ${MAINCLASS}1 ${SRC1}
+       ../../../buildscript ${FLAGS2} -o ${MAINCLASS}2NP ${SRC2}
+       ../../../buildscript ${FLAGS} -o ${MAINCLASS}2 ${SRC2}
+       ../../../buildscript ${FLAGS2} -o ${MAINCLASS}4NP ${SRC4}
+       ../../../buildscript ${FLAGS} -o ${MAINCLASS}4 ${SRC4}
 
 clean:
        rm *.bin