From 77aaabdf59bc4a475f8544a5dda6471e23b9c5d7 Mon Sep 17 00:00:00 2001 From: jjenista Date: Mon, 11 Oct 2010 18:55:27 +0000 Subject: [PATCH] We modify benchmarks to run the suite in different ways, just modularized the hefty part and only leave source file macros in the local makefiles, should save time and prevent errors when running for paper results --- .../src/Benchmarks/oooJava/barneshut/makefile | 47 +-------------- Robust/src/Benchmarks/oooJava/crypt/makefile | 47 +-------------- Robust/src/Benchmarks/oooJava/kmeans/makefile | 52 ++--------------- .../src/Benchmarks/oooJava/labyrinth/makefile | 52 +---------------- Robust/src/Benchmarks/oooJava/master-makefile | 57 +++++++++++++++++++ .../src/Benchmarks/oooJava/mergesort/makefile | 47 +-------------- Robust/src/Benchmarks/oooJava/moldyn/makefile | 47 +-------------- Robust/src/Benchmarks/oooJava/monte/makefile | 47 +-------------- Robust/src/Benchmarks/oooJava/power/makefile | 48 +--------------- .../src/Benchmarks/oooJava/raytracer/makefile | 47 +-------------- Robust/src/Benchmarks/oooJava/sor/makefile | 47 +-------------- .../src/Benchmarks/oooJava/tracking/makefile | 47 +-------------- 12 files changed, 71 insertions(+), 514 deletions(-) create mode 100644 Robust/src/Benchmarks/oooJava/master-makefile diff --git a/Robust/src/Benchmarks/oooJava/barneshut/makefile b/Robust/src/Benchmarks/oooJava/barneshut/makefile index 8350551b..e6d5f5df 100644 --- 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 1e777ad9..da3e5246 100644 --- 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 3d03c798..525ca78f 100644 --- 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 4d3eb321..f2b7f1ce 100644 --- 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 index 00000000..56ae7f05 --- /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 180b7a2e..3e5cd043 100644 --- 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 b2567699..fb380f91 100644 --- 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 2ce840df..e1df4cea 100644 --- 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 0c33df07..911f6a1f 100644 --- 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 baed9758..12a3832b 100644 --- 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 a995ca8e..9190cbd6 100644 --- 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 20718bad..699be667 100644 --- 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 -- 2.34.1