remove the system.clearPrefetchCache call

[IRC.git] / Robust / src / Benchmarks / Prefetch / SOR / dsm / SORRunner.java

diff --git a/Robust/src/Benchmarks/Prefetch/SOR/dsm/SORRunner.java b/Robust/src/Benchmarks/Prefetch/SOR/dsm/SORRunner.java
index 73d2b1500d76ce9cf56a9eb4c8fe9c52e8178552..9a41faecacdd710d1dfa345aa318ead642898f96 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/SOR/dsm/SORRunner.java
+++ b/Robust/src/Benchmarks/Prefetch/SOR/dsm/SORRunner.java
@@ -23,10 +23,10 @@ class SORRunner extends Thread {
 
   int id,num_iterations;
   double G[][],omega;
-  long sync[][];
+  int sync[][];
   int nthreads;
 
-  public SORRunner(int id, double omega, double G[][], int num_iterations,long[][] sync, int nthreads) {
+  public SORRunner(int id, double omega, double G[][], int num_iterations,int[][] sync, int nthreads) {
     this.id = id;
     this.omega=omega;
     this.G=G;
@@ -65,68 +65,67 @@ class SORRunner extends Thread {
     if (iupper > Mm1) iupper =  Mm1+1;
     if (tmpid == (numthreads-1)) iupper = Mm1+1;
 
-      for (int p=0; p<2*numiterations; p++) {
-        atomic {
-          for (int i=ilow+(p%2); i<iupper; i=i+2) {
+    for (int p=0; p<2*numiterations; p++) {
+      atomic {
+        for (int i=ilow+(p%2); i<iupper; i=i+2) {
 
-            double [] Gi = G[i];
-            double [] Gim1 = G[i-1];
+          double [] Gi = G[i];
+          double [] Gim1 = G[i-1];
 
-            if(i == 1) { 
-              double [] Gip1 = G[i+1];
+          if(i == 1) { 
+            double [] Gip1 = G[i+1];
 
-              for (int j=1; j<Nm1; j=j+2){
-                Gi[j] = omega_over_four * (Gim1[j] + Gip1[j] + Gi[j-1]
-                    + Gi[j+1]) + one_minus_omega * Gi[j];
+            for (int j=1; j<Nm1; j=j+2){
+              Gi[j] = omega_over_four * (Gim1[j] + Gip1[j] + Gi[j-1]
+                  + Gi[j+1]) + one_minus_omega * Gi[j];
 
-              }
-            } else if (i == Mm1) {
+            }
+          } else if (i == Mm1) {
 
-              double [] Gim2 = G[i-2];
+            double [] Gim2 = G[i-2];
 
-              for (int j=1; j<Nm1; j=j+2){
-                if((j+1) != Nm1) {
-                  Gim1[j+1]=omega_over_four * (Gim2[j+1] + Gi[j+1] + Gim1[j]
-                      + Gim1[j+2]) + one_minus_omega * Gim1[j+1];
-                }
+            for (int j=1; j<Nm1; j=j+2){
+              if((j+1) != Nm1) {
+                Gim1[j+1]=omega_over_four * (Gim2[j+1] + Gi[j+1] + Gim1[j]
+                    + Gim1[j+2]) + one_minus_omega * Gim1[j+1];
               }
+            }
 
-            } else {
+          } else {
 
-              double [] Gip1 = G[i+1];
-              double [] Gim2 = G[i-2];
+            double [] Gip1 = G[i+1];
+            double [] Gim2 = G[i-2];
 
-              for (int j=1; j<Nm1; j=j+2){
-                Gi[j] = omega_over_four * (Gim1[j] + Gip1[j] + Gi[j-1]
-                    + Gi[j+1]) + one_minus_omega * Gi[j];
+            for (int j=1; j<Nm1; j=j+2){
+              Gi[j] = omega_over_four * (Gim1[j] + Gip1[j] + Gi[j-1]
+                  + Gi[j+1]) + one_minus_omega * Gi[j];
 
-                if((j+1) != Nm1) {
-                  Gim1[j+1]=omega_over_four * (Gim2[j+1] + Gi[j+1] + Gim1[j]
-                      + Gim1[j+2]) + one_minus_omega * Gim1[j+1];
-                }
+              if((j+1) != Nm1) {
+                Gim1[j+1]=omega_over_four * (Gim2[j+1] + Gi[j+1] + Gim1[j]
+                    + Gim1[j+2]) + one_minus_omega * Gim1[j+1];
               }
             }
           }
-        } //close atomic
-        // Signal this thread has done iteration
+        }
+      } //close atomic
 
-        // Wait for neighbours;
-        long ourcount;
-        boolean done=true;
 
-        atomic {
-          sync[tmpid][0]++;
-          ourcount=sync[tmpid][0];
-        }
+      int ourcount;
+      boolean done=true;
+      atomic {
+        // Signal this thread has done iteration
+        sync[tmpid][0]++;
+        ourcount=sync[tmpid][0];
+      }
 
-       while(done) {
-           atomic {
-               if ((tmpid==0 || ourcount <= sync[tmpid-1][0])
-                   &&((tmpid==(numthreads-1))||ourcount<=sync[tmpid+1][0]))
-                   done=false;
-           }
+      // Wait for neighbours;
+      while(done) {
+        atomic {
+          if ((tmpid==0 || ourcount <= sync[tmpid-1][0])
+              &&((tmpid==(numthreads-1))||ourcount<=sync[tmpid+1][0]))
+            done=false;
         }
-
-      }//end of for
+      }
+    }//end of for
   } //end of run()
 }