changes
[IRC.git] / Robust / src / buildscript
index 002f4b6d50378b5ddd3797a0c98516a3d28e186f..a1b162f8de158062e547835a8a08023e60ea1a90 100755 (executable)
 #!/bin/bash
 
 printhelp() {
-echo -robustroot set up the ROBUSTROOT to directory other than default one
-echo -dsm distributed shared memory
+echo STM Options
 echo -singleTM single machine committing transactions
 echo -stmdebug STM debug
 echo "-stmstats prints single machine commit (stm) statistics for the benchmark"
 echo -fastmemcpy use fast memcpy
+echo -sandbox sandbox transactions
+echo -dcopts conflict optimizations for transactional memory
+echo -transstats generates transaction stats on commits and aborts
+echo -inlineatomic depth inline methods inside of transactions to specified depth
+echo "-stmarray partial array treatment"
+echo "-dualview dual view of arrays"
+echo "-hybrid use fission only when it looks like a good choice"
+echo "-numa numa aware"
+echo "-eventmonitor turn on transaction event trace recording"
+echo
+echo OOOJava options
+echo -coreprof, turn on profiling API
+echo -coreprof-eventwords NUM, space in words/thread for coreprof events
+echo -coreprof-checkoverflow, ONLY use for debugging event overflow
+echo -coreprof-enable EVENTNAME, only enable desired events to reduce overhead
+echo   EVENTNAME can be: cpe_main, cpe_runmalloc, cpe_runfree, cpe_poolalloc, cpe_count_poolalloc, cpe_count_poolreuse, cpe_workschedgrab, cpe_taskdispatch, cpe_preparememq, cpe_taskexecute, cpe_taskretire, cpe_taskstallvar, cpe_taskstallmem 
+echo "-ooojava <numberofcores> <maxseseage>"
+echo -ooodebug general OOOJava debugging messages
+echo -ooodebug-disable-task-mem-pool this is a tricky module, disable for simpler runtime
+echo -rcr turn on runtime conflict resolver
+echo
+echo Disjoint Reachability Analysis options
+echo -disjoint enable analysis
+echo -disjoint-k set k-limit for heap nodes per allocation site
+echo "-disjoint-write-dots <all/final> write reach graphs for all method sols. or only final sols."
+echo -disjoint-write-initial-contexts write reach graphs for callee initial contexts from all call sites
+echo -disjoint-write-ihms write reach graphs for each call site\'s Initial Heap Model
+echo "-disjoint-alias-file <filename> <normal/tabbed> write sharing for normal human reading or LaTeX tabbed"
+echo "-disjoint-debug-callsite <callee> <caller> <visit to start> <num caps> <T/F stop after>"
+echo "  To debug call site, give callee caller symbols (ie foo) the analysis visit to start capturing, num captures to take, and whether to halt analysis after capturing"
+echo "-disjoint-debug-snap-method <method> <visit to start> <num caps> <T/F stop after>"
+echo "  To take snapshots at statements, give method symbol, the analysis visit to start capturing, num captures to take, and whether to halt analsyis after capturing"
+echo "-disjoint-dvisit-stack use stack strat to visit descriptors (tasks or methods)"
+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 
+echo "-mlp <num cores> <max sese age> build mlp code"
+echo -mlpdebug if mlp, report progress and interim results
+echo
+echo DSM options
+echo -dsm distributed shared memory
 echo -abortreaders abort readers immediately
 echo -trueprob double - probabiltiy of true branch
 echo -dsmcaching -enable caching in dsm runtime
+echo
+echo BAMBOO Multicore options
+echo -scheduling do task scheduling
+echo "-distributioninfo  execute to collect distribution info for simulated annealing in multi-core version"
+echo "-disall  execute to collect whole distribution"
+echo "-disstart specify the start number of distribution information collection"
+echo -multicore generate multi-core version binary
+echo "-numcore set the number of cores (should be used together with -multicore), defaultly set as 1"
+echo "-cacheflush enable cache flush in raw version binary (should be used togethere with -raw)"
+echo "-interrupt generate raw version binary with interruption (should be used togethere with -raw)"
+echo "-rawpath print out execute path information for raw version (should be used together with -raw)"
+echo "-useprofile use profiling data for scheduling (should be used together with -raw)"
+echo -printscheduling print out scheduling graphs
+echo -printschedulesim print out scheduling simulator result graphs
+echo "-tilera_bme generate tilera version binary for Bare Mental Environment (should be used together with -multicore"
+echo "-tilera_zlinux generate tilera version binary for Zero-Overhead Linux with multi-process mode (should be used together with -multicore"
+echo "-tileraconfig config tilera simulator/pci as nxm (should be used together with -tilera)"
+echo "-raw generate raw version binary (should be used together with -multicore)"
+echo "-rawconfig config raw simulator as 4xn (should be used together with -raw)"
+echo "-tilera_memprof build the memprof version (should be used together with -tilera_xx) "
+echo -accurateprofile build with accurate profile information including pre/post task processing info
+echo -profile_interrupt build with profile information of interrupts
+echo "-useio use standard io to output profiling data (should be used together with -raw and -profile), it only works with single core version"
+echo
+echo Multicore GC options
+echo -multicoregc generate multi-core binary with garbage collection
+echo "-numcore4gc set the number of cores for gc (should be used together with -multicoregc), defaultly set as 0"
+echo "-gcmem_local set the gc shared memory allocation strategy as local (should be used together with -multicoregc)"
+echo "-gcmem_fixed set the gc shared memory allocation strategy as fixed (should be used together with -multicoregc)"
+echo "-gcmem_mixed set the gc shared memory allocation strategy as mixed (should be used together with -multicoregc)"
+echo "-gcmem_global set the gc shared memory allocation strategy as global (should be used together with -multicoregc)"
+echo "-gccache_local set the gc shared memory cache strategy as local (should be used together with -multicoregc)"
+echo "-gccache_ran set the gc shared memory cache strategy as random (should be used together with -multicoregc)"
+echo "-gccontroller_near set the gc shared memory to use the nearest controller for each core (should be used together with -multicoregc)"
+echo "-gccontroller_remote set the gc shared memory to use a remote controller for each core (should be used together with -multicoregc)"
+echo "-gcsmallpagesize(2) set the gc shared memory to use small page size (should be used together with -multicoregc)"
+echo "-gclargepagesize set the gc shared memory to use large page size (should be used together with -multicoregc)"
+echo "-gclargesharedheap(2) set the gc shared memory as large (should be used together with -multicoregc)"
+echo "-gccacheadapt setup as cacheadaptable mode (should be used together with -multicoregc)"
+echo -gcprofile build with gcprofile options
+echo -mgc generate Multicore GC binary without task stuff
+echo
+echo Other options
+echo -abcclose turnoff array boundary checks
+echo -builddir setup different build directory
+echo -robustroot set up the ROBUSTROOT to directory other than default one
+echo -readset turn on readset
 echo -mac distributed shared memory mac support
 echo -check generate check code
 echo -dmalloc link in dmalloc
 echo -64bit compile for 64 bit machine
+echo -32bit compile for 32 bit machine
 echo -joptimize java compiler optimizations
-echo -dcopts conflict optimizations for transactional memory
+echo -noloop turnoff loop optimizations
 echo -recover compile task code
 echo -fastcheck fast checkpointing for Bristlecone
 echo -specdir directory
@@ -24,25 +114,10 @@ echo -selfloop task - this task cannot self loop forever
 echo "-excprefetch methoddescriptor - exclude prefetches for this method (specified as class.method)"
 echo -taskstate do task state analysis
 echo -tagstate do tag state analysis
-echo -scheduling do task scheduling
-echo -multicore generate multi-core version binary
-echo "-numcore set the number of cores (should be used together with -multicore), defaultly set as 1"
-echo "-cacheflush enable cache flush in raw version binary (should be used togethere with -raw)"
-echo "-interrupt generate raw version binary with interruption (should be used togethere with -raw)"
-echo "-rawpath print out execute path information for raw version (should be used together with -raw)"
-echo "-useprofile use profiling data for scheduling (should be used together with -raw)"
-echo -printscheduling print out scheduling graphs
-echo -printschedulesim print out scheduling simulator result graphs
-echo -abcclose close the array boundary check
-echo "-tilera generate tilera version binary (should be used together with -multicore"
-echo "-tileraconfig config tilera simulator/pci as nxm (should be used together with -tilera)"
-echo "-raw generate raw version binary (should be used together with -multicore)"
-echo "-rawconfig config raw simulator as 4xn (should be used together with -raw)"
-echo -threadsimulate generate multi-thread simulate version binary
 echo -optional enable optional
 echo -debug generate debug symbols
 echo -prefetch do prefetch analysis
-echo -transstats generates transaction stats on commits and aborts
+echo -heapsize-mb NUM  set initial heap size in MB, default is 256
 echo -garbagestats Print garbage collection statistics
 echo -webinterface enable web interface
 echo -runtimedebug printout runtime debug messages
@@ -55,37 +130,80 @@ echo -o binary
 echo -nojava do not run bristlecone compiler
 echo -instructionfailures inject code for instructionfailures
 echo -profile build with profile options
-echo "-useio use standard io to output profiling data (should be used together with -raw and -profile), it only works with single core version"
 echo "-enable-assertions execute assert statements during compilation"
 echo -justanalyze exit after compiler analyses complete
+echo -assembly generate assembly
+echo -recovery compile recovery code
+echo -dsmtask support work and task class library
+echo -recoverystats print out recovery record 
+echo -src-after-pp prints source code after preprocessor to tmp.c
 echo -help help
 }
 
