rooty/rpi-vk-driver
1
0
Fork 0
mirror of https://github.com/Yours3lf/rpi-vk-driver.git synced 2025-02-20 17:54:17 +01:00
Code Issues Releases Wiki Activity

added CPA num free block tracking

Browse Source
This commit is contained in:
yours3lf 2020-05-29 21:49:16 +01:00
parent 3860f115c0
commit d947979785
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
driver/ConsecutivePoolAllocator.c
View File

@ -17,7 +17,8 @@ ConsecutivePoolAllocator createConsecutivePoolAllocator(char* b, unsigned bs, un
.buf = b,
.nextFreeBlock = (uint32_t*)b,
.blockSize = bs,
.size = s
.size = s,
.numFreeBlocks = s / bs
};
//initialize linked list of free pointers
@ -118,6 +119,8 @@ uint32_t consecutivePoolAllocate(ConsecutivePoolAllocator* pa, uint32_t numBlock
//TODO debug stuff, not for release
if(ptr) memset(ptr, 0, numBlocks * pa->blockSize);
pa->numFreeBlocks -= numBlocks;
return (char*)ptr - pa->buf;
}
@ -194,6 +197,8 @@ void consecutivePoolFree(ConsecutivePoolAllocator* pa, void* p, uint32_t numBloc
*(uint32_t*)listPtr = tmp;
}
}
pa->numFreeBlocks += numBlocks;
}
uint32_t consecutivePoolReAllocate(ConsecutivePoolAllocator* pa, void* currentMem, uint32_t currNumBlocks)
@ -221,6 +226,8 @@ uint32_t consecutivePoolReAllocate(ConsecutivePoolAllocator* pa, void* currentMe
pa->nextFreeBlock = *listPtr;
}
pa->numFreeBlocks -= 1;
return (char*)currentMem - pa->buf;
}
@ -235,6 +242,9 @@ uint32_t consecutivePoolReAllocate(ConsecutivePoolAllocator* pa, void* currentMe
{
return -1;
}
pa->numFreeBlocks -= 1;
//copy over old content
memcpy(pa->buf + newMemOffset, currentMem, currNumBlocks * pa->blockSize);
//free current element
@ -258,17 +268,18 @@ void CPAdebugPrint(ConsecutivePoolAllocator* pa)
fprintf(stderr, "\nCPA Debug Print\n");
fprintf(stderr, "pa->buf %p\n", pa->buf);
fprintf(stderr, "pa->nextFreeBlock %p\n", pa->nextFreeBlock);
fprintf(stderr, "pa->numFreeBlocks %u\n", pa->numFreeBlocks);
fprintf(stderr, "Linear walk:\n");
//fprintf(stderr, "Linear walk:\n");
for(char* ptr = pa->buf; ptr != pa->buf + pa->size; ptr += pa->blockSize)
{
fprintf(stderr, "%p: %p, ", ptr, *(uint32_t*)ptr);
//fprintf(stderr, "%p: %p, ", ptr, *(uint32_t*)ptr);
}
fprintf(stderr, "\nLinked List walk:\n");
//fprintf(stderr, "\nLinked List walk:\n");
for(uint32_t* ptr = pa->nextFreeBlock; ptr; ptr = *ptr)
{
fprintf(stderr, "%p: %p, ", ptr, *ptr);
//fprintf(stderr, "%p: %p, ", ptr, *ptr);
}
fprintf(stderr, "\n");
}

1
driver/ConsecutivePoolAllocator.h
View File

@ -14,6 +14,7 @@ typedef struct ConsecutivePoolAllocator
uint32_t* nextFreeBlock;
unsigned blockSize;
unsigned size; //size is exact multiple of block size
unsigned numFreeBlocks;
} ConsecutivePoolAllocator;
ConsecutivePoolAllocator createConsecutivePoolAllocator(char* b, unsigned bs, unsigned s);

2
driver/command.c
View File

@ -655,6 +655,8 @@ VKAPI_ATTR VkResult VKAPI_CALL RPIFUNC(vkQueueSubmit)(
//advance in linked list
marker = marker->nextMarkerOffset == -1 ? 0 : getCPAptrFromOffset(cmdbuf->binCl.CPA, marker->nextMarkerOffset + cmdbuf->binCl.offset);
}
//CPAdebugPrint(cmdbuf->binCl.CPA);
}
for(int c = 0; c < pSubmits->commandBufferCount; ++c)

3
test/CPAtest/CPAtest.cpp
View File

@ -121,9 +121,6 @@ void reallocTest()
consecutivePoolFree(&cpa, getCPAptrFromOffset(&cpa, mem4), 1);
CPAdebugPrint(&cpa);
consecutivePoolFree(&cpa, getCPAptrFromOffset(&cpa, mem5), 1);
CPAdebugPrint(&cpa);
//mem2 = consecutivePoolReAllocate(&cpa, getCPAptrFromOffset(&cpa, mem2), 1);
//CPAdebugPrint(&cpa);