We modify benchmarks to run the suite in different ways, just modularized the hefty...

diff --git a/Robust/src/Benchmarks/oooJava/barneshut/makefile b/Robust/src/Benchmarks/oooJava/barneshut/makefile
index 8350551b818b076a489d788a93515297c6ed920d..e6d5f5df8e9460c53d2c973715a40ab5b27ec178 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/barneshut/makefile
+++ b/Robust/src/Benchmarks/oooJava/barneshut/makefile
@@ -2,49 +2,4 @@ PROGRAM=Barneshut
 
 SOURCE_FILES=Barneshut.java
 
-BUILDSCRIPT=../../../buildscript
-
-
-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

diff --git a/Robust/src/Benchmarks/oooJava/crypt/makefile b/Robust/src/Benchmarks/oooJava/crypt/makefile
index 1e777ad9fb6fded9456356adea6771d637bd4ed4..da3e5246cbbdbd647b5e9d6bea75206a13b219d3 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/crypt/makefile
+++ b/Robust/src/Benchmarks/oooJava/crypt/makefile
@@ -2,49 +2,4 @@ PROGRAM=JGFCryptBench
 
 SOURCE_FILES=JGFCryptBench.java
 
-BUILDSCRIPT=../../../buildscript
-
-
-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

diff --git a/Robust/src/Benchmarks/oooJava/kmeans/makefile b/Robust/src/Benchmarks/oooJava/kmeans/makefile
index 3d03c798f4d3d85b758088c196b4338e009708ba..525ca78f10bb9be33be81e2ef884c364e797ba6a 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/kmeans/makefile
+++ b/Robust/src/Benchmarks/oooJava/kmeans/makefile
@@ -1,53 +1,9 @@
 PROGRAM=KMeans
-BUILDSCRIPT=../../../buildscript
 SOURCE_FILES=${PROGRAM}.java \
        Random.java \
        Cluster.java \
-    Normal.java \
-    Common.java \
-    GlobalArgs.java 
+       Normal.java \
+       Common.java \
+       GlobalArgs.java 
 
-
-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

diff --git a/Robust/src/Benchmarks/oooJava/labyrinth/makefile b/Robust/src/Benchmarks/oooJava/labyrinth/makefile
index 4d3eb3216ea13e1b53a44d382a5eabccde19de89..f2b7f1ce84188bd75ca20930eba99f95e72e4caf 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/labyrinth/makefile
+++ b/Robust/src/Benchmarks/oooJava/labyrinth/makefile
@@ -2,54 +2,4 @@ PROGRAM=Labyrinth
 
 SOURCE_FILES=Coordinate.java CoordPathWrapper.java Grid.java Labyrinth.java List_Iter.java List_Node.java List_t.java Maze.java Pair.java Point.java Queue_Int.java Queue_t.java Router.java Solve_Arg.java Vector_t.java
 
-SOURCE_FILES2=Coordinate.java CoordPathWrapper.java Grid.java Labyrinth.java List_Iter.java List_Node.java List_t.java Maze.java Pair.java Point.java Queue_Int.java Queue_t.java RouterSingle.java Solve_Arg.java Vector_t.java
-
-BUILDSCRIPT=../../../buildscript
-
-
-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)
-
-singler:
-       $(BUILDSCRIPT)         $(BSFLAGS)                                      -o $(PROGRAM)s -builddir sing2 $(SOURCE_FILES2)
-
-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 sing2
-       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

diff --git a/Robust/src/Benchmarks/oooJava/master-makefile b/Robust/src/Benchmarks/oooJava/master-makefile
new file mode 100644 (file)
index 0000000..56ae7f0
--- /dev/null
+++ b/Robust/src/Benchmarks/oooJava/master-makefile
@@ -0,0 +1,57 @@
+##########################################################################
+#
+#  This master makefile shoudl be included in each local makefile of a
+#  benchmark directory.  The local makefile should define PROGRAM as
+#  the name of the class with the main method, which also becomes the
+#  name of the output binary.  The local makefile should also declare
+#  SOURCE_FILES with whatever Java files should be compiled
+#
+##########################################################################
+
+
+BUILDSCRIPT=../../../buildscript
+
+
+COREPROFOVERFLOW= #-coreprof-checkoverflow
+USECOREPROF= #-coreprof $(COREPROFOVERFLOW) \
+       -coreprof-eventwords 1024*1024*128 \
+       -coreprof-enable cpe_main \
+       -coreprof-enable cpe_taskdispatch
+#      -coreprof-enable cpe_taskexecute \
+#      -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_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 -joptimize -noloop -optimize #-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)
+
+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

