intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-24 21:18:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Minor TagAllocator cleanup

Browse Source 
Change-Id: I7d7c522e32ddf7eb614714c5e81b5b7b88129165
Signed-off-by: Bartosz Dunajski <bartosz.dunajski@intel.com>
This commit is contained in:
Bartosz Dunajski
2020-05-15 10:29:44 +02:00
committed by sys_ocldev
parent 35abaf4592
commit 37a6a900a8
2 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
opencl/test/unit_test/utilities/tag_allocator_tests.cpp
View File

@@ -290,7 +290,6 @@ TEST_F(TagAllocatorTest, CleanupResources) {
tagAllocator.cleanUpResources();
EXPECT_EQ(0u, tagAllocator.getGraphicsAllocationsCount());
EXPECT_EQ(0u, tagAllocator.getTagPoolCount());
}
TEST_F(TagAllocatorTest, whenNewTagIsTakenThenInitialize) {

29
shared/source/utilities/tag_allocator.h
View File

@@ -78,7 +78,6 @@ class TagAllocator {
rootDeviceIndex(rootDeviceIndex),
memoryManager(memMngr),
tagCount(tagCount),
tagAlignment(tagAlignment),
doNotReleaseNodes(doNotReleaseNodes) {
this->tagSize = alignUp(tagSize, tagAlignment);
@@ -94,11 +93,6 @@ class TagAllocator {
memoryManager->freeGraphicsMemory(gfxAllocation);
}
gfxAllocations.clear();
for (auto nodesMemory : tagPoolMemory) {
delete[] nodesMemory;
}
tagPoolMemory.clear();
}
NodeType *getTag() {
@@ -132,13 +126,12 @@ class TagAllocator {
IDList<NodeType> usedTags;
IDList<NodeType> deferredTags;
std::vector<GraphicsAllocation *> gfxAllocations;
std::vector<NodeType *> tagPoolMemory;
std::vector<std::unique_ptr<NodeType[]>> tagPoolMemory;
const DeviceBitfield deviceBitfield;
const uint32_t rootDeviceIndex;
MemoryManager *memoryManager;
size_t tagCount;
size_t tagAlignment;
size_t tagSize;
bool doNotReleaseNodes = false;
@@ -166,25 +159,21 @@ class TagAllocator {
GraphicsAllocation *graphicsAllocation = memoryManager->allocateGraphicsMemoryWithProperties(allocationProperties);
gfxAllocations.push_back(graphicsAllocation);
uint64_t gpuBaseAddress = graphicsAllocation->getGpuAddress();
uintptr_t Size = graphicsAllocation->getUnderlyingBufferSize();
uintptr_t Start = reinterpret_cast<uintptr_t>(graphicsAllocation->getUnderlyingBuffer());
uintptr_t End = Start + Size;
NodeType *nodesMemory = new NodeType[tagCount];
auto nodesMemory = std::make_unique<NodeType[]>(tagCount);
for (size_t i = 0; i < tagCount; ++i) {
auto tagOffset = i * tagSize;
nodesMemory[i].allocator = this;
nodesMemory[i].gfxAllocation = graphicsAllocation;
nodesMemory[i].tagForCpuAccess = reinterpret_cast<TagType *>(Start);
nodesMemory[i].gpuAddress = gpuBaseAddress + (i * tagSize);
nodesMemory[i].tagForCpuAccess = reinterpret_cast<TagType *>(ptrOffset(graphicsAllocation->getUnderlyingBuffer(), tagOffset));
nodesMemory[i].gpuAddress = graphicsAllocation->getGpuAddress() + tagOffset;
nodesMemory[i].setDoNotReleaseNodes(doNotReleaseNodes);
freeTags.pushTailOne(nodesMemory[i]);
Start += tagSize;
}
DEBUG_BREAK_IF(Start > End);
UNUSED_VARIABLE(End);
tagPoolMemory.push_back(nodesMemory);
tagPoolMemory.push_back(std::move(nodesMemory));
}
void releaseDeferredTags() {