OOO and RCR are speparate targets in the master makefile, added runp scripts for...

diff --git a/Robust/src/Benchmarks/oooJava/barneshut/runp b/Robust/src/Benchmarks/oooJava/barneshut/runp
index fa638b0c40b50beac63fcea4b328c70f74f32d0d..423d4c3aa4af49f819b05668b49dfcef62baec82 100755 (executable)
--- 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 (executable)
index 0000000..d55b263
--- /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 3f8c2b8c811a2d3f6089d3a0b6e7f2cdc90f0f0c..3b192ea8674c8383769ad3d387d278f8e7e6c16d 100755 (executable)
--- 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 8002681af1cfec6c79d4eb5ab2b32d5d6ff48ccc..65f1fb8323c2cc1ea5b9b429cfe2e1574172eee5 100755 (executable)
--- 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 14798a398d1af3d97645e26043ceecc9c532cdcd..65f3b2ff53752b5af4ac083da1ed34b1989f1aca 100644 (file)
--- 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 1097466a7999edbecf08f06259c5b11d3105e548..ea7663a4a3037a232cf06de9de1c630b6cf2a23f 100644 (file)
--- 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 45dc4d4512cdd6cc1a2796ce5a7ff5abc5af02b0..2aab2a74d18e8257e8dc54fa339c461fdac00fab 100644 (file)
--- 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 2acf70c36c94da6b576e4bf1d6cce4d98ddafd66..c47a32b780d54462b34d7415a4e36ab554491183 100644 (file)
--- 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 (executable)
index 0000000..492543e
--- /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 (executable)
index 0000000..8acfa65
--- /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 (executable)
index 0000000..bee8269
--- /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 (executable)
index 0000000..ef46089
--- /dev/null
+++ b/Robust/src/Benchmarks/oooJava/tracking/runp
@@ -0,0 +1 @@
+time ./TrackingBenchp.bin
\ No newline at end of file