From 18f2cc2fb1c646f305483f6a10e9789ccc930104 Mon Sep 17 00:00:00 2001
From: yeom <yeom>
Date: Thu, 18 Nov 2010 06:30:52 +0000
Subject: [PATCH] provides 'corepin' flag for mergesort

---
 Robust/src/Benchmarks/oooJava/master-makefile    | 8 ++++----
 Robust/src/Benchmarks/oooJava/mergesort/makefile | 1 +
 Robust/src/Benchmarks/oooJava/mergesort/runr     | 2 +-
 Robust/src/Runtime/workschedule.c                | 1 -
 Robust/src/buildscript                           | 1 +
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Robust/src/Benchmarks/oooJava/master-makefile b/Robust/src/Benchmarks/oooJava/master-makefile
index 870f822f..38dd565b 100644
--- a/Robust/src/Benchmarks/oooJava/master-makefile
+++ b/Robust/src/Benchmarks/oooJava/master-makefile
@@ -13,7 +13,7 @@ BUILDSCRIPT=../../../buildscript
 
 
 COREPROFOVERFLOW= #-coreprof-checkoverflow
-USECOREPROF= -coreprof $(COREPROFOVERFLOW) \
+USECOREPROF= #-coreprof $(COREPROFOVERFLOW) \
 	-coreprof-eventwords 1024*1024*128 \
 	-coreprof-enable cpe_main \
 	-coreprof-enable cpe_taskexecute \
@@ -33,7 +33,7 @@ USECOREPROF= -coreprof $(COREPROFOVERFLOW) \
 
 
 USEOOO= -ooojava $(NUM_OOO_WORKERS) 2      -ooodebug -squeue #-ooodebug-disable-task-mem-pool
-USERCR= -ooojava $(NUM_RCR_WORKERS) 2 -rcr -ooodebug -squeue
+USERCR= -ooojava $(NUM_RCR_WORKERS) 2 -rcr -ooodebug -squeue 
 BSFLAGS= -64bit -mainclass $(PROGRAM)  -heapsize-mb 8000 -garbagestats -joptimize -noloop -optimize -debug #-nooptimize #src-after-pp #-debug
 
 DRELEASEMODE=-disjoint-release-mode -disjoint-dvisit-stack-callees-on-top -disjoint-alias-file aliases.txt tabbed
@@ -43,7 +43,7 @@ default:
 	$(BUILDSCRIPT) -nojava $(BSFLAGS) $(USECOREPROF) $(USEOOO) $(DISJOINT) -o $(PROGRAM)p -builddir par  $(SOURCE_FILES)
 
 rcr-remake-c:
-	$(BUILDSCRIPT) -nojava $(BSFLAGS) $(USECOREPROF) $(USERCR) $(DISJOINT) -o $(PROGRAM)r -builddir rcr  $(SOURCE_FILES) 
+	$(BUILDSCRIPT) -nojava $(COREPINFLAG) $(BSFLAGS) $(USECOREPROF) $(USERCR) $(DISJOINT) -o $(PROGRAM)r -builddir rcr  $(SOURCE_FILES) 
 
 
 single: $(PROGRAM)s.bin
@@ -59,7 +59,7 @@ $(PROGRAM)p.bin: $(SOURCE_FILES) ../master-makefile
 rcr: $(PROGRAM)r.bin
 
 $(PROGRAM)r.bin: $(SOURCE_FILES) ../master-makefile
-	$(BUILDSCRIPT)         $(BSFLAGS) $(USECOREPROF) $(USERCR) $(DISJOINT) -o $(PROGRAM)r -builddir rcr  $(SOURCE_FILES) 
+	$(BUILDSCRIPT)  $(COREPINFLAG) $(BSFLAGS) $(USECOREPROF) $(USERCR) $(DISJOINT) -o $(PROGRAM)r -builddir rcr  $(SOURCE_FILES) 
 
 clean:
 	rm -f  $(PROGRAM)p.bin $(PROGRAM)s.bin $(PROGRAM)r.bin
diff --git a/Robust/src/Benchmarks/oooJava/mergesort/makefile b/Robust/src/Benchmarks/oooJava/mergesort/makefile
index 1f9262cc..5ef57ae4 100644
--- a/Robust/src/Benchmarks/oooJava/mergesort/makefile
+++ b/Robust/src/Benchmarks/oooJava/mergesort/makefile
@@ -4,5 +4,6 @@ SOURCE_FILES=BMergeSort4.java
 
 NUM_OOO_WORKERS=64
 NUM_RCR_WORKERS=64
+COREPINFLAG=-corepin
 
 include ../master-makefile
diff --git a/Robust/src/Benchmarks/oooJava/mergesort/runr b/Robust/src/Benchmarks/oooJava/mergesort/runr
index 057ea4ce..73293372 100755
--- a/Robust/src/Benchmarks/oooJava/mergesort/runr
+++ b/Robust/src/Benchmarks/oooJava/mergesort/runr
@@ -1 +1 @@
-time ./MergeSort4r.bin 134217728 32
+time numactl --interleave=all ./MergeSort4r.bin 134217728 32
diff --git a/Robust/src/Runtime/workschedule.c b/Robust/src/Runtime/workschedule.c
index 01e0124d..b59151a0 100644
--- a/Robust/src/Runtime/workschedule.c
+++ b/Robust/src/Runtime/workschedule.c
@@ -370,7 +370,6 @@ void workScheduleInit( int numProcessors,
 			     workerMain,
 			     (void*) &(workerDataArray[idx])
 			     );
-    printf("assign %d on %d",idx,coreidx);
 
   }
 #endif
diff --git a/Robust/src/buildscript b/Robust/src/buildscript
index 12c75a56..f1ef1978 100755
--- a/Robust/src/buildscript
+++ b/Robust/src/buildscript
@@ -28,6 +28,7 @@ echo -ooodebug-disable-task-mem-pool this is a tricky module, disable for simple
 echo -mempool-detect-misuse turn on to find code misusing pool-allocated records
 echo -rcr turn on runtime conflict resolver
 echo -squeue use single queue
+echo -corepin use core pinning
 echo
 echo Disjoint Reachability Analysis options
 echo -disjoint enable analysis
-- 
2.34.1