From: bdemsky <bdemsky>
Date: Mon, 11 Aug 2008 20:13:42 +0000 (+0000)
Subject: rewritten SOR benchmark
X-Git-Tag: preEdgeChange~4
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=71c76fd1db47485d03d699683f195d5ab6f4f2e4;p=IRC.git

rewritten SOR benchmark
---

diff --git a/Robust/src/Benchmarks/Prefetch/SOR/dsm/SORRunner.java b/Robust/src/Benchmarks/Prefetch/SOR/dsm/SORRunner.java
index d1f4a4b8..9846a33f 100644
--- a/Robust/src/Benchmarks/Prefetch/SOR/dsm/SORRunner.java
+++ b/Robust/src/Benchmarks/Prefetch/SOR/dsm/SORRunner.java
@@ -99,6 +99,29 @@ class SORRunner extends Thread {
             }
           } else if (i == Mm1) {
 
+          } else {
+
+            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];
+
+            }
+          }
+        }
+      } //close atomic
+
+      Barrier.enterBarrier(barr);
+      atomic {
+        for (int i=ilow+(p%2); i<iupper; i=i+2) {
+
+          double [] Gi = G[i];
+          double [] Gim1 = G[i-1];
+
+          if(i == 1) { 
+          } else if (i == Mm1) {
+
             double [] Gim2 = G[i-2];
 
             for (int j=1; j<Nm1; j=j+2){
@@ -110,13 +133,9 @@ class SORRunner extends Thread {
 
           } else {
 
-            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];
-
               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];