diff --git a/runtime/memory_manager/graphics_allocation.h b/runtime/memory_manager/graphics_allocation.h index c7fcc6a7e4..eb74ee9fad 100644 --- a/runtime/memory_manager/graphics_allocation.h +++ b/runtime/memory_manager/graphics_allocation.h @@ -32,7 +32,7 @@ enum class HeapIndex : uint32_t { HEAP_EXTERNAL_DEVICE_MEMORY = 2u, HEAP_EXTERNAL = 3u, HEAP_STANDARD, - HEAP_STANDARD64Kb, + HEAP_STANDARD64KB, HEAP_SVM, HEAP_LIMITED }; diff --git a/runtime/memory_manager/memory_manager.cpp b/runtime/memory_manager/memory_manager.cpp index 37a037184f..31d25980b8 100644 --- a/runtime/memory_manager/memory_manager.cpp +++ b/runtime/memory_manager/memory_manager.cpp @@ -380,7 +380,7 @@ HeapIndex MemoryManager::selectHeap(const GraphicsAllocation *allocation, const return HeapIndex::HEAP_SVM; } if (allocation && allocation->gmm->gmmResourceInfo->is64KBPageSuitable()) { - return HeapIndex::HEAP_STANDARD64Kb; + return HeapIndex::HEAP_STANDARD64KB; } return HeapIndex::HEAP_STANDARD; } diff --git a/runtime/os_interface/windows/wddm/wddm.cpp b/runtime/os_interface/windows/wddm/wddm.cpp index 39cd4d689c..2972d956a0 100644 --- a/runtime/os_interface/windows/wddm/wddm.cpp +++ b/runtime/os_interface/windows/wddm/wddm.cpp @@ -331,7 +331,7 @@ bool Wddm::mapGpuVirtualAddressImpl(Gmm *gmm, D3DKMT_HANDLE handle, void *cpuPtr MapGPUVA.MinimumAddress = gfxPartition.Standard.Base; MapGPUVA.MaximumAddress = gfxPartition.Standard.Limit; break; - case HeapIndex::HEAP_STANDARD64Kb: + case HeapIndex::HEAP_STANDARD64KB: UNRECOVERABLE_IF(hardwareInfoTable[productFamily]->capabilityTable.gpuAddressSpace != MemoryConstants::max48BitAddress); MapGPUVA.MinimumAddress = gfxPartition.Standard64KB.Base; MapGPUVA.MaximumAddress = gfxPartition.Standard64KB.Limit; diff --git a/unit_tests/memory_manager/memory_manager_tests.cpp b/unit_tests/memory_manager/memory_manager_tests.cpp index 8c2308c0e8..852e0cd791 100644 --- a/unit_tests/memory_manager/memory_manager_tests.cpp +++ b/unit_tests/memory_manager/memory_manager_tests.cpp @@ -1663,7 +1663,7 @@ TEST(HeapSelectorTest, givenFullAddressSpaceWhenSelectingHeapForExternalAllocati if (platformDevices[0]->capabilityTable.gpuAddressSpace != MemoryConstants::max48BitAddress) { return; } - EXPECT_EQ(HeapIndex::HEAP_STANDARD64Kb, MemoryManager::selectHeap(&allocation, nullptr, *platformDevices[0])); + EXPECT_EQ(HeapIndex::HEAP_STANDARD64KB, MemoryManager::selectHeap(&allocation, nullptr, *platformDevices[0])); } TEST(HeapSelectorTest, givenFullAddressSpaceWhenSelectingHeapForExternalAllocationWithoutPtrAndResourceIsNot64KSuitableThenStandardHeapIsUsed) {