small changes

diff --git a/Robust/src/Runtime/bamboo/multicorecache.h b/Robust/src/Runtime/bamboo/multicorecache.h
index 1665df4f5e8807b27cf760a34950ed13b4f1fb7e..68c9f8ebe2fddce280911a78f3dce88970db7d9c 100644 (file)
--- a/Robust/src/Runtime/bamboo/multicorecache.h
+++ b/Robust/src/Runtime/bamboo/multicorecache.h
@@ -9,7 +9,7 @@
 #ifdef GC_CACHE_ADAPT
 // sampling unit to compute access frequency, this should be consistent all the
 // time.
-#define GC_CACHE_SAMPLING_UNIT 0x1000000 
+#define GC_CACHE_SAMPLING_UNIT 0x800000000 
 // freqeuency to trigger timer interrupt
 #define GC_TILE_TIMER_EVENT_SETTING 10000000  
 

diff --git a/Robust/src/Runtime/bamboo/multicoregarbage.h b/Robust/src/Runtime/bamboo/multicoregarbage.h
index 34428b8cadb0b4c27812f924d0647757eb67deb4..7ac1d6ed118dda8ed4892850a8b6617ddf63dc0d 100644 (file)
--- a/Robust/src/Runtime/bamboo/multicoregarbage.h
+++ b/Robust/src/Runtime/bamboo/multicoregarbage.h
@@ -144,7 +144,6 @@ struct allocrecord {
 struct allocrecord allocationinfo;
 
 #ifdef GC_CACHE_ADAPT
-volatile bool gccachestage;
 // table recording the sampling data collected for cache adaption 
 unsigned int * gccachesamplingtbl;
 unsigned int * gccachesamplingtbl_local;// for zeroing memory only

diff --git a/Robust/src/buildscript b/Robust/src/buildscript
index dbef4861556d0d5572ae4376e58f0d821c817f81..7a80b40acb0698513d5dbcdc15ad15a89110b770 100755 (executable)
--- a/Robust/src/buildscript
+++ b/Robust/src/buildscript
@@ -74,6 +74,7 @@ echo "-rawpath print out execute path information for raw version (should be use
 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_output_dir specify the output directory for the generated TILERA code"
 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)"
@@ -248,6 +249,7 @@ ASSEMBLY=false
 GCCORES=''
 TILERAN1COREFLAG=false
 TILERA56COREFLAG=false
+TILERAOUTPUTDIR=''
 
 if [[ -z $1 ]]
 then
@@ -459,6 +461,10 @@ elif [[ $1 = '-raw' ]]
 then
 RAWFLAG=true
 JAVAOPTS="$JAVAOPTS -raw"
+elif [[ $1 = '-tilera_output_dir' ]]
+then
+TILERAOUTPUTDIR="$2"
+shift
 elif [[ $1 = '-tilera_bme' ]]
 then
 TILERAFLAG=true
@@ -992,7 +998,7 @@ make
 
 elif $TILERAFLAG
 then # TILERAFLAG
-TILERADIR="$CURDIR/tilera"
+TILERADIR="$CURDIR/${TILERAOUTPUTDIR}"
 if $TILERABMEFLAG
 then # TILERABMEFLAG
 TILERA_INDIR="BME"
@@ -1261,7 +1267,7 @@ cp ../Tilera/lib/* ./
 cp ../$tmpbuilddirectory/*.c ./
 cp ../$tmpbuilddirectory/*.h ./
 
-echo $TILERA_CFLAGS
+echo $TILERACFLAGS > ./tileracflags.txt
 
 make