+tmpbuilddirectory="tmpbuilddirectory"
+SRCAFTERPP=false;
+COREPROF=false;
+NUMA=false;
+SANDBOX=false;
 ABORTREADERS=false;
 ROBUSTROOT=~/research/Robust/src
 DSMRUNTIME=$ROBUSTROOT/Runtime/DSTM/interface/
+STMRUNTIME=$ROBUSTROOT/Runtime/STM/
+DSMRECOVERYRUNTIME=$ROBUSTROOT/Runtime/DSTM/interface_recovery/
 REPAIRROOT=~/research/Repair/RepairCompiler/
 CURDIR=`pwd`
 DSMFLAG=false
+DSMRECOVERY=false
 FASTMEMCPY=false
-SINGLETM=false
+STMARRAY=false
+DUALVIEW=false
+STM=false
+EVENTMONITOR=false
 NOJAVA=false
 CHECKFLAG=false
 RECOVERFLAG=false
-MLPFLAG=false
+MLP_ON=false
+RCR=false
 MLPDEBUG=false
 MULTICOREFLAG=false
 RAWFLAG=false
 TILERAFLAG=false
+TILERABMEFLAG=false
+TILERAZLINUXFLAG=false
+TILERAMEMPROFFLAG=false
 TILERACONFIG=''
 CACHEFLUSHFLAG=false
 RAWCONFIG=''
 DEBUGFLAG=false
 RAWPATHFLAG=false
 PROFILEFLAG=false
+GCPROFILEFLAG=false
+GCPROFILESFLAG=false
+ACCURATEPROFILEFLAG=false
+PROFILEINTERRUPTFLAG=false
 USEIOFLAG=false
 INTERRUPTFLAG=false
 THREADSIMULATEFLAG=false;
+MULTICOREGCFLAG=false;
+GCMEMLOCALFLAG=false;
+GCMEMFIXEDFLAG=false;
+GCMEMMIXEDFLAG=false;
+GCMEMGLOBALFLAG=false;
+GCCACHELOCALFLAG=false;
+GCCACHERANFLAG=false;
+GCCONTROLLERNEARFLAG=false;
+GCCONTROLLERREMOTEFLAG=false;
+GCSMALLPAGESIZEFLAG=false;
+GCLARGEPAGESIZEFLAG=false;
+GCLARGEPAGESIZE2FLAG=false;
+GCLARGESHAREDHEAPFLAG=false;
+GCSMALLPAGESIZEFLAG2=false;
+GCLARGESHAREDHEAPFLAG2=false;
+GCCACHEADAPTFLAG=false
+GCCACHEADAPTPOLICYFLAG=false
+GCCACHEADAPTPOLICY=''
+GCCACHESAMPLINGFLAG=false
+MGCFLAG=false
 USEDMALLOC=false
 THREADFLAG=false
 FASTCHECK=false
@@ -97,6 +215,10 @@ JAVAFORWARDOPTS=''
 JAVAOPTS=''
 OPTIONALFLAG=false
 EXITAFTERANALYSIS=false
+ASSEMBLY=false
+GCCORES=''
+TILERAN1COREFLAG=false
+TILERA56COREFLAG=false
 
 if [[ -z $1 ]]
 then
@@ -110,27 +232,57 @@ if [[ $1 = '-help' ]]
 then
 printhelp
 exit
+
 elif [[ $1 = '-justanalyze' ]]
 then
 EXITAFTERANALYSIS=true
+
+elif [[ $1 = '-src-after-pp' ]]
+then
+SRCAFTERPP=true
+
+elif [[ $1 = '-assembly' ]]
+then
+ASSEMBLY=true
 elif [[ $1 = '-abortreaders' ]]
 then
 ABORTREADERS=true
 EXTRAOPTIONS="$EXTRAOPTIONS -DABORTREADERS"
 JAVAOPTS="$JAVAOPTS -abortreaders"
+elif [[ $1 = '-sandbox' ]]
+then
+SANDBOX=true
+EXTRAOPTIONS="$EXTRAOPTIONS -DSANDBOX"
+JAVAOPTS="$JAVAOPTS -sandbox"
+elif [[ $1 = '-numa' ]]
+then
+EXTRAOPTIONS="$EXTRAOPTIONS -DAFFINITY -D_GNU_SOURCE"
+NUMA=true
 elif [[ $1 = '-robustroot' ]]
 then
 ROBUSTROOT="$2"
 shift
