From 527aeeb7645656f8e1a9c2f7cdbb34161aa4c0c3 Mon Sep 17 00:00:00 2001
From: adash <adash>
Date: Tue, 10 Feb 2009 23:33:09 +0000
Subject: [PATCH] bug fix and latest changes to LookUpService

---
 .../Distributed/LookUpService/dsm/LookUpService.java       | 2 +-
 .../src/Benchmarks/Distributed/LookUpService/dsm/makefile  | 3 ++-
 Robust/src/Benchmarks/Prefetch/bm.txt                      | 4 +++-
 Robust/src/Benchmarks/Prefetch/run.sh                      | 7 +++++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Robust/src/Benchmarks/Distributed/LookUpService/dsm/LookUpService.java b/Robust/src/Benchmarks/Distributed/LookUpService/dsm/LookUpService.java
index c3b10680..850f6e40 100644
--- a/Robust/src/Benchmarks/Distributed/LookUpService/dsm/LookUpService.java
+++ b/Robust/src/Benchmarks/Distributed/LookUpService/dsm/LookUpService.java
@@ -33,7 +33,7 @@ public class LookUpService extends Thread {
   public LookUpService() {
   }
 
-  public LookUpService(DistributedHashMap dmap, int threadid, int numthreads, int nobjs, int numtrans, int rdprob, int nLookUps) {
+  public LookUpService(DistributedHashMap dmap, int threadid, int numthreads, int nobjs, int numtrans, int rdprob, int nLookUp) {
     mydhmap = dmap;
     this.threadid = threadid;
     this.numthreads = numthreads;
diff --git a/Robust/src/Benchmarks/Distributed/LookUpService/dsm/makefile b/Robust/src/Benchmarks/Distributed/LookUpService/dsm/makefile
index 49cd0c4f..4101a7a1 100644
--- a/Robust/src/Benchmarks/Distributed/LookUpService/dsm/makefile
+++ b/Robust/src/Benchmarks/Distributed/LookUpService/dsm/makefile
@@ -4,11 +4,12 @@ SRC1=${MAINCLASS}.java \
 FLAGS1=-dsm -dsmcaching -rangeprefetch -optimize -mainclass ${MAINCLASS} -trueprob 0.90
 FLAGS2=-dsm -dsmcaching -prefetch -optimize -excprefetch String.hashCode -excprefetch DistributedHashMap.resize -excprefetch String.equals -excprefetch LookUpService.main -mainclass ${MAINCLASS} -trueprob 0.90
 FLAGS3=-dsm -optimize -mainclass ${MAINCLASS}
+FLAGS4=-dsm -dsmcaching -optimize -mainclass ${MAINCLASS}
 default:
 	../../../../buildscript ${FLAGS3} -o ${MAINCLASS}NPNC ${SRC1}
 	../../../../buildscript ${FLAGS2} -o ${MAINCLASS}N ${SRC1}
 	../../../../buildscript ${FLAGS1} -o ${MAINCLASS}RangeN ${SRC1}
-
+	../../../../buildscript ${FLAGS4} -o ${MAINCLASS}NPC ${SRC1}
 clean:
 	rm -rf tmpbuilddirectory
 	rm *.bin
diff --git a/Robust/src/Benchmarks/Prefetch/bm.txt b/Robust/src/Benchmarks/Prefetch/bm.txt
index deaf47b8..695a43d8 100644
--- a/Robust/src/Benchmarks/Prefetch/bm.txt
+++ b/Robust/src/Benchmarks/Prefetch/bm.txt
@@ -22,4 +22,6 @@ Convolution:2DConv/dsm:1 16000:2 16000:3 16000:4 16000:5 16000:6 16000:7 16000:8
 Convolution:2DConv/dsm:1 2048:2 2048:3 2048:4 2048:5 2048:6 2048:7 2048:8 2048:20482dconv
 Convolution:2DConv/dsm:1 1024:2 1024:3 1024:4 1024:5 1024:6 1024:7 1024:8 1024:10242dconv
 Convolution:2DConv/dsm:1 6000:2 6000:3 6000:4 6000:5 6000:6 6000:7 6000:8 6000:60002dconv
-LookUpService:../Distributed/LookUpService:1:2:3:4:5:6:7:8:lookup
+LookUpService:../Distributed/LookUpService/dsm:-N 1 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 80:-N 2 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 80:-N 3 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 80:-N 4 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 80:-N 5 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 80:-N 6 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 80:-N 7 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 80:-N 8 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 80:80lookup
+LookUpService:../Distributed/LookUpService/dsm:-N 1 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 1000:-N 2 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 1000:-N 3 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 1000:-N 4 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 1000:-N 5 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 1000:-N 6 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 1000:-N 7 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 1000:-N 8 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 1000:1000lookup
+
diff --git a/Robust/src/Benchmarks/Prefetch/run.sh b/Robust/src/Benchmarks/Prefetch/run.sh
index e1c21521..d5c32a94 100755
--- a/Robust/src/Benchmarks/Prefetch/run.sh
+++ b/Robust/src/Benchmarks/Prefetch/run.sh
@@ -2,7 +2,8 @@
 
 #set -x
 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'
-benchmarks='lookup 40962dconv 1200mmver moldynverB'
+#benchmarks='40962dconv 1200mmver moldynverB'
+benchmarks='80lookup'
 
 LOGDIR=~/research/Robust/src/Benchmarks/Prefetch/runlog
 TOPDIR=`pwd`
@@ -110,7 +111,7 @@ function localrun {
 
 function callrun {
   PREFETCH=${BENCHMARK}N.bin
-  NONPREFETCH=${BENCHMARK}NP.bin
+  NONPREFETCH=${BENCHMARK}NPC.bin
   NONPREFETCH_NONCACHE=${BENCHMARK}NPNC.bin
 
   cd $BMDIR 
@@ -130,6 +131,8 @@ for count in 2 4 6 8
 do
 echo "------- Running $count threads $BMDIR non-prefetch + non-cache on $count machines -----"
 run 1 $count $NONPREFETCH_NONCACHE
+echo "------- Running $count threads $BMDIR non-prefetch on $count machines -----"
+run 1 $count $NONPREFETCH
 echo "------- Running $count threads $BMDIR prefetch on $count machines -----"
 run 1 $count $PREFETCH
 done
-- 
2.34.1