From 2747faa17a1e5577c665678876283464bf70b883 Mon Sep 17 00:00:00 2001
From: yeom <yeom>
Date: Thu, 18 Nov 2010 03:11:35 +0000
Subject: [PATCH] changes on SOR benchmark

---
 .../Benchmarks/oooJava/sor/JGFSORBench.java   | 36 ++++++++-----------
 .../oooJava/sor/JGFSORBenchSizeD.java         |  8 +----
 .../src/Benchmarks/oooJava/sor/SORRunner.java |  4 +++
 3 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/Robust/src/Benchmarks/oooJava/sor/JGFSORBench.java b/Robust/src/Benchmarks/oooJava/sor/JGFSORBench.java
index 2556db3a..0687ade3 100644
--- a/Robust/src/Benchmarks/oooJava/sor/JGFSORBench.java
+++ b/Robust/src/Benchmarks/oooJava/sor/JGFSORBench.java
@@ -59,26 +59,16 @@ public class JGFSORBench {
     double one_minus_omega = 1.0 - omega;
 
     // update interior points
-    //
-    //spawn threads
+       
+    SORWrap sorWrap = new SORWrap(new SORRunner(0,omega,G,num_iterations,numthreads, RANDOM_SEED));
+    sorWrap.sor.run();
 
-    SORWrap[] thobjects = new SORWrap[numthreads];
-
-    for(int i=0;i<numthreads;i++) {
-      thobjects[i] =  new SORWrap(new SORRunner(i,omega,G,num_iterations,numthreads, RANDOM_SEED));
-    }
-
-    for(int i=0;i<numthreads;i++) {
-      thobjects[i].sor.run();
-    }
-
-    //JGFInstrumentor.stopTimer("Section2:SOR:Kernel", instr.timers);
     for (int i=1; i<G.length-1; i++) {
       for (int j=1; j<G.length-1; j++) {
         sor.Gtotal += G[i][j];
       }
-    }               
-    //System.out.println("DEBUG: G.length= " + G.length+" sor.Gtotal= " + sor.Gtotal);
+    }      
+
   }
 
   public int JGFvalidate(){
@@ -88,14 +78,16 @@ public class JGFSORBench {
     refval[0] = 0.498574406322512;
     refval[1] = 1.1234778980135105;
     refval[2] = 1.9954895063582696;
-    refval[3] = 2.654895063582696;
+//    refval[3] = 2.654895063582696;
+//    refval[3] = 31.984487737222523;
+    refval[3]=31.984779;
     double dev = Math.fabs(Gtotal - refval[size]);
-    long l = (long) refval[size] * 1000000;
-    long r = (long) Gtotal * 1000000;
-    if (l != r ){
-      return 1;
-    } else {
-      return 0;
+    if (dev > 1.0e-6 ){
+      System.out.println("Validation failed");
+      System.out.println("Gtotal = " + Gtotal + "  dev=" + dev + "  sizeParam=" + size);
+    }else{
+      System.out.println("Validataion Success! dev="+dev);
     }
+
   }
 }
diff --git a/Robust/src/Benchmarks/oooJava/sor/JGFSORBenchSizeD.java b/Robust/src/Benchmarks/oooJava/sor/JGFSORBenchSizeD.java
index 6ef9add1..34f95ef5 100644
--- a/Robust/src/Benchmarks/oooJava/sor/JGFSORBenchSizeD.java
+++ b/Robust/src/Benchmarks/oooJava/sor/JGFSORBenchSizeD.java
@@ -39,13 +39,7 @@ public class JGFSORBenchSizeD{
 
     sor.JGFsetsize(size); 
     JGFSORBench.JGFkernel(sor); 
-    int retval = 0;
-    /*
-       retval = sor.JGFvalidate(); 
-    */
-    if(retval!=0) {
-      System.printString("Validation failed\n");
-    }
+    sor.JGFvalidate(); 
 
     int jacobi;
     jacobi = sor.JACOBI_NUM_ITER;
diff --git a/Robust/src/Benchmarks/oooJava/sor/SORRunner.java b/Robust/src/Benchmarks/oooJava/sor/SORRunner.java
index a8c8dc4c..3881e092 100644
--- a/Robust/src/Benchmarks/oooJava/sor/SORRunner.java
+++ b/Robust/src/Benchmarks/oooJava/sor/SORRunner.java
@@ -40,6 +40,7 @@ class SORRunner  {
     double omega_over_four, one_minus_omega;
     int numiterations;
     int ilow, iupper, slice, tslice, ttslice, Mm1, Nm1;
+    
 
     N = M = G.length;
 
@@ -70,6 +71,8 @@ class SORRunner  {
         R[j]=rand.nextDouble() * 1e-6;
     }
 
+    System.out.println("Starting computation!");
+    
     // update interior points
     //
 
@@ -147,5 +150,6 @@ class SORRunner  {
       }
       //barrier
     }//end of for
+        
   } //end of run()
 }
-- 
2.34.1