+elif [[ $1 = '-builddir' ]]
+then
+tmpbuilddirectory="$2"
+shift
 elif [[ $1 = '-nojava' ]]
 then
 NOJAVA=true
+elif [[ $1 = '-eventmonitor' ]]
+then
+JAVAOPTS="$JAVAOPTS -eventmonitor"
+EVENTMONITOR=true
+EXTRAOPTIONS="$EXTRAOPTIONS -DEVENTMONITOR"
 elif [[ $1 = '-garbagestats' ]]
 then
 EXTRAOPTIONS="$EXTRAOPTIONS -DGARBAGESTATS"
 elif [[ $1 = '-64bit' ]]
 then
-EXTRAOPTIONS="$EXTRAOPTIONS -DBIT64"
+EXTRAOPTIONS="$EXTRAOPTIONS -DBIT64 -m64"
+elif [[ $1 = '-32bit' ]]
+then
+EXTRAOPTIONS="$EXTRAOPTIONS -m32"
 elif [[ $1 = '-fastcheck' ]]
 then
 EXTRAOPTIONS="$EXTRAOPTIONS -DFASTCHECK"
@@ -152,6 +304,9 @@ elif [[ $1 = '-excprefetch' ]]
 then
 JAVAOPTS="$JAVAOPTS -excprefetch $2"
 shift
+elif [[ $1 = '-arraypad' ]]
+then
+JAVAOPTS="$JAVAOPTS -arraypad"
 elif [[ $1 = '-dsm' ]]
 then
 JAVAOPTS="$JAVAOPTS -dsm"
@@ -164,13 +319,30 @@ elif [[ $1 = '-singleTM' ]]
 then
 JAVAOPTS="$JAVAOPTS -singleTM"
 EXTRAOPTIONS="$EXTRAOPTIONS -DSTM"
-SINGLETM=true
+STM=true
+elif [[ $1 = '-stmarray' ]]
+then
+JAVAOPTS="$JAVAOPTS -stmarray"
+EXTRAOPTIONS="$EXTRAOPTIONS -DSTMARRAY"
+STMARRAY=true
+elif [[ $1 = '-dualview' ]]
+then
+JAVAOPTS="$JAVAOPTS -dualview"
+EXTRAOPTIONS="$EXTRAOPTIONS -DDUALVIEW"
+DUALVIEW=true
+elif [[ $1 = '-readset' ]]
+then
+JAVAOPTS="$JAVAOPTS -readset"
+EXTRAOPTIONS="$EXTRAOPTIONS -DREADSET"
 elif [[ $1 = '-stmdebug' ]]
 then
 EXTRAOPTIONS="$EXTRAOPTIONS -DSTMDEBUG"
 elif [[ $1 = '-stmstats' ]]
 then
 EXTRAOPTIONS="$EXTRAOPTIONS -DSTMSTATS"
+elif [[ $1 = '-stmlog' ]]
+then
+EXTRAOPTIONS="$EXTRAOPTIONS -DSTMLOG"
 elif [[ $1 = '-prefetch' ]]
 then
 JAVAOPTS="$JAVAOPTS -prefetch"
@@ -184,6 +356,10 @@ elif [[ $1 = '-trueprob' ]]
 then
 JAVAOPTS="$JAVAOPTS -trueprob $2"
 shift
+elif [[ $1 = '-inlineatomic' ]]
+then
+JAVAOPTS="$JAVAOPTS -inlineatomic $2"
+shift
 elif [[ $1 = '-mac' ]]
 then
 EXTRAOPTIONS="$EXTRAOPTIONS -DMAC"
@@ -191,6 +367,18 @@ elif [[ $1 = '-profile' ]]
 then
 PROFILEFLAG=true
 EXTRAOPTIONS="$EXTRAOPTIONS -pg"
+elif [[ $1 = '-gcprofile' ]]
+then
+GCPROFILEFLAG=true
+elif [[ $1 = '-gcprofile_s' ]]
+then
+GCPROFILESFLAG=true
+elif [[ $1 = '-accurateprofile' ]]
+then
+ACCURATEPROFILEFLAG=true
+elif [[ $1 = '-profile_interrupt' ]]
+then
+PROFILEINTERRUPTFLAG=true
 elif [[ $1 = '-useio' ]]
 then
 USEIOFLAG=true
@@ -210,14 +398,35 @@ JAVAOPTS="$JAVAOPTS -multicore"
 elif [[ $1 = '-numcore' ]]
 then
 JAVAOPTS="$JAVAOPTS -numcore $2"
+if [[ "$2" -gt "1" ]]
+then
+TILERAN1COREFLAG=true
+if [[ "$2" -eq "56" ]]
+then
+TILERA56COREFLAG=true
+fi
+fi
+shift
+elif [[ $1 = '-numcore4gc' ]]
+then
+JAVAOPTS="$JAVAOPTS -numcore4gc $2"
+GCCORES="GC_$2"
 shift
 elif [[ $1 = '-raw' ]]
 then
 RAWFLAG=true
 JAVAOPTS="$JAVAOPTS -raw"
-elif [[ $1 = '-tilera' ]]
+elif [[ $1 = '-tilera_bme' ]]
+then
+TILERAFLAG=true
+TILERABMEFLAG=true
+elif [[ $1 = '-tilera_zlinux' ]]
 then
 TILERAFLAG=true
+TILERAZLINUXFLAG=true
+elif [[ $1 = '-tilera_memprof' ]]
+then
+TILERAMEMPROFFLAG=true
 elif [[ $1 = '-tileraconfig' ]]
 then
 TILERACONFIG="$2"
@@ -232,9 +441,6 @@ shift
 elif [[ $1 = '-interrupt' ]]
 then
 INTERRUPTFLAG=true
-elif [[ $1 = '-threadsimulate' ]]
-then
-THREADSIMULATEFLAG=true
 elif [[ $1 = '-abcclose' ]]
 then
 JAVAOPTS="$JAVAOPTS -abcclose"
@@ -242,6 +448,67 @@ elif [[ $1 = '-optional' ]]
 then
 JAVAOPTS="$JAVAOPTS -optional"
 OPTIONALFLAG=true
