From 1dc32a13d156f8118b35621c434056fddd4fa478 Mon Sep 17 00:00:00 2001
From: yeom <yeom>
Date: Sat, 31 Jul 2010 01:16:16 +0000
Subject: [PATCH] modifies makefiles for using -joptimize -noloop -optimize

---
 Robust/src/Benchmarks/oooJava/barneshut/makefile | 9 +++------
 Robust/src/Benchmarks/oooJava/crypt/makefile     | 5 +----
 Robust/src/Benchmarks/oooJava/kmeans/makefile    | 6 +++---
 Robust/src/Benchmarks/oooJava/labyrinth/makefile | 5 ++---
 Robust/src/Benchmarks/oooJava/mergesort/makefile | 5 +----
 Robust/src/Benchmarks/oooJava/monte/makefile     | 6 ++----
 Robust/src/Benchmarks/oooJava/power/makefile     | 7 +++----
 Robust/src/Benchmarks/oooJava/raytracer/makefile | 7 +++----
 8 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/Robust/src/Benchmarks/oooJava/barneshut/makefile b/Robust/src/Benchmarks/oooJava/barneshut/makefile
index 26901b3a..abaa27a4 100644
--- 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 ee571c51..2084e5f9 100644
--- 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 666ef4a4..559a5e7a 100644
--- 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 40138742..e4c1a84e 100644
--- 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 899131c3..049fea44 100644
--- 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 d5dc79d7..3cbd05e9 100644
--- 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 babfcbfd..f04dc6cf 100644
--- 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 da6d1e5b..933a17f2 100644
--- 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) 
-- 
2.34.1