moldyn: increases workload per parallel task

mergesort: provides its own makefile to tune the number of worker

diff --git a/Robust/src/Benchmarks/oooJava/mergesort/makefile b/Robust/src/Benchmarks/oooJava/mergesort/makefile
index 3e5cd043f5e34f146d34c9082e3cdb28c48533fa..62a41365963c0130f891a4ae341e56a6f4262f0e 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/mergesort/makefile
+++ b/Robust/src/Benchmarks/oooJava/mergesort/makefile
@@ -2,4 +2,67 @@ PROGRAM=MergeSort4
 
 SOURCE_FILES=BMergeSort4.java
 
-include ../master-makefile
+BUILDSCRIPT=../../../buildscript
+
+COREPROFOVERFLOW= #-coreprof-checkoverflow
+USECOREPROF= #-coreprof $(COREPROFOVERFLOW) \
+       -coreprof-eventwords 1024*1024*128 \
+       -coreprof-enable cpe_main \
+       -coreprof-enable cpe_taskexecute \
+       -coreprof-enable cpe_taskdispatch \
+       -coreprof-enable cpe_rcr_traverse
+#      -coreprof-enable cpe_runmalloc \
+#      -coreprof-enable cpe_taskretire \
+       -coreprof-enable cpe_workschedsubmit \
+       -coreprof-enable cpe_workschedgrab \
+       -coreprof-enable cpe_poolalloc \
+       -coreprof-enable cpe_preparememq \
+       -coreprof-enable cpe_runfree \
+       -coreprof-enable cpe_count_poolalloc \
+       -coreprof-enable cpe_count_poolreuse \
+       -coreprof-enable cpe_taskstallvar \
+       -coreprof-enable cpe_taskstallmem
+
+
+USEOOO= -ooojava 64 2 -ooodebug -squeue #-ooodebug-disable-task-mem-pool
+USERCR= -ooojava 64 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
+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)
+
+rcr-remake-c:
+       $(BUILDSCRIPT) -nojava $(BSFLAGS) $(USECOREPROF) $(USERCR) $(DISJOINT) -o $(PROGRAM)r -builddir rcr  $(SOURCE_FILES) 
+
+
+single: $(PROGRAM)s.bin
+
+$(PROGRAM)s.bin: $(SOURCE_FILES) ../master-makefile
+       $(BUILDSCRIPT) -thread $(BSFLAGS) $(USECOREPROF)                       -o $(PROGRAM)s -builddir sing $(SOURCE_FILES) 
+
+ooo: $(PROGRAM)p.bin
+
+$(PROGRAM)p.bin: $(SOURCE_FILES) ../master-makefile
+       $(BUILDSCRIPT)         $(BSFLAGS) $(USECOREPROF) $(USEOOO) $(DISJOINT) -o $(PROGRAM)p -builddir par  $(SOURCE_FILES) 
+
+rcr: $(PROGRAM)r.bin
+
+$(PROGRAM)r.bin: $(SOURCE_FILES) ../master-makefile
+       $(BUILDSCRIPT)         $(BSFLAGS) $(USECOREPROF) $(USERCR) $(DISJOINT) -o $(PROGRAM)r -builddir rcr  $(SOURCE_FILES) 
+
+clean:
+       rm -f  $(PROGRAM)p.bin $(PROGRAM)s.bin $(PROGRAM)r.bin
+       rm -fr par sing rcr
+       rm -f tmp.c
+       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

diff --git a/Robust/src/Benchmarks/oooJava/moldyn/runr b/Robust/src/Benchmarks/oooJava/moldyn/runr
index 0df83acf83614de5d710c4033cb0f33fabbea77e..cab6327ff6fb9e499de0296a12abf19983247303 100755 (executable)
--- a/Robust/src/Benchmarks/oooJava/moldyn/runr
+++ b/Robust/src/Benchmarks/oooJava/moldyn/runr
@@ -1 +1 @@
-time ./JGFMolDynBenchSizeBr.bin
+time ./JGFMolDynBenchSizeBr.bin 1 300