+elif [[ $1 = '-multicoregc' ]]
+then
+MULTICOREGCFLAG=true
+JAVAOPTS="$JAVAOPTS -multicoregc"
+elif [[ $1 = '-gcmem_local' ]]
+then
+GCMEMLOCALFLAG=true
+elif [[ $1 = '-gcmem_fixed' ]]
+then
+GCMEMFIXEDFLAG=true
+elif [[ $1 = '-gcmem_mixed' ]]
+then
+GCMEMMIXEDFLAG=true
+elif [[ $1 = '-gcmem_global' ]]
+then
+GCMEMGLOBALFLAG=true
+elif [[ $1 = '-gccache_local' ]]
+then
+GCCACHELOCALFLAG=true
+elif [[ $1 = '-gccache_ran' ]]
+then
+GCCACHERANFLAG=true
+elif [[ $1 = '-gccontroller_near' ]]
+then
+GCCONTROLLERNEARFLAG=true
+elif [[ $1 = '-gccontroller_remote' ]]
+then
+GCCONTROLLERREMOTEFLAG=true
+elif [[ $1 = '-gcsmallpagesize' ]]
+then
+GCSMALLPAGESIZEFLAG=true
+elif [[ $1 = '-gcsmallpagesize2' ]]
+then
+GCSMALLPAGESIZEFLAG2=true
+elif [[ $1 = '-gclargepagesize' ]]
+then
+GCLARGEPAGESIZEFLAG=true
+elif [[ $1 = '-gclargepagesize2' ]]
+then
+GCLARGEPAGESIZE2FLAG=true
+elif [[ $1 = '-gclargesharedheap' ]]
+then
+GCLARGESHAREDHEAPFLAG=true
+elif [[ $1 = '-gclargesharedheap2' ]]
+then
+GCLARGESHAREDHEAPFLAG2=true
+elif [[ $1 = '-gccacheadapt' ]]
+then
+GCCACHEADAPTFLAG=true
+elif [[ $1 = '-gccacheadaptpolicy' ]]
+then
+GCCACHEADAPTPOLICYFLAG=true
+GCCACHEADAPTPOLICY="$2"
+shift
+elif [[ $1 = '-gccachesampling' ]]
+then
+GCCACHESAMPLINGFLAG=true
+elif [[ $1 = '-mgc' ]]
+then
+MGCFLAG=true
+JAVAOPTS="$JAVAOPTS -mgc"
 elif [[ $1 = '-dmalloc' ]]
 then
 USEDMALLOC=true
@@ -251,7 +518,8 @@ RECOVERFLAG=true
 JAVAOPTS="$JAVAOPTS -task"
 elif [[ $1 = '-useprofile' ]]
 then
-JAVAOPTS="$JAVAOPTS -useprofile"
+JAVAOPTS="$JAVAOPTS -useprofile $2"
+shift
 elif [[ $1 = '-webinterface' ]]
 then
 JAVAOPTS="$JAVAOPTS -webinterface"
@@ -261,15 +529,80 @@ JAVAOPTS="$JAVAOPTS -instructionfailures"
 elif [[ $1 = '-joptimize' ]]
 then
 JAVAOPTS="$JAVAOPTS -optimize"
+elif [[ $1 = '-noloop' ]]
+then
+JAVAOPTS="$JAVAOPTS -noloop"
 elif [[ $1 = '-dcopts' ]]
 then
 JAVAOPTS="$JAVAOPTS -dcopts"
+elif [[ $1 = '-delaycomp' ]]
+then
+JAVAOPTS="$JAVAOPTS -delaycomp"
+EXTRAOPTIONS="$EXTRAOPTIONS -DDELAYCOMP"
+elif [[ $1 = '-hybrid' ]]
+then
+JAVAOPTS="$JAVAOPTS -hybrid"
+EXTRAOPTIONS="$EXTRAOPTIONS -DHYBRID"
+elif [[ $1 = '-minimize' ]]
+then
+JAVAOPTS="$JAVAOPTS -minimize"
+
+elif [[ $1 = '-ooojava' ]]
+then
+MLP_ON=true
+JAVAOPTS="$JAVAOPTS -ooojava $2 $3"
+EXTRAOPTIONS="$EXTRAOPTIONS -DPRECISE_GC -lpthread -DMLP"
+shift
+shift
+
+elif [[ $1 = '-ooodebug-disable-task-mem-pool' ]]
+then
+EXTRAOPTIONS="$EXTRAOPTIONS -DOOO_DISABLE_TASKMEMPOOL"
+
+elif [[ $1 = '-heapsize-mb' ]]
+then
+EXTRAOPTIONS="$EXTRAOPTIONS -DINITIALHEAPSIZE_MB=($2)"
+shift
+
+elif [[ $1 = '-rcr' ]]
+then
+JAVAOPTS="$JAVAOPTS -rcr"
+RCR=true
+EXTRAOPTIONS="$EXTRAOPTIONS -DRCR -I$ROBUSTROOT/Runtime/oooJava"
+
+
+elif [[ $1 = '-coreprof' ]]
+then
+COREPROF=true
+JAVAOPTS="$JAVAOPTS -coreprof"
+EXTRAOPTIONS="$EXTRAOPTIONS -DCOREPROF -I$ROBUSTROOT/Runtime/coreprof"
+
+elif [[ $1 = '-coreprof-eventwords' ]]
+then
+EXTRAOPTIONS="$EXTRAOPTIONS -DCP_MAXEVENTWORDS=($2)"
+shift
+
+elif [[ $1 = '-coreprof-checkoverflow' ]]
+then
+EXTRAOPTIONS="$EXTRAOPTIONS -DCOREPROF_CHECKOVERFLOW"
+
+elif [[ $1 = '-coreprof-enable' ]]
+then
+EXTRAOPTIONS="$EXTRAOPTIONS -D$2"
+shift
+
 elif [[ $1 = '-mlp' ]]
 then
-JAVAOPTS="$JAVAOPTS -mlp"
+MLP_ON=true
+EXTRAOPTIONS="$EXTRAOPTIONS -DPRECISE_GC -lpthread -DMLP"
+JAVAOPTS="$JAVAOPTS -mlp $2 $3"
+shift
+shift
+
 elif [[ $1 = '-mlpdebug' ]]
 then
 JAVAOPTS="$JAVAOPTS -mlpdebug"
+
 elif [[ $1 = '-check' ]]
 then
 CHECKFLAG=true
@@ -286,7 +619,7 @@ shift
 elif [[ $1 = '-debug' ]]
 then
 DEBUGFLAG=true
-EXTRAOPTIONS="$EXTRAOPTIONS -g"
+EXTRAOPTIONS="$EXTRAOPTIONS -g -rdynamic"
 elif [[ $1 = '-rawpath' ]]
 then
 RAWPATHFLAG=true
@@ -304,15 +637,33 @@ then
 EXTRAOPTIONS="$EXTRAOPTIONS -O0"
 elif [[ $1 = '-optimize' ]]
 then
-EXTRAOPTIONS="$EXTRAOPTIONS -O9"
+EXTRAOPTIONS="$EXTRAOPTIONS -O3"
 elif [[ $1 = '-thread' ]]
 then
 JAVAOPTS="$JAVAOPTS -thread"
 EXTRAOPTIONS="$EXTRAOPTIONS -DTHREADS -lpthread"
 THREADFLAG=true
