diff --git a/opencl/source/memory_manager/os_agnostic_memory_manager.cpp b/opencl/source/memory_manager/os_agnostic_memory_manager.cpp index 52e549e561..d79269bcd9 100644 --- a/opencl/source/memory_manager/os_agnostic_memory_manager.cpp +++ b/opencl/source/memory_manager/os_agnostic_memory_manager.cpp @@ -124,7 +124,7 @@ GraphicsAllocation *OsAgnosticMemoryManager::allocateGraphicsMemory64kb(const Al GraphicsAllocation *OsAgnosticMemoryManager::allocate32BitGraphicsMemoryImpl(const AllocationData &allocationData, bool useLocalMemory) { auto hwInfo = executionEnvironment.rootDeviceEnvironments[allocationData.rootDeviceIndex]->getHardwareInfo(); - auto heap = heapAssigner.get32BitHeapIndex(allocationData.type, useLocalMemory, *hwInfo, allocationData.flags.use32BitExtraPool); + auto heap = heapAssigner.get32BitHeapIndex(allocationData.type, useLocalMemory, *hwInfo, allocationData.flags.use32BitFrontWindow); auto gfxPartition = getGfxPartition(allocationData.rootDeviceIndex); if (allocationData.hostPtr) { auto allocationSize = alignSizeWholePage(allocationData.hostPtr, allocationData.size); diff --git a/shared/source/memory_manager/allocation_properties.h b/shared/source/memory_manager/allocation_properties.h index b7875ebcaf..e8bfa7754b 100644 --- a/shared/source/memory_manager/allocation_properties.h +++ b/shared/source/memory_manager/allocation_properties.h @@ -25,7 +25,7 @@ struct AllocationProperties { uint32_t resource48Bit : 1; uint32_t isUSMHostAllocation : 1; uint32_t isUSMDeviceAllocation : 1; - uint32_t use32BitExtraPool : 1; + uint32_t use32BitFrontWindow : 1; uint32_t reserved : 20; } flags; uint32_t allFlags = 0; @@ -98,7 +98,7 @@ struct AllocationData { uint32_t shareable : 1; uint32_t resource48Bit : 1; uint32_t isUSMHostAllocation : 1; - uint32_t use32BitExtraPool : 1; + uint32_t use32BitFrontWindow : 1; uint32_t reserved : 18; } flags; uint32_t allFlags = 0; diff --git a/shared/source/memory_manager/memory_manager.cpp b/shared/source/memory_manager/memory_manager.cpp index fb524f0c6b..6ff3c6c847 100644 --- a/shared/source/memory_manager/memory_manager.cpp +++ b/shared/source/memory_manager/memory_manager.cpp @@ -382,7 +382,7 @@ bool MemoryManager::getAllocationData(AllocationData &allocationData, const Allo (mayRequireL3Flush ? properties.flags.flushL3RequiredForRead | properties.flags.flushL3RequiredForWrite : 0u); allocationData.flags.preferRenderCompressed = CompressionSelector::preferRenderCompressedBuffer(properties); allocationData.flags.multiOsContextCapable = properties.flags.multiOsContextCapable; - allocationData.flags.use32BitExtraPool = properties.flags.use32BitExtraPool; + allocationData.flags.use32BitFrontWindow = properties.flags.use32BitFrontWindow; allocationData.hostPtr = hostPtr; allocationData.size = properties.size; diff --git a/shared/source/os_interface/linux/drm_memory_manager.cpp b/shared/source/os_interface/linux/drm_memory_manager.cpp index 0307858482..7bd116d048 100644 --- a/shared/source/os_interface/linux/drm_memory_manager.cpp +++ b/shared/source/os_interface/linux/drm_memory_manager.cpp @@ -460,7 +460,7 @@ GraphicsAllocation *DrmMemoryManager::allocateGraphicsMemoryForImageImpl(const A DrmAllocation *DrmMemoryManager::allocate32BitGraphicsMemoryImpl(const AllocationData &allocationData, bool useLocalMemory) { auto hwInfo = executionEnvironment.rootDeviceEnvironments[allocationData.rootDeviceIndex]->getHardwareInfo(); - auto allocatorToUse = heapAssigner.get32BitHeapIndex(allocationData.type, useLocalMemory, *hwInfo, allocationData.flags.use32BitExtraPool); + auto allocatorToUse = heapAssigner.get32BitHeapIndex(allocationData.type, useLocalMemory, *hwInfo, allocationData.flags.use32BitFrontWindow); if (allocationData.hostPtr) { uintptr_t inputPtr = reinterpret_cast(allocationData.hostPtr); diff --git a/shared/source/os_interface/windows/wddm_memory_manager.cpp b/shared/source/os_interface/windows/wddm_memory_manager.cpp index d5b1d449dc..48aee4142e 100644 --- a/shared/source/os_interface/windows/wddm_memory_manager.cpp +++ b/shared/source/os_interface/windows/wddm_memory_manager.cpp @@ -323,7 +323,7 @@ GraphicsAllocation *WddmMemoryManager::allocate32BitGraphicsMemoryImpl(const All wddmAllocation->setDriverAllocatedCpuPtr(pSysMem); wddmAllocation->set32BitAllocation(true); wddmAllocation->setAllocationOffset(offset); - wddmAllocation->allocInFrontWindowPool = allocationData.flags.use32BitExtraPool; + wddmAllocation->allocInFrontWindowPool = allocationData.flags.use32BitFrontWindow; gmm = new Gmm(executionEnvironment.rootDeviceEnvironments[allocationData.rootDeviceIndex]->getGmmClientContext(), ptrAligned, sizeAligned, false); wddmAllocation->setDefaultGmm(gmm); @@ -334,7 +334,7 @@ GraphicsAllocation *WddmMemoryManager::allocate32BitGraphicsMemoryImpl(const All return nullptr; } auto hwInfo = executionEnvironment.rootDeviceEnvironments[allocationData.rootDeviceIndex]->getHardwareInfo(); - auto baseAddress = getGfxPartition(allocationData.rootDeviceIndex)->getHeapBase(heapAssigner.get32BitHeapIndex(allocationData.type, useLocalMemory, *hwInfo, allocationData.flags.use32BitExtraPool)); + auto baseAddress = getGfxPartition(allocationData.rootDeviceIndex)->getHeapBase(heapAssigner.get32BitHeapIndex(allocationData.type, useLocalMemory, *hwInfo, allocationData.flags.use32BitFrontWindow)); wddmAllocation->setGpuBaseAddress(GmmHelper::canonize(baseAddress)); return wddmAllocation.release(); diff --git a/shared/test/unit_test/memory_manager/special_heap_pool_tests.cpp b/shared/test/unit_test/memory_manager/special_heap_pool_tests.cpp index c833b81640..20f8d35f57 100644 --- a/shared/test/unit_test/memory_manager/special_heap_pool_tests.cpp +++ b/shared/test/unit_test/memory_manager/special_heap_pool_tests.cpp @@ -37,7 +37,7 @@ using FrontWindowAllocatorTests = Test; TEST_F(FrontWindowAllocatorTests, givenAllocateInFrontWindowPoolFlagWhenAllocate32BitGraphicsMemoryThenAllocateAtHeapBegining) { AllocationData allocData = {}; - allocData.flags.use32BitExtraPool = true; + allocData.flags.use32BitFrontWindow = true; allocData.size = MemoryConstants::kiloByte; auto allocation(memManager->allocate32BitGraphicsMemoryImpl(allocData, false)); EXPECT_EQ(allocation->getGpuBaseAddress(), allocation->getGpuAddress()); @@ -46,7 +46,7 @@ TEST_F(FrontWindowAllocatorTests, givenAllocateInFrontWindowPoolFlagWhenAllocate TEST_F(FrontWindowAllocatorTests, givenAllocateInFrontWindowPoolFlagWhenAllocate32BitGraphicsMemoryThenAlocationInFrontWindowPoolRange) { AllocationData allocData = {}; - allocData.flags.use32BitExtraPool = true; + allocData.flags.use32BitFrontWindow = true; allocData.size = MemoryConstants::kiloByte; auto allocation(memManager->allocate32BitGraphicsMemoryImpl(allocData, false)); auto heap = memManager->heapAssigner.get32BitHeapIndex(allocData.type, false, *defaultHwInfo, true); diff --git a/shared/test/unit_test/os_interface/linux/drm_special_heap_test.cpp b/shared/test/unit_test/os_interface/linux/drm_special_heap_test.cpp index 7ca31ba4c1..940cf08bff 100644 --- a/shared/test/unit_test/os_interface/linux/drm_special_heap_test.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_special_heap_test.cpp @@ -44,7 +44,7 @@ using DrmFrontWindowPoolAllocatorTests = Test; TEST_F(DrmFrontWindowPoolAllocatorTests, givenAllocateInSpecialPoolFlagWhenDrmAllocate32BitGraphicsMemoryThenAllocateAtHeapBegining) { AllocationData allocData = {}; - allocData.flags.use32BitExtraPool = true; + allocData.flags.use32BitFrontWindow = true; allocData.size = MemoryConstants::kiloByte; auto allocation = memManager->allocate32BitGraphicsMemoryImpl(allocData, false); EXPECT_EQ(allocation->getGpuBaseAddress(), allocation->getGpuAddress()); diff --git a/shared/test/unit_test/os_interface/windows/wddm_special_heap_test.cpp b/shared/test/unit_test/os_interface/windows/wddm_special_heap_test.cpp index 257c7242c1..db16c707b3 100644 --- a/shared/test/unit_test/os_interface/windows/wddm_special_heap_test.cpp +++ b/shared/test/unit_test/os_interface/windows/wddm_special_heap_test.cpp @@ -46,7 +46,7 @@ using WddmFrontWindowPoolAllocatorTests = Test; TEST_F(WddmFrontWindowPoolAllocatorTests, givenAllocateInFrontWindowPoolFlagWhenWddmAllocate32BitGraphicsMemoryThenAllocateAtHeapBegining) { AllocationData allocData = {}; - allocData.flags.use32BitExtraPool = true; + allocData.flags.use32BitFrontWindow = true; allocData.size = MemoryConstants::kiloByte; auto allocation = memManager->allocate32BitGraphicsMemoryImpl(allocData, false); EXPECT_EQ(allocation->getGpuBaseAddress(), GmmHelper::canonize(allocation->getGpuAddress()));