From: jjenista <jjenista>
Date: Thu, 18 Nov 2010 22:30:06 +0000 (+0000)
Subject: some tweaks to number of workers and workloads
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8ceb16e7cfddcf3700babd2bd7ce8b87a7206c3e;p=IRC.git

some tweaks to number of workers and workloads
---

diff --git a/Robust/src/Benchmarks/oooJava/buildall b/Robust/src/Benchmarks/oooJava/buildall
index 406f62a2..a93a13b7 100755
--- 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 63aa50ab..da05e665 100644
--- 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 d1c953a4..5834372e 100755
--- 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 1821aeb6..1c93d937 100644
--- 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 a2a80b79..7f152430 100644
--- 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 aa83639b..b6ebcc5e 100644
--- 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 ff882eb1..abed07c1 100755
--- 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 0da3eafe..81f32ad6 100644
--- 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 68232238..6d4c8c63 100644
--- 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