diff --git a/Robust/src/Benchmarks/oooJava/mergesort/makefile b/Robust/src/Benchmarks/oooJava/mergesort/makefile
index 180b7a2ed92f9776d3622ca8d8cab3d1b3c8da5e..3e5cd043f5e34f146d34c9082e3cdb28c48533fa 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/mergesort/makefile
+++ b/Robust/src/Benchmarks/oooJava/mergesort/makefile
@@ -2,49 +2,4 @@ PROGRAM=MergeSort4
 
 SOURCE_FILES=BMergeSort4.java
 
-BUILDSCRIPT=../../../buildscript
-
-
-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

diff --git a/Robust/src/Benchmarks/oooJava/moldyn/makefile b/Robust/src/Benchmarks/oooJava/moldyn/makefile
index b2567699016ec9a5d38200148d8abd5f06fa8af4..fb380f91925507b8d84d33c0ae9502e2d06e796b 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/moldyn/makefile
+++ b/Robust/src/Benchmarks/oooJava/moldyn/makefile
@@ -2,49 +2,4 @@ PROGRAM=JGFMolDynBenchSizeB
 
 SOURCE_FILES=JGFMolDynBenchSizeB.java
 
-BUILDSCRIPT=../../../buildscript
-
-
-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 5024 -garbagestats -joptimize -noloop -optimize -debug 
-
-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

diff --git a/Robust/src/Benchmarks/oooJava/monte/makefile b/Robust/src/Benchmarks/oooJava/monte/makefile
index 2ce840dffae959cd3107aa93a7225aa20f57724a..e1df4ceae62423c7e537846e1828a5c24448d39e 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/monte/makefile
+++ b/Robust/src/Benchmarks/oooJava/monte/makefile
@@ -2,49 +2,4 @@ PROGRAM=JGFMonteCarloBench
 
 SOURCE_FILES=JGFMonteCarloBench.java
 
-BUILDSCRIPT=../../../buildscript
-
-
-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

diff --git a/Robust/src/Benchmarks/oooJava/power/makefile b/Robust/src/Benchmarks/oooJava/power/makefile
index 0c33df07eaf08ed2a0fcb5b0214ed9d6eb794480..911f6a1f1907f7d3e505721dcaa10aeb7c17bf6d 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/power/makefile
+++ b/Robust/src/Benchmarks/oooJava/power/makefile
@@ -1,49 +1,3 @@
 PROGRAM=Power
 SOURCE_FILES=$(PROGRAM).java
-
-BUILDSCRIPT=../../../buildscript
-
-
-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

diff --git a/Robust/src/Benchmarks/oooJava/raytracer/makefile b/Robust/src/Benchmarks/oooJava/raytracer/makefile
index baed9758f33b372178b7eac8a78df358d5e7c51b..12a3832be8bfb5663401b7ca229d33f1aacc8469 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/raytracer/makefile
+++ b/Robust/src/Benchmarks/oooJava/raytracer/makefile
@@ -2,49 +2,4 @@ PROGRAM=test
 
 SOURCE_FILES=test.java
 
-BUILDSCRIPT=../../../buildscript
-
-
-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

diff --git a/Robust/src/Benchmarks/oooJava/sor/makefile b/Robust/src/Benchmarks/oooJava/sor/makefile
index a995ca8e1c9400af76f8031798040bd21e68d9f7..9190cbd600e43ebd89e766b98438cfeb5295e285 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/sor/makefile
+++ b/Robust/src/Benchmarks/oooJava/sor/makefile
@@ -2,49 +2,4 @@ PROGRAM=JGFSORBenchSizeD
 
 SOURCE_FILES=JGFSORBenchSizeD.java
 
-BUILDSCRIPT=../../../buildscript
-
-
-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

diff --git a/Robust/src/Benchmarks/oooJava/tracking/makefile b/Robust/src/Benchmarks/oooJava/tracking/makefile
index 20718bad84f9d3955b6a39fe73ff7966a96f1ff6..699be6677f9587ac696e9463136d29b41f3d3941 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/tracking/makefile
+++ b/Robust/src/Benchmarks/oooJava/tracking/makefile
@@ -2,49 +2,4 @@ PROGRAM=TrackingBench
 
 SOURCE_FILES=TrackingBench.java
 
-BUILDSCRIPT=../../../buildscript
-
-
-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 10000 -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