projects
/
IRC.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4cb63e9
)
change benchmark
author
adash
<adash>
Tue, 12 Aug 2008 00:17:42 +0000
(
00:17
+0000)
committer
adash
<adash>
Tue, 12 Aug 2008 00:17:42 +0000
(
00:17
+0000)
Robust/src/Benchmarks/Prefetch/Em3d/dsm/BiGraph2.java
patch
|
blob
|
history
Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java
patch
|
blob
|
history
Robust/src/Benchmarks/Prefetch/Em3d/dsm/makefile
patch
|
blob
|
history
diff --git
a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/BiGraph2.java
b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/BiGraph2.java
index d183880d0646eef1d5b319a482c56fc6d3242d1b..de8cb6dbca392f43b72c1fdff22c5f81dca364fa 100644
(file)
--- a/
Robust/src/Benchmarks/Prefetch/Em3d/dsm/BiGraph2.java
+++ b/
Robust/src/Benchmarks/Prefetch/Em3d/dsm/BiGraph2.java
@@
-15,7
+15,8
@@
public class BiGraph {
**/
Node[] hNodes;
**/
Node[] hNodes;
- EVector [][] reversetable;
+ EVector [][] ereversetable;
+ EVector [][] hreversetable;
int numNodes;
/**
int numNodes;
/**
@@
-43,7
+44,8
@@
public class BiGraph {
Node [] hTable = global new Node[numNodes];
BiGraph g = global new BiGraph(eTable, hTable);
g.numNodes=numNodes;
Node [] hTable = global new Node[numNodes];
BiGraph g = global new BiGraph(eTable, hTable);
g.numNodes=numNodes;
- g.reversetable=global new EVector[numThreads][];
+ g.ereversetable=global new EVector[numThreads][];
+ g.hreversetable=global new EVector[numThreads][];
return g;
}
return g;
}
@@
-58,10
+60,11
@@
public class BiGraph {
eNodes[i]=global new Node();
hNodes[i]=global new Node();
}
eNodes[i]=global new Node();
hNodes[i]=global new Node();
}
- reversetable[threadIndex]=global new EVector[numNodes];
+ ereversetable[threadIndex]=global new EVector[numNodes];
+ hreversetable[threadIndex]=global new EVector[numNodes];
}
}
- public void initializeNodes(Node[] fromnodes, Node[] tonodes, int begin, int end, int degree, Random r, int threadIndex) {
+ public void initializeNodes(Node[] fromnodes, Node[] tonodes,
EVector[][] reversetable,
int begin, int end, int degree, Random r, int threadIndex) {
for(int i = begin; i < end; i++ ) {
Node n=fromnodes[i];
n.init(degree, r.nextDouble());
for(int i = begin; i < end; i++ ) {
Node n=fromnodes[i];
n.init(degree, r.nextDouble());
@@
-75,7
+78,7
@@
public class BiGraph {
* @return
**/
* @return
**/
- public void makeFromNodes(Node[] nodes, int indexBegin, int indexEnd, Random r) {
+ public void makeFromNodes(Node[] nodes,
EVector reversetable[][],
int indexBegin, int indexEnd, Random r) {
// Create the fromNodes and coeff field
int numthreads=reversetable.length;
for(int i = indexBegin; i < indexEnd; i++) {
// Create the fromNodes and coeff field
int numthreads=reversetable.length;
for(int i = indexBegin; i < indexEnd; i++) {
diff --git
a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java
b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java
index 3d73a5d0a74bf67ca2b60ab4d1d269112eeb7aa6..b233e560389be8a4d219e01ef7e9b1593b1928de 100644
(file)
--- a/
Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java
+++ b/
Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java
@@
-63,6
+63,7
@@
public class Em3d extends Thread {
barr = new Barrier("128.195.175.79");
atomic {
barr = new Barrier("128.195.175.79");
atomic {
+ System.printString("Inside atomic 1\n");
iteration = numIter;
degree = numDegree;
random = new Random(lowerlimit);
iteration = numIter;
degree = numDegree;
random = new Random(lowerlimit);
@@
-70,6
+71,7
@@
public class Em3d extends Thread {
atomic {
//This is going to conflict badly...Minimize work here
atomic {
//This is going to conflict badly...Minimize work here
+ System.printString("Inside atomic 2\n");
bg.allocateNodes ( lowerlimit, upperlimit, threadindex);
}
Barrier.enterBarrier(barr);
bg.allocateNodes ( lowerlimit, upperlimit, threadindex);
}
Barrier.enterBarrier(barr);
@@
-77,23
+79,27
@@
public class Em3d extends Thread {
atomic {
//initialize the eNodes
atomic {
//initialize the eNodes
- bg.initializeNodes(bg.eNodes, bg.hNodes, lowerlimit, upperlimit, degree, random, threadindex);
+ 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
}
Barrier.enterBarrier(barr);
atomic {
//initialize the hNodes
- bg.initializeNodes(bg.hNodes, bg.eNodes, lowerlimit, upperlimit, degree, random, threadindex);
+ System.printString("Inside atomic 4\n");
+ bg.initializeNodes(bg.hNodes, bg.eNodes, bg.ereversetable, lowerlimit, upperlimit, degree, random, threadindex);
}
Barrier.enterBarrier(barr);
atomic {
}
Barrier.enterBarrier(barr);
atomic {
- bg.makeFromNodes(bg.hNodes, lowerlimit, upperlimit, random);
+ System.printString("Inside atomic 5\n");
+ bg.makeFromNodes(bg.hNodes, bg.hreversetable, lowerlimit, upperlimit, random);
}
Barrier.enterBarrier(barr);
atomic {
}
Barrier.enterBarrier(barr);
atomic {
- bg.makeFromNodes(bg.eNodes, lowerlimit, upperlimit, random);
+ System.printString("Inside atomic 6\n");
+ bg.makeFromNodes(bg.eNodes, bg.ereversetable, lowerlimit, upperlimit, random);
}
Barrier.enterBarrier(barr);
}
Barrier.enterBarrier(barr);
@@
-101,6
+107,7
@@
public class Em3d extends Thread {
for (int i = 0; i < iteration; i++) {
/* for eNodes */
atomic {
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];
for(int j = lowerlimit; j<upperlimit; j++) {
Node n = bg.eNodes[j];
@@
-114,6
+121,7
@@
public class Em3d extends Thread {
/* for hNodes */
atomic {
/* 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++) {
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 ca304c77eb1b1c15850dc83c514540dce938236a..c2daf4e803b10807a0fa07d5df91d0c790dd34f1 100644
(file)
--- 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
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 -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}
+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}
default:
# ../../../../buildscript ${FLAGS2} -o ${MAINCLASS}NP ${SRC}
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}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
clean:
rm -rf tmpbuilddirectory