more changes

diff --git a/Robust/src/Benchmarks/Prefetch/2DFFT/dsm/Makefile b/Robust/src/Benchmarks/Prefetch/2DFFT/dsm/Makefile
index 78ec58bbdf9391ae9661e37a65bcf8aaf5ac02be..9bbd183a80b9dd96033210bb422e2c18431b0b5b 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/2DFFT/dsm/Makefile
+++ b/Robust/src/Benchmarks/Prefetch/2DFFT/dsm/Makefile
@@ -8,21 +8,6 @@ FLAGS1=-dsm -optimize -mainclass ${MAINCLASS}
 default:
        ../../../../buildscript ${FLAGS1} ${SRC} -o ${MAINCLASS}NPNC
        ../../../../buildscript ${FLAGS} ${SRC} -o ${MAINCLASS}N
-       cp ${MAINCLASS}NPNC.bin ${MAINCLASS}1NPNC.bin
-       cp ${MAINCLASS}NPNC.bin ${MAINCLASS}2NPNC.bin
-       cp ${MAINCLASS}N.bin ${MAINCLASS}2.bin
-       cp ${MAINCLASS}NPNC.bin ${MAINCLASS}3NPNC.bin
-       cp ${MAINCLASS}N.bin ${MAINCLASS}3.bin
-       cp ${MAINCLASS}NPNC.bin ${MAINCLASS}4NPNC.bin
-       cp ${MAINCLASS}N.bin ${MAINCLASS}4.bin
-       cp ${MAINCLASS}NPNC.bin ${MAINCLASS}5NPNC.bin
-       cp ${MAINCLASS}N.bin ${MAINCLASS}5.bin
-       cp ${MAINCLASS}NPNC.bin ${MAINCLASS}6NPNC.bin
-       cp ${MAINCLASS}N.bin ${MAINCLASS}6.bin
-       cp ${MAINCLASS}NPNC.bin ${MAINCLASS}7NPNC.bin
-       cp ${MAINCLASS}N.bin ${MAINCLASS}7.bin
-       cp ${MAINCLASS}NPNC.bin ${MAINCLASS}8NPNC.bin
-       cp ${MAINCLASS}N.bin ${MAINCLASS}8.bin
 
 clean:
        rm -rf tmpbuilddirectory

diff --git a/Robust/src/Benchmarks/Prefetch/SOR/dsm/makefile b/Robust/src/Benchmarks/Prefetch/SOR/dsm/makefile
index 3ac0be0d1f620150525b2c89d5f4db1c8ddf9141..dcdf36fdacd090986f4ada0af7273558aec27c37 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/SOR/dsm/makefile
+++ b/Robust/src/Benchmarks/Prefetch/SOR/dsm/makefile
@@ -1,6 +1,6 @@
 #MAINCLASS=JGFSORBenchSizeA
 #MAINCLASS=JGFSORBenchSizeC
-MAINCLASS=JGFSORBenchSizeD
+MAINCLASS=JGFSORBenchSizeC
 SRC=${MAINCLASS}.java \
        JGFSORBench.java \
        JGFInstrumentor.java \

diff --git a/Robust/src/Benchmarks/Prefetch/SOR/javasingle/makefile b/Robust/src/Benchmarks/Prefetch/SOR/javasingle/makefile
index c59ceff51fb1c68ebf93303b5d3a817a7cb99d57..17b868588f2c95e7832bdf30bd4e55747401da69 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/SOR/javasingle/makefile
+++ b/Robust/src/Benchmarks/Prefetch/SOR/javasingle/makefile
@@ -1,4 +1,4 @@
-MAINCLASS=JGFMolDynBenchSizeD
+MAINCLASS=JGFMolDynBenchSizeC
 SRC=${MAINCLASS}.java \
 JGFInstrumentor.java \
 JGFTimer.java \

diff --git a/Robust/src/Benchmarks/Prefetch/run.sh b/Robust/src/Benchmarks/Prefetch/run.sh
index beb7756bd9f4158f06d2a4c26a3c8b734bedc6df..fc000ede35c511678e57aece0cd7f3ab182537e7 100755 (executable)
--- a/Robust/src/Benchmarks/Prefetch/run.sh
+++ b/Robust/src/Benchmarks/Prefetch/run.sh
@@ -1,13 +1,8 @@
 #!/bin/sh 
 
 #set -x
-MACHINES2='dw-11.eecs.uci.edu'
-MACHINES3='dw-11.eecs.uci.edu dw-12.eecs.uci.edu'
-MACHINES4='dw-11.eecs.uci.edu dw-12.eecs.uci.edu dw-13.eecs.uci.edu'
-MACHINES5='dw-11.eecs.uci.edu dw-12.eecs.uci.edu dw-13.eecs.uci.edu dw-14.eecs.uci.edu'
-MACHINES6='dw-11.eecs.uci.edu dw-12.eecs.uci.edu dw-13.eecs.uci.edu dw-14.eecs.uci.edu dw-15.eecs.uci.edu'
-MACHINES7='dw-11.eecs.uci.edu dw-12.eecs.uci.edu dw-13.eecs.uci.edu dw-14.eecs.uci.edu dw-15.eecs.uci.edu dw-16.eecs.uci.edu'
-MACHINES8='dw-11.eecs.uci.edu dw-12.eecs.uci.edu dw-13.eecs.uci.edu dw-14.eecs.uci.edu dw-15.eecs.uci.edu dw-16.eecs.uci.edu dw-17.eecs.uci.edu'
+MACHINELIST='dc-1.calit2.uci.edu dc-2.calit2.uci.edu dc-3.calit2.uci.edu dc-4.calit2.uci.edu dc-5.calit2.uci.edu dc-6.calit2.uci.edu dc-7.calit2.uci.edu dc-8.calit2.uci.edu'
+
 LOGDIR=/home/adash/research/Robust/src/Benchmarks/Prefetch/runlog
 TOPDIR=`pwd`
 
@@ -17,33 +12,35 @@ function run {
   while [ $i -lt $1 ]; do
     echo "$DIR" > ~/.tmpdir
     echo "bin=$3" > ~/.tmpvars
+    ct=0
+    MACHINES=''
+    for j in $MACHINELIST; do
+      if [ $ct -lt $2 ]; then
+         MACHINES='$MACHINES $j'
+      fi
+      let ct=$ct+1
+    done
+
     if [ $2 -eq 2 ]; then 
       arg=$ARGS2
-      MACHINES=$MACHINES2
     fi
     if [ $2 -eq 3 ]; then 
       arg=$ARGS3
-      MACHINES=$MACHINES3
     fi
     if [ $2 -eq 4 ]; then 
       arg=$ARGS4
-      MACHINES=$MACHINES4
     fi
     if [ $2 -eq 5 ]; then 
       arg=$ARGS5
-      MACHINES=$MACHINES5
     fi
     if [ $2 -eq 6 ]; then 
       arg=$ARGS6
-      MACHINES=$MACHINES6
     fi
     if [ $2 -eq 7 ]; then 
       arg=$ARGS7
-      MACHINES=$MACHINES7
     fi
     if [ $2 -eq 8 ]; then 
       arg=$ARGS8
-      MACHINES=$MACHINES8
     fi
     chmod +x ~/.tmpvars
     for machine in `echo $MACHINES`