allow each benchmark to use the master makefile but twiddle number of work threads...

diff --git a/Robust/src/Benchmarks/oooJava/barneshut/makefile b/Robust/src/Benchmarks/oooJava/barneshut/makefile
index e6d5f5df8e9460c53d2c973715a40ab5b27ec178..7757d8b7073038bdb9f47a1b59dee0f66fb92d80 100644 (file)
--- 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 17273d6b0bd5cbecb0f2f36ab1759b2838bf3094..159a8da26cce8c2f14b804abeccef049be880b3d 100644 (file)
--- 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 da3e5246cbbdbd647b5e9d6bea75206a13b219d3..63aa50aba951fc68e49db0f1619c1f6471eb2141 100644 (file)
--- 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 d55b263db1adbcad69becb5a4a526636efc20988..4a1a40d2a1733caad44e85297b484a0e3b127543 100755 (executable)
--- 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 e398bb80f265338e9086b02c9a3f7b0699d3fcfe..da656f2c5e0df6fcc3910bfa498f60e200dc991a 100755 (executable)
--- 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 (executable)
index 0000000..e97045d
--- /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 525ca78f10bb9be33be81e2ef884c364e797ba6a..1821aeb69af102debb4588cd04c345a1d2918e18 100644 (file)
--- 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 f2b7f1ce84188bd75ca20930eba99f95e72e4caf..7d89977006874789c8cf7a79f13169e1774eb22c 100644 (file)
--- 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 9a75c5aa52975a94d5df14c49b220294bc893d3d..9fbb04800127c0ac122eb48371a5ab862ff2dfb3 100644 (file)
--- 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 62a41365963c0130f891a4ae341e56a6f4262f0e..1f9262cc37c6778ceeae6dd8fba3ae58a754e16b 100644 (file)
--- 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 fb380f91925507b8d84d33c0ae9502e2d06e796b..6ef3d5634b2aa30856261dd0474c2957d8690a53 100644 (file)
--- 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 e1df4ceae62423c7e537846e1828a5c24448d39e..a2a80b792992360298beffb5a75870f0b78cb20b 100644 (file)
--- 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 911f6a1f1907f7d3e505721dcaa10aeb7c17bf6d..b9bb768ee8b216adf11cd171afea4802b7aa5ed9 100644 (file)
--- 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 12a3832be8bfb5663401b7ca229d33f1aacc8469..aa83639bc387bdf7938f8742457da3e580e8e53d 100644 (file)
--- 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 9190cbd600e43ebd89e766b98438cfeb5295e285..0da3eafe454d711213d9c5d2f8e0bc36ba73fc54 100644 (file)
--- 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 699be6677f9587ac696e9463136d29b41f3d3941..68232238ec5d97f8b1bbfbad3057248cd7beff12 100644 (file)
--- 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