changes to MGC class library

[IRC.git] / Robust / src / buildscript

diff --git a/Robust/src/buildscript b/Robust/src/buildscript
index 5e4ca12f7c6bb0bf1def994e382d8bacf698884e..e22558840f2abbaff3690939f6868e52dc2defb4 100755 (executable)
--- a/Robust/src/buildscript
+++ b/Robust/src/buildscript
@@ -50,6 +50,14 @@ echo -disjoint-dvisit-stack-callees-on-top alternate stack strat
 echo -disjoint-dvisit-pqueue use prio. q strat to visit descriptors
 echo -disjoint-desire-determinism set above interproc for determinism
 echo -disjoint-debug-scheduling debug when methods are scheduled for analysis
+echo -count-visits for counting visits in the fixed point algorithm to evaluate convergence behavior
+echo
+echo -do-definite-reach-analysis enable improved precision for disjoint reachability analysis
+echo -disjoint-disable-global-sweep
+echo -disjoint-disable-strong-update
+echo -disjoint-disable-predicates
+echo -disjoint-summarize-per-class
+echo
 echo
 echo -pointsto-check-v-runtime check allocation site of pointer targets at runtime to help verify heap analysis results
 echo 
@@ -116,6 +124,7 @@ echo
 echo SSJava options
 echo -ssjava enables SSJava
 echo -ssjavadebug reports interim results
+echo -ssjava-induce-error N S where 1/N is the probability to error at any deref or divide and S is a random seed
 echo
 echo Other options
 echo -jni enable jni
@@ -141,7 +150,8 @@ echo -tagstate do tag state analysis
 echo -optional enable optional
 echo -debug generate debug symbols
 echo -prefetch do prefetch analysis
-echo -heapsize-mb NUM  set initial heap size in MB, default is 256
+echo -heapsize-mb NUM  set output program initial heap size in MB, default is 256
+echo -compiler-heapsize-mb NUM  set heap size in MB for the JVM running the compiler, default is 1500
 echo -garbagestats Print garbage collection statistics
 echo -webinterface enable web interface
 echo -runtimedebug printout runtime debug messages
@@ -169,6 +179,7 @@ echo -help help
 tmpbuilddirectory="tmpbuilddirectory"
 JNI=false
 SSJAVA=false
+USE_SSJAVA_CLASSPATH=false
 SRCAFTERPP=false;
 COREPROF=false;
 NUMA=false;
@@ -192,6 +203,7 @@ NOJAVA=false
 CHECKFLAG=false
 RECOVERFLAG=false
 MLP_ON=false
+OOOJAVA=false
 RCR=false
 RCR_DEBUG=false
 RCR_DEBUG_VERBOSE=false
@@ -262,6 +274,8 @@ TILERA_PAGE_SIZE_BITS="16"
 TILERA_NUM_BLOCKS="20"
 TILERA_NUM_PAGES_PER_BLOCK="16"
 GCCACHECOHERENTFLAG=false
+COMPILER_HEAP_SIZE="1500"
+
 
 if [[ -z $1 ]]
 then
@@ -647,6 +661,7 @@ JAVAOPTS="$JAVAOPTS -minimize"
 elif [[ $1 = '-ooojava' ]]
 then
 MLP_ON=true
+OOOJAVA=true
 JAVAOPTS="$JAVAOPTS -ooojava $2 $3"
 EXTRAOPTIONS="$EXTRAOPTIONS -DPRECISE_GC -lpthread -DMLP"
 shift
@@ -659,12 +674,20 @@ EXTRAOPTIONS="$EXTRAOPTIONS -DOOO_DISABLE_TASKMEMPOOL"
 elif [[ $1 = '-ssjava' ]]
 then
 SSJAVA=true
+USE_SSJAVA_CLASSPATH=true
 JAVAOPTS="$JAVAOPTS -ssjava"
 
 elif [[ $1 = '-ssjavadebug' ]]
 then
 JAVAOPTS="$JAVAOPTS -ssjavadebug"
 
+elif [[ $1 = '-ssjava-inject-error' ]]
+then
+USE_SSJAVA_CLASSPATH=true
+JAVAOPTS="$JAVAOPTS -ssjava-inject-error $2 $3"
+shift
+shift
+
 elif [[ $1 = '-mempool-detect-misuse' ]]
 then
 EXTRAOPTIONS="$EXTRAOPTIONS -DMEMPOOL_DETECT_MISUSE"
@@ -674,6 +697,11 @@ then
 EXTRAOPTIONS="$EXTRAOPTIONS -DINITIALHEAPSIZE_MB=($2)"
 shift
 
+elif [[ $1 = '-compiler-heapsize-mb' ]]
+then
+COMPILER_HEAP_SIZE="$2"
+shift
+
 elif [[ $1 = '-nostalltr' ]]
 then
 JAVAOPTS="$JAVAOPTS -nostalltr"
@@ -813,6 +841,7 @@ fi
 shift
 done
 
+
 BUILDDIR="$CURDIR/$tmpbuilddirectory"
 
 BAMBOORUNTIME=$ROBUSTROOT/Runtime/bamboo
