From f4ec977b20d917228b539edbb0684a32be2ef86d Mon Sep 17 00:00:00 2001 From: adash Date: Mon, 14 Apr 2008 21:27:28 +0000 Subject: [PATCH] changed fillTable() to static method --- Robust/src/Benchmarks/Prefetch/Em3d/dsm/BiGraph.java | 5 ++--- Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d.java | 7 ++----- Robust/src/Benchmarks/Prefetch/Em3d/dsm/Node.java | 2 +- Robust/src/Benchmarks/Prefetch/Em3d/java/Barrier.java | 6 ++---- Robust/src/Benchmarks/Prefetch/Em3d/java/BiGraph.java | 6 ++---- Robust/src/Benchmarks/Prefetch/Em3d/java/Em3d.java | 8 ++------ Robust/src/Benchmarks/Prefetch/Em3d/java/Node.java | 2 +- 7 files changed, 12 insertions(+), 24 deletions(-) diff --git a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/BiGraph.java b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/BiGraph.java index 40ef2515..80099b92 100644 --- a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/BiGraph.java +++ b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/BiGraph.java @@ -38,14 +38,13 @@ public class BiGraph BiGraph create(int numNodes, int numDegree, boolean verbose, Random r) { - Node newnode = global new Node(); // making nodes (we create a table) //if (verbose) System.printString("making nodes (tables in orig. version)"); Node[] hTable = global new Node[numNodes]; Node[] eTable = global new Node[numNodes]; - hTable = newnode.fillTable(numNodes, numDegree, r); - eTable = newnode.fillTable(numNodes, numDegree, r); + hTable = Node.fillTable(numNodes, numDegree, r); + eTable = Node.fillTable(numNodes, numDegree, r); // making neighbors //if (verbose) System.printString("updating from and coeffs"); diff --git a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d.java b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d.java index 33e72ff4..7e2e23e2 100644 --- a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d.java +++ b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d.java @@ -60,15 +60,12 @@ public class Em3d extends Thread public void run() { int iteration; - int b; atomic { iteration = numIter; - b = mybarr.numthreads; } for (int i = 0; i < iteration; i++) { - Barrier runBarrier = new Barrier(); /* for eNodes */ atomic { Node prev, curr; @@ -85,7 +82,7 @@ public class Em3d extends Thread } curr = curr.next; } - runBarrier.enterBarrier(mybarr); + Barrier.enterBarrier(mybarr); } /* for hNodes */ @@ -104,7 +101,7 @@ public class Em3d extends Thread } curr = curr.next; } - runBarrier.enterBarrier(mybarr); + Barrier.enterBarrier(mybarr); } } } diff --git a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Node.java b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Node.java index 1284b7fd..02d7941a 100644 --- a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Node.java +++ b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Node.java @@ -63,7 +63,7 @@ public class Node { * @param degree the out degree of each node * @return a table containing all the nodes. **/ - public Node[] fillTable(int size, int degree, Random r) + public static Node[] fillTable(int size, int degree, Random r) { Node[] table = global new Node[size]; diff --git a/Robust/src/Benchmarks/Prefetch/Em3d/java/Barrier.java b/Robust/src/Benchmarks/Prefetch/Em3d/java/Barrier.java index 47f40620..590b3a66 100644 --- a/Robust/src/Benchmarks/Prefetch/Em3d/java/Barrier.java +++ b/Robust/src/Benchmarks/Prefetch/Em3d/java/Barrier.java @@ -21,15 +21,13 @@ public class Barrier { int tmp; boolean retry=true; - if (b.numthreads == 1) - return; - do { if (!b.cleared) { b.entercount++; tmp = b.entercount; if (tmp==b.numthreads) { - b.cleared=true; + if(b.numthreads > 1) + b.cleared=true; b.entercount--; return; } diff --git a/Robust/src/Benchmarks/Prefetch/Em3d/java/BiGraph.java b/Robust/src/Benchmarks/Prefetch/Em3d/java/BiGraph.java index a8a81070..20ba94a3 100644 --- a/Robust/src/Benchmarks/Prefetch/Em3d/java/BiGraph.java +++ b/Robust/src/Benchmarks/Prefetch/Em3d/java/BiGraph.java @@ -39,12 +39,10 @@ public class BiGraph BiGraph create(int numNodes, int numDegree, boolean verbose, Random r) { - Node newnode = new Node(); - // making nodes (we create a table) if (verbose) System.out.println("making nodes (tables in orig. version)"); - Node[] hTable = newnode.fillTable(numNodes, numDegree, r); - Node[] eTable = newnode.fillTable(numNodes, numDegree, r); + Node[] hTable = Node.fillTable(numNodes, numDegree, r); + Node[] eTable = Node.fillTable(numNodes, numDegree, r); // making neighbors if (verbose) System.out.println("updating from and coeffs"); diff --git a/Robust/src/Benchmarks/Prefetch/Em3d/java/Em3d.java b/Robust/src/Benchmarks/Prefetch/Em3d/java/Em3d.java index 8ca449d1..8021a830 100644 --- a/Robust/src/Benchmarks/Prefetch/Em3d/java/Em3d.java +++ b/Robust/src/Benchmarks/Prefetch/Em3d/java/Em3d.java @@ -43,7 +43,6 @@ public class Em3d extends Thread public void run() { for (int i = 0; i < numIter; i++) { - Barrier runBarrier = new Barrier(); /* for eNodes */ Node prev = bg.eNodes; Node curr = null; @@ -58,8 +57,7 @@ public class Em3d extends Thread } curr = curr.next; } - runBarrier.enterBarrier(mybarr); - //mybarr.reset(); + Barrier.enterBarrier(mybarr); /* for hNodes */ prev = bg.hNodes; @@ -75,8 +73,7 @@ public class Em3d extends Thread } curr = curr.next; } - runBarrier.enterBarrier(mybarr); - //mybarr.reset(); + Barrier.enterBarrier(mybarr); } } @@ -118,7 +115,6 @@ public class Em3d extends Thread BiGraph graph1 = new BiGraph(); int num_threads = 2; Barrier mybarr = new Barrier(num_threads); - System.out.println("DEBUG -> num_threads = " + num_threads); BiGraph graph = graph1.create(em.numNodes, em.numDegree, em.printResult, rand); long end0 = System.currentTimeMillis(); diff --git a/Robust/src/Benchmarks/Prefetch/Em3d/java/Node.java b/Robust/src/Benchmarks/Prefetch/Em3d/java/Node.java index 24201df6..abf7e5e1 100644 --- a/Robust/src/Benchmarks/Prefetch/Em3d/java/Node.java +++ b/Robust/src/Benchmarks/Prefetch/Em3d/java/Node.java @@ -66,7 +66,7 @@ public class Node { * @param degree the out degree of each node * @return a table containing all the nodes. **/ - public Node[] fillTable(int size, int degree, Random r) + public static Node[] fillTable(int size, int degree, Random r) { Node[] table = new Node[size]; -- 2.34.1