some tweaks to number of workers and workloads

diff --git a/Robust/src/Benchmarks/oooJava/buildall b/Robust/src/Benchmarks/oooJava/buildall
index 406f62a2efb9e191836d47f67cf65c9642fbcd2f..a93a13b7f349c2eee80c8ee7344c0ea996b12e69 100755 (executable)
--- a/Robust/src/Benchmarks/oooJava/buildall
+++ b/Robust/src/Benchmarks/oooJava/buildall
@@ -2,6 +2,7 @@
 CUR=`pwd`
 for i in *
 do
+cd $i
 make rcr > rcrlog &
 make single > singlelog &
 cd $CUR

diff --git a/Robust/src/Benchmarks/oooJava/crypt/makefile b/Robust/src/Benchmarks/oooJava/crypt/makefile
index 63aa50aba951fc68e49db0f1619c1f6471eb2141..da05e66521901c02bb7b1767873a10e17deb5bcd 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/crypt/makefile
+++ b/Robust/src/Benchmarks/oooJava/crypt/makefile
@@ -3,6 +3,6 @@ PROGRAM=JGFCryptBench
 SOURCE_FILES=JGFCryptBench.java
 
 NUM_OOO_WORKERS=24
-NUM_RCR_WORKERS=24
+NUM_RCR_WORKERS=23
 
 include ../master-makefile

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

diff --git a/Robust/src/Benchmarks/oooJava/kmeans/makefile b/Robust/src/Benchmarks/oooJava/kmeans/makefile
index 1821aeb69af102debb4588cd04c345a1d2918e18..1c93d937982e44e2d22f1c00a6336d39a1a1b2eb 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/kmeans/makefile
+++ b/Robust/src/Benchmarks/oooJava/kmeans/makefile
@@ -8,6 +8,6 @@ SOURCE_FILES=${PROGRAM}.java \
        GlobalArgs.java 
 
 NUM_OOO_WORKERS=24
-NUM_RCR_WORKERS=24
+NUM_RCR_WORKERS=23
 
 include ../master-makefile

diff --git a/Robust/src/Benchmarks/oooJava/monte/makefile b/Robust/src/Benchmarks/oooJava/monte/makefile
index a2a80b792992360298beffb5a75870f0b78cb20b..7f152430865506457d0704cd56525d42f3f4774f 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/monte/makefile
+++ b/Robust/src/Benchmarks/oooJava/monte/makefile
@@ -3,6 +3,6 @@ PROGRAM=JGFMonteCarloBench
 SOURCE_FILES=JGFMonteCarloBench.java
 
 NUM_OOO_WORKERS=24
-NUM_RCR_WORKERS=24
+NUM_RCR_WORKERS=23
 
 include ../master-makefile

diff --git a/Robust/src/Benchmarks/oooJava/raytracer/makefile b/Robust/src/Benchmarks/oooJava/raytracer/makefile
index aa83639bc387bdf7938f8742457da3e580e8e53d..b6ebcc5e67c1539048d4464034a5019842c34d74 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/raytracer/makefile
+++ b/Robust/src/Benchmarks/oooJava/raytracer/makefile
@@ -3,6 +3,6 @@ PROGRAM=test
 SOURCE_FILES=test.java
 
 NUM_OOO_WORKERS=24
-NUM_RCR_WORKERS=24
+NUM_RCR_WORKERS=23
 
 include ../master-makefile

diff --git a/Robust/src/Benchmarks/oooJava/runall b/Robust/src/Benchmarks/oooJava/runall
index ff882eb10fe488f92a03aee04dc695006854a3d4..abed07c10911021376a0c68f755b2d67fb6dea42 100755 (executable)
--- a/Robust/src/Benchmarks/oooJava/runall
+++ b/Robust/src/Benchmarks/oooJava/runall
@@ -2,6 +2,7 @@
 CUR=`pwd`
 for i in *
 do
+if [ -d "$i" ] ; then
 echo ENTERING $i
 cd $i
 for p in run*
@@ -13,4 +14,5 @@ do
 done
 done
 cd $CUR
+fi
 done
\ No newline at end of file

diff --git a/Robust/src/Benchmarks/oooJava/sor/makefile b/Robust/src/Benchmarks/oooJava/sor/makefile
index 0da3eafe454d711213d9c5d2f8e0bc36ba73fc54..81f32ad64c05ca67d9836025d5a9a4d389ab83a5 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/sor/makefile
+++ b/Robust/src/Benchmarks/oooJava/sor/makefile
@@ -3,6 +3,7 @@ PROGRAM=JGFSORBenchSizeD
 SOURCE_FILES=JGFSORBenchSizeD.java
 
 NUM_OOO_WORKERS=24
-NUM_RCR_WORKERS=24
+NUM_RCR_WORKERS=23
+COREPINFLAG=-corepin
 
 include ../master-makefile

diff --git a/Robust/src/Benchmarks/oooJava/tracking/makefile b/Robust/src/Benchmarks/oooJava/tracking/makefile
index 68232238ec5d97f8b1bbfbad3057248cd7beff12..6d4c8c633542bfc31f0210b50ae600a1acf1ad12 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/tracking/makefile
+++ b/Robust/src/Benchmarks/oooJava/tracking/makefile
@@ -3,6 +3,6 @@ PROGRAM=TrackingBench
 SOURCE_FILES=TrackingBench.java
 
 NUM_OOO_WORKERS=24
-NUM_RCR_WORKERS=24
+NUM_RCR_WORKERS=23
 
 include ../master-makefile