more changes

diff --git a/Robust/src/Runtime/bamboo/multicoregarbage.c b/Robust/src/Runtime/bamboo/multicoregarbage.c
index a253b8a1f9679cd5bbcda83888e863633d16660b..6d37942fafc11ac5d3472950083ae273937423b8 100644 (file)
--- a/Robust/src/Runtime/bamboo/multicoregarbage.c
+++ b/Robust/src/Runtime/bamboo/multicoregarbage.c
@@ -1,4 +1,3 @@
-// TODO: DO NOT support tag!!!
 #ifdef MULTICORE_GC
 #include "runtime.h"
 #include "multicoreruntime.h"
@@ -9,6 +8,7 @@
 #include "multicoregcflush.h"
 #include "multicoregcprofile.h"
 #include "gcqueue.h"
+#include "multicoremem_helper.h"
 
 volatile bool gcflag;
 gc_status_t gc_status_info;
@@ -111,6 +111,7 @@ void initmulticoregcdata() {
       else
        allocationinfo.blocktable[i].corenum=gc_block2core[(i%(NUMCORES4GC*2))];
     }
+    buildCore2Test();
   }
 
   INIT_MULTICORE_GCPROFILE_DATA();
@@ -251,18 +252,19 @@ void checkMarkStatus() {
 } 
 
 // compute load balance for all cores
