From 8e5b5bd718a63446aac345d462bae6d945306f46 Mon Sep 17 00:00:00 2001
From: adash <adash>
Date: Thu, 20 Nov 2008 00:37:01 +0000
Subject: [PATCH] changes for the new build

---
 .../Prefetch/2DConv/javasingle/makefile       |  2 +-
 .../Benchmarks/Prefetch/Em3d/dsm/Em3d2.java   |  2 +-
 .../Prefetch/Em3d/javasingle/Em3d2.java       | 39 +-----------
 .../Prefetch/LUFact/dsm/JGFLUFactBench.java   |  8 +--
 .../Prefetch/LUFact/dsm/LinpackRunner.java    |  2 +-
 .../Benchmarks/Prefetch/LUFact/dsm/makefile   | 10 +---
 .../Prefetch/MicroBenchmarks/average.txt      | 60 -------------------
 .../Prefetch/Moldyn/dsm/JGFMolDynBench.java   |  2 +-
 .../Prefetch/SOR/dsm/SORRunner.java           |  2 +-
 9 files changed, 12 insertions(+), 115 deletions(-)
 delete mode 100644 Robust/src/Benchmarks/Prefetch/MicroBenchmarks/average.txt

diff --git a/Robust/src/Benchmarks/Prefetch/2DConv/javasingle/makefile b/Robust/src/Benchmarks/Prefetch/2DConv/javasingle/makefile
index ff90875c..81bad9bf 100644
--- a/Robust/src/Benchmarks/Prefetch/2DConv/javasingle/makefile
+++ b/Robust/src/Benchmarks/Prefetch/2DConv/javasingle/makefile
@@ -1,7 +1,7 @@
 MAINCLASS=Convolution
 SRC=${MAINCLASS}.java 
 default:
-	../../../../buildscript -optimize -thread -debug -mainclass ${MAINCLASS} ${SRC} -o ${MAINCLASS}
+	../../../../buildscript -optimize -thread -mainclass ${MAINCLASS} ${SRC} -o ${MAINCLASS}
 
 clean:
 	rm -rf tmpbuilddirectory
