From e97465be181ef50b6c11a577c20ab3b07f30ddd3 Mon Sep 17 00:00:00 2001
From: jjenista <jjenista>
Date: Wed, 17 Nov 2010 20:14:32 +0000
Subject: [PATCH] allow each benchmark to use the master makefile but twiddle
 number of work threads independently, also default for RCR should be 24, the
 main thread should stall after dispatching workers, so 23 active workers and
 one stalled, plus the traverser core keeps all processors busy

---
 .../src/Benchmarks/oooJava/barneshut/makefile |  3 +
 .../oooJava/crypt/JGFCryptBench.java          |  6 +-
 Robust/src/Benchmarks/oooJava/crypt/makefile  |  3 +
 Robust/src/Benchmarks/oooJava/crypt/runp      |  2 +-
 Robust/src/Benchmarks/oooJava/crypt/runr      |  2 +-
 Robust/src/Benchmarks/oooJava/crypt/runs      |  1 +
 Robust/src/Benchmarks/oooJava/kmeans/makefile |  4 ++
 .../src/Benchmarks/oooJava/labyrinth/makefile |  3 +
 Robust/src/Benchmarks/oooJava/master-makefile |  4 +-
 .../src/Benchmarks/oooJava/mergesort/makefile | 66 +------------------
 Robust/src/Benchmarks/oooJava/moldyn/makefile |  3 +
 Robust/src/Benchmarks/oooJava/monte/makefile  |  3 +
 Robust/src/Benchmarks/oooJava/power/makefile  |  5 ++
 .../src/Benchmarks/oooJava/raytracer/makefile |  3 +
 Robust/src/Benchmarks/oooJava/sor/makefile    |  3 +
 .../src/Benchmarks/oooJava/tracking/makefile  |  3 +
 16 files changed, 45 insertions(+), 69 deletions(-)
 create mode 100755 Robust/src/Benchmarks/oooJava/crypt/runs

diff --git a/Robust/src/Benchmarks/oooJava/barneshut/makefile b/Robust/src/Benchmarks/oooJava/barneshut/makefile
index e6d5f5df..7757d8b7 100644
--- a/Robust/src/Benchmarks/oooJava/barneshut/makefile
+++ b/Robust/src/Benchmarks/oooJava/barneshut/makefile
@@ -2,4 +2,7 @@ PROGRAM=Barneshut
 
 SOURCE_FILES=Barneshut.java
 
+NUM_OOO_WORKERS=24
+NUM_RCR_WORKERS=24
+
 include ../master-makefile
