changes

diff --git a/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/tsp/TestRunner.p b/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/tsp/TestRunner.p
index f6701483002523cc38b38ec28972def131d058ce..7f0bff1d122fa0fcd3f4def9727ab72781495d9a 100644 (file)
--- a/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/tsp/TestRunner.p
+++ b/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/tsp/TestRunner.p
@@ -105,7 +105,7 @@ public class TestRunner extends Thread
   }*/
   public static void main(String[] args) {
     int threadnum = THREADNUM;
-    int ncities = 4080*2;
+    int ncities = 4080*4;
     System.setgcprofileflag();
     for(int i = 0; i < threadnum; ++i) {
       TestRunner tr = new TestRunner(ncities);

diff --git a/Robust/src/buildscript b/Robust/src/buildscript
index 6b7fda6044e058727d5fceb856f7f65f33f5c63c..0f3aa0f8519bf6563d8b62942ec212b28a902569 100755 (executable)
--- a/Robust/src/buildscript
+++ b/Robust/src/buildscript
@@ -101,6 +101,10 @@ echo "-gccontroller_remote set the gc shared memory to use a remote controller f
 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 "-tilera_page_size set the page size in multicore code"
+echo "-tilera_page_size_bits set the page size bits in multicore code"
+echo "-tilera_num_blocks set the total number of blocks in multicore code"
+echo "-tilera_num_pages_per_block set the number of pages per block in multicore code"
 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
@@ -250,6 +254,10 @@ GCCORES=''
 TILERAN1COREFLAG=false
 TILERA56COREFLAG=false
 TILERAOUTPUTDIR="tilera"
+TILERA_PAGE_SIZE="0x10000"
+TILERA_PAGE_SIZE_BITS="16"
+TILERA_NUM_BLOCKS="20"
+TILERA_NUM_PAGES_PER_BLOCK="16" 
 
 if [[ -z $1 ]]
 then
@@ -465,6 +473,22 @@ elif [[ $1 = '-tilera_output_dir' ]]
 then
 TILERAOUTPUTDIR="$2"
 shift
+elif [[ $1 = '-tilera_page_size' ]]
+then
+TILERA_PAGE_SIZE="$2"
+shift
+elif [[ $1 = '-tilera_page_size_bits' ]]
+then
+TILERA_PAGE_SIZE_BITS="$2"
+shift
+elif [[ $1 = '-tilera_num_blocks' ]]
+then
+TILERA_NUM_BLOCKS="$2"
+shift
+elif [[ $1 = '-tilera_num_pages_per_block' ]]
+then
+TILERA_NUM_PAGES_PER_BLOCK="$2"
+shift
 elif [[ $1 = '-tilera_bme' ]]
 then
 TILERAFLAG=true
@@ -794,6 +818,8 @@ then
 JAVAOPTS="$JAVAOPTS -struct structfile"
 fi
 
+# for tilera code, generate multicorememsize.h
+./generate_memsize.sh ${TILERA_PAGE_SIZE} ${TILERA_PAGE_SIZE_BITS} ${TILERA_NUM_BLOCKS} ${TILERA_NUM_PAGES_PER_BLOCK}
 
 
 #########################