From 3ad66ca7d7382ac2d066fef4f4cc11787dda9203 Mon Sep 17 00:00:00 2001
From: jjenista <jjenista>
Date: Mon, 25 Oct 2010 23:28:26 +0000
Subject: [PATCH] OOO and RCR are speparate targets in the master makefile,
 added runp scripts for all benchmarks, time command included in runp's

---
 Robust/src/Benchmarks/oooJava/barneshut/runp        | 2 +-
 Robust/src/Benchmarks/oooJava/crypt/runp            | 1 +
 Robust/src/Benchmarks/oooJava/kmeans/runp           | 2 +-
 Robust/src/Benchmarks/oooJava/labyrinth/runp        | 6 +++---
 Robust/src/Benchmarks/oooJava/master-makefile       | 6 +++++-
 Robust/src/Benchmarks/oooJava/micro-master-makefile | 2 +-
 Robust/src/Benchmarks/oooJava/micro3/test.java      | 2 +-
 Robust/src/Benchmarks/oooJava/micro4/test.java      | 2 +-
 Robust/src/Benchmarks/oooJava/moldyn/runp           | 1 +
 Robust/src/Benchmarks/oooJava/monte/runp            | 1 +
 Robust/src/Benchmarks/oooJava/power/runp            | 1 +
 Robust/src/Benchmarks/oooJava/tracking/runp         | 1 +
 12 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100755 Robust/src/Benchmarks/oooJava/crypt/runp
 create mode 100755 Robust/src/Benchmarks/oooJava/moldyn/runp
 create mode 100755 Robust/src/Benchmarks/oooJava/monte/runp
 create mode 100755 Robust/src/Benchmarks/oooJava/power/runp
 create mode 100755 Robust/src/Benchmarks/oooJava/tracking/runp

diff --git a/Robust/src/Benchmarks/oooJava/barneshut/runp b/Robust/src/Benchmarks/oooJava/barneshut/runp
index fa638b0c..423d4c3a 100755
--- a/Robust/src/Benchmarks/oooJava/barneshut/runp
+++ b/Robust/src/Benchmarks/oooJava/barneshut/runp
@@ -1 +1 @@
-./Barneshutp.bin ./inputs/BarnesHut.in
+time ./Barneshutp.bin ./inputs/BarnesHut.in
diff --git a/Robust/src/Benchmarks/oooJava/crypt/runp b/Robust/src/Benchmarks/oooJava/crypt/runp
new file mode 100755
index 00000000..d55b263d
--- /dev/null
+++ b/Robust/src/Benchmarks/oooJava/crypt/runp
@@ -0,0 +1 @@
+time ./JGFCryptBenchp.bin
diff --git a/Robust/src/Benchmarks/oooJava/kmeans/runp b/Robust/src/Benchmarks/oooJava/kmeans/runp
index 3f8c2b8c..3b192ea8 100755
--- a/Robust/src/Benchmarks/oooJava/kmeans/runp
+++ b/Robust/src/Benchmarks/oooJava/kmeans/runp
@@ -1 +1 @@
-./KMeansp.bin -m 40 -n 40 -t 0.00001 -i inputs/random-n65536-d32-c16.txt -nthreads 1
+time ./KMeansp.bin -m 40 -n 40 -t 0.00001 -i inputs/random-n65536-d32-c16.txt -nthreads 1
diff --git a/Robust/src/Benchmarks/oooJava/labyrinth/runp b/Robust/src/Benchmarks/oooJava/labyrinth/runp
index 8002681a..65f1fb83 100755
--- a/Robust/src/Benchmarks/oooJava/labyrinth/runp
+++ b/Robust/src/Benchmarks/oooJava/labyrinth/runp
@@ -1,3 +1,3 @@
-#./Labyrinthp.bin -i ./inputs/random-x32-y32-z3-n64.txt
-#./Labyrinthp.bin -i ./inputs/random-x256-y256-z3-n256.txt
-./Labyrinthp.bin -w 24 -i ./inputs/random-x512-y512-z7-n512.txt
+#time ./Labyrinthp.bin -i ./inputs/random-x32-y32-z3-n64.txt
+#time ./Labyrinthp.bin -i ./inputs/random-x256-y256-z3-n256.txt
+time ./Labyrinthp.bin -w 24 -i ./inputs/random-x512-y512-z7-n512.txt
diff --git a/Robust/src/Benchmarks/oooJava/master-makefile b/Robust/src/Benchmarks/oooJava/master-makefile
index 14798a39..65f3b2ff 100644
--- a/Robust/src/Benchmarks/oooJava/master-makefile
+++ b/Robust/src/Benchmarks/oooJava/master-makefile
@@ -30,7 +30,8 @@ USECOREPROF= #-coreprof $(COREPROFOVERFLOW) \
 #	-coreprof-enable cpe_taskstallmem
 
 