diff --git a/Robust/src/Benchmarks/oooJava/crypt/JGFCryptBench.java b/Robust/src/Benchmarks/oooJava/crypt/JGFCryptBench.java
index 17273d6b..159a8da2 100644
--- a/Robust/src/Benchmarks/oooJava/crypt/JGFCryptBench.java
+++ b/Robust/src/Benchmarks/oooJava/crypt/JGFCryptBench.java
@@ -292,10 +292,12 @@ public class JGFCryptBench {
   }
 
   public void JGFkernel(){
-    long startT=System.currentTimeMillis();
+
     byte [] crypt1 =  new byte [array_rows];
     byte [] plain2 =  new byte [array_rows];
 
+    long startT=System.currentTimeMillis();
+
     int nW=nWorker;
     // Encrypt plain1.    
     int  slice, tslice, ttslice; 
@@ -386,7 +388,7 @@ public class JGFCryptBench {
     JGFCryptBench cb = new JGFCryptBench();
 
     int problem_size = 2;
-    int nWorker = 30;
+    int nWorker = 2;
     if (argv.length > 0) {
       problem_size = Integer.parseInt(argv[0]);
     }
diff --git a/Robust/src/Benchmarks/oooJava/crypt/makefile b/Robust/src/Benchmarks/oooJava/crypt/makefile
index da3e5246..63aa50ab 100644
--- a/Robust/src/Benchmarks/oooJava/crypt/makefile
+++ b/Robust/src/Benchmarks/oooJava/crypt/makefile
@@ -2,4 +2,7 @@ PROGRAM=JGFCryptBench
 
 SOURCE_FILES=JGFCryptBench.java
 
+NUM_OOO_WORKERS=24
+NUM_RCR_WORKERS=24
+
 include ../master-makefile
diff --git a/Robust/src/Benchmarks/oooJava/crypt/runp b/Robust/src/Benchmarks/oooJava/crypt/runp
index d55b263d..4a1a40d2 100755
--- a/Robust/src/Benchmarks/oooJava/crypt/runp
+++ b/Robust/src/Benchmarks/oooJava/crypt/runp
@@ -1 +1 @@
-time ./JGFCryptBenchp.bin
+time ./JGFCryptBenchp.bin 2 23
diff --git a/Robust/src/Benchmarks/oooJava/crypt/runr b/Robust/src/Benchmarks/oooJava/crypt/runr
index e398bb80..da656f2c 100755
--- a/Robust/src/Benchmarks/oooJava/crypt/runr
+++ b/Robust/src/Benchmarks/oooJava/crypt/runr
@@ -1 +1 @@
-time ./JGFCryptBenchr.bin
+time ./JGFCryptBenchr.bin 2 23
diff --git a/Robust/src/Benchmarks/oooJava/crypt/runs b/Robust/src/Benchmarks/oooJava/crypt/runs
new file mode 100755
index 00000000..e97045da
--- /dev/null
+++ b/Robust/src/Benchmarks/oooJava/crypt/runs
@@ -0,0 +1 @@
+time ./JGFCryptBenchs.bin 2 1
diff --git a/Robust/src/Benchmarks/oooJava/kmeans/makefile b/Robust/src/Benchmarks/oooJava/kmeans/makefile
index 525ca78f..1821aeb6 100644
--- a/Robust/src/Benchmarks/oooJava/kmeans/makefile
+++ b/Robust/src/Benchmarks/oooJava/kmeans/makefile
@@ -1,4 +1,5 @@
 PROGRAM=KMeans
+
 SOURCE_FILES=${PROGRAM}.java \
 	Random.java \
 	Cluster.java \
@@ -6,4 +7,7 @@ SOURCE_FILES=${PROGRAM}.java \
 	Common.java \
 	GlobalArgs.java 
 
+NUM_OOO_WORKERS=24
+NUM_RCR_WORKERS=24
+
 include ../master-makefile
diff --git a/Robust/src/Benchmarks/oooJava/labyrinth/makefile b/Robust/src/Benchmarks/oooJava/labyrinth/makefile
index f2b7f1ce..7d899770 100644
--- a/Robust/src/Benchmarks/oooJava/labyrinth/makefile
+++ b/Robust/src/Benchmarks/oooJava/labyrinth/makefile
@@ -2,4 +2,7 @@ PROGRAM=Labyrinth
 
 SOURCE_FILES=Coordinate.java CoordPathWrapper.java Grid.java Labyrinth.java List_Iter.java List_Node.java List_t.java Maze.java Pair.java Point.java Queue_Int.java Queue_t.java Router.java Solve_Arg.java Vector_t.java
 
+NUM_OOO_WORKERS=24
+NUM_RCR_WORKERS=24
+
 include ../master-makefile
diff --git a/Robust/src/Benchmarks/oooJava/master-makefile b/Robust/src/Benchmarks/oooJava/master-makefile
index 9a75c5aa..9fbb0480 100644
--- a/Robust/src/Benchmarks/oooJava/master-makefile
+++ b/Robust/src/Benchmarks/oooJava/master-makefile
@@ -32,8 +32,8 @@ USECOREPROF= #-coreprof $(COREPROFOVERFLOW) \
 	-coreprof-enable cpe_taskstallmem
 
 
-USEOOO= -ooojava 24 2 -ooodebug -squeue #-ooodebug-disable-task-mem-pool
-USERCR= -ooojava 23 2 -rcr -ooodebug -squeue
+USEOOO= -ooojava $(NUM_OOO_WORKERS) 2      -ooodebug -squeue #-ooodebug-disable-task-mem-pool
+USERCR= -ooojava $(NUM_RCR_WORKERS) 2 -rcr -ooodebug -squeue
 BSFLAGS= -64bit -mainclass $(PROGRAM)  -heapsize-mb 8000 -garbagestats -joptimize -noloop -optimize -debug #-nooptimize #src-after-pp #-debug
 
 DRELEASEMODE=-disjoint-release-mode -disjoint-dvisit-stack-callees-on-top -disjoint-alias-file aliases.txt tabbed
diff --git a/Robust/src/Benchmarks/oooJava/mergesort/makefile b/Robust/src/Benchmarks/oooJava/mergesort/makefile
index 62a41365..1f9262cc 100644
--- a/Robust/src/Benchmarks/oooJava/mergesort/makefile
+++ b/Robust/src/Benchmarks/oooJava/mergesort/makefile
@@ -2,67 +2,7 @@ PROGRAM=MergeSort4
 
 SOURCE_FILES=BMergeSort4.java
 
-BUILDSCRIPT=../../../buildscript
+NUM_OOO_WORKERS=64
+NUM_RCR_WORKERS=64
 
-COREPROFOVERFLOW= #-coreprof-checkoverflow
-USECOREPROF= #-coreprof $(COREPROFOVERFLOW) \
-	-coreprof-eventwords 1024*1024*128 \
-	-coreprof-enable cpe_main \
-	-coreprof-enable cpe_taskexecute \
-	-coreprof-enable cpe_taskdispatch \
-	-coreprof-enable cpe_rcr_traverse
-#	-coreprof-enable cpe_runmalloc \
-#	-coreprof-enable cpe_taskretire \
-	-coreprof-enable cpe_workschedsubmit \
-	-coreprof-enable cpe_workschedgrab \
-	-coreprof-enable cpe_poolalloc \
-	-coreprof-enable cpe_preparememq \
-	-coreprof-enable cpe_runfree \
-	-coreprof-enable cpe_count_poolalloc \
-	-coreprof-enable cpe_count_poolreuse \
-	-coreprof-enable cpe_taskstallvar \
-	-coreprof-enable cpe_taskstallmem
-
-
-USEOOO= -ooojava 64 2 -ooodebug -squeue #-ooodebug-disable-task-mem-pool
-USERCR= -ooojava 64 2 -rcr -ooodebug -squeue
-BSFLAGS= -64bit -mainclass $(PROGRAM)  -heapsize-mb 8000 -garbagestats -joptimize -noloop -optimize -debug #-nooptimize #src-after-pp #-debug
-
-DRELEASEMODE=-disjoint-release-mode -disjoint-dvisit-stack-callees-on-top -disjoint-alias-file aliases.txt tabbed
-DISJOINT= -disjoint -disjoint-k 1 -enable-assertions $(DRELEASEMODE) #-disjoint-desire-determinism
-
-default:
-	$(BUILDSCRIPT) -nojava $(BSFLAGS) $(USECOREPROF) $(USEOOO) $(DISJOINT) -o $(PROGRAM)p -builddir par  $(SOURCE_FILES)
-
-rcr-remake-c:
-	$(BUILDSCRIPT) -nojava $(BSFLAGS) $(USECOREPROF) $(USERCR) $(DISJOINT) -o $(PROGRAM)r -builddir rcr  $(SOURCE_FILES) 
-
-
-single: $(PROGRAM)s.bin
-
-$(PROGRAM)s.bin: $(SOURCE_FILES) ../master-makefile
-	$(BUILDSCRIPT) -thread $(BSFLAGS) $(USECOREPROF)                       -o $(PROGRAM)s -builddir sing $(SOURCE_FILES) 
-
-ooo: $(PROGRAM)p.bin
-
-$(PROGRAM)p.bin: $(SOURCE_FILES) ../master-makefile
-	$(BUILDSCRIPT)         $(BSFLAGS) $(USECOREPROF) $(USEOOO) $(DISJOINT) -o $(PROGRAM)p -builddir par  $(SOURCE_FILES) 
-
-rcr: $(PROGRAM)r.bin
-
-$(PROGRAM)r.bin: $(SOURCE_FILES) ../master-makefile
-	$(BUILDSCRIPT)         $(BSFLAGS) $(USECOREPROF) $(USERCR) $(DISJOINT) -o $(PROGRAM)r -builddir rcr  $(SOURCE_FILES) 
-
-clean:
-	rm -f  $(PROGRAM)p.bin $(PROGRAM)s.bin $(PROGRAM)r.bin
-	rm -fr par sing rcr
-	rm -f tmp.c
-	rm -f  *~
-	rm -f  *.dot
-	rm -f  *.png
-	rm -f  *.txt
-	rm -f  aliases.txt
-	rm -f  mlpReport*txt
-	rm -f  results*txt
-	rm -f coreprof.dat
-	rm -f trace.out
+include ../master-makefile
diff --git a/Robust/src/Benchmarks/oooJava/moldyn/makefile b/Robust/src/Benchmarks/oooJava/moldyn/makefile
index fb380f91..6ef3d563 100644
--- a/Robust/src/Benchmarks/oooJava/moldyn/makefile
+++ b/Robust/src/Benchmarks/oooJava/moldyn/makefile
@@ -2,4 +2,7 @@ PROGRAM=JGFMolDynBenchSizeB
 
 SOURCE_FILES=JGFMolDynBenchSizeB.java
 
+NUM_OOO_WORKERS=24
+NUM_RCR_WORKERS=24
+
 include ../master-makefile
diff --git a/Robust/src/Benchmarks/oooJava/monte/makefile b/Robust/src/Benchmarks/oooJava/monte/makefile
index e1df4cea..a2a80b79 100644
--- a/Robust/src/Benchmarks/oooJava/monte/makefile
+++ b/Robust/src/Benchmarks/oooJava/monte/makefile
@@ -2,4 +2,7 @@ PROGRAM=JGFMonteCarloBench
 
 SOURCE_FILES=JGFMonteCarloBench.java
 
+NUM_OOO_WORKERS=24
+NUM_RCR_WORKERS=24
+
 include ../master-makefile
diff --git a/Robust/src/Benchmarks/oooJava/power/makefile b/Robust/src/Benchmarks/oooJava/power/makefile
index 911f6a1f..b9bb768e 100644
--- a/Robust/src/Benchmarks/oooJava/power/makefile
+++ b/Robust/src/Benchmarks/oooJava/power/makefile
@@ -1,3 +1,8 @@
 PROGRAM=Power
+
 SOURCE_FILES=$(PROGRAM).java
+
+NUM_OOO_WORKERS=24
+NUM_RCR_WORKERS=24
+
 include ../master-makefile
diff --git a/Robust/src/Benchmarks/oooJava/raytracer/makefile b/Robust/src/Benchmarks/oooJava/raytracer/makefile
index 12a3832b..aa83639b 100644
--- a/Robust/src/Benchmarks/oooJava/raytracer/makefile
+++ b/Robust/src/Benchmarks/oooJava/raytracer/makefile
@@ -2,4 +2,7 @@ PROGRAM=test
 
 SOURCE_FILES=test.java
 
+NUM_OOO_WORKERS=24
+NUM_RCR_WORKERS=24
+
 include ../master-makefile
diff --git a/Robust/src/Benchmarks/oooJava/sor/makefile b/Robust/src/Benchmarks/oooJava/sor/makefile
index 9190cbd6..0da3eafe 100644
--- a/Robust/src/Benchmarks/oooJava/sor/makefile
+++ b/Robust/src/Benchmarks/oooJava/sor/makefile
@@ -2,4 +2,7 @@ PROGRAM=JGFSORBenchSizeD
 
 SOURCE_FILES=JGFSORBenchSizeD.java
 
+NUM_OOO_WORKERS=24
+NUM_RCR_WORKERS=24
+
 include ../master-makefile
diff --git a/Robust/src/Benchmarks/oooJava/tracking/makefile b/Robust/src/Benchmarks/oooJava/tracking/makefile
index 699be667..68232238 100644
--- a/Robust/src/Benchmarks/oooJava/tracking/makefile
+++ b/Robust/src/Benchmarks/oooJava/tracking/makefile
@@ -2,4 +2,7 @@ PROGRAM=TrackingBench
 
 SOURCE_FILES=TrackingBench.java
 
+NUM_OOO_WORKERS=24
+NUM_RCR_WORKERS=24
+
 include ../master-makefile
-- 
2.34.1