+elif [[ $1 = '-recovery' ]]
+then
+EXTRAOPTIONS="$EXTRAOPTIONS -DRECOVERY"
+DSMRECOVERY=true
+elif [[ $1 = '-recoverystats' ]]
+then
+JAVAOPTS="$JAVAOPTS -recoverystats"
+EXTRAOPTIONS="$EXTRAOPTIONS -DRECOVERYSTATS"
 elif [[ $1 = '-distributioninfo' ]]
 then
 JAVAOPTS="$JAVAOPTS -distributioninfo"
+elif [[ $1 = '-disall' ]]
+then
+JAVAOPTS="$JAVAOPTS -disall"
+elif [[ $1 = '-disstart' ]]
+then
+JAVAOPTS="$JAVAOPTS -disstart $2"
+shift
+elif [[ $1 = '-noc' ]]
+then
+CCOMPILEFLAG=false
 elif [[ $1 = '-curdir' ]]
 then
 CURDIR=$2
@@ -327,7 +678,9 @@ fi
 shift
 done
 
-BUILDDIR="$CURDIR/tmpbuilddirectory"
+BUILDDIR="$CURDIR/$tmpbuilddirectory"
+
+BAMBOORUNTIME=$ROBUSTROOT/Runtime/bamboo
 
 cd $1
 cd $CURDIR
@@ -357,13 +710,17 @@ if $DSMFLAG
 then
 #dsm stuff
 JAVAOPTS="$JAVAOPTS -classlibrary $ROBUSTROOT/ClassLibrary/JavaDSM"
-elif $SINGLETM
+elif $STM
 then
 JAVAOPTS="$JAVAOPTS -classlibrary $ROBUSTROOT/ClassLibrary/JavaSTM"
 elif $THREADFLAG
 then
 #threading java stuff
 JAVAOPTS="$JAVAOPTS -classlibrary $ROBUSTROOT/ClassLibrary/JavaThread"
+elif $MGCFLAG
+then
+#base multicore gc files
+JAVAOPTS="$JAVAOPTS -classlibrary $ROBUSTROOT/ClassLibrary/MGC"
 fi
 #base java stuff
 JAVAOPTS="$JAVAOPTS -classlibrary $ROBUSTROOT/ClassLibrary/Java"
@@ -373,7 +730,7 @@ fi
 
 if $MULTICOREFLAG
 then
-if ! ${ROBUSTROOT}/ourjava -Xms50m -Xmx800m $JAVAFORWARDOPTS -classpath $ROBUSTROOT/../cup/:$ROBUSTROOT Main.Main -classlibrary \
+if ! ${ROBUSTROOT}/ourjava -Xms50m -Xmx1500m $JAVAFORWARDOPTS -classpath $ROBUSTROOT/../cup/:$ROBUSTROOT Main.Main -classlibrary \
 $ROBUSTROOT/ClassLibrary/ -classlibrary $ROBUSTROOT/ClassLibrary/gnu/ \
 -dir $BUILDDIR $JAVAOPTS $SRCFILES
 then exit $?
@@ -382,7 +739,7 @@ else
 #if ! ${ROBUSTROOT}/ourjava -Xms5m -Xmx100m $JAVAFORWARDOPTS -classpath $ROBUSTROOT/../cup/:$ROBUSTROOT Main.Main -classlibrary \
 if ! $NOJAVA
 then
-if ! ${ROBUSTROOT}/ourjava -Xms50m -Xmx600m $JAVAFORWARDOPTS -classpath $ROBUSTROOT/../cup/:$ROBUSTROOT Main.Main -classlibrary \
+if ! ${ROBUSTROOT}/ourjava -Xms50m -Xmx1500m $JAVAFORWARDOPTS -classpath $ROBUSTROOT/../cup/:$ROBUSTROOT Main.Main -classlibrary \
 $ROBUSTROOT/ClassLibrary/ -classlibrary $ROBUSTROOT/ClassLibrary/gnu/ -dir $BUILDDIR -precise \
 $JAVAOPTS $SRCFILES
 then exit $?
@@ -464,6 +821,11 @@ then # profile version
 RAWRGCCFLAGS="${RAWRGCCFLAGS} -DPROFILE"
 fi
 
+if $ACCURATEPROFILEFLAG
+then # accurateprofile version
+RAWRGCCFLAGS="${RAWRGCCFLAGS} -DACCURATEPROFILE"
+fi
+
 if $USEIOFLAG
 then # useio version
 RAWRGCCFLAGS="${RAWRGCCFLAGS} -DUSEIO"
@@ -482,31 +844,69 @@ else
 MAKEFILE="$MAKEFILE.$RAWCONFIG"
 fi #useio version
 
