clean up points-to-check files properly

[IRC.git] / Robust / src / Benchmarks / oooJava / master-makefile

diff --git a/Robust/src/Benchmarks/oooJava/master-makefile b/Robust/src/Benchmarks/oooJava/master-makefile
index 1c0ce76c2de7eaee96883c5c8bd1270212280478..d871658b923d6c28f98b61bc6cf8242f86323abf 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/master-makefile
+++ b/Robust/src/Benchmarks/oooJava/master-makefile
@@ -32,16 +32,19 @@ USECOREPROF= #-coreprof $(COREPROFOVERFLOW) \
        -coreprof-enable cpe_taskstallmem
 
 
-USEOOO= -ooojava $(NUM_OOO_WORKERS) 2 -squeue #-ooodebug-disable-task-mem-pool
-USERCR= -ooojava $(NUM_RCR_WORKERS) 2 -rcr -squeue 
+USEOOO= -ooojava $(NUM_OOO_WORKERS) 2      -squeue #-ooodebug-disable-task-mem-pool
+USERCR= -ooojava $(NUM_RCR_WORKERS) 2 -rcr -squeue -ooodebug
 OOODEBUG= -ooodebug -printlinenum
 RCRDEBUG= -rcr_debug -printlinenum
 RCRDEBUGV= -rcr_debug_verbose -printlinenum
-BSFLAGS= -64bit -mainclass $(PROGRAM)  -heapsize-mb 8000 -garbagestats -joptimize -noloop -optimize -debug #-nooptimize #src-after-pp
+BSFLAGS= -64bit -mainclass $(PROGRAM)  -heapsize-mb 5000 -garbagestats -joptimize -noloop -optimize -nolock -debug #-nooptimize #src-after-pp
+
+
+CHECKPOINTSTO= -disjoint -pointsto-check-v-runtime
 
 
 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
+DISJOINT= -disjoint -disjoint-k 1 -enable-assertions $(DRELEASEMODE) #-disjoint-desire-determinism 
 
 
 #####################################
@@ -73,8 +76,9 @@ DISJOINT= -disjoint -disjoint-k 1 -enable-assertions $(DRELEASEMODE) #-disjoint-
 # EX: (skip first 10 visits, capture the next 3, then halt)
 # -disjoint-debug-snap-method Remove 10 3 true
 
-DISJOINTDEBUG= -justanalyze -disjoint -disjoint-k 1 -enable-assertions \
-       -disjoint-debug-callsite createNode run 100 50 false
+DISJOINTDEBUG= -justanalyze -disjoint -disjoint-k 1 -enable-assertions 
+#      -disjoint-write-dots final \
+#      -disjoint-debug-callsite Demand.add Lateral.compute 1 1000 true
 #      -disjoint-desire-determinism
 #      -disjoint-debug-snap-method ComputeCenterOfMass 6 2 true
 #      -disjoint-debug-scheduling
@@ -92,10 +96,19 @@ single-remake-c:
 rcr-remake-c:
        $(BUILDSCRIPT) -nojava $(BMFLAGS) $(BSFLAGS) $(USECOREPROF) $(USERCR) $(DISJOINT) -o $(PROGRAM)r -builddir rcr  $(SOURCE_FILES) 
 
+
 single: $(PROGRAM)s.bin
 
 $(PROGRAM)s.bin: $(SOURCE_FILES) ../master-makefile
-       $(BUILDSCRIPT) -thread $(BMFLAGS) $(BSFLAGS) $(USECOREPROF)                       -o $(PROGRAM)s -builddir sing $(SOURCE_FILES) 
+       $(BUILDSCRIPT) $(BMFLAGS) $(BSFLAGS) $(USECOREPROF) -o $(PROGRAM)s -builddir sing $(SOURCE_FILES)
+
+
+check-pointsto: $(PROGRAM)c.bin
+
+$(PROGRAM)c.bin: $(SOURCE_FILES) ../master-makefile
+       $(BUILDSCRIPT) $(BMFLAGS) $(BSFLAGS) $(USECOREPROF) $(CHECKPOINTSTO) -o $(PROGRAM)c -builddir chk $(SOURCE_FILES)
+
+
 
 ooo: $(PROGRAM)p.bin
 
@@ -107,7 +120,7 @@ ooo-debug: $(SOURCE_FILES) ../master-makefile
 
 
 disjoint-debug: $(SOURCE_FILES) ../master-makefile
-       $(BUILDSCRIPT) $(BMFLAGS) $(BSFLAGS) $(USECOREPROF) $(USEOOO) $(DISJOINTDEBUG) -o $(PROGRAM)p -builddir par  $(SOURCE_FILES) 
+       $(BUILDSCRIPT) $(BMFLAGS) $(BSFLAGS) $(USECOREPROF) $(USEOOO) $(DISJOINTDEBUG) -o $(PROGRAM)p -builddir par  $(SOURCE_FILES)
 
 rcr: $(SOURCE_FILES) ../master-makefile
        $(BUILDSCRIPT) $(BMFLAGS) $(BSFLAGS) $(USECOREPROF) $(USERCR) $(DISJOINT) -o $(PROGRAM)r -builddir rcr  $(SOURCE_FILES) 
@@ -119,12 +132,16 @@ rcrpointer: $(SOURCE_FILES) ../master-makefile
 rcr-debug: $(SOURCE_FILES) ../master-makefile
        $(BUILDSCRIPT) $(BMFLAGS) $(BSFLAGS) $(USECOREPROF) $(USERCR) $(OOODEBUG) $(RCRDEBUG) $(DISJOINT) -o $(PROGRAM)r -builddir rcr  $(SOURCE_FILES) 
 
+rcrpointer-debug: $(SOURCE_FILES) ../master-makefile
+       $(BUILDSCRIPT) $(BMFLAGS) $(BSFLAGS) $(USECOREPROF) $(USERCR) -pointer $(OOODEBUG) $(RCRDEBUG) $(DISJOINT) -o $(PROGRAM)r -builddir rcr  $(SOURCE_FILES) 
+
+
 rcr-debug-v: $(SOURCE_FILES) ../master-makefile
        $(BUILDSCRIPT) $(BMFLAGS) $(BSFLAGS) $(USECOREPROF) $(USERCR) $(RCRDEBUGV) $(DISJOINT) -o $(PROGRAM)r -builddir rcr  $(SOURCE_FILES) 
 
 clean:
-       rm -f  $(PROGRAM)p.bin $(PROGRAM)s.bin $(PROGRAM)r.bin
-       rm -fr par sing rcr
+       rm -f  $(PROGRAM)p.bin $(PROGRAM)s.bin $(PROGRAM)r.bin $(PROGRAM)c.bin
+       rm -fr par sing rcr chk
        rm -f tmp.c
        rm -f  *~
        rm -f  *.dot