From: adash <adash>
Date: Sun, 13 Dec 2009 05:40:21 +0000 (+0000)
Subject: SOR fix, problem was with Random generator that had an initial seed defined
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=472e6621d1b0f66b570de6bfae4b1e98368f258c;p=IRC.git

SOR fix, problem was with Random generator that had an initial seed defined
but never used
---

diff --git a/Robust/src/Benchmarks/Prefetch/SOR/dsm/JGFSORBench.java b/Robust/src/Benchmarks/Prefetch/SOR/dsm/JGFSORBench.java
index 6e13994d..b1d563d4 100644
--- a/Robust/src/Benchmarks/Prefetch/SOR/dsm/JGFSORBench.java
+++ b/Robust/src/Benchmarks/Prefetch/SOR/dsm/JGFSORBench.java
@@ -58,6 +58,7 @@ public class JGFSORBench {
 
     double[][] G;
     int num_iterations;
+    long RANDOM_SEED;
 
     atomic {
       numthreads = sor.nthreads;
@@ -65,6 +66,7 @@ public class JGFSORBench {
       mybarr = global new BarrierServer(numthreads);
       G =  global new double[datasize][];
       num_iterations = sor.JACOBI_NUM_ITER;
+      RANDOM_SEED = sor.RANDOM_SEED;
     }
     mybarr.start(mid[0]);
 
@@ -80,7 +82,7 @@ public class JGFSORBench {
 
     atomic {
 	for(int i=0;i<numthreads;i++) {
-	    thobjects[i] =  new SORWrap(global new SORRunner(i,omega,G,num_iterations,numthreads));
+	    thobjects[i] =  new SORWrap(global new SORRunner(i,omega,G,num_iterations,numthreads, RANDOM_SEED));
 	}
     }
 
@@ -107,6 +109,7 @@ public class JGFSORBench {
 		sor.Gtotal += G[i][j];
 	    }
 	}               
+    //System.out.println("DEBUG: G.length= " + G.length+" sor.Gtotal= " + sor.Gtotal);
     }
   }
 
diff --git a/Robust/src/Benchmarks/Prefetch/SOR/dsm/SORRunner.java b/Robust/src/Benchmarks/Prefetch/SOR/dsm/SORRunner.java
index 11eb9e56..6465fede 100644
--- a/Robust/src/Benchmarks/Prefetch/SOR/dsm/SORRunner.java
+++ b/Robust/src/Benchmarks/Prefetch/SOR/dsm/SORRunner.java
@@ -24,13 +24,15 @@ class SORRunner extends Thread {
   int id, num_iterations;
   double G[][],omega;
   int nthreads;
+  long RANDOM_SEED;
 
-  public SORRunner(int id, double omega, double G[][], int num_iterations, int nthreads) {
+  public SORRunner(int id, double omega, double G[][], int num_iterations, int nthreads, long RANDOM_SEED) {
     this.id = id;
     this.omega=omega;
     this.G=G;
     this.num_iterations=num_iterations;
     this.nthreads = nthreads;
+    this.RANDOM_SEED =  RANDOM_SEED;
   }
 
   public void run() {
@@ -66,7 +68,7 @@ class SORRunner extends Thread {
     Barrier.enterBarrier(barr);
     
     atomic {
-      Random rand=new Random();
+      Random rand=new Random(RANDOM_SEED);
       double[] R = G[0];
       for(int j=0;j<M;j++)
         R[j]=rand.nextDouble() * 1e-6;