-cp $ROBUSTROOT/Runtime/RAW/$MAKEFILE ./Makefile
+cp $BAMBOORUNTIME/RAW/$MAKEFILE ./Makefile
 cp ../Runtime/*.c ./
 cp ../Runtime/*.h ./
 cp ../Runtime/*.S ./
 cp ../Runtime/*.s ./
-cp ../Runtime/RAW/*.c ./
-cp ../Runtime/RAW/*.h ./
-cp ../Runtime/RAW/*.S ./
-cp ../Runtime/RAW/*.s ./
-cp ../tmpbuilddirectory/*.c ./
-cp ../tmpbuilddirectory/*.h ./
+mkdir ./coreprof
+cp ../Runtime/coreprof/*.c ./coreprof/
+cp ../Runtime/coreprof/*.h ./coreprof/
+cp $BAMBOORUNTIME/*.c ./
+cp $BAMBOORUNTIME/*.h ./
+cp $BAMBOORUNTIME/RAW/*.c ./
+cp $BAMBOORUNTIME/RAW/*.h ./
+cp $BAMBOORUNTIME/RAW/*.S ./
+cp $BAMBOORUNTIME/RAW/*.s ./
+cp ../$tmpbuilddirectory/*.c ./
+cp ../$tmpbuilddirectory/*.h ./
 
 make
 
 elif $TILERAFLAG
 then # TILERAFLAG
 TILERADIR="$CURDIR/tilera"
+if $TILERABMEFLAG
+then # TILERABMEFLAG
+TILERA_INDIR="BME"
 MAKEFILE="Makefile.tilera.$TILERACONFIG"
 SIMHVC="sim.hvc.$TILERACONFIG"
+PCIHVC="pci.hvc.$TILERACONFIG"
+if $TILERA56COREFLAG
+then
+  PCIHVC="$PCIHVC.56"
+fi
+elif $TILERAZLINUXFLAG
+then # TILERAZLINUXFLAG
+TILERA_INDIR="ZLinux"
+MAKEFILE="Makefile.tilera.$TILERACONFIG"
+fi
+
 mkdir $TILERADIR
 cd $TILERADIR
 make clean
 rm ./*
 
-export TILERACFLAGS="-DTASK -DMULTICORE"
+if $MGCFLAG
+then
+export TILERACFLAGS="-DMULTICORE -DCLOSE_PRINT -DTILERA"
+else
+export TILERACFLAGS="-DTASK -DMULTICORE -DCLOSE_PRINT -DTILERA"
+fi
+
+if $TILERAMEMPROFFLAG
+then # not only with 1 core
+  PCIHVC="$PCIHVC.memprof"
+  TILERACFLAGS="${TILERACFLAGS} -DBAMBOO_MEMPROF"
+fi
+
+if $TILERABMEFLAG
+then # TILERABMEFLAG
+TILERACFLAGS="${TILERACFLAGS} -DTILERA_BME"
+elif $TILERAZLINUXFLAG
+then # TILERAZLINUXFLAG
+TILERACFLAGS="${TILERACFLAGS} -DTILERA_ZLINUX"
+fi
 
 if $CACHEFLUSHFLAG
 then # print path
@@ -528,6 +928,16 @@ then # profile version
 TILERACFLAGS="${TILERACFLAGS} -DPROFILE"
 fi
 
+if $ACCURATEPROFILEFLAG
+then # accurateprofile version
+TILERACFLAGS="${TILERACFLAGS} -DACCURATEPROFILE"
+fi
+
+if $PROFILEINTERRUPTFLAG
+then # profile_interrupt version
+TILERACFLAGS="${TILERACFLAGS} -DPROFILE_INTERRUPT"
+fi
+
 if $USEIOFLAG
 then # useio version
 TILERACFLAGS="${TILERACFLAGS} -DUSEIO"
@@ -538,14 +948,135 @@ then #INTERRUPT version
 TILERACFLAGS="${TILERACFLAGS} -DINTERRUPT"
 fi #INTERRUPT version
 
-cp $ROBUSTROOT/Runtime/Tilera/$MAKEFILE ./Makefile
-cp $ROBUSTROOT/Runtime/Tilera/$SIMHVC ./sim.hvc
-cp ../Runtime/multicoretask.c ./
-cp ../Runtime/multicoreruntime.c ./
+if $MGCFLAG
+then #MGCFLAG
+TILERACFLAGS="${TILERACFLAGS} -DMGC"
+fi
+
+if $MULTICOREGCFLAG
+then #MULTICOREGC version
+TILERACFLAGS="${TILERACFLAGS} -DMULTICORE_GC -D${GCCORES}"
+fi
+
+if $GCPROFILEFLAG
+then # GC_PROFILE version
+TILERACFLAGS="${TILERACFLAGS} -DGC_PROFILE"
+fi
+
+if $GCPROFILESFLAG
+then # GC_PROFILE_S version
+TILERACFLAGS="${TILERACFLAGS} -DGC_PROFILE_S"
+fi
+
+if $GCMEMLOCALFLAG
+then # SMEMLOCAL version
+TILERACFLAGS="${TILERACFLAGS} -DSMEML"
+fi
+
+if $GCMEMFIXEDFLAG
+then # SMEMFIXED version
+TILERACFLAGS="${TILERACFLAGS} -DSMEMF"
+fi
+
+if $GCMEMMIXEDFLAG
+then # SMEMMIXED version
+TILERACFLAGS="${TILERACFLAGS} -DSMEMM"
+fi
+
+if $GCMEMGLOBALFLAG
+then # SMEMGLOBAL version
+TILERACFLAGS="${TILERACFLAGS} -DSMEMG"
+fi
+
+if $GCCACHELOCALFLAG
+then # CACHE_LOCAL version
+TILERACFLAGS="${TILERACFLAGS} -DCACHE_LOCAL"
+fi
+
+if $GCCACHERANFLAG
+then # CACHE_RAN version
+TILERACFLAGS="${TILERACFLAGS} -DCACHE_RAN"
+fi
+
+if $GCCONTROLLERNEARFLAG
+then # CONTROLLER_NEAR version
+TILERACFLAGS="${TILERACFLAGS} -DCONTROLLER_NEAR"
+fi
+
+if $GCCONTROLLERREMOTEFLAG
+then # CONTROLLER_REMOTE version
+TILERACFLAGS="${TILERACFLAGS} -DCONTROLLER_REMOTE"
+fi
+
+if $GCSMALLPAGESIZEFLAG
+then # GC_SMALLPAGESIZE version
+TILERACFLAGS="${TILERACFLAGS} -DGC_SMALLPAGESIZE"
+fi
+
+if $GCLARGEPAGESIZEFLAG
+then # GC_LARGEPAGESIZE version
+TILERACFLAGS="${TILERACFLAGS} -DGC_LARGEPAGESIZE"
+fi
+
+if $GCLARGEPAGESIZE2FLAG
+then # GC_LARGEPAGESIZE2 version
+TILERACFLAGS="${TILERACFLAGS} -DGC_LARGEPAGESIZE2"
+fi
+
+if $GCLARGESHAREDHEAPFLAG
+then # GC_LARGESHAREDHEAP version
+TILERACFLAGS="${TILERACFLAGS} -DGC_LARGESHAREDHEAP"
+fi
+
+if $GCSMALLPAGESIZEFLAG2
+then # GC_SMALLPAGESIZE2 version
+TILERACFLAGS="${TILERACFLAGS} -DGC_SMALLPAGESIZE2"
+fi
+
+if $GCLARGESHAREDHEAPFLAG2
+then # GC_LARGESHAREDHEAP2 version
+TILERACFLAGS="${TILERACFLAGS} -DGC_LARGESHAREDHEAP2"
+fi
+
+if $GCCACHEADAPTFLAG
+then # GC_CACHE_ADAPT version
+TILERACFLAGS="${TILERACFLAGS} -DGC_CACHE_ADAPT"
+fi
+
+if $GCCACHEADAPTPOLICYFLAG
+then # GC_CACHE_ADAPT version
+TILERACFLAGS="${TILERACFLAGS} -DGC_CACHE_ADAPT_POLICY${GCCACHEADAPTPOLICY}"
+fi
+
+if $GCCACHESAMPLINGFLAG
+then # GC_CACHE_ADAPT version
+TILERACFLAGS="${TILERACFLAGS} -DGC_CACHE_SAMPLING"
+fi
+
+if $MGCFLAG
+then
+cp $ROBUSTROOT/Tilera/Runtime/MGC/$MAKEFILE ./Makefile
+else
+cp $ROBUSTROOT/Tilera/Runtime/$TILERA_INDIR/$MAKEFILE ./Makefile
+fi
+if $TILERABMEFLAG
+then # TILERABMEFLAG
+cp $ROBUSTROOT/Tilera/Runtime/$TILERA_INDIR/$SIMHVC ./sim.hvc
+cp $ROBUSTROOT/Tilera/Runtime/$TILERA_INDIR/$PCIHVC ./pci.hvc
+if $TILERA56COREFLAG
+then
+cp $ROBUSTROOT/Tilera/Runtime/$TILERA_INDIR/bamboo-vmlinux-pci.hvc.56 ./bamboo-vmlinux-pci.hvc.56
+else
+cp $ROBUSTROOT/Tilera/Runtime/$TILERA_INDIR/bamboo-vmlinux-pci.hvc ./bamboo-vmlinux-pci.hvc
+fi
+fi
 cp ../Runtime/Queue.c ./
 cp ../Runtime/file.c ./
 cp ../Runtime/math.c ./
+if [ !$MGCFLAG ]
+then
 cp ../Runtime/object.c ./
+fi
 cp ../Runtime/GenericHashtable.c ./
 cp ../Runtime/SimpleHash.c ./
 cp ../Runtime/ObjectHash.c ./
@@ -553,18 +1084,55 @@ cp ../Runtime/socket.c ./
 cp ../Runtime/mem.c ./
 cp ../Runtime/GenericHashtable.h ./
 cp ../Runtime/mem.h ./
-cp ../Runtime/multicoreruntime.h ./
+if [ !$MGCFLAG ]
+then
 cp ../Runtime/object.h ./
+fi
 cp ../Runtime/ObjectHash.h ./
 cp ../Runtime/Queue.h ./
 cp ../Runtime/runtime.h ./
 cp ../Runtime/SimpleHash.h ./
-cp ../Runtime/Tilera/*.c ./
-cp ../Runtime/Tilera/*.h ./
-cp ../tmpbuilddirectory/*.c ./
-cp ../tmpbuilddirectory/*.h ./
+mkdir ./coreprof
+cp ../Runtime/coreprof/coreprof.c ./coreprof/
+cp ../Runtime/coreprof/coreprof.h ./coreprof/
+cp $BAMBOORUNTIME/multicoretask.c ./
+cp $BAMBOORUNTIME/multicoreruntime.c ./
+cp $BAMBOORUNTIME/multicoremem.c ./
+cp $BAMBOORUNTIME/multicoregarbage.c ./
+cp $BAMBOORUNTIME/GCSharedHash.c ./
+cp $BAMBOORUNTIME/MGCHash.c ./
+cp $BAMBOORUNTIME/multicoreruntime.h ./
+cp $BAMBOORUNTIME/multicoremem.h ./
+cp $BAMBOORUNTIME/multicoregarbage.h ./
+cp $BAMBOORUNTIME/multicorecache.h ./
+cp $BAMBOORUNTIME/multicoregc.h ./
+cp $BAMBOORUNTIME/multicorehelper.h ./
+cp $BAMBOORUNTIME/GCSharedHash.h ./
+cp $BAMBOORUNTIME/MGCHash.h ./
+cp ../Tilera/Runtime/*.c ./
+cp ../Tilera/Runtime/*.h ./
+cp ../Tilera/Runtime/$TILERA_INDIR/*.c ./
+cp ../Tilera/Runtime/$TILERA_INDIR/*.h ./
+if $TILERAZLINUXFLAG
+then # TILERAZLINUXFLAG
+cp ../Tilera/Runtime/$TILERA_INDIR/*.S ./
+fi
+#if $TILERAMEMPROFFLAG
+#then # TILERAMEMPROFFLAG
+cp ../Tilera/Runtime/$TILERA_INDIR/linux_client.c ./
+#fi
+if $MGCFLAG
+then
+cp ../Tilera/Runtime/MGC/*.c ./
+cp ../Tilera/Runtime/MGC/*.h ./
+fi
+cp ../Tilera/lib/* ./
+cp ../$tmpbuilddirectory/*.c ./
+cp ../$tmpbuilddirectory/*.h ./
+
+make
 
-else #!RAWFLAG && !TILERAFLAG
+else #!RAWFLAG && !TILERABMEFLAG  && ! TILERAZLINUXFLAG
 cd $CURDIR 
 
 INCLUDES="$INCLUDES -I$ROBUSTROOT/Runtime -I. -IRuntime/include \
@@ -572,7 +1140,8 @@ INCLUDES="$INCLUDES -I$ROBUSTROOT/Runtime -I. -IRuntime/include \
 
 if $MULTICOREFLAG
 then
-RUNTIMEFILE="$ROBUSTROOT/Runtime/multicoreruntime.c $ROBUSTROOT/Runtime/multicoretask.c"
+RUNTIMEFILE="$BAMBOORUNTIME/multicoreruntime.c $BAMBOORUNTIME/multicoretask.c"
+INCLUDES="$INCLUDES -I$BAMBOORUNTIME"
 else
 RUNTIMEFILE="$ROBUSTROOT/Runtime/runtime.c $ROBUSTROOT/Runtime/task.c"
 fi
@@ -585,6 +1154,16 @@ $ROBUSTROOT/Runtime/garbage.c $ROBUSTROOT/Runtime/socket.c \
 $ROBUSTROOT/Runtime/math.c \
 $ROBUSTROOT/Runtime/GenericHashtable.c $ROBUSTROOT/Runtime/object.c"
 
+if $NUMA
+then
+FILES="$FILES $ROBUSTROOT/Runtime/affinity.c"
+fi
+
+if $EVENTMONITOR
+then
+FILES="$FILES $ROBUSTROOT/Runtime/STM/monitor.c"
+fi
+
 if $FASTMEMCPY
 then
 FILES="$FILES $ROBUSTROOT/Runtime/memcpy32.o $ROBUSTROOT/Runtime/instrset32.o"
@@ -592,14 +1171,30 @@ fi
 
 if $DSMFLAG
 then
+if $DSMRECOVERY
+then
+EXTRAOPTIONS="$EXTRAOPTIONS -lpthread -DCOMPILER -DDSTM -I$DSMRECOVERYRUNTIME"
+FILES="$FILES $DSMRECOVERYRUNTIME/trans.c $DSMRECOVERYRUNTIME/mcpileq.c $DSMRECOVERYRUNTIME/objstr.c $DSMRECOVERYRUNTIME/dstm.c $DSMRECOVERYRUNTIME/altmlookup.c $DSMRECOVERYRUNTIME/clookup.c $DSMRECOVERYRUNTIME/llookup.c $DSMRECOVERYRUNTIME/tlookup.c $DSMRECOVERYRUNTIME/threadnotify.c $DSMRECOVERYRUNTIME/dstmserver.c $DSMRECOVERYRUNTIME/plookup.c $DSMRECOVERYRUNTIME/ip.c $DSMRECOVERYRUNTIME/queue.c $DSMRECOVERYRUNTIME/altprelookup.c $DSMRECOVERYRUNTIME/machinepile.c $ROBUSTROOT/Runtime/localobjects.c $ROBUSTROOT/Runtime/thread.c $DSMRECOVERYRUNTIME/sockpool.c $DSMRECOVERYRUNTIME/addUdpEnhance.c $DSMRECOVERYRUNTIME/signal.c $DSMRECOVERYRUNTIME/gCollect.c $DSMRECOVERYRUNTIME/addPrefetchEnhance.c $DSMRECOVERYRUNTIME/dsmlock.c $DSMRECOVERYRUNTIME/translist.c $DSMRECOVERYRUNTIME/paxos.c"
+else
 EXTRAOPTIONS="$EXTRAOPTIONS -lpthread -DCOMPILER -DDSTM -I$DSMRUNTIME"
-FILES="$FILES $DSMRUNTIME/trans.c $DSMRUNTIME/mcpileq.c $DSMRUNTIME/objstr.c $DSMRUNTIME/dstm.c $DSMRUNTIME/mlookup.c $DSMRUNTIME/clookup.c $DSMRUNTIME/llookup.c $DSMRUNTIME/threadnotify.c $DSMRUNTIME/dstmserver.c $DSMRUNTIME/plookup.c $DSMRUNTIME/ip.c $DSMRUNTIME/queue.c $DSMRUNTIME/prelookup.c $DSMRUNTIME/machinepile.c $ROBUSTROOT/Runtime/localobjects.c $ROBUSTROOT/Runtime/thread.c $DSMRUNTIME/sockpool.c $DSMRUNTIME/addUdpEnhance.c $DSMRUNTIME/signal.c $DSMRUNTIME/gCollect.c $DSMRUNTIME/addPrefetchEnhance.c $DSMRUNTIME/dsmlock.c $DSMRUNTIME/prefetch.c"
+FILES="$FILES $DSMRUNTIME/trans.c $DSMRUNTIME/mcpileq.c $DSMRUNTIME/objstr.c $DSMRUNTIME/dstm.c $DSMRUNTIME/clookup.c $DSMRUNTIME/llookup.c $DSMRUNTIME/threadnotify.c $DSMRUNTIME/dstmserver.c $DSMRUNTIME/plookup.c $DSMRUNTIME/ip.c $DSMRUNTIME/queue.c $DSMRUNTIME/altprelookup.c $DSMRUNTIME/machinepile.c $ROBUSTROOT/Runtime/localobjects.c $ROBUSTROOT/Runtime/thread.c $DSMRUNTIME/sockpool.c $DSMRUNTIME/addUdpEnhance.c $DSMRUNTIME/signal.c $DSMRUNTIME/gCollect.c $DSMRUNTIME/addPrefetchEnhance.c $DSMRUNTIME/dsmlock.c $DSMRUNTIME/prefetch.c $DSMRUNTIME/altmlookup.c"
+fi
 fi
 
-if $SINGLETM
+if $STM
 then
-EXTRAOPTIONS="$EXTRAOPTIONS -lpthread -DCOMPILER -I$DSMRUNTIME"
-FILES="$FILES $DSMRUNTIME/dsmlock.c $DSMRUNTIME/singleTMCommit.c $DSMRUNTIME/stmlookup.c $ROBUSTROOT/Runtime/thread.c"
+EXTRAOPTIONS="$EXTRAOPTIONS -lpthread -DCOMPILER -I$STMRUNTIME"
+FILES="$FILES $STMRUNTIME/stmlock.c $STMRUNTIME/stm.c $STMRUNTIME/stmlookup.c $ROBUSTROOT/Runtime/thread.c $STMRUNTIME/stats.c $STMRUNTIME/commit.c $STMRUNTIME/objstr.c"
+fi
+
+if $SANDBOX
+then
+if $DSMFLAG
+then
+FILES="$FILES $DSMRUNTIME/sandbox.c"
+else
+FILES="$FILES $STMRUNTIME/sandbox.c"
+fi
 fi
 
 if $ABORTREADERS
@@ -612,9 +1207,21 @@ then
 FILES="$FILES $ROBUSTROOT/Runtime/localobjects.c"
 fi
 
-if $MLP
+if $COREPROF
+then
+FILES="$FILES $ROBUSTROOT/Runtime/coreprof/coreprof.c"
+fi
+
+if $RCR
+then
+FILES="$FILES $tmpbuilddirectory/RuntimeConflictResolver.c $ROBUSTROOT/Runtime/oooJava/hashRCR.c $ROBUSTROOT/Runtime/oooJava/Queue_RCR.c $ROBUSTROOT/Runtime/oooJava/hashStructure.c $ROBUSTROOT/Runtime/oooJava/trqueue.c $ROBUSTROOT/Runtime/oooJava/rcr_runtime.c"
+fi
+
+if $MLP_ON
 then
 FILES="$FILES $ROBUSTROOT/Runtime/mlp_runtime.c"
+FILES="$FILES $ROBUSTROOT/Runtime/psemaphore.c"
+FILES="$FILES $ROBUSTROOT/Runtime/workschedule.c"
 fi
 
 if $RECOVERFLAG
@@ -624,7 +1231,7 @@ if $MULTICOREFLAG
 then
 EXTRAOPTIONS="$EXTRAOPTIONS -DMULTICORE"
 fi
-FILES="$FILES tmpbuilddirectory/taskdefs.c $ROBUSTROOT/Runtime/checkpoint.c $ROBUSTROOT/Runtime/chash.c"
+FILES="$FILES $tmpbuilddirectory/taskdefs.c $ROBUSTROOT/Runtime/checkpoint.c $ROBUSTROOT/Runtime/chash.c"
 if $RAWFLAG
 then
 EXTRAOPTIONS="$EXTRAOPTIONS -DRAW"
@@ -639,7 +1246,7 @@ fi
 if $OPTIONALFLAG
 then
 EXTRAOPTIONS="$EXTRAOPTIONS -DOPTIONAL"
-FILES="$FILES tmpbuilddirectory/optionalarrays.c"
+FILES="$FILES $tmpbuilddirectory/optionalarrays.c"
 fi
 
 if $THREADFLAG
@@ -658,16 +1265,34 @@ then
 EXTRAOPTIONS="$EXTRAOPTIONS -ldmalloc -DDMALLOC"
 fi
 
+echo Compiling C...
+echo EXTRAOPTIONS=$EXTRAOPTIONS
+
+if $ASSEMBLY
+then
+gcc -S $INCLUDES $EXTRAOPTIONS -DPRECISE_GC \
+-c $tmpbuilddirectory/methods.c -lm
+fi
+
 if $MULTICOREFLAG
 then
-gcc $INCLUDES $EXTRAOPTIONS \
-tmpbuilddirectory/methods.c $FILES -lm -o $MAINFILE.bin
+NONMULTICOREOPTS=
 else
-gcc $INCLUDES $EXTRAOPTIONS -DPRECISE_GC \
-tmpbuilddirectory/methods.c $FILES -lm -o $MAINFILE.bin
+NONMULTICOREOPTS=-DPRECISE_GC
+fi
+
+if $SRCAFTERPP
+then
+gcc -E $INCLUDES $EXTRAOPTIONS $NONMULTICOREOPTS \
+$tmpbuilddirectory/methods.c $FILES > tmp.c
 fi
 
+gcc $INCLUDES $EXTRAOPTIONS $NONMULTICOREOPTS \
+$tmpbuilddirectory/methods.c $FILES -lm -o $MAINFILE.bin
+
+
 fi #!RAWFLAG
 
+
 exit