diff --git a/runtime/memory_manager/memory_manager.cpp b/runtime/memory_manager/memory_manager.cpp index 097a8652be..d45f281eb7 100644 --- a/runtime/memory_manager/memory_manager.cpp +++ b/runtime/memory_manager/memory_manager.cpp @@ -159,7 +159,7 @@ GraphicsAllocation *MemoryManager::allocateGraphicsMemory(size_t size, const voi } GraphicsAllocation *MemoryManager::createInternalGraphicsAllocation(const void *ptr, size_t allocationSize) { - return allocate32BitGraphicsMemory(allocationSize, const_cast(ptr), MemoryType::INTERNAL_ALLOCATION); + return allocate32BitGraphicsMemory(allocationSize, const_cast(ptr), AllocationOrigin::INTERNAL_ALLOCATION); } void MemoryManager::cleanGraphicsMemoryCreatedFromHostPtr(GraphicsAllocation *graphicsAllocation) { diff --git a/runtime/memory_manager/memory_manager.h b/runtime/memory_manager/memory_manager.h index 9a03e0cb22..55ad7319b4 100644 --- a/runtime/memory_manager/memory_manager.h +++ b/runtime/memory_manager/memory_manager.h @@ -55,7 +55,7 @@ enum allocationType { REUSABLE_ALLOCATION }; -enum MemoryType { +enum AllocationOrigin { EXTERNAL_ALLOCATION, INTERNAL_ALLOCATION }; @@ -107,7 +107,7 @@ class MemoryManager { } virtual GraphicsAllocation *allocateGraphicsMemory(size_t size, const void *ptr, bool forcePin); - virtual GraphicsAllocation *allocate32BitGraphicsMemory(size_t size, void *ptr, MemoryType memoryType) = 0; + virtual GraphicsAllocation *allocate32BitGraphicsMemory(size_t size, void *ptr, AllocationOrigin allocationOrigin) = 0; virtual GraphicsAllocation *allocateGraphicsMemoryForImage(ImageInfo &imgInfo, Gmm *gmm) = 0; @@ -186,7 +186,7 @@ class MemoryManager { MOCKABLE_VIRTUAL GraphicsAllocation *createGraphicsAllocationWithRequiredBitness(size_t size, void *ptr, bool forcePin) { if (force32bitAllocations && is64bit) { - return allocate32BitGraphicsMemory(size, ptr, MemoryType::EXTERNAL_ALLOCATION); + return allocate32BitGraphicsMemory(size, ptr, AllocationOrigin::EXTERNAL_ALLOCATION); } else { if (ptr) { return allocateGraphicsMemory(size, ptr, forcePin); diff --git a/runtime/memory_manager/os_agnostic_memory_manager.cpp b/runtime/memory_manager/os_agnostic_memory_manager.cpp index 700ed3c8cc..940fb2ee26 100644 --- a/runtime/memory_manager/os_agnostic_memory_manager.cpp +++ b/runtime/memory_manager/os_agnostic_memory_manager.cpp @@ -67,7 +67,7 @@ GraphicsAllocation *OsAgnosticMemoryManager::allocateGraphicsMemory64kb(size_t s return allocateGraphicsMemory(alignUp(size, MemoryConstants::pageSize64k), MemoryConstants::pageSize64k, forcePin, false); } -GraphicsAllocation *OsAgnosticMemoryManager::allocate32BitGraphicsMemory(size_t size, void *ptr, MemoryType memoryType) { +GraphicsAllocation *OsAgnosticMemoryManager::allocate32BitGraphicsMemory(size_t size, void *ptr, AllocationOrigin allocationOrigin) { if (ptr) { auto allocationSize = alignSizeWholePage(reinterpret_cast(ptr), size); auto gpuVirtualAddress = allocator32Bit->allocate(allocationSize); diff --git a/runtime/memory_manager/os_agnostic_memory_manager.h b/runtime/memory_manager/os_agnostic_memory_manager.h index 90d9396bcc..f12b0b90c1 100644 --- a/runtime/memory_manager/os_agnostic_memory_manager.h +++ b/runtime/memory_manager/os_agnostic_memory_manager.h @@ -61,7 +61,7 @@ class OsAgnosticMemoryManager : public MemoryManager { ~OsAgnosticMemoryManager() override; GraphicsAllocation *allocateGraphicsMemory(size_t size, size_t alignment, bool forcePin, bool uncacheable) override; GraphicsAllocation *allocateGraphicsMemory64kb(size_t size, size_t alignment, bool forcePin) override; - GraphicsAllocation *allocate32BitGraphicsMemory(size_t size, void *ptr, MemoryType memoryType) override; + GraphicsAllocation *allocate32BitGraphicsMemory(size_t size, void *ptr, AllocationOrigin allocationOrigin) override; GraphicsAllocation *createGraphicsAllocationFromSharedHandle(osHandle handle, bool requireSpecificBitness, bool reuseBO) override; GraphicsAllocation *createGraphicsAllocationFromNTHandle(void *handle) override { return nullptr; } GraphicsAllocation *allocateGraphicsMemoryForImage(ImageInfo &imgInfo, Gmm *gmm) override; diff --git a/runtime/os_interface/linux/drm_memory_manager.cpp b/runtime/os_interface/linux/drm_memory_manager.cpp index 3bc87b3a5b..dc899bf9c6 100644 --- a/runtime/os_interface/linux/drm_memory_manager.cpp +++ b/runtime/os_interface/linux/drm_memory_manager.cpp @@ -247,9 +247,9 @@ GraphicsAllocation *DrmMemoryManager::allocateGraphicsMemoryForImage(ImageInfo & return allocation; } -DrmAllocation *DrmMemoryManager::allocate32BitGraphicsMemory(size_t size, void *ptr, MemoryType memoryType) { - auto allocatorToUse = memoryType == MemoryType::EXTERNAL_ALLOCATION ? allocator32Bit.get() : internal32bitAllocator.get(); - auto allocationType = memoryType == MemoryType::EXTERNAL_ALLOCATION ? BIT32_ALLOCATOR_EXTERNAL : BIT32_ALLOCATOR_INTERNAL; +DrmAllocation *DrmMemoryManager::allocate32BitGraphicsMemory(size_t size, void *ptr, AllocationOrigin allocationOrigin) { + auto allocatorToUse = allocationOrigin == AllocationOrigin::EXTERNAL_ALLOCATION ? allocator32Bit.get() : internal32bitAllocator.get(); + auto allocationType = allocationOrigin == AllocationOrigin::EXTERNAL_ALLOCATION ? BIT32_ALLOCATOR_EXTERNAL : BIT32_ALLOCATOR_INTERNAL; if (ptr) { uintptr_t inputPtr = (uintptr_t)ptr; @@ -285,7 +285,7 @@ DrmAllocation *DrmMemoryManager::allocate32BitGraphicsMemory(size_t size, void * auto res = allocatorToUse->allocate(allocationSize); if (!res) { - if (memoryType == MemoryType::EXTERNAL_ALLOCATION && device && device->getProgramCount() == 0) { + if (allocationOrigin == AllocationOrigin::EXTERNAL_ALLOCATION && device && device->getProgramCount() == 0) { this->force32bitAllocations = false; device->setForce32BitAddressing(false); return (DrmAllocation *)createGraphicsAllocationWithRequiredBitness(size, ptr); @@ -313,7 +313,7 @@ DrmAllocation *DrmMemoryManager::allocate32BitGraphicsMemory(size_t size, void * } GraphicsAllocation *DrmMemoryManager::createInternalGraphicsAllocation(const void *ptr, size_t allocationSize) { - return allocate32BitGraphicsMemory(allocationSize, const_cast(ptr), MemoryType::INTERNAL_ALLOCATION); + return allocate32BitGraphicsMemory(allocationSize, const_cast(ptr), AllocationOrigin::INTERNAL_ALLOCATION); } BufferObject *DrmMemoryManager::findAndReferenceSharedBufferObject(int boHandle) { diff --git a/runtime/os_interface/linux/drm_memory_manager.h b/runtime/os_interface/linux/drm_memory_manager.h index 022b38be72..c7fcb43d95 100644 --- a/runtime/os_interface/linux/drm_memory_manager.h +++ b/runtime/os_interface/linux/drm_memory_manager.h @@ -52,7 +52,7 @@ class DrmMemoryManager : public MemoryManager { } DrmAllocation *allocateGraphicsMemory(size_t size, const void *ptr, bool forcePin) override; GraphicsAllocation *allocateGraphicsMemoryForImage(ImageInfo &imgInfo, Gmm *gmm) override; - DrmAllocation *allocate32BitGraphicsMemory(size_t size, void *ptr, MemoryType memoryType) override; + DrmAllocation *allocate32BitGraphicsMemory(size_t size, void *ptr, AllocationOrigin allocationOrigin) override; GraphicsAllocation *createInternalGraphicsAllocation(const void *ptr, size_t allocationSize) override; GraphicsAllocation *createGraphicsAllocationFromSharedHandle(osHandle handle, bool requireSpecificBitness, bool reuseBO) override; GraphicsAllocation *createPaddedAllocation(GraphicsAllocation *inputGraphicsAllocation, size_t sizeWithPadding) override; diff --git a/runtime/os_interface/windows/wddm_memory_manager.cpp b/runtime/os_interface/windows/wddm_memory_manager.cpp index 29f1646357..3c61a5a39e 100644 --- a/runtime/os_interface/windows/wddm_memory_manager.cpp +++ b/runtime/os_interface/windows/wddm_memory_manager.cpp @@ -67,7 +67,7 @@ GraphicsAllocation *WddmMemoryManager::allocateGraphicsMemoryForImage(ImageInfo auto allocation = new WddmAllocation(nullptr, imgInfo.size, nullptr); allocation->gmm = gmm; - if (!WddmMemoryManager::createWddmAllocation(allocation, MemoryType::EXTERNAL_ALLOCATION)) { + if (!WddmMemoryManager::createWddmAllocation(allocation, AllocationOrigin::EXTERNAL_ALLOCATION)) { delete allocation; return nullptr; } @@ -118,7 +118,7 @@ GraphicsAllocation *WddmMemoryManager::allocateGraphicsMemory(size_t size, size_ wddmAllocation->gmm = gmm; - if (!createWddmAllocation(wddmAllocation, MemoryType::EXTERNAL_ALLOCATION)) { + if (!createWddmAllocation(wddmAllocation, AllocationOrigin::EXTERNAL_ALLOCATION)) { delete gmm; delete wddmAllocation; freeSystemMemory(pSysMem); @@ -151,7 +151,7 @@ GraphicsAllocation *WddmMemoryManager::allocateGraphicsMemory(size_t size, const Gmm *gmm = Gmm::create(ptrAligned, sizeAligned, false); allocation->gmm = gmm; - if (createWddmAllocation(allocation, MemoryType::EXTERNAL_ALLOCATION)) { + if (createWddmAllocation(allocation, AllocationOrigin::EXTERNAL_ALLOCATION)) { return allocation; } freeGraphicsMemory(allocation); @@ -161,7 +161,7 @@ GraphicsAllocation *WddmMemoryManager::allocateGraphicsMemory(size_t size, const return MemoryManager::allocateGraphicsMemory(size, ptr); } -GraphicsAllocation *WddmMemoryManager::allocate32BitGraphicsMemory(size_t size, void *ptr, MemoryType memoryType) { +GraphicsAllocation *WddmMemoryManager::allocate32BitGraphicsMemory(size_t size, void *ptr, AllocationOrigin allocationOrigin) { Gmm *gmm = nullptr; const void *ptrAligned = nullptr; size_t sizeAligned = size; @@ -191,7 +191,7 @@ GraphicsAllocation *WddmMemoryManager::allocate32BitGraphicsMemory(size_t size, gmm = Gmm::create(ptrAligned, sizeAligned, false); wddmAllocation->gmm = gmm; - if (!createWddmAllocation(wddmAllocation, memoryType)) { + if (!createWddmAllocation(wddmAllocation, allocationOrigin)) { delete gmm; delete wddmAllocation; freeSystemMemory(pSysMem); @@ -199,7 +199,7 @@ GraphicsAllocation *WddmMemoryManager::allocate32BitGraphicsMemory(size_t size, } wddmAllocation->is32BitAllocation = true; - auto baseAddress = memoryType == MemoryType::EXTERNAL_ALLOCATION ? allocator32Bit->getBase() : this->wddm->getGfxPartition().Heap32[1].Base; + auto baseAddress = allocationOrigin == AllocationOrigin::EXTERNAL_ALLOCATION ? allocator32Bit->getBase() : this->wddm->getGfxPartition().Heap32[1].Base; wddmAllocation->gpuBaseAddress = Gmm::canonize(baseAddress); return wddmAllocation; @@ -249,7 +249,7 @@ GraphicsAllocation *WddmMemoryManager::createGraphicsAllocationFromNTHandle(void } GraphicsAllocation *WddmMemoryManager::createInternalGraphicsAllocation(const void *ptr, size_t allocationSize) { - return allocate32BitGraphicsMemory(allocationSize, const_cast(ptr), MemoryType::INTERNAL_ALLOCATION); + return allocate32BitGraphicsMemory(allocationSize, const_cast(ptr), AllocationOrigin::INTERNAL_ALLOCATION); } void *WddmMemoryManager::lockResource(GraphicsAllocation *graphicsAllocation) { @@ -765,8 +765,8 @@ AlignedMallocRestrictions *WddmMemoryManager::getAlignedMallocRestrictions() { return &mallocRestrictions; } -bool WddmMemoryManager::createWddmAllocation(WddmAllocation *allocation, MemoryType memoryType) { - bool useHeap1 = (memoryType == MemoryType::INTERNAL_ALLOCATION); +bool WddmMemoryManager::createWddmAllocation(WddmAllocation *allocation, AllocationOrigin allocationOrigin) { + bool useHeap1 = (allocationOrigin == AllocationOrigin::INTERNAL_ALLOCATION); auto wddmSuccess = wddm->createAllocation(allocation); if (wddmSuccess == STATUS_GRAPHICS_NO_VIDEO_MEMORY && deferredDeleter) { deferredDeleter->drain(true); diff --git a/runtime/os_interface/windows/wddm_memory_manager.h b/runtime/os_interface/windows/wddm_memory_manager.h index 3b4e10674a..e7cbdc78e1 100644 --- a/runtime/os_interface/windows/wddm_memory_manager.h +++ b/runtime/os_interface/windows/wddm_memory_manager.h @@ -46,7 +46,7 @@ class WddmMemoryManager : public MemoryManager { GraphicsAllocation *allocateGraphicsMemory64kb(size_t size, size_t alignment, bool forcePin) override; GraphicsAllocation *allocateGraphicsMemory(size_t size, size_t alignment, bool forcePin, bool uncacheable) override; GraphicsAllocation *allocateGraphicsMemory(size_t size, const void *ptr) override; - GraphicsAllocation *allocate32BitGraphicsMemory(size_t size, void *ptr, MemoryType memoryType) override; + GraphicsAllocation *allocate32BitGraphicsMemory(size_t size, void *ptr, AllocationOrigin allocationOrigin) override; GraphicsAllocation *createGraphicsAllocationFromSharedHandle(osHandle handle, bool requireSpecificBitness, bool reuseBO) override; GraphicsAllocation *createGraphicsAllocationFromNTHandle(void *handle) override; GraphicsAllocation *createInternalGraphicsAllocation(const void *ptr, size_t allocationSize) override; @@ -111,7 +111,7 @@ class WddmMemoryManager : public MemoryManager { static bool validateAllocation(WddmAllocation *alloc); bool checkTrimCandidateListCompaction(); void checkTrimCandidateCount(); - bool createWddmAllocation(WddmAllocation *allocation, MemoryType memoryType); + bool createWddmAllocation(WddmAllocation *allocation, AllocationOrigin origin); ResidencyContainer trimCandidateList; std::mutex trimCandidateListMutex; std::atomic residencyLock; diff --git a/unit_tests/memory_manager/memory_manager_tests.cpp b/unit_tests/memory_manager/memory_manager_tests.cpp index f8206a4380..3581837459 100644 --- a/unit_tests/memory_manager/memory_manager_tests.cpp +++ b/unit_tests/memory_manager/memory_manager_tests.cpp @@ -591,7 +591,7 @@ TEST_F(MemoryAllocatorTest, givenMemoryManagerWhensetForce32BitAllocationsIsCall TEST_F(MemoryAllocatorTest, givenMemoryManagerWhenAskedFor32bitAllocationThen32bitGraphicsAllocationIsReturned) { size_t size = 10; - auto allocation = memoryManager->allocate32BitGraphicsMemory(size, nullptr, MemoryType::EXTERNAL_ALLOCATION); + auto allocation = memoryManager->allocate32BitGraphicsMemory(size, nullptr, AllocationOrigin::EXTERNAL_ALLOCATION); EXPECT_NE(nullptr, allocation); EXPECT_NE(nullptr, allocation->getUnderlyingBuffer()); EXPECT_EQ(size, allocation->getUnderlyingBufferSize()); @@ -601,8 +601,8 @@ TEST_F(MemoryAllocatorTest, givenMemoryManagerWhenAskedFor32bitAllocationThen32b TEST_F(MemoryAllocatorTest, givenNotEnoughSpaceInAllocatorWhenAskedFor32bitAllocationNullptrIsReturned) { size_t size = 0xfffff000; - auto allocationFirst = memoryManager->allocate32BitGraphicsMemory(0x5000, nullptr, MemoryType::EXTERNAL_ALLOCATION); - auto allocation = memoryManager->allocate32BitGraphicsMemory(size, nullptr, MemoryType::EXTERNAL_ALLOCATION); + auto allocationFirst = memoryManager->allocate32BitGraphicsMemory(0x5000, nullptr, AllocationOrigin::EXTERNAL_ALLOCATION); + auto allocation = memoryManager->allocate32BitGraphicsMemory(size, nullptr, AllocationOrigin::EXTERNAL_ALLOCATION); EXPECT_EQ(nullptr, allocation); if (allocation) memoryManager->freeGraphicsMemory(allocation); @@ -612,8 +612,8 @@ TEST_F(MemoryAllocatorTest, givenNotEnoughSpaceInAllocatorWhenAskedFor32bitAlloc TEST_F(MemoryAllocatorTest, givenNotEnoughSpaceInAllocatorWhenAskedFor32bitAllocationWithHostPtrThenNullptrIsReturned) { size_t size = 0xfffff000; void *ptr = (void *)0x10000; - auto allocationFirst = memoryManager->allocate32BitGraphicsMemory(0x5000, nullptr, MemoryType::EXTERNAL_ALLOCATION); - auto allocation = memoryManager->allocate32BitGraphicsMemory(size, ptr, MemoryType::EXTERNAL_ALLOCATION); + auto allocationFirst = memoryManager->allocate32BitGraphicsMemory(0x5000, nullptr, AllocationOrigin::EXTERNAL_ALLOCATION); + auto allocation = memoryManager->allocate32BitGraphicsMemory(size, ptr, AllocationOrigin::EXTERNAL_ALLOCATION); EXPECT_EQ(nullptr, allocation); if (allocation) memoryManager->freeGraphicsMemory(allocation); @@ -623,7 +623,7 @@ TEST_F(MemoryAllocatorTest, givenNotEnoughSpaceInAllocatorWhenAskedFor32bitAlloc TEST_F(MemoryAllocatorTest, givenMemoryManagerWhenAskedFor32bitAllocationWithPtrThen32bitGraphicsAllocationWithGpuAddressIsReturned) { size_t size = 10; void *ptr = (void *)0x1000; - auto allocation = memoryManager->allocate32BitGraphicsMemory(size, ptr, MemoryType::EXTERNAL_ALLOCATION); + auto allocation = memoryManager->allocate32BitGraphicsMemory(size, ptr, AllocationOrigin::EXTERNAL_ALLOCATION); EXPECT_NE(nullptr, allocation); EXPECT_NE(nullptr, allocation->getUnderlyingBuffer()); EXPECT_EQ(size, allocation->getUnderlyingBufferSize()); diff --git a/unit_tests/mocks/mock_device.h b/unit_tests/mocks/mock_device.h index a59f5ec4fc..7ce7193542 100644 --- a/unit_tests/mocks/mock_device.h +++ b/unit_tests/mocks/mock_device.h @@ -145,7 +145,7 @@ class FailMemoryManager : public MockMemoryManager { GraphicsAllocation *allocateGraphicsMemory(size_t size, const void *ptr) override { return nullptr; }; - GraphicsAllocation *allocate32BitGraphicsMemory(size_t size, void *ptr, MemoryType memoryType) override { + GraphicsAllocation *allocate32BitGraphicsMemory(size_t size, void *ptr, AllocationOrigin allocationOrigin) override { return nullptr; }; GraphicsAllocation *createGraphicsAllocationFromSharedHandle(osHandle handle, bool requireSpecificBitness, bool reuseBO) override { diff --git a/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp b/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp index 28263c7ce7..adb715360d 100644 --- a/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp +++ b/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp @@ -737,7 +737,7 @@ TEST_F(DrmMemoryManagerTest, givenMemoryManagerWhenAskedFor32BitAllocationThen32 auto size = 10u; memoryManager->setForce32BitAllocations(true); - auto allocation = memoryManager->allocate32BitGraphicsMemory(size, nullptr, MemoryType::EXTERNAL_ALLOCATION); + auto allocation = memoryManager->allocate32BitGraphicsMemory(size, nullptr, AllocationOrigin::EXTERNAL_ALLOCATION); EXPECT_NE(nullptr, allocation); EXPECT_NE(nullptr, allocation->getUnderlyingBuffer()); EXPECT_GE(allocation->getUnderlyingBufferSize(), size); @@ -963,7 +963,7 @@ TEST_F(DrmMemoryManagerTest, givenMemoryManagerWhenAskedFor32BitAllocationWithHo auto size = 10u; void *host_ptr = reinterpret_cast(0x1000); memoryManager->setForce32BitAllocations(true); - auto allocation = memoryManager->allocate32BitGraphicsMemory(size, host_ptr, MemoryType::EXTERNAL_ALLOCATION); + auto allocation = memoryManager->allocate32BitGraphicsMemory(size, host_ptr, AllocationOrigin::EXTERNAL_ALLOCATION); EXPECT_EQ(nullptr, allocation); mock->ioctl_res_ext = &mock->NONE; @@ -977,7 +977,7 @@ TEST_F(DrmMemoryManagerTest, givenMemoryManagerWhenAskedFor32BitAllocationAndAll auto size = 10u; memoryManager->setForce32BitAllocations(true); - auto allocation = memoryManager->allocate32BitGraphicsMemory(size, nullptr, MemoryType::EXTERNAL_ALLOCATION); + auto allocation = memoryManager->allocate32BitGraphicsMemory(size, nullptr, AllocationOrigin::EXTERNAL_ALLOCATION); EXPECT_EQ(nullptr, allocation); mock->ioctl_res_ext = &mock->NONE; @@ -1854,7 +1854,7 @@ TEST_F(DrmMemoryManagerTest, given32BitAllocatorWithHeapAllocatorWhenLargerFragm size_t pages3size = 3 * MemoryConstants::pageSize; void *host_ptr = reinterpret_cast(0x1000); - DrmAllocation *graphicsAlloaction = memoryManager->allocate32BitGraphicsMemory(pages3size, host_ptr, MemoryType::EXTERNAL_ALLOCATION); + DrmAllocation *graphicsAlloaction = memoryManager->allocate32BitGraphicsMemory(pages3size, host_ptr, AllocationOrigin::EXTERNAL_ALLOCATION); auto bo = graphicsAlloaction->getBO(); EXPECT_EQ(allocationSize, bo->peekUnmapSize()); diff --git a/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp b/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp index 1804ad26f8..ff401781d3 100644 --- a/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp +++ b/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp @@ -483,7 +483,7 @@ HWTEST_F(WddmMemoryManagerTest, GivenAlignedPointerWhenAllocate32BitMemoryThenGm bool success = false; uint32_t size = 4096; void *ptr = reinterpret_cast(4096); - auto *gpuAllocation = memoryManager->allocate32BitGraphicsMemory(size, ptr, MemoryType::EXTERNAL_ALLOCATION); + auto *gpuAllocation = memoryManager->allocate32BitGraphicsMemory(size, ptr, AllocationOrigin::EXTERNAL_ALLOCATION); EXPECT_EQ(ptr, reinterpret_cast(gpuAllocation->gmm->resourceParams.pExistingSysMem)); EXPECT_EQ(size, gpuAllocation->gmm->resourceParams.ExistingSysMemSize); memoryManager->freeGraphicsMemory(gpuAllocation); @@ -495,7 +495,7 @@ HWTEST_F(WddmMemoryManagerTest, GivenUnAlignedPointerAndSizeWhenAllocate32BitMem bool success = false; uint32_t size = 0x1001; void *ptr = reinterpret_cast(0x1001); - auto *gpuAllocation = memoryManager->allocate32BitGraphicsMemory(size, ptr, MemoryType::EXTERNAL_ALLOCATION); + auto *gpuAllocation = memoryManager->allocate32BitGraphicsMemory(size, ptr, AllocationOrigin::EXTERNAL_ALLOCATION); EXPECT_EQ(reinterpret_cast(0x1000), reinterpret_cast(gpuAllocation->gmm->resourceParams.pExistingSysMem)); EXPECT_EQ(0x2000, gpuAllocation->gmm->resourceParams.ExistingSysMemSize); memoryManager->freeGraphicsMemory(gpuAllocation); @@ -519,7 +519,7 @@ HWTEST_F(WddmMemoryManagerTest, getMaxApplicationAddress) { HWTEST_F(WddmMemoryManagerTest, Allocate32BitMemoryWithNullptr) { SetUpMm(); - auto *gpuAllocation = memoryManager->allocate32BitGraphicsMemory(3 * MemoryConstants::pageSize, nullptr, MemoryType::EXTERNAL_ALLOCATION); + auto *gpuAllocation = memoryManager->allocate32BitGraphicsMemory(3 * MemoryConstants::pageSize, nullptr, AllocationOrigin::EXTERNAL_ALLOCATION); ASSERT_NE(nullptr, gpuAllocation); EXPECT_LE(Gmm::canonize(wddm->getHeap32Base()), gpuAllocation->getGpuAddress()); @@ -534,7 +534,7 @@ HWTEST_F(WddmMemoryManagerTest, Allocate32BitMemoryWithMisalignedHostPtrDoesNotD size_t misalignedSize = 0x2500; void *misalignedPtr = reinterpret_cast(0x12500); - auto *gpuAllocation = memoryManager->allocate32BitGraphicsMemory(misalignedSize, misalignedPtr, MemoryType::EXTERNAL_ALLOCATION); + auto *gpuAllocation = memoryManager->allocate32BitGraphicsMemory(misalignedSize, misalignedPtr, AllocationOrigin::EXTERNAL_ALLOCATION); ASSERT_NE(nullptr, gpuAllocation); @@ -554,7 +554,7 @@ HWTEST_F(WddmMemoryManagerTest, Allocate32BitMemoryWithMisalignedHostPtrDoesNotD HWTEST_F(WddmMemoryManagerTest, Allocate32BitMemorySetsCannonizedGpuBaseAddress) { SetUpMm(); - auto *gpuAllocation = memoryManager->allocate32BitGraphicsMemory(3 * MemoryConstants::pageSize, nullptr, MemoryType::EXTERNAL_ALLOCATION); + auto *gpuAllocation = memoryManager->allocate32BitGraphicsMemory(3 * MemoryConstants::pageSize, nullptr, AllocationOrigin::EXTERNAL_ALLOCATION); ASSERT_NE(nullptr, gpuAllocation); @@ -642,7 +642,7 @@ HWTEST_F(WddmMemoryManagerTest, givenManagerWithDisabledDeferredDeleterWhenMapGp WddmAllocation allocation(ptr, size, nullptr); allocation.gmm = gmm.get(); - bool ret = memoryManager->createWddmAllocation(&allocation, MemoryType::EXTERNAL_ALLOCATION); + bool ret = memoryManager->createWddmAllocation(&allocation, AllocationOrigin::EXTERNAL_ALLOCATION); EXPECT_FALSE(ret); } @@ -659,7 +659,7 @@ HWTEST_F(WddmMemoryManagerTest, givenManagerWithEnabledDeferredDeleterWhenFirstM WddmAllocation allocation(ptr, size, nullptr); allocation.gmm = gmm.get(); - bool ret = memoryManager->createWddmAllocation(&allocation, MemoryType::EXTERNAL_ALLOCATION); + bool ret = memoryManager->createWddmAllocation(&allocation, AllocationOrigin::EXTERNAL_ALLOCATION); EXPECT_TRUE(ret); EXPECT_EQ(reinterpret_cast(ptr), allocation.getGpuAddress()); } @@ -677,7 +677,7 @@ HWTEST_F(WddmMemoryManagerTest, givenManagerWithEnabledDeferredDeleterWhenFirstA WddmAllocation allocation(ptr, size, nullptr); allocation.gmm = gmm.get(); - bool ret = memoryManager->createWddmAllocation(&allocation, MemoryType::EXTERNAL_ALLOCATION); + bool ret = memoryManager->createWddmAllocation(&allocation, AllocationOrigin::EXTERNAL_ALLOCATION); EXPECT_FALSE(ret); }