modifies makefiles for using -joptimize -noloop -optimize

diff --git a/Robust/src/Benchmarks/oooJava/barneshut/makefile b/Robust/src/Benchmarks/oooJava/barneshut/makefile
index 26901b3a75dc052670c01ff8310aad18c9b310a2..abaa27a4e4de9c0a2d75314fd0fcb8ac201671a7 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/barneshut/makefile
+++ b/Robust/src/Benchmarks/oooJava/barneshut/makefile
@@ -5,18 +5,15 @@ SOURCE_FILES=Barneshut.java
 
 BUILDSCRIPT=../../../buildscript
 
-#USEOOO= -ooojava 24 2  -ooodebug  
-BSFLAGS= -64bit -mainclass $(PROGRAM) -debug -garbagestats #-joptimize
-USEOOO= -ooojava 8 2  -ooodebug 
-#BSFLAGS= -32bit -nooptimize -mainclass $(PROGRAM) -debug -garbagestats 
-#-joptimize
+USEOOO= -ooojava 24 2  -ooodebug  
+BSFLAGS= -64bit -mainclass $(PROGRAM) -garbagestats -joptimize -noloop -optimize 
 DISJOINT= -disjoint -disjoint-k 1 -enable-assertions 
 
 default:
        $(BUILDSCRIPT) -nojava $(USEOOO) $(BSFLAGS) $(DISJOINT) -o $(PROGRAM)p $(SOURCE_FILES) -builddir par
 
 single:
-       $(BUILDSCRIPT) $(BSFLAGS) -o $(PROGRAM)s -builddir sing $(SOURCE_FILES) 
+       $(BUILDSCRIPT) $(BSFLAGS) -thread -o $(PROGRAM)s -builddir sing $(SOURCE_FILES) 
 
 ooo:
        $(BUILDSCRIPT) $(USEOOO) $(BSFLAGS) $(DISJOINT) -o $(PROGRAM)p -builddir par $(SOURCE_FILES) 

diff --git a/Robust/src/Benchmarks/oooJava/crypt/makefile b/Robust/src/Benchmarks/oooJava/crypt/makefile
index ee571c5106411152e41d6d08a1064994316eec44..2084e5f9e01e7f5ee6d404a274768697605deb23 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/crypt/makefile
+++ b/Robust/src/Benchmarks/oooJava/crypt/makefile
@@ -1,14 +1,11 @@
-#raytracer
 PROGRAM=JGFCryptBench
 
 SOURCE_FILES=JGFCryptBench.java
 
 BUILDSCRIPT=../../../buildscript
 
-#USEOOO= -ooojava 8 2  -ooodebug  
-#BSFLAGS= -64bit -nooptimize -mainclass $(PROGRAM) -garbagestats #-joptimize -debug
 USEOOO= -ooojava 24 2  -ooodebug  
-BSFLAGS= -64bit -mainclass $(PROGRAM) -garbagestats -joptimize
+BSFLAGS= -64bit -mainclass $(PROGRAM) -garbagestats -joptimize -noloop -optimize
 DISJOINT= -disjoint -disjoint-k 1 -enable-assertions 
 
 default:

diff --git a/Robust/src/Benchmarks/oooJava/kmeans/makefile b/Robust/src/Benchmarks/oooJava/kmeans/makefile
index 666ef4a4cc255308eefeca7b0e9b8c9897864c5c..559a5e7a6e2eb1dbf615e91dc4c7b260afec88c6 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/kmeans/makefile
+++ b/Robust/src/Benchmarks/oooJava/kmeans/makefile
@@ -8,15 +8,15 @@ SOURCE_FILES=${MAINCLASS}.java \
     Common.java \
     GlobalArgs.java 
 
-USEOOO= -ooojava 8 2  -ooodebug #-joptimize
-BSFLAGS= -debug -garbagestats -32bit -nooptimize -mainclass $(MAINCLASS) 
+USEOOO= -ooojava 24 2 -ooodebug 
+BSFLAGS= -garbagestats -64bit -mainclass $(MAINCLASS) -joptimize -noloop -optimize
 DISJOINT= -disjoint -disjoint-k 1 -enable-assertions
 
 default:
        $(BUILDSCRIPT) -nojava $(USEOOO) $(BSFLAGS) $(DISJOINT) -o $(PROGRAM)p $(SOURCE_FILES) -builddir par
 
 single:
