From 34c2ca232f747ff3bb9e015bf033d1dcee4a09dc Mon Sep 17 00:00:00 2001
From: adash <adash>
Date: Tue, 12 Aug 2008 21:38:33 +0000
Subject: [PATCH] latest files

---
 Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java | 8 --------
 Robust/src/Benchmarks/Prefetch/Em3d/dsm/makefile   | 8 ++++----
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java
index b233e560..374599d3 100644
--- a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java
+++ b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java
@@ -63,7 +63,6 @@ public class Em3d extends Thread {
 
     barr = new Barrier("128.195.175.79");
     atomic {
-    System.printString("Inside atomic 1\n");
 	iteration = numIter;
 	degree = numDegree;
 	random = new Random(lowerlimit);
@@ -71,7 +70,6 @@ public class Em3d extends Thread {
 
     atomic {
 	//This is going to conflict badly...Minimize work here
-    System.printString("Inside atomic 2\n");
 	bg.allocateNodes ( lowerlimit, upperlimit, threadindex);
     }
     Barrier.enterBarrier(barr);
@@ -79,26 +77,22 @@ public class Em3d extends Thread {
 
     atomic {
 	//initialize the eNodes
-    System.printString("Inside atomic 3\n");
 	bg.initializeNodes(bg.eNodes, bg.hNodes, bg.hreversetable, lowerlimit, upperlimit, degree, random, threadindex);
     }
     Barrier.enterBarrier(barr);
 
     atomic {
 	//initialize the hNodes
-    System.printString("Inside atomic 4\n");
 	bg.initializeNodes(bg.hNodes, bg.eNodes, bg.ereversetable, lowerlimit, upperlimit, degree, random, threadindex);
     }
     Barrier.enterBarrier(barr);
 
     atomic {
-    System.printString("Inside atomic 5\n");
 	bg.makeFromNodes(bg.hNodes, bg.hreversetable, lowerlimit, upperlimit, random);
     }
     Barrier.enterBarrier(barr);
 
     atomic {
-    System.printString("Inside atomic 6\n");
 	bg.makeFromNodes(bg.eNodes, bg.ereversetable, lowerlimit, upperlimit, random);
     }
     Barrier.enterBarrier(barr);
@@ -107,7 +101,6 @@ public class Em3d extends Thread {
     for (int i = 0; i < iteration; i++) {
 	/* for  eNodes */
 	atomic {
-    System.printString("Inside atomic 7\n");
 	    for(int j = lowerlimit; j<upperlimit; j++) {
 		Node n = bg.eNodes[j];
 		
@@ -121,7 +114,6 @@ public class Em3d extends Thread {
 	
 	/* for  hNodes */
 	atomic {
-    System.printString("Inside atomic 8\n");
 	    for(int j = lowerlimit; j<upperlimit; j++) {
 		Node n = bg.hNodes[j];
 		for (int k = 0; k < n.fromCount; k++) {
diff --git a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/makefile b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/makefile
index c2daf4e8..ca304c77 100644
--- a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/makefile
+++ b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/makefile
@@ -14,8 +14,8 @@ SRC3=${MAINCLASS}2.java \
 	EVector.java 
 
 FLAGS=-dsm -prefetch -optimize -excprefetch Em3d.main -excprefetch BiGraph.create -excprefetch Node.Node -excprefetch Node.fillTable -excprefetch Node.makeUniqueNeighbors -excprefetch Node.makeFromNodes -excprefetch Node.updateFromNodes -debug -mainclass ${MAINCLASS} -trueprob 0.91
-FLAGS1=-dsm -prefetch -optimize -runtimedebug -transstats -excprefetch Node.makeUniqueNeighbors -excprefetch EVector.ensureCapacity -excprefetch EVector.addElement -excprefetch BiGraph.makeFromNodes -excprefetch EVector.elementAt -excprefetch BiGraph.initializeNodes -excprefetch BiGraph.allocateNodes -mainclass ${MAINCLASS} -trueprob 0.91
-FLAGS2=-dsm -optimize -transstats -runtimedebug -mainclass ${MAINCLASS}
+FLAGS1=-dsm -prefetch -optimize -excprefetch Node.makeUniqueNeighbors -excprefetch EVector.ensureCapacity -excprefetch EVector.addElement -excprefetch BiGraph.makeFromNodes -excprefetch EVector.elementAt -excprefetch BiGraph.initializeNodes -excprefetch BiGraph.allocateNodes -mainclass ${MAINCLASS} -trueprob 0.91
+FLAGS2=-dsm -optimize -mainclass ${MAINCLASS}
 
 default:
 #	../../../../buildscript ${FLAGS2} -o ${MAINCLASS}NP ${SRC}
@@ -28,8 +28,8 @@ default:
 	cp ${MAINCLASS}N.bin ${MAINCLASS}2.bin
 	cp ${MAINCLASS}NNP.bin ${MAINCLASS}3NP.bin
 	cp ${MAINCLASS}N.bin ${MAINCLASS}3.bin
-#	cp ${MAINCLASS}NNP.bin ${MAINCLASS}4NP.bin
-#	cp ${MAINCLASS}N.bin ${MAINCLASS}4.bin
+	cp ${MAINCLASS}NNP.bin ${MAINCLASS}4NP.bin
+	cp ${MAINCLASS}N.bin ${MAINCLASS}4.bin
 
 clean:
 	rm -rf tmpbuilddirectory
-- 
2.34.1