cpaturing some makefile updates and have OoOJava print number of sites disjoint reach...

diff --git a/Robust/src/Analysis/Disjoint/DisjointAnalysis.java b/Robust/src/Analysis/Disjoint/DisjointAnalysis.java
index c96adb02eba5b1955f3c36411e2387348e44ff93..129bffd2ddafff07ed8f643d16c9c1ecb83dde25 100644 (file)
--- a/Robust/src/Analysis/Disjoint/DisjointAnalysis.java
+++ b/Robust/src/Analysis/Disjoint/DisjointAnalysis.java
@@ -273,8 +273,15 @@ public class DisjointAnalysis {
 
     bw.close();
   }
+
+
        
   // this version of writeAllSharing is for Java programs that have no tasks
+  // ***********************************
+  // WARNING: THIS DOES NOT DO THE RIGHT THING, REPORTS 0 ALWAYS!
+  // It should use mayBothReachTarget and mayManyReachTarget like
+  // OoOJava does to query analysis results
+  // ***********************************
   public void writeAllSharingJava(String outputFile, 
                                   String timeReport,
                                   String justTime,
@@ -709,12 +716,20 @@ public class DisjointAnalysis {
 
     analysisComplete=true;
 
+
     double timeEndAnalysis = (double) System.nanoTime();
     double dt = (timeEndAnalysis - timeStartAnalysis)/(Math.pow( 10.0, 9.0 ) );
-    String treport = String.format( "The reachability analysis took %.3f sec.", dt );
+
+    String treport;
+    if( sitesToFlag != null ) {
+      treport = String.format( "Disjoint reachability analysis flagged %d sites and took %.3f sec.", sitesToFlag.size(), dt );
+    } else {
+      treport = String.format( "Disjoint reachability analysis took %.3f sec.", dt );
+    }
     String justtime = String.format( "%.2f", dt );
     System.out.println( treport );
 
+
     try {
       if( writeFinalDOTs && !writeAllIncrementalDOTs ) {
         writeFinalGraphs();      

diff --git a/Robust/src/Benchmarks/oooJava/barneshut/makefile b/Robust/src/Benchmarks/oooJava/barneshut/makefile
index 8609cb7c12975d0268df2ff4e6d65068765ea5c3..1a2f1e4d33b9dea15f13d473a15fdb1bbebe8a16 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/barneshut/makefile
+++ b/Robust/src/Benchmarks/oooJava/barneshut/makefile
@@ -9,7 +9,6 @@ USEOOO= -ooojava 24 2  -ooodebug
 BSFLAGS= -64bit -mainclass $(PROGRAM)  -heapsize-mb 1024 -garbagestats -debug -joptimize -noloop -optimize #-coreprof -coreprof-checkoverflow 
 
 DRELEASEMODE=-disjoint-release-mode -disjoint-alias-file aliases.txt tabbed
-
 DISJOINT= -disjoint -disjoint-k 1 -enable-assertions $(DRELEASEMODE) #-disjoint-desire-determinism
 
 default:

diff --git a/Robust/src/Benchmarks/oooJava/crypt/makefile b/Robust/src/Benchmarks/oooJava/crypt/makefile
index b7e49238ac8c14d8507da3e793c60401967db9f8..9e86df7b24d100e7c75bc1e3f1da6ab85e59b21e 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/crypt/makefile
+++ b/Robust/src/Benchmarks/oooJava/crypt/makefile
@@ -6,7 +6,10 @@ BUILDSCRIPT=../../../buildscript
 
 USEOOO= -ooojava 24 2  -ooodebug  
 BSFLAGS= -64bit -mainclass $(PROGRAM) -heapsize-mb 1024 -garbagestats -joptimize -noloop -optimize
-DISJOINT= -disjoint -disjoint-k 1 -enable-assertions 
+
+DRELEASEMODE=-disjoint-release-mode -disjoint-alias-file aliases.txt tabbed
+DISJOINT= -disjoint -disjoint-k 1 -enable-assertions $(DRELEASEMODE) #-disjoint-desire-determinism
+
 
 default:
        $(BUILDSCRIPT) -nojava $(USEOOO) $(BSFLAGS) $(DISJOINT) -o $(PROGRAM)p $(SOURCE_FILES) -builddir par

diff --git a/Robust/src/Benchmarks/oooJava/kmeans/makefile b/Robust/src/Benchmarks/oooJava/kmeans/makefile
index 559a5e7a6e2eb1dbf615e91dc4c7b260afec88c6..ec00963b4b328cc1c4fb4cfa92f8808734070837 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/kmeans/makefile
+++ b/Robust/src/Benchmarks/oooJava/kmeans/makefile
@@ -10,7 +10,10 @@ SOURCE_FILES=${MAINCLASS}.java \
 
 USEOOO= -ooojava 24 2 -ooodebug 
 BSFLAGS= -garbagestats -64bit -mainclass $(MAINCLASS) -joptimize -noloop -optimize
-DISJOINT= -disjoint -disjoint-k 1 -enable-assertions
+
+DRELEASEMODE=-disjoint-release-mode -disjoint-alias-file aliases.txt tabbed
+DISJOINT= -disjoint -disjoint-k 1 -enable-assertions $(DRELEASEMODE) #-disjoint-desire-determinism
+
 
 default:
        $(BUILDSCRIPT) -nojava $(USEOOO) $(BSFLAGS) $(DISJOINT) -o $(PROGRAM)p $(SOURCE_FILES) -builddir par

diff --git a/Robust/src/Benchmarks/oooJava/labyrinth/makefile b/Robust/src/Benchmarks/oooJava/labyrinth/makefile
index e4c1a84ee521b98ff6657c02e7c7f7b69d466631..c3fa5dbd4203ac437c0dd47602d794352b73ff39 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/labyrinth/makefile
+++ b/Robust/src/Benchmarks/oooJava/labyrinth/makefile
@@ -8,7 +8,10 @@ BUILDSCRIPT=../../../buildscript
 
 USEOOO= -ooojava 24 2  -ooodebug -joptimize
 BSFLAGS= -64bit -mainclass $(PROGRAM) -garbagestats -joptimize -noloop -optimize
-DISJOINT= -disjoint -disjoint-k 1 -enable-assertions
+
+DRELEASEMODE=-disjoint-release-mode -disjoint-alias-file aliases.txt tabbed
+DISJOINT= -disjoint -disjoint-k 1 -enable-assertions $(DRELEASEMODE) #-disjoint-desire-determinism
+
 
 default:
        $(BUILDSCRIPT) -nojava $(USEOOO) $(BSFLAGS) $(DISJOINT) -o $(PROGRAM)p $(SOURCE_FILES) -builddir par

diff --git a/Robust/src/Benchmarks/oooJava/mergesort/makefile b/Robust/src/Benchmarks/oooJava/mergesort/makefile
index 049fea442a6eaa40d74253a40acd9f4b63c7b840..2cc128c00ddce4509ed0fbd9a594b5b2b8c22bd0 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/mergesort/makefile
+++ b/Robust/src/Benchmarks/oooJava/mergesort/makefile
@@ -6,7 +6,10 @@ BUILDSCRIPT=../../../buildscript
 
 USEOOO= -ooojava 64 2  -ooodebug  
 BSFLAGS= -64bit -mainclass $(PROGRAM) -garbagestats -joptimize -noloop -optimize
-DISJOINT= -disjoint -disjoint-k 1 -enable-assertions 
+
+DRELEASEMODE=-disjoint-release-mode -disjoint-alias-file aliases.txt tabbed
+DISJOINT= -disjoint -disjoint-k 1 -enable-assertions $(DRELEASEMODE) #-disjoint-desire-determinism
+
 
 default:
        $(BUILDSCRIPT) -nojava $(USEOOO) $(BSFLAGS) $(DISJOINT) -o $(PROGRAM)p $(SOURCE_FILES) -builddir par

diff --git a/Robust/src/Benchmarks/oooJava/monte/makefile b/Robust/src/Benchmarks/oooJava/monte/makefile
index 3cbd05e969f0c2496f218cff1ee09c14e80bc3f3..85e7cf09bc6b475c600f01341c471cdf3cea9e0e 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/monte/makefile
+++ b/Robust/src/Benchmarks/oooJava/monte/makefile
@@ -6,7 +6,10 @@ BUILDSCRIPT=../../../buildscript
 
 USEOOO= -ooojava 24 2  -ooodebug  
 BSFLAGS= -64bit -mainclass $(PROGRAM) -garbagestats -joptimize -noloop -optimize
-DISJOINT= -disjoint -disjoint-k 1 -enable-assertions
+
+DRELEASEMODE=-disjoint-release-mode -disjoint-alias-file aliases.txt tabbed
+DISJOINT= -disjoint -disjoint-k 1 -enable-assertions $(DRELEASEMODE) #-disjoint-desire-determinism
+
 
 default:
        $(BUILDSCRIPT) -nojava $(USEOOO) $(BSFLAGS) $(DISJOINT) -o $(PROGRAM)p $(SOURCE_FILES) -builddir par

diff --git a/Robust/src/Benchmarks/oooJava/power/makefile b/Robust/src/Benchmarks/oooJava/power/makefile
index f04dc6cfeeb667cf5973d6992162fe37938ef239..b6b6b6ac28be6aa65c7f2a44a6e33fa177afdf58 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/power/makefile
+++ b/Robust/src/Benchmarks/oooJava/power/makefile
@@ -1,12 +1,14 @@
-PROGRAM=test
-MAINCLASS=Power
-SOURCE_FILES=${MAINCLASS}.java
+PROGRAM=Power
+SOURCE_FILES=$(PROGRAM).java
 
 BUILDSCRIPT=../../../buildscript
 
 USEOOO= -ooojava 24 2  -ooodebug
 BSFLAGS= -64bit -mainclass $(PROGRAM) -garbagestats -joptimize -noloop -optimize
-DISJOINT= -disjoint -disjoint-k 1 -enable-assertions 
+
+DRELEASEMODE=-disjoint-release-mode -disjoint-alias-file aliases.txt tabbed
+DISJOINT= -disjoint -disjoint-k 1 -enable-assertions $(DRELEASEMODE) #-disjoint-desire-determinism
+
 
 default:
        $(BUILDSCRIPT) -nojava $(USEOOO) $(BSFLAGS) $(DISJOINT) -o $(PROGRAM)p $(SOURCE_FILES) -builddir par

diff --git a/Robust/src/Benchmarks/oooJava/raytracer/makefile b/Robust/src/Benchmarks/oooJava/raytracer/makefile
index 933a17f298aced5b80055f35382bbe50b153d415..f121d824528e85fb773285dcd9e7f8d627f41fa0 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/raytracer/makefile
+++ b/Robust/src/Benchmarks/oooJava/raytracer/makefile
@@ -6,7 +6,10 @@ BUILDSCRIPT=../../../buildscript
 
 USEOOO= -ooojava 24 2  -ooodebug  
 BSFLAGS= -64bit -mainclass $(PROGRAM) -garbagestats -joptimize -noloop -optimize
-DISJOINT= -disjoint -disjoint-k 1 -enable-assertions 
+
+DRELEASEMODE=-disjoint-release-mode -disjoint-alias-file aliases.txt tabbed
+DISJOINT= -disjoint -disjoint-k 1 -enable-assertions $(DRELEASEMODE) #-disjoint-desire-determinism
+
 
 default:
        $(BUILDSCRIPT) -nojava $(USEOOO) $(BSFLAGS) $(DISJOINT) -o $(PROGRAM)p $(SOURCE_FILES) -builddir par

diff --git a/Robust/src/Benchmarks/oooJava/sor/makefile b/Robust/src/Benchmarks/oooJava/sor/makefile
index cebb6c2069d844878632a8e08602961d2e2384ad..79961d5b578e13f4da65adedde9930d6f911fcbd 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/sor/makefile
+++ b/Robust/src/Benchmarks/oooJava/sor/makefile
@@ -9,7 +9,9 @@ USEOOO= -ooojava 24 2  -ooodebug
 BSFLAGS= -64bit -mainclass $(PROGRAM)  -heapsize-mb 6*1024 -garbagestats -debug -joptimize -noloop -optimize #-ooodebug-disable-task-mem-pool
 #-coreprof -coreprof-eventwords 1024*1024*128 #-coreprof-checkoverflow 
 
-DISJOINT= -disjoint -disjoint-k 1 -enable-assertions #-disjoint-desire-determinism
+DRELEASEMODE=-disjoint-release-mode -disjoint-alias-file aliases.txt tabbed
+DISJOINT= -disjoint -disjoint-k 1 -enable-assertions $(DRELEASEMODE) #-disjoint-desire-determinism
+
 
 default:
        $(BUILDSCRIPT) -nojava $(USEOOO) $(BSFLAGS) $(DISJOINT) -o $(PROGRAM)p $(SOURCE_FILES) -builddir par

diff --git a/Robust/src/Benchmarks/oooJava/tracking/makefile b/Robust/src/Benchmarks/oooJava/tracking/makefile
index bcca5c681045f9d63fc8e142a7e3906d6e3c3726..41822a9593336b5824c5f95917bddb70dad458cf 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/tracking/makefile
+++ b/Robust/src/Benchmarks/oooJava/tracking/makefile
@@ -8,7 +8,10 @@ USEOOO= -ooojava 24 2  -ooodebug
 BSFLAGS= -64bit -mainclass $(PROGRAM) -garbagestats -joptimize -noloop -optimize
 #USEOOO= -ooojava 8 2  -ooodebug 
 #BSFLAGS= -64bit -nooptimize -mainclass $(PROGRAM) -debug -garbagestats -joptimize -noloop
-DISJOINT= -disjoint -disjoint-k 1 -enable-assertions 
+
+DRELEASEMODE=-disjoint-release-mode -disjoint-alias-file aliases.txt tabbed
+DISJOINT= -disjoint -disjoint-k 1 -enable-assertions $(DRELEASEMODE) #-disjoint-desire-determinism
+
 
 default:
        $(BUILDSCRIPT) -nojava $(USEOOO) $(BSFLAGS) $(DISJOINT) -o $(PROGRAM)p $(SOURCE_FILES) -builddir par