-       $(BUILDSCRIPT) $(BSFLAGS) -o $(PROGRAM)s -builddir sing $(SOURCE_FILES) 
+       $(BUILDSCRIPT) $(BSFLAGS) -thread -o $(PROGRAM)s -builddir sing $(SOURCE_FILES) 
 
 ooo:
        $(BUILDSCRIPT) $(USEOOO) $(BSFLAGS) $(DISJOINT) -o $(PROGRAM)p -builddir par $(SOURCE_FILES) 

diff --git a/Robust/src/Benchmarks/oooJava/labyrinth/makefile b/Robust/src/Benchmarks/oooJava/labyrinth/makefile
index 40138742e9d53ba1c707a999a3fba61f269961ac..e4c1a84ee521b98ff6657c02e7c7f7b69d466631 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/labyrinth/makefile
+++ b/Robust/src/Benchmarks/oooJava/labyrinth/makefile
@@ -7,8 +7,7 @@ SOURCE_FILES2=Coordinate.java CoordPathWrapper.java Grid.java Labyrinth.java Lis
 BUILDSCRIPT=../../../buildscript
 
 USEOOO= -ooojava 24 2  -ooodebug -joptimize
-#BSFLAGS= -debug -garbagestats -32bit -nooptimize -mainclass $(PROGRAM) 
-BSFLAGS= -garbagestats -64bit -mainclass $(PROGRAM) 
+BSFLAGS= -64bit -mainclass $(PROGRAM) -garbagestats -joptimize -noloop -optimize
 DISJOINT= -disjoint -disjoint-k 1 -enable-assertions
 
 default:
@@ -18,7 +17,7 @@ singler:
        $(BUILDSCRIPT) $(BSFLAGS) -o $(PROGRAM)s -builddir sing2 $(SOURCE_FILES2)
 
 single:
-       $(BUILDSCRIPT) $(BSFLAGS) -o $(PROGRAM)s -builddir sing $(SOURCE_FILES) 
+       $(BUILDSCRIPT) $(BSFLAGS) -thread -o $(PROGRAM)s -builddir sing $(SOURCE_FILES) 
 
 ooo:
        $(BUILDSCRIPT) $(USEOOO) $(BSFLAGS) $(DISJOINT) -o $(PROGRAM)p -builddir par $(SOURCE_FILES) 

diff --git a/Robust/src/Benchmarks/oooJava/mergesort/makefile b/Robust/src/Benchmarks/oooJava/mergesort/makefile
index 899131c3b2db6a3af32bc3503b84a83a0ba493b4..049fea442a6eaa40d74253a40acd9f4b63c7b840 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/mergesort/makefile
+++ b/Robust/src/Benchmarks/oooJava/mergesort/makefile
@@ -1,4 +1,3 @@
-#raytracer
 PROGRAM=MergeSort4
 
 SOURCE_FILES=BMergeSort4.java
@@ -6,9 +5,7 @@ SOURCE_FILES=BMergeSort4.java
 BUILDSCRIPT=../../../buildscript
 
 USEOOO= -ooojava 64 2  -ooodebug  
-BSFLAGS= -64bit -mainclass $(PROGRAM) -garbagestats -joptimize #-debug
-#USEOOO= -ooojava 8 2  -ooodebug  
-#BSFLAGS= -64bit -nooptimize -mainclass $(PROGRAM) -debug -garbagestats -joptimize
+BSFLAGS= -64bit -mainclass $(PROGRAM) -garbagestats -joptimize -noloop -optimize
 DISJOINT= -disjoint -disjoint-k 1 -enable-assertions 
 
 default:

diff --git a/Robust/src/Benchmarks/oooJava/monte/makefile b/Robust/src/Benchmarks/oooJava/monte/makefile
index d5dc79d7467f97b9b8e2c4f7c4206d8facde870e..3cbd05e969f0c2496f218cff1ee09c14e80bc3f3 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/monte/makefile
+++ b/Robust/src/Benchmarks/oooJava/monte/makefile
@@ -4,17 +4,15 @@ SOURCE_FILES=JGFMonteCarloBench.java
 
 BUILDSCRIPT=../../../buildscript
 
-#USEOOO= -ooojava 8 2  -ooodebug  
-#BSFLAGS= -32bit -nooptimize -mainclass $(PROGRAM) -garbagestats -debug -joptimize
 USEOOO= -ooojava 24 2  -ooodebug  