@@ -828,17 +857,25 @@ then
 JAVAOPTS="$JAVAOPTS -struct structfile"
 fi
 
+if $TILERAFLAG
+then
 # for tilera code, generate multicorememsize.h
 ./generate_memsize.sh ${TILERA_PAGE_SIZE} ${TILERA_PAGE_SIZE_BITS} ${TILERA_NUM_BLOCKS} ${TILERA_NUM_PAGES_PER_BLOCK} ${BUILDDIR}
+fi
 
 
 #########################
 # Setup class path
 #########################
-if $JNI
+if $OOOJAVA
   then
-  JAVAOPTS="$JAVAOPTS -classlibrary $ROBUSTROOT/classpath/ -classlibrary $ROBUSTROOT/classpath/vm/reference"
+  # stuff for OoOJava to mask parts of the base
+  JAVAOPTS="$JAVAOPTS -classlibrary $ROBUSTROOT/ClassLibrary/OoOJava"  
+fi
 
+if $JNI
+  then
+  JAVAOPTS="$JAVAOPTS -classlibrary $ROBUSTROOT/classpath/ -classlibrary $ROBUSTROOT/classpath/vm/reference/"
 elif $MGCINTELFLAG
   then
   JAVAOPTS="$JAVAOPTS -classlibrary $ROBUSTROOT/ClassLibrary/MGC/ -classlibrary $ROBUSTROOT/ClassLibrary/MGC/gnu/"
@@ -848,11 +885,13 @@ elif $MGCFLAG
   #base multicore gc files
   JAVAOPTS="$JAVAOPTS -classlibrary $ROBUSTROOT/ClassLibrary/MGC/ -classlibrary $ROBUSTROOT/ClassLibrary/MGC/gnu/"
 
-elif $SSJAVA
+elif $USE_SSJAVA_CLASSPATH
   then
   JAVAOPTS="$JAVAOPTS -classlibrary $ROBUSTROOT/ClassLibrary/SSJava"  
 
 else
+  JAVAOPTS="$JAVAOPTS -classlibrary $ROBUSTROOT/ClassLibrary/ -classlibrary $ROBUSTROOT/ClassLibrary/gnu/"
+
   if $RECOVERFLAG
     then
     if $FASTCHECK
@@ -885,7 +924,7 @@ else
 fi
 
 # everyone gets this except ssjava!
-if ! $SSJAVA
+if ! $USE_SSJAVA_CLASSPATH
   then
   JAVAOPTS="$JAVAOPTS -classlibrary $ROBUSTROOT/ClassLibrary/ -classlibrary $ROBUSTROOT/ClassLibrary/gnu/"
 fi
@@ -894,12 +933,14 @@ fi
 #########################
 
 
+echo "compiler running in JVM with heap size: ${COMPILER_HEAP_SIZE}MB"
+
 
 # Build bristlecone/java sources
 
 if $MULTICOREFLAG
   then
-  if ! ${ROBUSTROOT}/ourjava -Xms50m -Xmx1500m $JAVAFORWARDOPTS -classpath $ROBUSTROOT/../cup/:$ROBUSTROOT Main.Main \
+  if ! ${ROBUSTROOT}/ourjava -Xms50m -Xmx${COMPILER_HEAP_SIZE}m $JAVAFORWARDOPTS -classpath $ROBUSTROOT/../cup/:$ROBUSTROOT Main.Main \
        -dir $BUILDDIR $JAVAOPTS $SRCFILES
     then exit $?
   fi
@@ -908,7 +949,7 @@ else
 
   if $MGCINTELFLAG
     then
-    if ! ${ROBUSTROOT}/ourjava -Xms50m -Xmx1500m $JAVAFORWARDOPTS -classpath $ROBUSTROOT/../cup/:$ROBUSTROOT Main.Main $JAVAOPTS \
+    if ! ${ROBUSTROOT}/ourjava -Xms50m -Xmx${COMPILER_HEAP_SIZE}m $JAVAFORWARDOPTS -classpath $ROBUSTROOT/../cup/:$ROBUSTROOT Main.Main $JAVAOPTS \
          -dir $BUILDDIR -precise $SRCFILES
       then exit $?
     fi
@@ -916,7 +957,7 @@ else
   else
     if ! $NOJAVA
       then
-      if ! ${ROBUSTROOT}/ourjava -Xms50m -Xmx1500m $JAVAFORWARDOPTS -classpath $ROBUSTROOT/../cup/:$ROBUSTROOT Main.Main \
+      if ! ${ROBUSTROOT}/ourjava -Xms50m -Xmx${COMPILER_HEAP_SIZE}m $JAVAFORWARDOPTS -classpath $ROBUSTROOT/../cup/:$ROBUSTROOT Main.Main \
           -dir $BUILDDIR -precise $JAVAOPTS $SRCFILES
         then exit $?
       fi
@@ -924,11 +965,14 @@ else
   fi
 fi
 
+# after executing Main, if -justanalyze flag, just exit
 if $EXITAFTERANALYSIS
 then
 exit
 fi
 
+
+
 # Build all of the consistency specs
 
 if $CHECKFLAG # CHECKFLAG