-USEOOO= -ooojava 24 2 -rcr#-ooodebug-disable-task-mem-pool #-ooodebug 
+USEOOO= -ooojava 24 2  #-ooodebug #-rcr # -ooodebug-disable-task-mem-pool
+USERCR= -ooojava 24 2  -rcr
 BSFLAGS= -64bit -mainclass $(PROGRAM)  -heapsize-mb 8000 -garbagestats -joptimize -noloop -debug -nooptimize #src-after-pp #-debug
 
 DRELEASEMODE=-disjoint-release-mode -disjoint-dvisit-stack-callees-on-top -disjoint-alias-file aliases.txt tabbed
@@ -45,6 +46,9 @@ single:
 ooo:
 	$(BUILDSCRIPT)         $(BSFLAGS) $(USECOREPROF) $(USEOOO) $(DISJOINT) -o $(PROGRAM)p -builddir par  $(SOURCE_FILES) 
 
+rcr:
+	$(BUILDSCRIPT)         $(BSFLAGS) $(USECOREPROF) $(USERCR) $(DISJOINT) -o $(PROGRAM)p -builddir par  $(SOURCE_FILES) 
+
 clean:
 	rm -f  $(PROGRAM)p.bin $(PROGRAM)s.bin
 	rm -fr par sing
diff --git a/Robust/src/Benchmarks/oooJava/micro-master-makefile b/Robust/src/Benchmarks/oooJava/micro-master-makefile
index 1097466a..ea7663a4 100644
--- a/Robust/src/Benchmarks/oooJava/micro-master-makefile
+++ b/Robust/src/Benchmarks/oooJava/micro-master-makefile
@@ -33,7 +33,7 @@ USECOREPROF= -coreprof $(COREPROFOVERFLOW) \
 
 
 USEOOO= -ooojava 24 2 #-ooodebug-disable-task-mem-pool #-ooodebug 
-BSFLAGS= -64bit -mainclass $(PROGRAM)  -heapsize-mb 2000 -garbagestats -joptimize -noloop -optimize -debug #src-after-pp
+BSFLAGS= -64bit -mainclass $(PROGRAM)  -heapsize-mb 2000 -garbagestats -joptimize -noloop -debug #-debug-deque #-optimize src-after-pp
 
 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
diff --git a/Robust/src/Benchmarks/oooJava/micro3/test.java b/Robust/src/Benchmarks/oooJava/micro3/test.java
index 45dc4d45..2aab2a74 100644
--- a/Robust/src/Benchmarks/oooJava/micro3/test.java
+++ b/Robust/src/Benchmarks/oooJava/micro3/test.java
@@ -8,7 +8,7 @@ public class test {
 
   public static void main( String argv[] ) {
     
-    long count  = 5000;
+    long count  = 500;
     int  numFoo = 1000;
     
     if( argv.length > 0 ) {
diff --git a/Robust/src/Benchmarks/oooJava/micro4/test.java b/Robust/src/Benchmarks/oooJava/micro4/test.java
index 2acf70c3..c47a32b7 100644
--- a/Robust/src/Benchmarks/oooJava/micro4/test.java
+++ b/Robust/src/Benchmarks/oooJava/micro4/test.java
@@ -8,7 +8,7 @@ public class test {
 
   public static void main( String argv[] ) {
     
-    long count  = 5000;
+    long count  = 500;
     int  numFoo = 1000;
     
     if( argv.length > 0 ) {
diff --git a/Robust/src/Benchmarks/oooJava/moldyn/runp b/Robust/src/Benchmarks/oooJava/moldyn/runp
new file mode 100755
index 00000000..492543ee
--- /dev/null
+++ b/Robust/src/Benchmarks/oooJava/moldyn/runp
@@ -0,0 +1 @@
+time ./JGFMolDynBenchSizeBp.bin
diff --git a/Robust/src/Benchmarks/oooJava/monte/runp b/Robust/src/Benchmarks/oooJava/monte/runp
new file mode 100755
index 00000000..8acfa659
--- /dev/null
+++ b/Robust/src/Benchmarks/oooJava/monte/runp
@@ -0,0 +1 @@
+time ./JGFMonteCarloBenchp.bin
\ No newline at end of file
diff --git a/Robust/src/Benchmarks/oooJava/power/runp b/Robust/src/Benchmarks/oooJava/power/runp
new file mode 100755
index 00000000..bee8269f
--- /dev/null
+++ b/Robust/src/Benchmarks/oooJava/power/runp
@@ -0,0 +1 @@
+time ./Powerp.bin
\ No newline at end of file
diff --git a/Robust/src/Benchmarks/oooJava/tracking/runp b/Robust/src/Benchmarks/oooJava/tracking/runp
new file mode 100755
index 00000000..ef46089d
--- /dev/null
+++ b/Robust/src/Benchmarks/oooJava/tracking/runp
@@ -0,0 +1 @@
+time ./TrackingBenchp.bin
\ No newline at end of file
-- 
2.34.1