-BSFLAGS= -64bit -mainclass $(PROGRAM) -garbagestats -joptimize  
+BSFLAGS= -64bit -mainclass $(PROGRAM) -garbagestats -joptimize -noloop -optimize
 DISJOINT= -disjoint -disjoint-k 1 -enable-assertions
 
 default:
        $(BUILDSCRIPT) -nojava $(USEOOO) $(BSFLAGS) $(DISJOINT) -o $(PROGRAM)p $(SOURCE_FILES) -builddir par
 
 single:
-       $(BUILDSCRIPT) $(BSFLAGS) -o $(PROGRAM)s -builddir sing $(SOURCE_FILES) 
+       $(BUILDSCRIPT) $(BSFLAGS) -thread -o $(PROGRAM)s -builddir sing $(SOURCE_FILES) 
 
 ooo:
        $(BUILDSCRIPT) $(USEOOO) $(BSFLAGS) $(DISJOINT) -o $(PROGRAM)p -builddir par $(SOURCE_FILES) 

diff --git a/Robust/src/Benchmarks/oooJava/power/makefile b/Robust/src/Benchmarks/oooJava/power/makefile
index babfcbfd2423d3116596f91a6c019ae72d5cdbcb..f04dc6cfeeb667cf5973d6992162fe37938ef239 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/power/makefile
+++ b/Robust/src/Benchmarks/oooJava/power/makefile
@@ -1,19 +1,18 @@
-#power
 PROGRAM=test
 MAINCLASS=Power
 SOURCE_FILES=${MAINCLASS}.java
 
 BUILDSCRIPT=../../../buildscript
 
-USEOOO= -ooojava 8 2  -ooodebug  #-joptimize
-BSFLAGS= -32bit -nooptimize  -debug -garbagestats  -mainclass $(MAINCLASS)
+USEOOO= -ooojava 24 2  -ooodebug
+BSFLAGS= -64bit -mainclass $(PROGRAM) -garbagestats -joptimize -noloop -optimize
 DISJOINT= -disjoint -disjoint-k 1 -enable-assertions 
 
 default:
        $(BUILDSCRIPT) -nojava $(USEOOO) $(BSFLAGS) $(DISJOINT) -o $(PROGRAM)p $(SOURCE_FILES) -builddir par
 
 single:
-       $(BUILDSCRIPT) $(BSFLAGS) -o $(PROGRAM)s -builddir sing $(SOURCE_FILES) 
+       $(BUILDSCRIPT) $(BSFLAGS) -thread -o $(PROGRAM)s -builddir sing $(SOURCE_FILES) 
 
 ooo:
        $(BUILDSCRIPT) $(USEOOO) $(BSFLAGS) $(DISJOINT) -o $(PROGRAM)p -builddir par $(SOURCE_FILES)

diff --git a/Robust/src/Benchmarks/oooJava/raytracer/makefile b/Robust/src/Benchmarks/oooJava/raytracer/makefile
index da6d1e5b1b98946dacecc777447485a23c02b22f..933a17f298aced5b80055f35382bbe50b153d415 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/raytracer/makefile
+++ b/Robust/src/Benchmarks/oooJava/raytracer/makefile
@@ -1,19 +1,18 @@
-#raytracer
 PROGRAM=test
 
 SOURCE_FILES=test.java
 
 BUILDSCRIPT=../../../buildscript
 
-USEOOO= -ooojava 8 2  -ooodebug  
-BSFLAGS= -32bit -nooptimize -mainclass test -debug -garbagestats -joptimize
+USEOOO= -ooojava 24 2  -ooodebug  
+BSFLAGS= -64bit -mainclass $(PROGRAM) -garbagestats -joptimize -noloop -optimize
 DISJOINT= -disjoint -disjoint-k 1 -enable-assertions 
 
 default:
        $(BUILDSCRIPT) -nojava $(USEOOO) $(BSFLAGS) $(DISJOINT) -o $(PROGRAM)p $(SOURCE_FILES) -builddir par
 
 single:
-       $(BUILDSCRIPT) $(BSFLAGS) -o $(PROGRAM)s -builddir sing $(SOURCE_FILES) 
+       $(BUILDSCRIPT) $(BSFLAGS) -thread -o $(PROGRAM)s -builddir sing $(SOURCE_FILES) 
 
 ooo:
        $(BUILDSCRIPT) $(USEOOO) $(BSFLAGS) $(DISJOINT) -o $(PROGRAM)p -builddir par $(SOURCE_FILES)