intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-10 15:12:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add capability to use malloc for Heap32 base.

Browse Source 
- shift page tables to lower bits

Change-Id: I54dcba72255215cf5be75ba425fc27727b0bfd98
This commit is contained in:
Mrozek, Michal
2018-10-25 11:11:22 +02:00
committed by sys_ocldev
parent 08a55f05b3
commit 7319023b0f
6 changed files with 47 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
runtime/memory_manager/os_agnostic_memory_manager.cpp
View File

@@ -19,6 +19,9 @@
namespace OCLRT {
OsAgnosticMemoryManager::~OsAgnosticMemoryManager() {
if (DebugManager.flags.UseMallocToObtainHeap32Base.get()) {
alignedFreeWrapper(reinterpret_cast<void *>(allocator32Bit->getBase()));
}
applyCommonCleanup();
}
@@ -92,8 +95,15 @@ GraphicsAllocation *OsAgnosticMemoryManager::allocate32BitGraphicsMemory(size_t
void *ptrAlloc = nullptr;
auto gpuAddress = allocator32Bit->allocate(allocationSize);
if (size < 0xfffff000) {
ptrAlloc = alignedMallocWrapper(allocationSize, MemoryConstants::allocationAlignment);
auto freeCpuPointer = true;
if (DebugManager.flags.UseMallocToObtainHeap32Base.get()) {
ptrAlloc = reinterpret_cast<void *>(gpuAddress);
freeCpuPointer = false;
} else {
if (size < 0xfffff000) {
ptrAlloc = alignedMallocWrapper(allocationSize, MemoryConstants::allocationAlignment);
}
}
MemoryAllocation *memoryAllocation = nullptr;
@@ -102,7 +112,7 @@ GraphicsAllocation *OsAgnosticMemoryManager::allocate32BitGraphicsMemory(size_t
memoryAllocation->is32BitAllocation = true;
memoryAllocation->gpuBaseAddress = GmmHelper::canonize(allocator32Bit->getBase());
memoryAllocation->sizeToFree = allocationSize;
memoryAllocation->cpuPtrAllocated = true;
memoryAllocation->cpuPtrAllocated = freeCpuPointer;
}
counter++;
return memoryAllocation;
@@ -242,6 +252,13 @@ Allocator32bit *OsAgnosticMemoryManager::create32BitAllocator(bool aubUsage) {
if (is32bit) {
heap32Base = 0x0;
}
if (DebugManager.flags.UseMallocToObtainHeap32Base.get()) {
size_t allocationSize = 40 * 1024 * 1024u;
allocatorSize = static_cast<uint64_t>(allocationSize);
heap32Base = castToUint64(alignedMallocWrapper(allocationSize, MemoryConstants::allocationAlignment));
}
return new Allocator32bit(heap32Base, allocatorSize);
}
} // namespace OCLRT