updates for multicore version runtime, temporarily disable math operations in multico...

[IRC.git] / Robust / src / buildscript

diff --git a/Robust/src/buildscript b/Robust/src/buildscript
index a23e2eb1c3e65ebb0b2a27bc0ecfd88f8b1a19f7..c43dbe3f6ebd34c77f7463113878daf6df6238e3 100755 (executable)
--- a/Robust/src/buildscript
+++ b/Robust/src/buildscript
@@ -34,6 +34,7 @@ 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
@@ -74,6 +75,7 @@ MLPDEBUG=false
 MULTICOREFLAG=false
 RAWFLAG=false
 TILERAFLAG=false
+TILERACONFIG=''
 CACHEFLUSHFLAG=false
 RAWCONFIG=''
 DEBUGFLAG=false
@@ -206,9 +208,14 @@ shift
 elif [[ $1 = '-raw' ]]
 then
 RAWFLAG=true
+JAVAOPTS="$JAVAOPTS -raw"
 elif [[ $1 = '-tilera' ]]
 then
 TILERAFLAG=true
+elif [[ $1 = '-tileraconfig' ]]
+then
+TILERACONFIG="$2"
+shift
 elif [[ $1 = '-cacheflush' ]]
 then
 CACHEFLUSHFLAG=true
@@ -486,7 +493,8 @@ make
 elif $TILERAFLAG
 then # TILERAFLAG
 TILERADIR="$CURDIR/tilera"
-MAKEFILE="Makefile.tilera"
+MAKEFILE="Makefile.tilera.$TILERACONFIG"
+SIMHVC="sim.hvc.$TILERACONFIG"
 mkdir $TILERADIR
 cd $TILERADIR
 make clean
@@ -525,6 +533,7 @@ TILERACFLAGS="${TILERACFLAGS} -DINTERRUPT"
 fi #INTERRUPT version
 
 cp $ROBUSTROOT/Runtime/Tilera/$MAKEFILE ./Makefile
+cp $ROBUSTROOT/Runtime/Tilera/$SIMHVS ./sim.hvc
 cp ../Runtime/multicoretask.c ./
 cp ../Runtime/multicoreruntime.c ./
 cp ../Runtime/Queue.c ./
@@ -535,8 +544,6 @@ cp ../Runtime/GenericHashtable.c ./
 cp ../Runtime/SimpleHash.c ./
 cp ../Runtime/ObjectHash.c ./
 cp ../Runtime/socket.c ./
-cp ../Runtime/taskdefs.c ./
-cp ../Runtime/methods.c ./
 cp ../Runtime/mem.c ./
 cp ../Runtime/GenericHashtable.h ./
 cp ../Runtime/mem.h ./