#ifdef MULTICORE_GC
+#include "structdefs.h"
#include "multicoregccompact.h"
#include "runtime_arch.h"
#include "multicoreruntime.h"
#include "multicoregarbage.h"
#include "markbit.h"
#include "multicoremem_helper.h"
+#include "gcqueue.h"
int gc_countRunningCores() {
int count=0;
// init the orig ptr
orig->localblocknum = 0;
orig->ptr=orig->base = to->base;
- orig->bound = orig->base + BLOCKSIZE(orig->localblocknum);
+ orig->bound=orig->base+BLOCKSIZE(orig->localblocknum);
+#ifdef GC_CACHE_ADAPT
+ to->pagebound=to->base+BAMBOO_PAGE_SIZE;
+ orig->pagebound=orig->base+BAMBOO_PAGE_SIZE;
+#endif
}
void getSpaceLocally(struct moveHelper *to) {
to->localblocknum++;
BASEPTR(to->base,BAMBOO_NUM_OF_CORE, to->localblocknum);
to->ptr=to->base;
- to->bound = to->base + BLOCKSIZE(to->localblocknum);
+ to->bound=to->base+BLOCKSIZE(to->localblocknum);
+#ifdef GC_CACHE_ADAPT
+ to->pagebound=to->base+BAMBOO_PAGE_SIZE;
+#endif
}
//This function is called on the master core only...and typically by
}
/* This is our own block...means we should mark other blocks above us as free*/
+
if (cnum==blockrecord->corenum) {
unsigned INTPTR nextlocalblocknum=localblocknum+1;
for(;nextlocalblocknum<numblockspercore;nextlocalblocknum++) {
}
}
-void useReturnedMem(unsigned int corenum, block_t localblockindex) {
+void useReturnedMem(unsigned int retcorenum, block_t localblockindex) {
for(int i=0;i<NUMCORES4GC;i++) {
unsigned INTPTR requiredmem=gcrequiredmems[i];
if (requiredmem) {
for(block_t nextlocalblocknum=localblockindex;nextlocalblocknum<numblockspercore;nextlocalblocknum++) {
- unsigned INTPTR blocknum=BLOCKINDEX2(corenum, nextlocalblocknum);
+ unsigned INTPTR blocknum=BLOCKINDEX2(retcorenum, nextlocalblocknum);
struct blockrecord * nextblockrecord=&allocationinfo.blocktable[blocknum];
if (nextblockrecord->status==BS_FREE) {
unsigned INTPTR freespace=nextblockrecord->freespace&~BAMBOO_CACHE_LINE_MASK;
unsigned int globalblocknum;
BLOCKINDEX(globalblocknum, to->ptr);
to->base = gcbaseva + OFFSET2BASEVA(globalblocknum);
- to->bound = gcbaseva + BOUNDPTR(globalblocknum);
+ to->bound=gcbaseva+BOUNDPTR(globalblocknum);
+#ifdef GC_CACHE_ADAPT
+ to->pagebound=(void *)((int)((int)(to->ptr)&(~(BAMBOO_PAGE_SIZE-1)))+BAMBOO_PAGE_SIZE);
+#endif
}
void getSpace(struct moveHelper *to, unsigned int minimumbytes) {
//need more space to compact into
- if (to->localblocknum < gcblock2fill) {
+ if ((to->localblocknum+1) < gcblock2fill) {
getSpaceLocally(to);
} else {
getSpaceRemotely(to, minimumbytes);
void compacthelper(struct moveHelper * orig,struct moveHelper * to) {
bool senttopmessage=false;
while(true) {
- if ((gccurr_heaptop < ((unsigned INTPTR)(to->bound-to->ptr)))&&!senttopmessage) {
+ if ((gccurr_heaptop <= ((unsigned INTPTR)(to->bound-to->ptr)))&&!senttopmessage) {
//This block is the last for this core...let the startup know
if (BAMBOO_NUM_OF_CORE==STARTUPCORE) {
handleReturnMem(BAMBOO_NUM_OF_CORE, to->ptr+gccurr_heaptop);
//Only send the message once
senttopmessage=true;
}
- unsigned int minimumbytes=compactblocks(orig, to);
+ unsigned int minimumbytes=COMPACTUNITS(orig, to);
if (orig->ptr==orig->bound) {
//need more data to compact
//increment the core
orig->localblocknum++;
BASEPTR(orig->base,BAMBOO_NUM_OF_CORE, orig->localblocknum);
orig->ptr=orig->base;
- orig->bound = orig->base + BLOCKSIZE(orig->localblocknum);
- if (orig->base >= gcbaseva+BAMBOO_SHARED_MEM_SIZE)
+ orig->bound=orig->base+BLOCKSIZE(orig->localblocknum);
+#ifdef GC_CACHE_ADAPT
+ orig->pagebound=orig->base+BAMBOO_PAGE_SIZE;
+#endif
+ if (orig->base >= gcbaseva+BAMBOO_SHARED_MEM_SIZE) {
+ CACHEADAPT_FINISH_COMPACT(to->ptr);
break;
+ }
}
if (minimumbytes!=0) {
getSpace(to, minimumbytes);
}
}
-void * checkNeighbors_I(int corenum, unsigned INTPTR requiredmem, unsigned INTPTR desiredmem) {
+void * checkNeighbors_I(int ncorenum, unsigned INTPTR requiredmem, unsigned INTPTR desiredmem) {
int minblockindex=allocationinfo.lowestfreeblock/NUMCORES4GC;
unsigned INTPTR threshold=(desiredmem<MINMEMORYCHUNKSIZE)? desiredmem: MINMEMORYCHUNKSIZE;
unsigned INTPTR memcheck=requiredmem>threshold?requiredmem:threshold;
for(block_t lblock=minblockindex;lblock<numblockspercore;lblock++) {
for(int i=0;i<NUM_CORES2TEST;i++) {
- int neighborcore=core2test[corenum][i];
+ int neighborcore=core2test[ncorenum][i];
if (neighborcore!=-1) {
block_t globalblockindex=BLOCKINDEX2(neighborcore, lblock);
struct blockrecord * block=&allocationinfo.blocktable[globalblockindex];
if (block->status==BS_FREE) {
if(firstfree==NOFREEBLOCK)
firstfree=searchblock;
+ //don't take a block from another core that hasn't returned its memory yet
+ if (block->corenum!=core&&returnedmem[block->corenum])
+ continue;
+
unsigned INTPTR freespace=block->freespace&~BAMBOO_CACHE_LINE_MASK;
if (freespace>=memcheck) {
//TODO: should check memory block at same level on our own core...if that works, use it to preserve locality
//taken care of one block
gcmovepending--;
void *startaddr=blockptr+usedspace;
- if(BAMBOO_CHECK_SEND_MODE()) {
+ if (core==STARTUPCORE) {
+ gctomove=true;
+ gcmovestartaddr=startaddr;
+ } else if(BAMBOO_CHECK_SEND_MODE()) {
cache_msg_2_I(core,GCMOVESTART,startaddr);
} else {
send_msg_2_I(core,GCMOVESTART,startaddr);
return NULL;
}
+#ifdef GC_CACHE_ADAPT
+unsigned int compactblockshelper(struct moveHelper * orig, struct moveHelper * to) {
+ unsigned int minimumbytes=0;
+ void *origptr=orig->ptr;
+ void *origbound=orig->bound;
+ void * tmporig=orig->ptr;
+ void * tmpto=to->ptr;
+
+ while(true) {
+ //call compactblocks using the page boundaries at the current bounds
+ minimumbytes=compactblocks(orig, to);
+ if(minimumbytes == 0) {
+ //bump the orig page bound...
+ //use old orig pointer to make sure we get correct block
+ CACHEADAPT_FINISH_SRC_PAGE(tmporig, tmpto, to->ptr);
+ if (orig->ptr<origbound) {
+ tmporig=orig->ptr;
+ tmpto=to->ptr;
+ orig->pagebound=orig->pagebound+BAMBOO_PAGE_SIZE;
+ } else {
+ return 0;
+ }
+ } else {
+ // require more memory
+ void *endtoptr=to->ptr+minimumbytes;
+ if (endtoptr>to->bound) {
+ CACHEADAPT_FINISH_DST_PAGE(orig->ptr, tmpto, to->ptr, 0);
+ return minimumbytes;
+ } else {
+ CACHEADAPT_FINISH_DST_PAGE(orig->ptr, tmpto, to->ptr, minimumbytes);
+ to->pagebound=((((unsigned INTPTR)endtoptr)-1)&~(BAMBOO_PAGE_SIZE-1))+BAMBOO_PAGE_SIZE;
+ //update pointers to avoid double counting the stuff we already added in
+ tmporig=orig->ptr+minimumbytes;
+ tmpto=to->ptr+minimumbytes;
+ }
+ }
+ }
+}
+#endif
+
/* This function is performance critical... spend more time optimizing it */
unsigned int compactblocks(struct moveHelper * orig, struct moveHelper * to) {
void *toptrinit=to->ptr;
void *toptr=toptrinit;
- void *tobound=to->bound;
void *origptr=orig->ptr;
+#ifdef GC_CACHE_ADAPT
+ void *origbound=orig->pagebound;
+ void *tobound=to->pagebound;
+ //set to the first line so we don't need conditions
+ void *lastflush=(void *)(((unsigned INTPTR)&gcmappingtbl[OBJMAPPINGINDEX(origptr)])&~(BAMBOO_CACHE_LINE_MASK));
+#else
void *origbound=orig->bound;
+ void *tobound=to->bound;
+#endif
unsigned INTPTR origendoffset=ALIGNTOTABLEINDEX((unsigned INTPTR)(origbound-gcbaseva));
unsigned int objlength;
+
while(origptr<origbound) {
//Try to skip over stuff fast first
unsigned INTPTR offset=(unsigned INTPTR) (origptr-gcbaseva);
do {
arrayoffset++;
if (arrayoffset>=origendoffset) {
- //finished with block...
- origptr=origbound;
+ //finished with block(a page in CACHE_ADAPT version)...
to->ptr=toptr;
- orig->ptr=origptr;
+ orig->ptr=origbound;
gccurr_heaptop-=(unsigned INTPTR)(toptr-toptrinit);
+#ifdef GC_CACHE_ADAPT
+ BAMBOO_CACHE_FLUSH_LINE(lastflush);
+#endif
return 0;
}
} while(!gcmarktbl[arrayoffset]);
origptr=CONVERTTABLEINDEXTOPTR(arrayoffset);
}
-
+
//Scan more carefully next
objlength=getMarkedLength(origptr);
void *endtoptr=toptr+length;
if (endtoptr>tobound) {
gccurr_heaptop-=(unsigned INTPTR)(toptr-toptrinit);
- to->ptr=tobound;
+ to->ptr=toptr;
orig->ptr=origptr;
+#ifdef GC_CACHE_ADAPT
+ BAMBOO_CACHE_FLUSH_LINE(lastflush);
+#endif
return length;
}
//good to move objects and update pointers
- //tprintf("Decided to compact obj %x to %x\n", origptr, toptr);
+
+ void ** mapptr=&gcmappingtbl[OBJMAPPINGINDEX(origptr)];
+ *mapptr=toptr;
- gcmappingtbl[OBJMAPPINGINDEX(origptr)]=toptr;
+#ifdef GC_CACHE_ADAPT
+ void *maskmapptr=(void *)(((unsigned INTPTR)mapptr)&~(BAMBOO_CACHE_LINE_MASK));
+
+ if (lastflush!=maskmapptr) {
+ BAMBOO_CACHE_FLUSH_LINE(lastflush);
+ lastflush=maskmapptr;
+ }
+#endif
origptr+=length;
toptr=endtoptr;
to->ptr=toptr;
orig->ptr=origptr;
gccurr_heaptop-=(unsigned INTPTR)(toptr-toptrinit);
+#ifdef GC_CACHE_ADAPT
+ BAMBOO_CACHE_FLUSH_LINE(lastflush);
+#endif
return 0;
}
BAMBOO_ASSERT(COMPACTPHASE == gc_status_info.gcphase);
// initialize structs for compacting
- struct moveHelper orig={0,NULL,NULL,0,NULL,0,0,0,0};
- struct moveHelper to={0,NULL,NULL,0,NULL,0,0,0,0};
+ struct moveHelper orig;
+ struct moveHelper to;
initOrig_Dst(&orig, &to);
- CACHEADAPT_SAMPLING_DATA_REVISE_INIT(&orig, &to);
-
compacthelper(&orig, &to);
+#ifdef GC_CACHE_ADAPT
+ BAMBOO_CACHE_MF();
+#endif
}
void master_compact() {
gcblock2fill = numblockspercore;
}
}
- GCPROFILE_ITEM();
+ GCPROFILE_ITEM_MASTER();
// compact phase
compact();
/* wait for all cores to finish compacting */
-
+ GC_PRINTF("master finished\n");
while(!gc_checkCoreStatus())
;
- GCPROFILE_ITEM();
+#ifdef GC_DEBUG
+ void *nextvalid=gcbaseva;
+ for(void *tmp=gcbaseva; tmp<gcbaseva+BAMBOO_SHARED_MEM_SIZE;tmp+=ALIGNMENTSIZE) {
+ unsigned int objlength=getMarkedLength(tmp);
+ void *forwarding=gcmappingtbl[OBJMAPPINGINDEX(tmp)];
+ if (tmp>=nextvalid&&((objlength!=0)!=(forwarding!=NULL))) {
+ tprintf("Maps disagree tmp=%x olength=%u forwarding=%x\n",tmp, objlength, forwarding);
+ }
+ if (tmp<nextvalid&&forwarding!=NULL) {
+ tprintf("Weird forwarding pointer\n");
+ }
+ if (tmp>=nextvalid&&(objlength!=0||forwarding!=NULL)) {
+ unsigned int length=ALIGNSIZETOBYTES(objlength);
+ unsigned int size;
+ unsigned int type;
+ nextvalid=tmp+length;
+ gettype_size(tmp, &type, &size);
+ size=((size-1)&(~(ALIGNMENTSIZE-1)))+ALIGNMENTSIZE;
+ if (size!=length) {
+ tprintf("Bad size in bitmap: tmp=%x length=%u size=%u type=%u\n", tmp, length, size, type);
+ }
+ block_t blockindex;
+ BLOCKINDEX(blockindex, forwarding);
+ struct blockrecord * block=&allocationinfo.blocktable[blockindex];
+ void *blockptr=OFFSET2BASEVA(blockindex)+gcbaseva;
+
+ if (block->status==BS_FREE) {
+ if (forwarding>(blockptr+block->usedspace)) {
+ tprintf("Pointer references free space forwarding=%x tmp=%x length=%u type=%u blockindex=%u, baseptr=%x, usedspace=%u, status=%u\n", forwarding, tmp, length, type,blockindex, blockptr, block->usedspace, block->status);
+ }
+ }
+ }
+ }
+#endif
+
+ GCPROFILE_ITEM_MASTER();
//just in case we didn't get blocks back...
if (allocationinfo.lowestfreeblock==NOFREEBLOCK)
allocationinfo.lowestfreeblock=numblockspercore*NUMCORES4GC;
+ // compute live object space
+ GCPROFILE_RECORD_SPACE_MASTER();
GC_PRINTF("compact phase finished \n");
}
projects / IRC.git / blobdiff