-int loadbalance(void ** heaptop) {
+int loadbalance() {
   // compute load balance
   // get the total loads
+  void * heaptop;
   unsigned int tloads = 0;
   for(int i = 0; i < NUMCORES4GC; i++) {
     tloads += gcloads[i];
   }
-  *heaptop = gcbaseva + tloads;
+  heaptop = gcbaseva + tloads;
 
   unsigned int topblockindex;
   
-  BLOCKINDEX(topblockindex, *heaptop);
+  BLOCKINDEX(topblockindex, heaptop);
   // num of blocks per core
   unsigned int numbpc = (topblockindex+NUMCORES4GC-1)/NUMCORES4GC;
   

diff --git a/Robust/src/Runtime/bamboo/multicoregarbage.h b/Robust/src/Runtime/bamboo/multicoregarbage.h
index 1e5b6989c5623ee1e23b77b8a047e19859b9857a..a3f6890c4697d9b16e3a243402b9bbb49d731538 100644 (file)
--- a/Robust/src/Runtime/bamboo/multicoregarbage.h
+++ b/Robust/src/Runtime/bamboo/multicoregarbage.h
@@ -19,6 +19,8 @@ m#ifndef BAMBOO_MULTICORE_GARBAGE_H
 // let each gc core to have one big block, this is very important
 // for the computation of NUMBLOCKS(s, n), DO NOT change this!
 
+typedef int block_t;
+
 typedef enum {
   INITPHASE = 0x0,         // 0x0
   MARKPHASE,               // 0x1
@@ -61,7 +63,7 @@ unsigned int gcself_numreceiveobjs;
 // for load balancing
 unsigned int gcheaptop;
 unsigned INTPTR gcloads[NUMCORES4GC];
-unsigned INTPTR numblockspercore;
+block_t numblockspercore;
 
 //Top of each core's heap
 void * topptrs[NUMCORES4GC];
@@ -98,8 +100,8 @@ void * gcbaseva; // base va for shared memory without reserved sblocks
 
 /* Structure to keep track of free space in block */
 enum blockstatus {
-  /* BS_INIT indicates that we don't have information for this block yet */
-  BS_INIT,
+  /* BS_USED indicates that we don't have information for this block yet */
+  BS_USED,
   /* BS_LARGEOBJECT indicates that the beginning of this block has a large object*/
   BS_LARGEOBJECT,
   /* BS_FREE indicates that the block is at least partially free */
@@ -109,8 +111,8 @@ enum blockstatus {
 struct blockrecord {
   enum blockstatus status;
   unsigned INTPTR usedspace;
+  unsigned INTPTR freespace;
   unsigned int corenum;
-
 };
 
 #define NOFREEBLOCK 0xffffffff

diff --git a/Robust/src/Runtime/bamboo/multicoregccompact.c b/Robust/src/Runtime/bamboo/multicoregccompact.c
index 62021194a8a897b7cf192f89c23cc8f19e7f70c9..050b4d15287c29b9cc032ece0a1e58ea804378cf 100644 (file)
--- a/Robust/src/Runtime/bamboo/multicoregccompact.c
+++ b/Robust/src/Runtime/bamboo/multicoregccompact.c
@@ -5,6 +5,16 @@
 #include "multicoregarbage.h"
 #include "markbit.h"
 
+int gc_countRunningCores() {
+  int count=0;
+  for(int i = 0; i < NUMCORES4GC; ++i) {
+    if(gccorestatus[i] != 0) {
+      count++;
+    }
+  }
+  return count;
+}
+
 bool gc_checkCoreStatus() {
   for(int i = 0; i < NUMCORES4GC; ++i) {
     if(gccorestatus[i] != 0) {
@@ -99,29 +109,80 @@ void compacthelper(struct moveHelper * orig,struct moveHelper * to) {
   send_msg_3(STARTUPCORE,GCFINISHCOMPACT,BAMBOO_NUM_OF_CORE, 0);
 }
 
-/* Should be invoked with interrupt turned off. */
-
-void * assignSpareMem_I(unsigned int sourcecore, unsigned int requiredmem) {
+void * checkNeighbors(int corenum, unsigned INTPTR requiredmem) {
+  int minblockindex=allocation.lowestfreeblock/NUMCORES4GC;
+  block_t toplocalblock=topblock/NUMCORES4GC;
+  for(int i=0;i<NUM_CORES2TEST;i++) {
+    int neighborcore=core2test[corenum][i];
+    if (neighborcore!=-1) {
+      for(block_t lblock=minblockindex;lblock<numblockspercore;lblock++) {
+       block_t globalblockindex=BLOCKINDEX2(neighborcore, lblock);
+       struct blockrecord * block=&allocationinfo.blocktable[globalblockindex];
+       if (block->status==BS_FREE) {
+         unsigned INTPTR freespace=block->freespace&~BAMBOO_CACHE_LINE_MASK;
+         if (requiredmem<freespace) {
+           //we have a block
+           //mark block as used
+           block->status=BS_USED;
+           void *blockptr=OFFSET2BASEVA(globalblockindex)+gcbaseva;
+           unsigned INTPTR usedspace=((block->usedspace-1)&~BAMBOO_CACHE_LINE_MASK)+BAMBOO_CACHE_LINE_SIZE;
+           return blockptr+usedspace;
+         }
+       }
+      }
+    }
+  }
   return NULL;
 }
 
-void * assignSpareMem(unsigned int sourcecore,unsigned int requiredmem) {
-  BAMBOO_ENTER_RUNTIME_MODE_FROM_CLIENT();
-  void * retval=assignSpareMem_I(sourcecore, requiredmem);
-  BAMBOO_ENTER_CLIENT_MODE_FROM_RUNTIME();
-  return retval;
+void * globalSearch(unsigned int topblock) {
+  unsigned int firstfree=NOFREEBLOCK;
+  for(block_t i=allocationinfo.lowestfreeblock;i<topblock;i++) {
+    struct blockrecord * block=&allocationinfo.blocktable[i];
+    if (block->status==BS_FREE) {
+      if(firstfree==NOFREEBLOCK)
+       firstfree=i;
+      unsigned INTPTR freespace=block->freespace&~BAMBOO_CACHE_LINE_MASK;
+      if (requiredmem<freespace) {
+       //we have a block
+       //mark block as used
+       block->status=BS_USED;
+       void *blockptr=OFFSET2BASEVA(globalblockindex)+gcbaseva;
+       unsigned INTPTR usedspace=((block->usedspace-1)&~BAMBOO_CACHE_LINE_MASK)+BAMBOO_CACHE_LINE_SIZE;
+       allocationinfo.lowestfreeblock=firstfree;
+       return blockptr+usedspace;
+      }
+    }
+  }
+  allocationinfo.lowestfreeblock=firstfree;
+  return NULL;
 }
 
 /* should be invoked with interrupt turned off */
 
 void * gcfindSpareMem_I(unsigned int requiredmem,unsigned int requiredcore) {
-  void * startaddr;
-  for(int k = 0; k < NUMCORES4GC; k++) {
+  if (allocationinfo.lowestfreeblock!=NOFREEBLOCK) {
+    //There are spare blocks
+    unsigned int topblock=numblockspercore*NUMCORES4GC;
+    void *memblock;
     
+    if (memblock=checkNeighbors(requiredcore, requiredmem)) {
+      return memblock;
+    } else if (memblock=globalSearch(topblock, requiredmem)) {
+      return memblock;
+    }
   }
+  
   // If we cannot find spare mem right now, hold the request
   gcrequiredmems[requiredcore] = requiredmem;
   gcmovepending++;
+
+  int count=gc_countRunningCores();
+  if (gcmovepending==count) {
+    // All cores have stopped...hand out memory as necessary to handle all requests
+    
+  }
+
   return NULL;
 } 
 
@@ -199,8 +260,7 @@ void compact() {
 
 void master_compact() {
   // predict number of blocks to fill for each core
-  void * tmpheaptop = 0;
-  numblockspercore = loadbalance(&tmpheaptop);
+  numblockspercore = loadbalance()+1;
   
   GC_PRINTF("mark phase finished \n");
   
@@ -211,13 +271,15 @@ void master_compact() {
 
   //assigned blocks
   for(int i=0;i<initblocks;i++) {
-    allocationinfo.blocktable[i].status=BS_INIT;
+    allocationinfo.blocktable[i].status=BS_USED;
   }
 
   //free blocks
   for(int i=initblocks;i<GCNUMBLOCK;i++) {
     allocationinfo.blocktable[i].status=BS_FREE;
     allocationinfo.blocktable[i].usedspace=0;
+    //this is true because all cores have at least one block already...
+    allocationinfo.blocktable[i].freespace=BLOCKSIZE(1);
   }
 
   //start all of the cores

diff --git a/Robust/src/Runtime/bamboo/multicoremem_helper.h b/Robust/src/Runtime/bamboo/multicoremem_helper.h
index 2bd6a57cce1265eec87d57bf9c12733595339a38..68b42dd99cb634b51579c78be1a65fadf803e0ca 100644 (file)
--- a/Robust/src/Runtime/bamboo/multicoremem_helper.h
+++ b/Robust/src/Runtime/bamboo/multicoremem_helper.h
@@ -1,412 +1,9 @@
-// NOTE: this file should be changed to be generated automatically
-
 #ifndef BAMBOO_MULTICORE_MEM_HELPER_H
 #define BAMBOO_MULTICORE_MEM_HELPER_H
 
-#ifdef SMEMF
-#define NUM_CORES2TEST 5
-#ifdef GC_1
-int core2test[1][NUM_CORES2TEST] = {
-  {0, -1, -1, -1, -1}
-};
-#elif defined GC_56
-int core2test[56][NUM_CORES2TEST] = {
-  { 0, -1,  7, -1,  1}, { 1, -1,  8,  0,  2}, { 2, -1,  9,  1,  3},
-  { 3, -1, 10,  2,  4}, { 4, -1, 11,  3,  5}, { 5, -1, 12,  4,  6},
-  { 6, -1, 13,  5, -1}, { 7,  0, 14, -1,  8}, { 8,  1, 15,  7,  9},
-  { 9,  2, 16,  8, 10}, {10,  3, 17,  9, 11}, {11,  4, 18, 10, 12},
-  {12,  5, 19, 11, 13}, {13,  6, 20, 12, -1}, {14,  7, 21, -1, 15},
-  {15,  8, 22, 14, 16}, {16,  9, 23, 15, 17}, {17, 10, 24, 16, 18},
-  {18, 11, 25, 17, 19}, {19, 12, 26, 18, 20}, {20, 13, 27, 19, -1},
-  {21, 14, 28, -1, 22}, {22, 15, 29, 21, 23}, {23, 16, 30, 22, 24},
-  {24, 17, 31, 23, 25}, {25, 18, 32, 24, 26}, {26, 19, 33, 25, 27},
-  {27, 20, 34, 26, -1}, {28, 21, 35, -1, 29}, {29, 22, 36, 28, 30},
-  {30, 23, 37, 29, 31}, {31, 24, 38, 30, 32}, {32, 25, 39, 31, 33},
-  {33, 26, 40, 32, 34}, {34, 27, 41, 33, -1}, {35, 28, 42, -1, 36},
-  {36, 29, 43, 35, 37}, {37, 30, 44, 36, 38}, {38, 31, 45, 37, 39},
-  {39, 32, 46, 38, 40}, {40, 33, 47, 39, 41}, {41, 34, 48, 40, -1},
-  {42, 35, 49, -1, 43}, {43, 36, 50, 42, 44}, {44, 37, 51, 43, 45},
-  {45, 38, 52, 44, 46}, {46, 39, 53, 45, 47}, {47, 40, 54, 46, 48},
-  {48, 41, 55, 47, -1}, {49, 42, -1, -1, 50}, {50, 43, -1, 49, 51},
-  {51, 44, -1, 50, 52}, {52, 45, -1, 51, 53}, {53, 46, -1, 52, 54},
-  {54, 47, -1, 53, 55}, {55, 48, -1, 54, -1}
-};
-#elif defined GC_62
-int core2test[62][NUM_CORES2TEST] = {
-  { 0, -1,  6, -1,  1}, { 1, -1,  7,  0,  2}, { 2, -1,  8,  1,  3},
-  { 3, -1,  9,  2,  4}, { 4, -1, 10,  3,  5}, { 5, -1, 11,  4, -1},
-  { 6,  0, 14, -1,  7}, { 7,  1, 15,  6,  8}, { 8,  2, 16,  7,  9},
-  { 9,  3, 17,  8, 10}, {10,  4, 18,  9, 11}, {11,  5, 19, 10, 12},
-  {12, -1, 20, 11, 13}, {13, -1, 21, 12, -1}, {14,  6, 22, -1, 15},
-  {15,  7, 23, 14, 16}, {16,  8, 24, 15, 17}, {17,  9, 25, 16, 18},
-  {18, 10, 26, 17, 19}, {19, 11, 27, 18, 20}, {20, 12, 28, 19, 21},
-  {21, 13, 29, 28, -1}, {22, 14, 30, -1, 23}, {23, 15, 31, 22, 24},
-  {24, 16, 32, 23, 25}, {25, 17, 33, 24, 26}, {26, 18, 34, 25, 27},
-  {27, 19, 35, 26, 28}, {28, 20, 36, 27, 29}, {29, 21, 37, 28, -1},
-  {30, 22, 38, -1, 31}, {31, 23, 39, 30, 32}, {32, 24, 40, 31, 33},
-  {33, 25, 41, 32, 34}, {34, 26, 42, 33, 35}, {35, 27, 43, 34, 36},
-  {36, 28, 44, 35, 37}, {37, 29, 45, 36, -1}, {38, 30, 46, -1, 39},
-  {39, 31, 47, 38, 40}, {40, 32, 48, 39, 41}, {41, 33, 49, 40, 42},
-  {42, 34, 50, 41, 43}, {43, 35, 51, 42, 44}, {44, 36, 52, 43, 45},
-  {45, 37, 53, 44, -1}, {46, 38, 54, -1, 47}, {47, 39, 55, 46, 48},
-  {48, 40, 56, 47, 49}, {49, 41, 57, 48, 50}, {50, 42, 58, 49, 51},
-  {51, 43, 59, 50, 52}, {52, 44, 60, 51, 53}, {53, 45, 61, 52, -1},
-  {54, 46, -1, -1, 55}, {55, 47, -1, 54, 56}, {56, 48, -1, 55, 57},
-  {57, 49, -1, 56, 59}, {58, 50, -1, 57, 59}, {59, 51, -1, 58, 60},
-  {60, 52, -1, 59, 61}, {61, 53, -1, 60, -1}
-};
-#endif // GC_1
-#elif defined SMEMM
-#define NUM_CORES2TEST 13
-#ifdef GC_1
-int core2test[1][NUM_CORES2TEST] = {
-  {0, -1, -1, -1, -1, -1, -1, -1, -1}
-};
-#elif defined GC_2
-int core2test[2][NUM_CORES2TEST] = {
-  { 0, -1, -1, -1,  1, -1, -1, -1, -1, -1, -1, -1, -1}, 
-  { 1, -1,  0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1} 
-};
-#elif defined GC_4
-int core2test[4][NUM_CORES2TEST] = {
-  { 0, -1, -1,  2,  1, -1, -1, -1, -1, -1, -1, -1, -1}, 
-  { 1, -1,  0,  3, -1, -1, -1, -1, -1, -1, -1, -1, -1}, 
-  { 2,  0, -1, -1,  3, -1, -1, -1, -1, -1, -1, -1, -1}, 
-  { 3,  1,  2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1} 
-};
-#elif defined GC_8
-int core2test[8][NUM_CORES2TEST] = {
-  { 0, -1, -1,  4,  1, -1, -1, -1, -1, -1,  5,  2, -1}, 
-  { 1, -1,  0,  5,  2, -1, -1, -1,  4, -1,  6,  3, -1}, 
-  { 2, -1,  1,  6,  3, -1, -1,  0,  5, -1,  7, -1, -1}, 
-  { 3, -1,  2,  7, -1, -1, -1,  1,  6, -1, -1, -1, -1}, 
-  { 4,  0, -1, -1,  5, -1, -1, -1, -1, -1, -1,  6,  1}, 
-  { 5,  1,  4, -1,  6, -1,  0, -1, -1, -1, -1,  7,  2},
-  { 6,  2,  5, -1,  7, -1,  1,  4, -1, -1, -1, -1,  3}, 
-  { 7,  3,  6, -1, -1, -1,  2,  5, -1, -1, -1, -1, -1} 
-};
-#elif defined GC_16
-int core2test[16][NUM_CORES2TEST] = {
-  { 0, -1, -1,  4,  1, -1, -1, -1, -1,  8,  5,  2, -1}, 
-  { 1, -1,  0,  5,  2, -1, -1, -1,  4,  9,  6,  3, -1}, 
-  { 2, -1,  1,  6,  3, -1, -1,  0,  5, 10,  7, -1, -1}, 
-  { 3, -1,  2,  7, -1, -1, -1,  1,  6, 11, -1, -1, -1}, 
-  { 4,  0, -1,  8,  5, -1, -1, -1, -1, 12,  9,  6,  1}, 
-  { 5,  1,  4,  9,  6, -1,  0, -1,  8, 13, 10,  7,  2},
-  { 6,  2,  5, 10,  7, -1,  1,  4,  9, 14, 11, -1,  3}, 
-  { 7,  3,  6, 11, -1, -1,  2,  5, 10, 15, -1, -1, -1}, 
-  { 8,  4, -1, 12,  9,  0, -1, -1, -1, -1, 13, 10,  5}, 
-  { 9,  5,  8, 13, 10,  1,  4, -1, 12, -1, 14, 11,  6}, 
-  {10,  6,  9, 14, 11,  2,  5,  8, 13, -1, 15, -1,  7}, 
-  {11,  7, 10, 15, -1,  3,  6,  9, 14, -1, -1, -1, -1},
-  {12,  8, -1, -1, 13,  4, -1, -1, -1, -1, -1, 14,  9}, 
-  {13,  9, 12, -1, 14,  5,  8, -1, -1, -1, -1, 15, 10}, 
-  {14, 10, 13, -1, 15,  6,  9, 12, -1, -1, -1, -1, 11}, 
-  {15, 11, 14, -1, -1,  7, 10, 13, -1, -1, -1, -1, -1} 
-};
-#elif defined GC_32
-int core2test[32][NUM_CORES2TEST] = {
-  { 0, -1, -1,  4,  1, -1, -1, -1, -1,  8,  5,  2, -1}, 
-  { 1, -1,  0,  5,  2, -1, -1, -1,  4,  9,  6,  3, -1}, 
-  { 2, -1,  1,  6,  3, -1, -1,  0,  5, 10,  7, -1, -1}, 
-  { 3, -1,  2,  7, -1, -1, -1,  1,  6, 11, -1, -1, -1}, 
-  { 4,  0, -1,  8,  5, -1, -1, -1, -1, 12,  9,  6,  1}, 
-  { 5,  1,  4,  9,  6, -1,  0, -1,  8, 13, 10,  7,  2},
-  { 6,  2,  5, 10,  7, -1,  1,  4,  9, 14, 11, -1,  3}, 
-  { 7,  3,  6, 11, -1, -1,  2,  5, 10, 15, -1, -1, -1}, 
-  { 8,  4, -1, 12,  9,  0, -1, -1, -1, 16, 13, 10,  5}, 
-  { 9,  5,  8, 13, 10,  1,  4, -1, 12, 17, 14, 11,  6}, 
-  {10,  6,  9, 14, 11,  2,  5,  8, 13, 18, 15, -1,  7}, 
-  {11,  7, 10, 15, -1,  3,  6,  9, 14, 19, -1, -1, -1},
-  {12,  8, -1, 16, 13,  4, -1, -1, -1, 20, 17, 14,  9}, 
-  {13,  9, 12, 17, 14,  5,  8, -1, 16, 21, 18, 15, 10}, 
-  {14, 10, 13, 18, 15,  6,  9, 12, 17, 22, 19, -1, 11}, 
-  {15, 11, 14, 19, -1,  7, 10, 13, 18, 23, -1, -1, -1}, 
-  {16, 12, -1, 20, 17,  8, -1, -1, -1, 24, 21, 18, 13}, 
-  {17, 13, 16, 21, 18,  9, 12, -1, 20, 25, 22, 19, 14},
-  {18, 14, 17, 22, 19, 10, 13, 16, 21, 26, 23, -1, 15}, 
-  {19, 15, 18, 23, -1, 11, 14, 17, 22, 27, -1, -1, -1}, 
-  {20, 16, -1, 24, 21, 12, -1, -1, -1, 28, 25, 22, 17}, 
-  {21, 17, 20, 25, 22, 13, 16, -1, 24, 29, 26, 23, 18}, 
-  {22, 18, 21, 26, 23, 14, 17, 20, 25, 30, 27, -1, 19}, 
-  {23, 19, 22, 27, -1, 15, 18, 21, 26, 31, -1, -1, -1},
-  {24, 20, -1, 28, 25, 16, -1, -1, -1, -1, 29, 26, 21}, 
-  {25, 21, 24, 29, 26, 17, 20, -1, 28, -1, 30, 27, 22}, 
-  {26, 22, 25, 30, 27, 18, 21, 24, 29, -1, 31, -1, 23}, 
-  {27, 23, 26, 31, -1, 19, 22, 25, 30, -1, -1, -1, -1}, 
-  {28, 24, -1, -1, 29, 20, -1, -1, -1, -1, -1, 30, 25}, 
-  {29, 25, 28, -1, 30, 21, 24, -1, -1, -1, -1, 31, 26},
-  {30, 26, 29, -1, 31, 22, 25, 28, -1, -1, -1, -1, 27}, 
-  {31, 27, 30, -1, -1, 23, 26, 29, -1, -1, -1, -1, -1} 
-};
-#elif defined GC_36
-int core2test[36][NUM_CORES2TEST] = {
-  { 0, -1, -1,  6,  1, -1, -1, -1, -1, 12,  7,  2, -1}, 
-  { 1, -1,  0,  7,  2, -1, -1, -1,  6, 13,  8,  3, -1}, 
-  { 2, -1,  1,  8,  3, -1, -1,  0,  7, 14,  9,  4, -1}, 
-  { 3, -1,  2,  9,  4, -1, -1,  1,  8, 15, 10,  5, -1}, 
-  { 4, -1,  3, 10,  5, -1, -1,  2,  9, 16, 11, -1, -1}, 
-  { 5, -1,  4, 11, -1, -1, -1,  3, 10, 17, -1, -1, -1},
-  { 6,  0, -1, 12,  7, -1, -1, -1, -1, 18, 13,  8,  1}, 
-  { 7,  1,  6, 13,  8, -1,  0, -1, 12, 19, 14,  9,  2}, 
-  { 8,  2,  7, 14,  9, -1,  1,  6, 13, 20, 15, 10,  3}, 
-  { 9,  3,  8, 15, 10, -1,  2,  7, 14, 21, 16, 11,  4}, 
-  {10,  4,  9, 16, 11, -1,  3,  8, 15, 22, 17, -1,  5}, 
-  {11,  5, 10, 17, -1, -1,  4,  9, 16, 23, -1, -1, -1},
-  {12,  6, -1, 18, 13,  0, -1, -1, -1, 24, 19, 14,  7}, 
-  {13,  7, 12, 19, 14,  1,  6, -1, 18, 25, 20, 15,  8}, 
-  {14,  8, 13, 20, 15,  2,  7, 12, 19, 26, 21, 16,  9}, 
-  {15,  9, 14, 21, 16,  3,  8, 13, 20, 27, 22, 17, 10}, 
-  {16, 10, 15, 22, 17,  4,  9, 14, 21, 28, 23, -1, 11}, 
-  {17, 11, 16, 23, -1,  5, 10, 15, 22, 29, -1, -1, -1},
-  {18, 12, -1, 24, 19,  6, -1, -1, -1, 30, 25, 20, 13}, 
-  {19, 13, 18, 25, 20,  7, 12, -1, 24, 31, 26, 21, 14}, 
-  {20, 14, 19, 26, 21,  8, 13, 18, 25, 32, 27, 22, 15}, 
-  {21, 15, 20, 27, 22,  9, 14, 19, 26, 33, 28, 23, 16}, 
-  {22, 16, 21, 28, 23, 10, 15, 20, 27, 34, 29, -1, 17}, 
-  {23, 17, 22, 29, -1, 11, 16, 21, 28, 35, -1, -1, -1},
-  {24, 18, -1, 30, 25, 12, -1, -1, -1, -1, 31, 26, 19}, 
-  {25, 19, 24, 31, 26, 13, 18, -1, 30, -1, 32, 27, 20}, 
-  {26, 20, 25, 32, 27, 14, 19, 24, 31, -1, 33, 28, 21}, 
-  {27, 21, 26, 33, 28, 15, 20, 25, 32, -1, 34, 29, 22}, 
-  {28, 22, 27, 34, 29, 16, 21, 26, 33, -1, 35, -1, 23}, 
-  {29, 23, 28, 35, -1, 17, 22, 27, 34, -1, -1, -1, -1},
-  {30, 24, -1, -1, 31, 18, -1, -1, -1, -1, -1, 32, 25}, 
-  {31, 25, 30, -1, 32, 19, 24, -1, -1, -1, -1, 33, 26},
-  {32, 26, 31, -1, 33, 20, 25, 30, -1, -1, -1, 34, 27}, 
-  {33, 27, 32, -1, 34, 21, 26, 31, -1, -1, -1, 35, 28}, 
-  {34, 28, 33, -1, 35, 22, 27, 32, -1, -1, -1, -1, 29}, 
-  {35, 29, 34, -1, -1, 23, 28, 33, -1, -1, -1, -1, -1}
-};
-#elif defined GC_48
-int core2test[48][NUM_CORES2TEST] = {
-  { 0, -1, -1,  6,  1, -1, -1, -1, -1, 12,  7,  2, -1}, 
-  { 1, -1,  0,  7,  2, -1, -1, -1,  6, 13,  8,  3, -1}, 
-  { 2, -1,  1,  8,  3, -1, -1,  0,  7, 14,  9,  4, -1}, 
-  { 3, -1,  2,  9,  4, -1, -1,  1,  8, 15, 10,  5, -1}, 
-  { 4, -1,  3, 10,  5, -1, -1,  2,  9, 16, 11, -1, -1}, 
-  { 5, -1,  4, 11, -1, -1, -1,  3, 10, 17, -1, -1, -1},
-  { 6,  0, -1, 12,  7, -1, -1, -1, -1, 18, 13,  8,  1}, 
-  { 7,  1,  6, 13,  8, -1,  0, -1, 12, 19, 14,  9,  2}, 
-  { 8,  2,  7, 14,  9, -1,  1,  6, 13, 20, 15, 10,  3}, 
-  { 9,  3,  8, 15, 10, -1,  2,  7, 14, 21, 16, 11,  4}, 
-  {10,  4,  9, 16, 11, -1,  3,  8, 15, 22, 17, -1,  5}, 
-  {11,  5, 10, 17, -1, -1,  4,  9, 16, 23, -1, -1, -1},
-  {12,  6, -1, 18, 13,  0, -1, -1, -1, 24, 19, 14,  7}, 
-  {13,  7, 12, 29, 14,  1,  6, -1, 18, 25, 20, 15,  8}, 
-  {14,  8, 13, 20, 15,  2,  7, 12, 19, 26, 21, 16,  9}, 
-  {15,  9, 14, 21, 16,  3,  8, 13, 20, 27, 22, 17, 10}, 
-  {16, 10, 15, 22, 17,  4,  9, 14, 21, 28, 23, -1, 11}, 
-  {17, 11, 16, 23, -1,  5, 10, 15, 22, 29, -1, -1, -1},
-  {18, 12, -1, 24, 19,  6, -1, -1, -1, 30, 25, 20, 13}, 
-  {19, 13, 18, 25, 20,  7, 12, -1, 24, 31, 26, 21, 14}, 
-  {20, 14, 19, 26, 21,  8, 13, 18, 25, 32, 27, 22, 15}, 
-  {21, 15, 20, 27, 22,  9, 14, 19, 26, 33, 28, 23, 16}, 
-  {22, 16, 21, 28, 23, 10, 15, 20, 27, 34, 29, -1, 17}, 
-  {23, 17, 22, 29, -1, 11, 16, 21, 28, 35, -1, -1, -1},
-  {24, 18, -1, 30, 25, 12, -1, -1, -1, 36, 31, 26, 19}, 
-  {25, 19, 24, 31, 26, 13, 18, -1, 30, 37, 32, 27, 20}, 
-  {26, 20, 25, 32, 27, 14, 19, 24, 31, 38, 33, 28, 21}, 
-  {27, 21, 26, 33, 28, 15, 20, 25, 32, 39, 34, 29, 22}, 
-  {28, 22, 27, 34, 29, 16, 21, 26, 33, 40, 35, -1, 23}, 
-  {29, 23, 28, 35, -1, 17, 22, 27, 34, 41, -1, -1, -1},
-  {30, 24, -1, 36, 31, 18, -1, -1, -1, 42, 37, 32, 25}, 
-  {31, 25, 30, 37, 32, 19, 24, -1, 36, 43, 38, 33, 26}, 
-  {32, 26, 31, 38, 33, 20, 25, 30, 37, 44, 39, 34, 27}, 
-  {33, 27, 32, 39, 34, 21, 26, 31, 38, 45, 40, 35, 28}, 
-  {34, 28, 33, 40, 35, 22, 27, 32, 39, 46, 41, -1, 29}, 
-  {35, 29, 34, 41, -1, 23, 28, 33, 40, 47, -1, -1, -1},
-  {36, 30, -1, 42, 37, 24, -1, -1, -1, -1, 43, 38, 31}, 
-  {37, 31, 36, 43, 38, 25, 30, -1, 42, -1, 44, 39, 32}, 
-  {38, 32, 37, 44, 39, 26, 31, 36, 43, -1, 45, 40, 33}, 
-  {39, 33, 38, 45, 40, 27, 32, 37, 44, -1, 46, 41, 34}, 
-  {40, 34, 39, 46, 41, 28, 33, 38, 45, -1, 47, -1, 35}, 
-  {41, 35, 40, 47, -1, 29, 34, 39, 46, -1, -1, -1, -1},
-  {42, 36, -1, -1, 43, 30, -1, -1, -1, -1, -1, 44, 37}, 
-  {43, 37, 42, -1, 44, 31, 36, -1, -1, -1, -1, 45, 38}, 
-  {44, 38, 43, -1, 45, 32, 37, 42, -1, -1, -1, 46, 39}, 
-  {45, 39, 44, -1, 46, 33, 38, 43, -1, -1, -1, 47, 40}, 
-  {46, 40, 45, -1, 47, 34, 39, 44, -1, -1, -1, -1, 41}, 
-  {47, 41, 46, -1, -1, 35, 40, 45, -1, -1, -1, -1, -1},
-};
-#elif defined GC_50
-int core2test[50][NUM_CORES2TEST] = {
-  { 0, -1, -1,  6,  1, -1, -1, -1, -1, 12,  7,  2, -1}, 
-  { 1, -1,  0,  7,  2, -1, -1, -1,  6, 13,  8,  3, -1}, 
-  { 2, -1,  1,  8,  3, -1, -1,  0,  7, 14,  9,  4, -1}, 
-  { 3, -1,  2,  9,  4, -1, -1,  1,  8, 15, 10,  5, -1}, 
-  { 4, -1,  3, 10,  5, -1, -1,  2,  9, 16, 11, -1, -1}, 
-  { 5, -1,  4, 11, -1, -1, -1,  3, 10, 17, -1, -1, -1},
-  { 6,  0, -1, 12,  7, -1, -1, -1, -1, 18, 13,  8,  1}, 
-  { 7,  1,  6, 13,  8, -1,  0, -1, 12, 19, 14,  9,  2}, 
-  { 8,  2,  7, 14,  9, -1,  1,  6, 13, 20, 15, 10,  3}, 
-  { 9,  3,  8, 15, 10, -1,  2,  7, 14, 21, 16, 11,  4}, 
-  {10,  4,  9, 16, 11, -1,  3,  8, 15, 22, 17, -1,  5}, 
-  {11,  5, 10, 17, -1, -1,  4,  9, 16, 23, -1, -1, -1},
-  {12,  6, -1, 18, 13,  0, -1, -1, -1, 24, 19, 14,  7}, 
-  {13,  7, 12, 29, 14,  1,  6, -1, 18, 25, 20, 15,  8}, 
-  {14,  8, 13, 20, 15,  2,  7, 12, 19, 26, 21, 16,  9}, 
-  {15,  9, 14, 21, 16,  3,  8, 13, 20, 27, 22, 17, 10}, 
-  {16, 10, 15, 22, 17,  4,  9, 14, 21, 28, 23, -1, 11}, 
-  {17, 11, 16, 23, -1,  5, 10, 15, 22, 29, -1, -1, -1},
-  {18, 12, -1, 24, 19,  6, -1, -1, -1, 30, 25, 20, 13}, 
-  {19, 13, 18, 25, 20,  7, 12, -1, 24, 31, 26, 21, 14}, 
-  {20, 14, 19, 26, 21,  8, 13, 18, 25, 32, 27, 22, 15}, 
-  {21, 15, 20, 27, 22,  9, 14, 19, 26, 33, 28, 23, 16}, 
-  {22, 16, 21, 28, 23, 10, 15, 20, 27, 34, 29, -1, 17}, 
-  {23, 17, 22, 29, -1, 11, 16, 21, 28, 35, -1, -1, -1},
-  {24, 18, -1, 30, 25, 12, -1, -1, -1, 36, 31, 26, 19}, 
-  {25, 19, 24, 31, 26, 13, 18, -1, 30, 37, 32, 27, 20}, 
-  {26, 20, 25, 32, 27, 14, 19, 24, 31, 38, 33, 28, 21}, 
-  {27, 21, 26, 33, 28, 15, 20, 25, 32, 39, 34, 29, 22}, 
-  {28, 22, 27, 34, 29, 16, 21, 26, 33, 40, 35, -1, 23}, 
-  {29, 23, 28, 35, -1, 17, 22, 27, 34, 41, -1, -1, -1},
-  {30, 24, -1, 36, 31, 18, -1, -1, -1, 43, 37, 32, 25}, 
-  {31, 25, 30, 37, 32, 19, 24, -1, 36, 44, 38, 33, 26}, 
-  {32, 26, 31, 38, 33, 20, 25, 30, 37, 45, 39, 34, 27}, 
-  {33, 27, 32, 39, 34, 21, 26, 31, 38, 46, 40, 35, 28}, 
-  {34, 28, 33, 40, 35, 22, 27, 32, 39, 47, 41, -1, 29}, 
-  {35, 29, 34, 41, -1, 23, 28, 33, 40, 48, 42, -1, -1},
-  {36, 30, -1, 43, 37, 24, -1, -1, -1, -1, 44, 38, 31}, 
-  {37, 31, 36, 44, 38, 25, 30, -1, 43, -1, 45, 39, 32}, 
-  {38, 32, 37, 45, 39, 26, 31, 36, 44, -1, 46, 40, 33}, 
-  {39, 33, 38, 46, 40, 27, 32, 37, 45, -1, 47, 41, 34}, 
-  {40, 34, 39, 47, 41, 28, 33, 38, 46, -1, 48, 42, 35}, 
-  {41, 35, 40, 48, 42, 29, 34, 39, 47, -1, 49, -1, -1},
-  {42, -1, 41, 49, -1, -1, 35, 40, 48, -1, -1, -1, -1}, 
-  {43, 36, -1, -1, 44, 30, -1, -1, -1, -1, -1, 45, 37}, 
-  {44, 37, 43, -1, 45, 31, 36, -1, -1, -1, -1, 46, 38}, 
-  {45, 38, 44, -1, 46, 32, 37, 43, -1, -1, -1, 47, 39}, 
-  {46, 39, 45, -1, 47, 33, 38, 44, -1, -1, -1, 48, 40}, 
-  {47, 40, 46, -1, 48, 34, 39, 45, -1, -1, -1, 49, 41},
-  {48, 41, 47, -1, 49, 35, 40, 46, -1, -1, -1, -1, 42}, 
-  {49, 42, 48, -1, -1, -1, 41, 47, -1, -1, -1, -1, -1} 
-};
-#elif defined GC_56
-int core2test[56][NUM_CORES2TEST] = {
-  { 0, -1, -1,  7,  1, -1, -1, -1, -1, 14,  8,  2, -1}, 
-  { 1, -1,  0,  8,  2, -1, -1, -1,  7, 15,  9,  3, -1}, 
-  { 2, -1,  1,  9,  3, -1, -1,  0,  8, 16, 10,  4, -1}, 
-  { 3, -1,  2, 10,  4, -1, -1,  1,  9, 17, 11,  5, -1}, 
-  { 4, -1,  3, 11,  5, -1, -1,  2, 10, 18, 12,  6, -1}, 
-  { 5, -1,  4, 12,  6, -1, -1,  3, 11, 19, 13, -1, -1},
-  { 6, -1,  5, 13, -1, -1, -1,  4, 12, 20, -1, -1, -1}, 
-  { 7,  0, -1, 14,  8, -1, -1, -1, -1, 21, 15,  9,  1}, 
-  { 8,  1,  7, 15,  9, -1,  0, -1, 14, 22, 16, 10,  2}, 
-  { 9,  2,  8, 16, 10, -1,  1,  7, 15, 23, 17, 11,  3}, 
-  {10,  3,  9, 17, 11, -1,  2,  8, 16, 24, 18, 12,  4}, 
-  {11,  4, 10, 18, 12, -1,  3,  9, 17, 25, 19, 13,  5},
-  {12,  5, 11, 19, 13, -1,  4, 10, 18, 26, 20, -1,  6}, 
-  {13,  6, 12, 20, -1, -1,  5, 11, 19, 27, -1, -1, -1}, 
-  {14,  7, -1, 21, 15,  0, -1, -1, -1, 28, 22, 16,  8}, 
-  {15,  8, 14, 22, 16,  1,  7, -1, 21, 29, 23, 17,  9}, 
-  {16,  9, 15, 23, 17,  2,  8, 14, 22, 30, 24, 18, 10}, 
-  {17, 10, 16, 24, 18,  3,  9, 15, 23, 31, 25, 19, 11},
-  {18, 11, 17, 25, 19,  4, 10, 16, 24, 32, 26, 20, 12}, 
-  {19, 12, 18, 26, 20,  5, 11, 17, 25, 33, 27, -1, 13}, 
-  {20, 13, 19, 27, -1,  6, 12, 18, 26, 34, -1, -1, -1}, 
-  {21, 14, -1, 28, 22,  7, -1, -1, -1, 35, 29, 23, 15}, 
-  {22, 15, 21, 29, 23,  8, 14, -1, 28, 36, 30, 24, 16}, 
-  {23, 16, 22, 30, 24,  9, 15, 21, 29, 37, 31, 25, 17},
-  {24, 17, 23, 31, 25, 10, 16, 22, 40, 38, 32, 26, 18}, 
-  {25, 18, 24, 32, 26, 11, 17, 23, 31, 39, 33, 27, 19}, 
-  {26, 19, 25, 33, 27, 12, 18, 24, 32, 40, 34, -1, 20}, 
-  {27, 20, 26, 34, -1, 13, 19, 25, 33, 41, -1, -1, -1}, 
-  {28, 21, -1, 35, 29, 14, -1, -1, -1, 42, 36, 30, 22}, 
-  {29, 22, 28, 36, 30, 15, 21, -1, 35, 43, 37, 31, 23},
-  {30, 23, 29, 37, 31, 16, 22, 28, 36, 44, 38, 32, 24}, 
-  {31, 24, 30, 38, 32, 17, 23, 29, 37, 45, 39, 33, 25}, 
-  {32, 25, 31, 39, 33, 18, 24, 30, 38, 46, 40, 34, 26}, 
-  {33, 26, 32, 40, 34, 19, 25, 31, 39, 47, 41, -1, 27}, 
-  {34, 27, 33, 41, -1, 20, 26, 32, 40, 48, -1, -1, -1}, 
-  {35, 28, -1, 42, 36, 21, -1, -1, -1, 49, 43, 37, 29},
-  {36, 29, 35, 43, 37, 22, 28, -1, 42, 50, 44, 38, 30}, 
-  {37, 30, 36, 44, 38, 23, 29, 35, 43, 51, 45, 39, 31}, 
-  {38, 31, 37, 45, 39, 24, 30, 36, 44, 52, 46, 40, 32}, 
-  {39, 32, 38, 46, 40, 25, 31, 37, 45, 53, 47, 41, 33}, 
-  {40, 33, 39, 47, 41, 26, 32, 38, 46, 54, 48, -1, 34}, 
-  {41, 34, 40, 48, -1, 27, 33, 39, 47, 55, -1, -1, -1},
-  {42, 35, -1, 49, 43, 28, -1, -1, -1, -1, 50, 44, 36}, 
-  {43, 36, 42, 50, 44, 29, 35, -1, 49, -1, 51, 45, 37}, 
-  {44, 37, 43, 51, 45, 30, 36, 42, 50, -1, 52, 46, 38}, 
-  {45, 38, 44, 52, 46, 31, 37, 43, 51, -1, 53, 47, 39}, 
-  {46, 39, 45, 53, 47, 32, 38, 44, 52, -1, 54, 48, 40}, 
-  {47, 40, 46, 54, 48, 33, 39, 45, 53, -1, 55, -1, 41},
-  {48, 41, 47, 55, -1, 34, 40, 46, 54, -1, -1, -1, -1}, 
-  {49, 42, -1, -1, 50, 35, -1, -1, -1, -1, -1, 51, 43}, 
-  {50, 43, 49, -1, 51, 36, 42, -1, -1, -1, -1, 52, 44}, 
-  {51, 44, 50, -1, 52, 37, 43, 49, -1, -1, -1, 53, 45}, 
-  {52, 45, 51, -1, 53, 38, 44, 50, -1, -1, -1, 54, 46}, 
-  {53, 46, 52, -1, 54, 39, 45, 51, -1, -1, -1, 55, 47},
-  {54, 47, 53, -1, 55, 40, 46, 52, -1, -1, -1, -1, 48}, 
-  {55, 48, 54, -1, -1, 41, 47, 53, -1, -1, -1, -1, -1}
-};
-#elif defined GC_62
-int core2test[62][NUM_CORES2TEST] = {
-  { 0, -1, -1,  6,  1, -1, -1, -1, -1, 14,  7,  2, -1}, 
-  { 1, -1,  0,  7,  2, -1, -1, -1,  6, 15,  8,  3, -1}, 
-  { 2, -1,  1,  8,  3, -1, -1,  0,  7, 16,  9,  4, -1}, 
-  { 3, -1,  2,  9,  4, -1, -1,  1,  8, 17, 10,  5, -1}, 
-  { 4, -1,  3, 10,  5, -1, -1,  2,  9, 18,  11, -1, -1}, 
-  { 5, -1,  4, 11, -1, -1, -1,  3, 10, 19, 12, -1, -1},
-  { 6,  0, -1, 14,  7, -1, -1, -1, -1, 22, 15,  8,  1}, 
-  { 7,  1,  6, 15,  8, -1,  0, -1, 14, 23, 16,  9,  2}, 
-  { 8,  2,  7, 16,  9, -1,  1,  6, 15, 24, 17, 10,  3}, 
-  { 9,  3,  8, 17, 10, -1,  2,  7, 16, 25, 18, 11,  4}, 
-  {10,  4,  9, 18, 11, -1,  3,  8, 17, 26, 19, 12,  5}, 
-  {11,  5, 10, 19, 12, -1,  4,  9, 18, 27, 20, 13, -1},
-  {12, -1, 11, 20, 13, -1,  5, 10, 19, 28, 21, -1, -1}, 
-  {13, -1,  12, 21, -1, -1, -1, 11, 20, 29, -1, -1, -1}, 
-  {14,  6, -1, 22, 15,  0, -1, -1, -1, 30, 23, 16,  7}, 
-  {15,  7, 14, 23, 16,  1,  6, -1, 22, 31, 24, 17,  8}, 
-  {16,  8, 15, 24, 17,  2,  7, 14, 23, 32, 25, 18,  9}, 
-  {17,  9, 16, 25, 18,  3,  8, 15, 24, 33, 26, 19, 10},
-  {18, 10, 17, 26, 19,  4,   9, 16, 25, 34, 27, 20, 11}, 
-  {19, 11, 18, 27, 20,  5, 10, 17, 26, 35, 28, 21, 12}, 
-  {20, 12, 19, 28, 21, -1, 11, 18, 27, 36, 29, -1, 13}, 
-  {21, 13, 28, 29, -1, -1, 12, 19, 28, 37, -1, -1, -1}, 
-  {22, 14, -1, 30, 23,  6, -1, -1, -1, 38, 31, 24, 15}, 
-  {23, 15, 22, 31, 24,  7, 14, -1, 30, 39, 32, 25, 16},
-  {24, 16, 23, 32, 25,  8, 15, 22, 31, 40, 33, 26, 17}, 
-  {25, 17, 24, 33, 26,  9, 16, 23, 32, 41, 34, 27, 18}, 
-  {26, 18, 25, 34, 27, 10, 17, 24, 33, 42, 35, 28, 19}, 
-  {27, 19, 26, 35, 28, 11, 18, 25, 34, 43, 36, 29, 20}, 
-  {28, 20, 27, 36, 29, 12, 19, 26, 35, 44, 37, -1, 21}, 
-  {29, 21, 28, 37, -1, 13, 20, 27, 36, 45, -1, -1, -1},
-  {30, 22, -1, 38, 31, 14, -1, -1, -1, 46, 39, 32, 23}, 
-  {31, 23, 30, 39, 32, 15, 22, -1, 38, 47, 40, 33, 24}, 
-  {32, 24, 31, 40, 33, 16, 23, 30, 39, 48, 41, 34, 25}, 
-  {33, 25, 32, 41, 34, 17, 24, 31, 40, 49, 42, 35, 26}, 
-  {34, 26, 33, 42, 35, 18, 25, 32, 41, 50, 43, 36, 27}, 
-  {35, 27, 34, 43, 36, 19, 26, 33, 42, 51, 44, 37, 28},
-  {36, 28, 35, 44, 37, 20, 27, 34, 43, 52, 45, -1, 29}, 
-  {37, 29, 36, 45, -1, 21, 28, 35, 44, 53, -1, -1, -1}, 
-  {38, 30, -1, 46, 39, 22, -1, -1, -1, 54, 47, 40, 31}, 
-  {39, 31, 38, 47, 40, 23, 30, -1, 46, 55, 48, 41, 32}, 
-  {40, 32, 39, 48, 41, 24, 31, 38, 47, 56, 49, 42, 33}, 
-  {41, 33, 40, 49, 42, 25, 32, 39, 48, 57, 50, 43, 34},
-  {42, 34, 41, 50, 43, 26, 33, 40, 49, 58, 51, 44, 35}, 
-  {43, 35, 42, 51, 44, 27, 34, 41, 50, 59, 52, 45, 36}, 
-  {44, 36, 43, 52, 45, 28, 35, 42, 51, 60, 53, -1, 37}, 
-  {45, 37, 44, 53, -1, 29, 36, 43, 52, 61, -1, -1}, 
-  {46, 38, -1, 54, 47, 30, -1, -1, -1, -1, 55, 48, 39}, 
-  {47, 39, 46, 55, 48, 31, 38, -1, 54, -1, 56, 49, 40},
-  {48, 40, 47, 56, 49, 32, 39, 46, 55 -1, 57, 50, 41}, 
-  {49, 41, 48, 57, 50, 33, 40, 47, 56, -1, 58, 51, 42}, 
-  {50, 42, 49, 58, 51, 34, 41, 48, 57, -1, 59, 52, 43}, 
-  {51, 43, 50, 59, 52, 35, 42, 49, 58, -1, 60, 53, 44}, 
-  {52, 44, 51, 60, 53, 36, 43, 50, 59, -1, 61, -1, 45}, 
-  {53, 45, 52, 61, -1, 37, 44, 51, 60, -1, -1, -1, -1},
-  {54, 46, -1, -1, 55, 38, -1, -1, -1, -1, -1, 56, 47}, 
-  {55, 47, 54, -1, 56, 39, 46, -1, -1, -1, -1, 57, 48}, 
-  {56, 48, 55, -1, 57, 40, 47, 54, -1, -1, -1, 58, 49}, 
-  {57, 49, 56, -1, 58, 41, 48, 55, -1, -1, -1, 59, 50}, 
-  {58, 50, 57, -1, 59, 42, 49, 56, -1, -1, -1, 60, 51}, 
-  {59, 51, 58, -1, 60, 43, 50, 57, -1, -1, -1, 61, 52},
-  {60, 52, 59, -1, 61, 44, 51, 58, -1, -1, -1, -1, 53}, 
-  {61, 53, 60, -1, -1, 45, 52, 59, -1, -1, -1, -1, -1}
-};
-#endif // GC_1
-#endif // SMEMF
+void buildCore2Test();
+
+#define NUM_CORES2TEST 8
+int core2test[NUMCORES4GC][NUM_CORES2TEST];
 
 #endif // BAMBOO_MULTICORE_MEM_HELPER_H

diff --git a/Robust/src/Runtime/bamboo/multicoremsg.c b/Robust/src/Runtime/bamboo/multicoremsg.c
index ad673b942c33d8059b1245de14dd11bca47032eb..038b9fc7937f86db2bef062b6a8a733e6cd7db92 100644 (file)
--- a/Robust/src/Runtime/bamboo/multicoremsg.c
+++ b/Robust/src/Runtime/bamboo/multicoremsg.c
@@ -504,9 +504,13 @@ void processmsg_returnmem_I() {
   MSG_INDEXINC_I();   
   unsigned int blockindex;
   BLOCKINDEX(blockindex, heaptop);
+  unsigned INTPTR localblocknum=GLOBALBLOCK2LOCK(blockindex);
+
   struct blockrecord * blockrecord=&allocationinfo.blocktable[blockindex];
+
   blockrecord->status=BS_FREE;
   blockrecord->usedspace=(unsigned INTPTR)(heaptop-OFFSET2BASEVA(blockindex));
+  blockrecord->freespace=BLOCKSIZE(localblocknum)-blockrecord->usedspace;
   /* Update the lowest free block */
   if (blockindex < allocationinfo.lowestfreeblock) {
     blockindex=allocationinfo.lowestfreeblock;
@@ -514,12 +518,14 @@ void processmsg_returnmem_I() {
 
   /* This is our own block...means we should mark other blocks above us as free*/
   if (cnum==blockrecord->corenum) {
-    unsigned INTPTR nextlocalblocknum=GLOBALBLOCK2LOCK(blockindex)+1;
+    unsigned INTPTR nextlocalblocknum=localblocknum+1;
     for(;nextlocalblocknum<numblockspercore;nextlocalblocknum++) {
       unsigned INTPTR blocknum=BLOCKINDEX2(cnum, nextlocalblocknum);
       struct blockrecord * nextblockrecord=&allocationinfo.blocktable[blockindex];
       nextblockrecord->status=BS_FREE;
       nextblockrecord->usedspace=0;
+      //this is true because this cannot be the lowest block
+      nextblockrecord->freespace=BLOCKSIZE(1);
     }
   }
 }