some tweaks to number of workers and workloads

[IRC.git] / Robust / src / Benchmarks / oooJava / sor / makefile

diff --git a/Robust/src/Benchmarks/oooJava/sor/makefile b/Robust/src/Benchmarks/oooJava/sor/makefile
index a995ca8e1c9400af76f8031798040bd21e68d9f7..81f32ad64c05ca67d9836025d5a9a4d389ab83a5 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/sor/makefile
+++ b/Robust/src/Benchmarks/oooJava/sor/makefile
@@ -2,49 +2,8 @@ PROGRAM=JGFSORBenchSizeD
 
 SOURCE_FILES=JGFSORBenchSizeD.java
 
-BUILDSCRIPT=../../../buildscript
+NUM_OOO_WORKERS=24
+NUM_RCR_WORKERS=23
+COREPINFLAG=-corepin
 
-
-COREPROFOVERFLOW= #-coreprof-checkoverflow
-USECOREPROF= -coreprof $(COREPROFOVERFLOW) \
-       -coreprof-eventwords 1024*1024*128 \
-       -coreprof-enable cpe_main \
-       -coreprof-enable cpe_taskdispatch
-#      -coreprof-enable cpe_runmalloc \
-#      -coreprof-enable cpe_runfree \
-#      -coreprof-enable cpe_count_poolalloc \
-#      -coreprof-enable cpe_count_poolreuse \
-#      -coreprof-enable cpe_workschedgrab \
-#      -coreprof-enable cpe_taskexecute \
-#      -coreprof-enable cpe_taskretire \
-#      -coreprof-enable cpe_taskstallvar \
-#      -coreprof-enable cpe_taskstallmem
-
-
-USEOOO= -ooojava 24 2  -ooodebug -ooodebug-disable-task-mem-pool 
-BSFLAGS= -64bit -mainclass $(PROGRAM)  -heapsize-mb 1024 -garbagestats -debug -joptimize -noloop -optimize 
-
-DRELEASEMODE=-disjoint-release-mode -disjoint-alias-file aliases.txt tabbed
-DISJOINT= -disjoint -disjoint-k 1 -enable-assertions $(DRELEASEMODE) #-disjoint-desire-determinism
-
-default:
-       $(BUILDSCRIPT) -nojava $(BSFLAGS) $(USECOREPROF) $(USEOOO) $(DISJOINT) -o $(PROGRAM)p -builddir par  $(SOURCE_FILES)
-
-single:
-       $(BUILDSCRIPT) -thread $(BSFLAGS) $(USECOREPROF)                       -o $(PROGRAM)s -builddir sing $(SOURCE_FILES) 
-
-ooo:
-       $(BUILDSCRIPT)         $(BSFLAGS) $(USECOREPROF) $(USEOOO) $(DISJOINT) -o $(PROGRAM)p -builddir par  $(SOURCE_FILES) 
-
-clean:
-       rm -f  $(PROGRAM)p.bin $(PROGRAM)s.bin
-       rm -fr par sing
-       rm -f  *~
-       rm -f  *.dot
-       rm -f  *.png
-       rm -f  *.txt
-       rm -f  aliases.txt
-       rm -f  mlpReport*txt
-       rm -f  results*txt
-       rm -f coreprof.dat
-       rm -f trace.out
+include ../master-makefile