diff --git a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java
index 1d68cbf1..15bad461 100644
--- a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java
+++ b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java
@@ -60,7 +60,7 @@ public class Em3d extends Thread {
     int degree;
     Random random;
 
-    barr = new Barrier("128.195.175.84");
+    barr = new Barrier("128.195.136.162");
     atomic {
 	iteration = numIter;
 	degree = numDegree;
diff --git a/Robust/src/Benchmarks/Prefetch/Em3d/javasingle/Em3d2.java b/Robust/src/Benchmarks/Prefetch/Em3d/javasingle/Em3d2.java
index 0abfad2b..7ef738ea 100644
--- a/Robust/src/Benchmarks/Prefetch/Em3d/javasingle/Em3d2.java
+++ b/Robust/src/Benchmarks/Prefetch/Em3d/javasingle/Em3d2.java
@@ -56,34 +56,27 @@ public class Em3d {
 
   public void run() {
     int iteration;
-    //Barrier barr;
     int degree;
     Random random;
     String hname;
 
-    //barr = new Barrier("128.195.175.84");
     iteration = numIter;
     degree = numDegree;
     random = new Random(lowerlimit);
 
     //This is going to conflict badly...Minimize work here
     bg.allocateNodes ( lowerlimit, upperlimit, threadindex);
-    //Barrier.enterBarrier(barr);
 
 
     //initialize the eNodes
     bg.initializeNodes(bg.eNodes, bg.hNodes, bg.hreversetable, lowerlimit, upperlimit, degree, random, threadindex);
-    //Barrier.enterBarrier(barr);
 
     //initialize the hNodes
     bg.initializeNodes(bg.hNodes, bg.eNodes, bg.ereversetable, lowerlimit, upperlimit, degree, random, threadindex);
-    //Barrier.enterBarrier(barr);
 
     bg.makeFromNodes(bg.hNodes, bg.hreversetable, lowerlimit, upperlimit, random);
-    //Barrier.enterBarrier(barr);
 
     bg.makeFromNodes(bg.eNodes, bg.ereversetable, lowerlimit, upperlimit, random);
-    //Barrier.enterBarrier(barr);
 
     //Do the computation
     for (int i = 0; i < iteration; i++) {
@@ -96,7 +89,6 @@ public class Em3d {
         }
       }
 
-      //Barrier.enterBarrier(barr);
 
       /* for  hNodes */
       for(int j = lowerlimit; j<upperlimit; j++) {
@@ -105,7 +97,6 @@ public class Em3d {
           n.value -= n.coeffs[k] * n.fromNodes[k].value;
         }
       }
-      //Barrier.enterBarrier(barr);
     }
   }
 
@@ -122,30 +113,15 @@ public class Em3d {
       System.printString("Initializing em3d random graph...\n");
     long start0 = System.currentTimeMillis();
     int numThreads = em.numThreads;
-    /*
-    int[] mid = new int[8];
-    mid[0] = (128<<24)|(195<<16)|(175<<8)|84;//dw-10
-    mid[1] = (128<<24)|(195<<16)|(175<<8)|85;//dw-11
-    mid[2] = (128<<24)|(195<<16)|(175<<8)|86;//dw-12
-    mid[3] = (128<<24)|(195<<16)|(175<<8)|87;//dw-13
-    mid[4] = (128<<24)|(195<<16)|(175<<8)|88;//dw-14
-    mid[5] = (128<<24)|(195<<16)|(175<<8)|89;//dw-15
-    mid[6] = (128<<24)|(195<<16)|(175<<8)|90;//dw-16
-    mid[7] = (128<<24)|(195<<16)|(175<<8)|91;//dw-17
-    */
 
     System.printString("DEBUG -> numThreads = " + numThreads+"\n");
-    //BarrierServer mybarr;
     BiGraph graph;
 
 
     // initialization step 1: allocate BiGraph
     // System.printString( "Allocating BiGraph.\n" );
 
-    //mybarr = new BarrierServer(numThreads);
     graph =  BiGraph.create(em.numNodes, em.numDegree, numThreads);
-    //mybarr.run();
-    //mybarr.start(mid[0]);
 
 
     Em3dWrap[] em3d=new Em3dWrap[numThreads];    
@@ -166,24 +142,11 @@ public class Em3d {
       base+=increment;
     }
 
-/*
-    boolean waitfordone=true;
-    while(waitfordone) {
-      if (mybarr.done)
-        waitfordone=false;
-    }
-    */
-
     //System.printString("Starting Barrier run\n");
     for(int i = 0; i<numThreads; i++) {
-      //em3d[i].em3d.start(mid[i]);
       em3d[i].em3d.run();
     }
-    /*
-    for(int i = 0; i<numThreads; i++) {
-      em3d[i].em3d.join();
-    }
-    */
+
     System.printString("Done!"+ "\n");
   }
 
diff --git a/Robust/src/Benchmarks/Prefetch/LUFact/dsm/JGFLUFactBench.java b/Robust/src/Benchmarks/Prefetch/LUFact/dsm/JGFLUFactBench.java
index d41f4d0d..8d7ecf0c 100644
--- a/Robust/src/Benchmarks/Prefetch/LUFact/dsm/JGFLUFactBench.java
+++ b/Robust/src/Benchmarks/Prefetch/LUFact/dsm/JGFLUFactBench.java
@@ -67,10 +67,10 @@ public class JGFLUFactBench {
     }
 
     int[] mid = new int[4];
-    mid[0] = (128<<24)|(195<<16)|(175<<8)|84; //dw-10
-    mid[1] = (128<<24)|(195<<16)|(175<<8)|85; //dw-11
-    mid[2] = (128<<24)|(195<<16)|(175<<8)|86; //dw-12
-    mid[3] = (128<<24)|(195<<16)|(175<<8)|87; //dw-13
+    mid[0] = (128<<24)|(195<<16)|(136<<8)|162; //dw-10
+    mid[1] = (128<<24)|(195<<16)|(136<<8)|163; //dw-11
+    mid[2] = (128<<24)|(195<<16)|(136<<8)|164; //dw-12
+    mid[3] = (128<<24)|(195<<16)|(136<<8)|165; //dw-13
 
     /* spawn threads */
     LinpackRunner[] thobjects;
diff --git a/Robust/src/Benchmarks/Prefetch/LUFact/dsm/LinpackRunner.java b/Robust/src/Benchmarks/Prefetch/LUFact/dsm/LinpackRunner.java
index 730fa162..28f87539 100644
--- a/Robust/src/Benchmarks/Prefetch/LUFact/dsm/LinpackRunner.java
+++ b/Robust/src/Benchmarks/Prefetch/LUFact/dsm/LinpackRunner.java
@@ -39,7 +39,7 @@ class LinpackRunner extends Thread {
 
   public void run() {
     Barrier barr;
-    barr = new Barrier("128.195.175.84");
+    barr = new Barrier("128.195.136.162");
     double[] col_k, col_j;
     double t;
     int j,k,kp1,l,nm1;
diff --git a/Robust/src/Benchmarks/Prefetch/LUFact/dsm/makefile b/Robust/src/Benchmarks/Prefetch/LUFact/dsm/makefile
index 100f37e2..5e8795e1 100644
--- a/Robust/src/Benchmarks/Prefetch/LUFact/dsm/makefile
+++ b/Robust/src/Benchmarks/Prefetch/LUFact/dsm/makefile
@@ -10,14 +10,8 @@ FLAGS2=-dsm -optimize -mainclass ${MAINCLASS}
 default:
 #../../../../buildscript ${FLAGS2} ${SRC}
 #	../../../../buildscript ${FLAGS} ${SRC}
-	../../../../buildscript ${FLAGS2} -o ${MAINCLASS}1NPNC ${SRC}
-	../../../../buildscript ${FLAGS} -o ${MAINCLASS}1  ${SRC}
-	cp ${MAINCLASS}1NPNC.bin ${MAINCLASS}2NPNC.bin
-	cp ${MAINCLASS}1.bin ${MAINCLASS}2.bin
-	cp ${MAINCLASS}1NPNC.bin ${MAINCLASS}3NPNC.bin
-	cp ${MAINCLASS}1.bin ${MAINCLASS}3.bin
-	cp ${MAINCLASS}1NPNC.bin ${MAINCLASS}4NPNC.bin
-	cp ${MAINCLASS}1.bin ${MAINCLASS}4.bin
+	../../../../buildscript ${FLAGS2} -o ${MAINCLASS}NPNC ${SRC}
+	../../../../buildscript ${FLAGS} -o ${MAINCLASS}N  ${SRC}
 
 clean:
 	rm -rf tmpbuilddirectory
diff --git a/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/average.txt b/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/average.txt
deleted file mode 100644
index e8ad7956..00000000
--- a/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/average.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-../runlog/MultiMCReadcommit1NP.bin_local_rao.txt 0.71
-../runlog/MultiMCWritecommit1NP.bin_local_wao.txt 1.72
-../runlog/OneMCReadcommit1NP.bin_local_rarray.txt 0.69
-../runlog/OneMCWritecommit1NP.bin_local_warray.txt 1.72
-===========
-
-../runlog/MultiMCReadcommit1NP.bin_local_rao.txt 0.67
-../runlog/MultiMCReadcommit5NP.bin_rao.txt 100.36
-../runlog/MultiMCWritecommit1NP.bin_local_wao.txt 1.7
-../runlog/MultiMCWritecommit5NP.bin_wao.txt 42.54
-../runlog/OneMCReadcommit1NP.bin_local_rarray.txt 0.67
-../runlog/OneMCReadcommit5NP.bin_rarray.txt 4.72
-../runlog/OneMCWritecommit1NP.bin_local_warray.txt 1.69
-../runlog/OneMCWritecommit5NP.bin_warray.txt 8.75
-===========
-
-../runlog/MultiMCReadcommit1NP.bin_local_rao.txt 0.67
-../runlog/MultiMCReadcommit2NP.bin_rao.txt 21.26
-../runlog/MultiMCReadcommit3NP.bin_rao.txt 28.62
-../runlog/MultiMCReadcommit4NP.bin_rao.txt 56.52
-../runlog/MultiMCReadcommit5NP.bin_rao.txt 94.85
-../runlog/MultiMCWritecommit1NP.bin_local_wao.txt 1.69
-../runlog/MultiMCWritecommit2NP.bin_wao.txt 8.21
-../runlog/MultiMCWritecommit3NP.bin_wao.txt 15.54
-../runlog/MultiMCWritecommit4NP.bin_wao.txt 27.45
-../runlog/MultiMCWritecommit5NP.bin_wao.txt 42.72
-../runlog/OneMCReadcommit1NP.bin_local_rarray.txt 0.66
-../runlog/OneMCReadcommit2NP.bin_rarray.txt 3.14
-../runlog/OneMCReadcommit3NP.bin_rarray.txt 3.6
-../runlog/OneMCReadcommit4NP.bin_rarray.txt 4.08
-../runlog/OneMCReadcommit5NP.bin_rarray.txt 4.79
-../runlog/OneMCWritecommit1NP.bin_local_warray.txt 1.7
-../runlog/OneMCWritecommit2NP.bin_warray.txt 3.84
-../runlog/OneMCWritecommit3NP.bin_warray.txt 5.34
-../runlog/OneMCWritecommit4NP.bin_warray.txt 7.03
-../runlog/OneMCWritecommit5NP.bin_warray.txt 8.72
-===========
-
-../runlog/MultiMCReadcommit1NP.bin_local.txt 0.04
-../runlog/MultiMCReadcommit2NP.bin.txt 0.04
-../runlog/MultiMCReadcommit3NP.bin.txt 0.04
-../runlog/MultiMCReadcommit4NP.bin.txt 0.05
-../runlog/MultiMCReadcommit5NP.bin.txt 0.06
-../runlog/MultiMCWritecommit1NP.bin_local.txt 0.03
-../runlog/MultiMCWritecommit2NP.bin.txt 0.03
-../runlog/MultiMCWritecommit3NP.bin.txt 0.04
-../runlog/MultiMCWritecommit4NP.bin.txt 0.05
-../runlog/MultiMCWritecommit5NP.bin.txt 0.04
-../runlog/OneMCReadcommit1NP.bin_local.txt 0.03
-../runlog/OneMCReadcommit2NP.bin.txt 0.03
-../runlog/OneMCReadcommit3NP.bin.txt 0.04
-../runlog/OneMCReadcommit4NP.bin.txt 0.04
-../runlog/OneMCReadcommit5NP.bin.txt 0.05
-../runlog/OneMCWritecommit1NP.bin_local.txt 0.03
-../runlog/OneMCWritecommit2NP.bin.txt 0.03
-../runlog/OneMCWritecommit3NP.bin.txt 0.04
-../runlog/OneMCWritecommit4NP.bin.txt 0.04
-../runlog/OneMCWritecommit5NP.bin.txt 0.04
-===========
-
diff --git a/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/JGFMolDynBench.java b/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/JGFMolDynBench.java
index 20a0948d..6d023981 100644
--- a/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/JGFMolDynBench.java
+++ b/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/JGFMolDynBench.java
@@ -349,7 +349,7 @@ class mdRunner extends Thread {
     int mdsize;
     double tmpden;
     int movemx=50;
-    Barrier barr=new Barrier("128.195.175.84");
+    Barrier barr=new Barrier("128.195.136.162");
     particle[] one;
     int id;
     atomic {
diff --git a/Robust/src/Benchmarks/Prefetch/SOR/dsm/SORRunner.java b/Robust/src/Benchmarks/Prefetch/SOR/dsm/SORRunner.java
index 032cc6ed..11eb9e56 100644
--- a/Robust/src/Benchmarks/Prefetch/SOR/dsm/SORRunner.java
+++ b/Robust/src/Benchmarks/Prefetch/SOR/dsm/SORRunner.java
@@ -38,7 +38,7 @@ class SORRunner extends Thread {
     double omega_over_four, one_minus_omega;
     int numiterations;
     Barrier barr;
-    barr = new Barrier("128.195.175.84");
+    barr = new Barrier("128.195.136.162");
     int ilow, iupper, slice, tslice, ttslice, Mm1, Nm1;
 
     atomic {
-- 
2.34.1