a few little benchmark tweaks

diff --git a/Robust/src/Benchmarks/oooJava/crypt/runr b/Robust/src/Benchmarks/oooJava/crypt/runr
index da656f2c5e0df6fcc3910bfa498f60e200dc991a..d1c953a4f94e7b0e167982165db602f7e2fc4a52 100755 (executable)
--- a/Robust/src/Benchmarks/oooJava/crypt/runr
+++ b/Robust/src/Benchmarks/oooJava/crypt/runr
@@ -1 +1 @@
-time ./JGFCryptBenchr.bin 2 23
+./JGFCryptBenchr.bin 2 46

diff --git a/Robust/src/Benchmarks/oooJava/crypt/runs b/Robust/src/Benchmarks/oooJava/crypt/runs
index e97045da7f60b27e132f51fd5070c55e257a1d47..aa342a777730c5afeea406af5e207d2d8cb9ad54 100755 (executable)
--- a/Robust/src/Benchmarks/oooJava/crypt/runs
+++ b/Robust/src/Benchmarks/oooJava/crypt/runs
@@ -1 +1 @@
-time ./JGFCryptBenchs.bin 2 1
+./JGFCryptBenchs.bin 2 1

diff --git a/Robust/src/Benchmarks/oooJava/kmeans/runr b/Robust/src/Benchmarks/oooJava/kmeans/runr
new file mode 100755 (executable)
index 0000000..924daec
--- /dev/null
+++ b/Robust/src/Benchmarks/oooJava/kmeans/runr
@@ -0,0 +1 @@
+time ./KMeansr.bin -m 40 -n 40 -t 0.00001 -i inputs/random-n65536-d32-c16.txt -nthreads 1

diff --git a/Robust/src/Benchmarks/oooJava/master-makefile b/Robust/src/Benchmarks/oooJava/master-makefile
index 9fbb04800127c0ac122eb48371a5ab862ff2dfb3..8e84a30109aad4c7fde399b1049c4dc5de58b9d4 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/master-makefile
+++ b/Robust/src/Benchmarks/oooJava/master-makefile
@@ -18,8 +18,8 @@ USECOREPROF= #-coreprof $(COREPROFOVERFLOW) \
        -coreprof-enable cpe_main \
        -coreprof-enable cpe_taskexecute \
        -coreprof-enable cpe_taskdispatch \
-       -coreprof-enable cpe_runmalloc \
        -coreprof-enable cpe_rcr_traverse
+#      -coreprof-enable cpe_runmalloc \
 #      -coreprof-enable cpe_taskretire \
        -coreprof-enable cpe_workschedsubmit \
        -coreprof-enable cpe_workschedgrab \

diff --git a/Robust/src/Benchmarks/oooJava/power/Power.java b/Robust/src/Benchmarks/oooJava/power/Power.java
index deab92a3fea3a2cb5e139ec84e3e246273aff9a5..33dde4823a944471f225e8053332c23a7676fe81 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/power/Power.java
+++ b/Robust/src/Benchmarks/oooJava/power/Power.java
@@ -35,7 +35,7 @@ public class Power {
         **/
        public static void main(String args[]) {
 
-               boolean printResults = true;
+               boolean printResults = false;
                boolean printMsgs =true;
                // the input size is fixed, but the user may want the result printed
                // parseCmdLine(args);
@@ -43,7 +43,10 @@ public class Power {
                // initial pass
                long start0 = System.currentTimeMillis();
 //             Root r = new Root(10, 20, 5, 10);
-               Root r = new Root(24, 18, 5, 10);
+//             Root r = new Root(24, 18, 5, 10);
+//             Root r = new Root(22, 20, 5, 10);
+               Root r = new Root(21, 20, 5, 10);
+//             Root r = new Root(20, 20, 5, 10);
                long end0 = System.currentTimeMillis();
 
                long start1 = System.currentTimeMillis();

diff --git a/Robust/src/Benchmarks/oooJava/power/makefile b/Robust/src/Benchmarks/oooJava/power/makefile
index b9bb768ee8b216adf11cd171afea4802b7aa5ed9..36ae01ed08d7dbbed47b3e7d351e9a269956665a 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/power/makefile
+++ b/Robust/src/Benchmarks/oooJava/power/makefile
@@ -3,6 +3,6 @@ PROGRAM=Power
 SOURCE_FILES=$(PROGRAM).java
 
 NUM_OOO_WORKERS=24
-NUM_RCR_WORKERS=24
+NUM_RCR_WORKERS=23
 
 include ../master-makefile

diff --git a/Robust/src/Benchmarks/oooJava/power/runr b/Robust/src/Benchmarks/oooJava/power/runr
index 7a13f26a6df6e1e3877eddb001e8363ec4f7d1d2..365ff3492d48654e7a880ef489058225438ff4e0 100755 (executable)
--- a/Robust/src/Benchmarks/oooJava/power/runr
+++ b/Robust/src/Benchmarks/oooJava/power/runr
@@ -1 +1 @@
-time ./Powerr.bin
\ No newline at end of file
+./Powerr.bin
\ No newline at end of file

diff --git a/Robust/src/Benchmarks/oooJava/power/runs b/Robust/src/Benchmarks/oooJava/power/runs
new file mode 100755 (executable)
index 0000000..b733be3
--- /dev/null
+++ b/Robust/src/Benchmarks/oooJava/power/runs
@@ -0,0 +1 @@
+./Powers.bin
\ No newline at end of file

diff --git a/Robust/src/Benchmarks/oooJava/raytracer/runr b/Robust/src/Benchmarks/oooJava/raytracer/runr
new file mode 100755 (executable)
index 0000000..b95fd04
--- /dev/null
+++ b/Robust/src/Benchmarks/oooJava/raytracer/runr
@@ -0,0 +1,2 @@
+#!/bin/bash
+time ./testr.bin 1

diff --git a/Robust/src/Benchmarks/oooJava/tracking/TrackingBench.java b/Robust/src/Benchmarks/oooJava/tracking/TrackingBench.java
index a0b89d3499f80c742190ff76d71d9e6f355e7b72..8cbc3f074f6653b417ebb960dbd1e1a472457593 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/tracking/TrackingBench.java
+++ b/Robust/src/Benchmarks/oooJava/tracking/TrackingBench.java
@@ -1,7 +1,8 @@
 public class TrackingBench {
 
   public static void main(String args[]) {
-    int nump = 32; //32; // 60;
+    //int nump = 32; //32; // 60;
+    int nump = 22;
     TrackDemo tdmo = new TrackDemo(nump);
     tdmo.run();
   }

diff --git a/Robust/src/Benchmarks/oooJava/tracking/runr b/Robust/src/Benchmarks/oooJava/tracking/runr
new file mode 100755 (executable)
index 0000000..359120f
--- /dev/null
+++ b/Robust/src/Benchmarks/oooJava/tracking/runr
@@ -0,0 +1 @@
+time ./TrackingBenchr.bin
\ No newline at end of file