From 4ec5be0c99f4285fb1c73c32f2d05c6dbd30abfb Mon Sep 17 00:00:00 2001 From: Piotr Fusik Date: Thu, 21 Feb 2019 16:29:05 +0100 Subject: [PATCH] Simplify code by removing AllocationOrigin. Change-Id: Ie73cefc1ae1ee846fb9a5ef1054af01cd1867a4d --- runtime/memory_manager/graphics_allocation.h | 6 ----- runtime/memory_manager/memory_manager.cpp | 13 ++------- runtime/memory_manager/memory_manager.h | 5 +++- .../os_interface/linux/drm_memory_manager.cpp | 12 +++------ .../windows/wddm_memory_manager.cpp | 6 ++--- unit_tests/helpers/kernel_commands_tests.cpp | 2 +- ...nager_allocate_in_preferred_pool_tests.inl | 14 +++++----- .../memory_manager/memory_manager_tests.cpp | 27 ++++++++----------- .../mocks/linux/mock_drm_memory_manager.h | 8 ++---- unit_tests/mocks/mock_allocation_properties.h | 8 +----- unit_tests/mocks/mock_memory_manager.cpp | 9 +++---- unit_tests/mocks/mock_memory_manager.h | 3 ++- .../linux/drm_memory_manager_tests.cpp | 24 ++++++++--------- .../windows/mock_wddm_memory_manager.h | 8 ++---- .../os_interface/windows/wddm20_tests.cpp | 4 +-- .../windows/wddm_memory_manager_tests.cpp | 18 ++++++------- 16 files changed, 63 insertions(+), 104 deletions(-) diff --git a/runtime/memory_manager/graphics_allocation.h b/runtime/memory_manager/graphics_allocation.h index 10417e4642..c7fcc6a7e4 100644 --- a/runtime/memory_manager/graphics_allocation.h +++ b/runtime/memory_manager/graphics_allocation.h @@ -26,11 +26,6 @@ namespace OCLRT { using osHandle = unsigned int; -enum class AllocationOrigin { - EXTERNAL_ALLOCATION, - INTERNAL_ALLOCATION -}; - enum class HeapIndex : uint32_t { HEAP_INTERNAL_DEVICE_MEMORY = 0u, HEAP_INTERNAL = 1u, @@ -60,7 +55,6 @@ class GraphicsAllocation : public IDNode { void *driverAllocatedCpuPointer = nullptr; DevicesBitfield devicesBitfield = {}; bool flushL3Required = false; - AllocationOrigin origin = AllocationOrigin::EXTERNAL_ALLOCATION; enum class AllocationType { UNKNOWN = 0, diff --git a/runtime/memory_manager/memory_manager.cpp b/runtime/memory_manager/memory_manager.cpp index 432cb084f6..37a037184f 100644 --- a/runtime/memory_manager/memory_manager.cpp +++ b/runtime/memory_manager/memory_manager.cpp @@ -258,15 +258,6 @@ bool MemoryManager::getAllocationData(AllocationData &allocationData, const Allo break; } - switch (properties.allocationType) { - case GraphicsAllocation::AllocationType::KERNEL_ISA: - case GraphicsAllocation::AllocationType::INTERNAL_HEAP: - allocationData.allocationOrigin = AllocationOrigin::INTERNAL_ALLOCATION; - break; - default: - break; - } - allocationData.flags.requiresCpuAccess = GraphicsAllocation::isCpuAccessRequired(properties.allocationType); allocationData.flags.mustBeZeroCopy = mustBeZeroCopy; allocationData.flags.allocateMemory = properties.flags.allocateMemory; @@ -317,7 +308,7 @@ GraphicsAllocation *MemoryManager::allocateGraphicsMemory(const AllocationData & return allocateGraphicsMemoryForImage(allocationData); } - if (allocationData.allocationOrigin == AllocationOrigin::INTERNAL_ALLOCATION || + if (useInternal32BitAllocator(allocationData.type) || (force32bitAllocations && allocationData.flags.allow32Bit && is64bit)) { return allocate32BitGraphicsMemoryImpl(allocationData); } @@ -378,7 +369,7 @@ void MemoryManager::unlockResource(GraphicsAllocation *graphicsAllocation) { HeapIndex MemoryManager::selectHeap(const GraphicsAllocation *allocation, const void *ptr, const HardwareInfo &hwInfo) { if (allocation) { - if (allocation->origin == AllocationOrigin::INTERNAL_ALLOCATION) { + if (useInternal32BitAllocator(allocation->getAllocationType())) { return internalHeapIndex; } else if (allocation->is32BitAllocation) { return HeapIndex::HEAP_EXTERNAL; diff --git a/runtime/memory_manager/memory_manager.h b/runtime/memory_manager/memory_manager.h index 53298ba2e1..4d8988c848 100644 --- a/runtime/memory_manager/memory_manager.h +++ b/runtime/memory_manager/memory_manager.h @@ -211,7 +211,6 @@ class MemoryManager { }; static_assert(sizeof(AllocationData::flags) == sizeof(AllocationData::allFlags), ""); GraphicsAllocation::AllocationType type = GraphicsAllocation::AllocationType::UNKNOWN; - AllocationOrigin allocationOrigin = AllocationOrigin::EXTERNAL_ALLOCATION; const void *hostPtr = nullptr; size_t size = 0; size_t alignment = 0; @@ -221,6 +220,10 @@ class MemoryManager { static bool getAllocationData(AllocationData &allocationData, const AllocationProperties &properties, const DevicesBitfield devicesBitfield, const void *hostPtr); + static bool useInternal32BitAllocator(GraphicsAllocation::AllocationType allocationType) { + return allocationType == GraphicsAllocation::AllocationType::KERNEL_ISA || + allocationType == GraphicsAllocation::AllocationType::INTERNAL_HEAP; + } virtual GraphicsAllocation *allocateGraphicsMemoryForNonSvmHostPtr(size_t size, void *cpuPtr) = 0; GraphicsAllocation *allocateGraphicsMemory(const AllocationData &allocationData); diff --git a/runtime/os_interface/linux/drm_memory_manager.cpp b/runtime/os_interface/linux/drm_memory_manager.cpp index 0972106804..71c533be7c 100644 --- a/runtime/os_interface/linux/drm_memory_manager.cpp +++ b/runtime/os_interface/linux/drm_memory_manager.cpp @@ -240,9 +240,7 @@ DrmAllocation *DrmMemoryManager::allocateGraphicsMemoryWithAlignment(const Alloc if (forcePinEnabled && pinBB != nullptr && allocationData.flags.forcePin && allocationData.size >= this->pinThreshold) { pinBB->pin(&bo, 1, getDefaultCommandStreamReceiver(0)->getOsContext().get()->getDrmContextId()); } - auto allocation = new DrmAllocation(bo, res, castToUint64(res), cSize, MemoryPool::System4KBPages, allocationData.flags.multiOsContextCapable); - allocation->origin = allocationData.allocationOrigin; - return allocation; + return new DrmAllocation(bo, res, castToUint64(res), cSize, MemoryPool::System4KBPages, allocationData.flags.multiOsContextCapable); } DrmAllocation *DrmMemoryManager::allocateGraphicsMemoryWithHostPtr(const AllocationData &allocationData) { @@ -328,13 +326,13 @@ GraphicsAllocation *DrmMemoryManager::allocateGraphicsMemoryForImageImpl(const A auto allocation = new DrmAllocation(bo, nullptr, (uint64_t)gpuRange, allocationData.imgInfo->size, MemoryPool::SystemCpuInaccessible, false); bo->setAllocationType(allocatorType); allocation->gmm = gmm.release(); - allocation->origin = allocationData.allocationOrigin; return allocation; } DrmAllocation *DrmMemoryManager::allocate32BitGraphicsMemoryImpl(const AllocationData &allocationData) { - auto allocatorToUse = allocationData.allocationOrigin == AllocationOrigin::EXTERNAL_ALLOCATION ? allocator32Bit.get() : internal32bitAllocator.get(); - auto allocatorType = allocationData.allocationOrigin == AllocationOrigin::EXTERNAL_ALLOCATION ? BIT32_ALLOCATOR_EXTERNAL : BIT32_ALLOCATOR_INTERNAL; + auto internal = useInternal32BitAllocator(allocationData.type); + auto allocatorToUse = internal ? internal32bitAllocator.get() : allocator32Bit.get(); + auto allocatorType = internal ? BIT32_ALLOCATOR_INTERNAL : BIT32_ALLOCATOR_EXTERNAL; if (allocationData.hostPtr) { uintptr_t inputPtr = reinterpret_cast(allocationData.hostPtr); @@ -361,7 +359,6 @@ DrmAllocation *DrmMemoryManager::allocate32BitGraphicsMemoryImpl(const Allocatio allocationSize, MemoryPool::System4KBPagesWith32BitGpuAddressing, false); drmAllocation->is32BitAllocation = true; drmAllocation->gpuBaseAddress = allocatorToUse->getBase(); - drmAllocation->origin = allocationData.allocationOrigin; return drmAllocation; } @@ -415,7 +412,6 @@ DrmAllocation *DrmMemoryManager::allocate32BitGraphicsMemoryImpl(const Allocatio drmAllocation->is32BitAllocation = true; drmAllocation->gpuBaseAddress = allocatorToUse->getBase(); drmAllocation->driverAllocatedCpuPointer = ptrAlloc; - drmAllocation->origin = allocationData.allocationOrigin; return drmAllocation; } diff --git a/runtime/os_interface/windows/wddm_memory_manager.cpp b/runtime/os_interface/windows/wddm_memory_manager.cpp index 9e2a409c58..8cbc8287ee 100644 --- a/runtime/os_interface/windows/wddm_memory_manager.cpp +++ b/runtime/os_interface/windows/wddm_memory_manager.cpp @@ -47,7 +47,6 @@ GraphicsAllocation *WddmMemoryManager::allocateGraphicsMemoryForImageImpl(const auto allocation = std::make_unique(nullptr, allocationData.imgInfo->size, nullptr, MemoryPool::SystemCpuInaccessible, false); allocation->gmm = gmm.get(); - allocation->origin = allocationData.allocationOrigin; if (!createWddmAllocation(allocation.get())) { return nullptr; } @@ -98,7 +97,6 @@ GraphicsAllocation *WddmMemoryManager::allocateGraphicsMemoryWithAlignment(const gmm = new Gmm(pSysMem, sizeAligned, allocationData.flags.uncacheable); wddmAllocation->gmm = gmm; - wddmAllocation->origin = allocationData.allocationOrigin; if (!createWddmAllocation(wddmAllocation.get())) { delete gmm; @@ -192,10 +190,10 @@ GraphicsAllocation *WddmMemoryManager::allocate32BitGraphicsMemoryImpl(const All wddmAllocation->driverAllocatedCpuPointer = pSysMem; wddmAllocation->is32BitAllocation = true; wddmAllocation->allocationOffset = offset; + wddmAllocation->setAllocationType(allocationData.type); gmm = new Gmm(ptrAligned, sizeAligned, false); wddmAllocation->gmm = gmm; - wddmAllocation->origin = allocationData.allocationOrigin; if (!createWddmAllocation(wddmAllocation.get())) { delete gmm; @@ -204,7 +202,7 @@ GraphicsAllocation *WddmMemoryManager::allocate32BitGraphicsMemoryImpl(const All } wddmAllocation->is32BitAllocation = true; - auto baseAddress = allocationData.allocationOrigin == AllocationOrigin::EXTERNAL_ALLOCATION ? allocator32Bit->getBase() : getInternalHeapBaseAddress(); + auto baseAddress = useInternal32BitAllocator(allocationData.type) ? getInternalHeapBaseAddress() : allocator32Bit->getBase(); wddmAllocation->gpuBaseAddress = GmmHelper::canonize(baseAddress); DebugManager.logAllocation(wddmAllocation.get()); diff --git a/unit_tests/helpers/kernel_commands_tests.cpp b/unit_tests/helpers/kernel_commands_tests.cpp index 66b268f210..3b78288253 100644 --- a/unit_tests/helpers/kernel_commands_tests.cpp +++ b/unit_tests/helpers/kernel_commands_tests.cpp @@ -210,7 +210,7 @@ HWTEST_F(KernelCommandsTest, givenIndirectHeapNotAllocatedFromInternalPoolWhenSe } HWTEST_F(KernelCommandsTest, givenIndirectHeapAllocatedFromInternalPoolWhenSendCrossThreadDataIsCalledThenHeapBaseOffsetIsReturned) { - auto internalAllocation = pDevice->getMemoryManager()->allocateGraphicsMemoryWithProperties(MockAllocationProperties::getPropertiesFor32BitInternalAllocation(MemoryConstants::pageSize, true)); + auto internalAllocation = pDevice->getMemoryManager()->allocateGraphicsMemoryWithProperties(MockAllocationProperties(true, MemoryConstants::pageSize, GraphicsAllocation::AllocationType::INTERNAL_HEAP)); IndirectHeap indirectHeap(internalAllocation, true); auto expectedOffset = internalAllocation->getGpuAddressToPatch(); diff --git a/unit_tests/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl b/unit_tests/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl index b638c6a834..080a607734 100644 --- a/unit_tests/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl +++ b/unit_tests/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl @@ -415,17 +415,17 @@ TEST(MemoryManagerTest, givenAllocationPropertiesWithMultiOsContextCapableFlagDi memoryManager.freeGraphicsMemory(allocation); } -TEST(MemoryManagerTest, givenInternalHeapTypeWhenGetAllocationDataIsCalledThenInternalAllocationIsRequested) { - AllocationData allocData; - MockMemoryManager::getAllocationData(allocData, {1, GraphicsAllocation::AllocationType::INTERNAL_HEAP}, {}, nullptr); - EXPECT_EQ(AllocationOrigin::INTERNAL_ALLOCATION, allocData.allocationOrigin); +TEST(MemoryManagerTest, givenInternalHeapTypeThenUseInternal32BitAllocator) { + EXPECT_TRUE(MockMemoryManager::useInternal32BitAllocator(GraphicsAllocation::AllocationType::INTERNAL_HEAP)); } + TEST(MemoryManagerTest, givenInternalHeapTypeWhenGetAllocationDataIsCalledThenSystemMemoryIsNotRequested) { AllocationData allocData; MockMemoryManager::getAllocationData(allocData, {1, GraphicsAllocation::AllocationType::INTERNAL_HEAP}, {}, nullptr); EXPECT_FALSE(allocData.flags.useSystemMemory); EXPECT_TRUE(allocData.flags.requiresCpuAccess); } + TEST(MemoryManagerTest, givenKernelIsaTypeWhenGetAllocationDataIsCalledThenSystemMemoryIsNotRequested) { AllocationData allocData; MockMemoryManager::getAllocationData(allocData, {1, GraphicsAllocation::AllocationType::KERNEL_ISA}, {}, nullptr); @@ -440,8 +440,6 @@ TEST(MemoryManagerTest, givenLinearStreamWhenGetAllocationDataIsCalledThenSystem EXPECT_TRUE(allocData.flags.requiresCpuAccess); } -TEST(MemoryManagerTest, givenKernelIsaTypeWhenGetAllocationDataIsCalledThenInternalAllocationIsRequested) { - AllocationData allocData; - MockMemoryManager::getAllocationData(allocData, {1, GraphicsAllocation::AllocationType::KERNEL_ISA}, {}, nullptr); - EXPECT_EQ(AllocationOrigin::INTERNAL_ALLOCATION, allocData.allocationOrigin); +TEST(MemoryManagerTest, givenKernelIsaTypeThenUseInternal32BitAllocator) { + EXPECT_TRUE(MockMemoryManager::useInternal32BitAllocator(GraphicsAllocation::AllocationType::KERNEL_ISA)); } diff --git a/unit_tests/memory_manager/memory_manager_tests.cpp b/unit_tests/memory_manager/memory_manager_tests.cpp index f2c3be8284..8c2308c0e8 100644 --- a/unit_tests/memory_manager/memory_manager_tests.cpp +++ b/unit_tests/memory_manager/memory_manager_tests.cpp @@ -345,7 +345,7 @@ TEST_F(MemoryAllocatorTest, givenMemoryManagerWhensetForce32BitAllocationsIsCall TEST_F(MemoryAllocatorTest, givenMemoryManagerWhenAskedFor32bitAllocationThen32bitGraphicsAllocationIsReturned) { size_t size = 10; - auto allocation = memoryManager->allocate32BitGraphicsMemory(size, nullptr, AllocationOrigin::EXTERNAL_ALLOCATION); + auto allocation = memoryManager->allocate32BitGraphicsMemory(size, nullptr, GraphicsAllocation::AllocationType::BUFFER); EXPECT_NE(nullptr, allocation); EXPECT_NE(nullptr, allocation->getUnderlyingBuffer()); EXPECT_EQ(size, allocation->getUnderlyingBufferSize()); @@ -355,8 +355,8 @@ TEST_F(MemoryAllocatorTest, givenMemoryManagerWhenAskedFor32bitAllocationThen32b TEST_F(MemoryAllocatorTest, givenNotEnoughSpaceInAllocatorWhenAskedFor32bitAllocationNullptrIsReturned) { size_t size = 0xfffff000; - auto allocationFirst = memoryManager->allocate32BitGraphicsMemory(0x5000, nullptr, AllocationOrigin::EXTERNAL_ALLOCATION); - auto allocation = memoryManager->allocate32BitGraphicsMemory(size, nullptr, AllocationOrigin::EXTERNAL_ALLOCATION); + auto allocationFirst = memoryManager->allocate32BitGraphicsMemory(0x5000, nullptr, GraphicsAllocation::AllocationType::BUFFER); + auto allocation = memoryManager->allocate32BitGraphicsMemory(size, nullptr, GraphicsAllocation::AllocationType::BUFFER); EXPECT_EQ(nullptr, allocation); memoryManager->freeGraphicsMemory(allocationFirst); } @@ -364,8 +364,8 @@ TEST_F(MemoryAllocatorTest, givenNotEnoughSpaceInAllocatorWhenAskedFor32bitAlloc TEST_F(MemoryAllocatorTest, givenNotEnoughSpaceInAllocatorWhenAskedFor32bitAllocationWithHostPtrThenNullptrIsReturned) { size_t size = 0xfffff000; void *ptr = (void *)0x10000; - auto allocationFirst = memoryManager->allocate32BitGraphicsMemory(0x5000, nullptr, AllocationOrigin::EXTERNAL_ALLOCATION); - auto allocation = memoryManager->allocate32BitGraphicsMemory(size, ptr, AllocationOrigin::EXTERNAL_ALLOCATION); + auto allocationFirst = memoryManager->allocate32BitGraphicsMemory(0x5000, nullptr, GraphicsAllocation::AllocationType::BUFFER); + auto allocation = memoryManager->allocate32BitGraphicsMemory(size, ptr, GraphicsAllocation::AllocationType::BUFFER); EXPECT_EQ(nullptr, allocation); memoryManager->freeGraphicsMemory(allocationFirst); } @@ -373,7 +373,7 @@ TEST_F(MemoryAllocatorTest, givenNotEnoughSpaceInAllocatorWhenAskedFor32bitAlloc TEST_F(MemoryAllocatorTest, givenMemoryManagerWhenAskedFor32bitAllocationWithPtrThen32bitGraphicsAllocationWithGpuAddressIsReturned) { size_t size = 10; void *ptr = (void *)0x1000; - auto allocation = memoryManager->allocate32BitGraphicsMemory(size, ptr, AllocationOrigin::EXTERNAL_ALLOCATION); + auto allocation = memoryManager->allocate32BitGraphicsMemory(size, ptr, GraphicsAllocation::AllocationType::BUFFER); EXPECT_NE(nullptr, allocation); EXPECT_NE(nullptr, allocation->getUnderlyingBuffer()); EXPECT_EQ(size, allocation->getUnderlyingBufferSize()); @@ -718,7 +718,7 @@ TEST(OsAgnosticMemoryManager, givenMemoryManagerWhenAllocate32BitGraphicsMemoryW void *ptr = reinterpret_cast(0x1001); auto size = MemoryConstants::pageSize; - auto allocation = memoryManager.allocate32BitGraphicsMemory(size, ptr, AllocationOrigin::EXTERNAL_ALLOCATION); + auto allocation = memoryManager.allocate32BitGraphicsMemory(size, ptr, GraphicsAllocation::AllocationType::BUFFER); ASSERT_NE(nullptr, allocation); EXPECT_EQ(MemoryPool::System4KBPagesWith32BitGpuAddressing, allocation->getMemoryPool()); @@ -732,7 +732,7 @@ TEST(OsAgnosticMemoryManager, givenMemoryManagerWhenAllocate32BitGraphicsMemoryW void *ptr = nullptr; auto size = MemoryConstants::pageSize; - auto allocation = memoryManager.allocate32BitGraphicsMemory(size, ptr, AllocationOrigin::EXTERNAL_ALLOCATION); + auto allocation = memoryManager.allocate32BitGraphicsMemory(size, ptr, GraphicsAllocation::AllocationType::BUFFER); ASSERT_NE(nullptr, allocation); EXPECT_EQ(MemoryPool::System4KBPagesWith32BitGpuAddressing, allocation->getMemoryPool()); @@ -1019,7 +1019,7 @@ TEST(OsAgnosticMemoryManager, givenPointerAndSizeWhenCreateInternalAllocationIsC MockMemoryManager memoryManager(false, false, executionEnvironment); auto ptr = (void *)0x100000; size_t allocationSize = 4096; - auto graphicsAllocation = memoryManager.allocate32BitGraphicsMemory(allocationSize, ptr, AllocationOrigin::INTERNAL_ALLOCATION); + auto graphicsAllocation = memoryManager.allocate32BitGraphicsMemory(allocationSize, ptr, GraphicsAllocation::AllocationType::INTERNAL_HEAP); EXPECT_EQ(ptr, graphicsAllocation->getUnderlyingBuffer()); EXPECT_EQ(allocationSize, graphicsAllocation->getUnderlyingBufferSize()); memoryManager.freeGraphicsMemory(graphicsAllocation); @@ -1621,27 +1621,25 @@ TEST(OsContextTest, givenOsContextWithNumberOfSupportedDevicesWhenConstructingTh TEST(HeapSelectorTest, given32bitInternalAllocationWhenSelectingHeapThenInternalHeapIsUsed) { GraphicsAllocation allocation{nullptr, 0, 0, 0, false}; allocation.is32BitAllocation = true; - allocation.origin = AllocationOrigin::INTERNAL_ALLOCATION; + allocation.setAllocationType(GraphicsAllocation::AllocationType::KERNEL_ISA); EXPECT_EQ(internalHeapIndex, MemoryManager::selectHeap(&allocation, nullptr, *platformDevices[0])); } TEST(HeapSelectorTest, givenNon32bitInternalAllocationWhenSelectingHeapThenInternalHeapIsUsed) { GraphicsAllocation allocation{nullptr, 0, 0, 0, false}; allocation.is32BitAllocation = false; - allocation.origin = AllocationOrigin::INTERNAL_ALLOCATION; + allocation.setAllocationType(GraphicsAllocation::AllocationType::KERNEL_ISA); EXPECT_EQ(internalHeapIndex, MemoryManager::selectHeap(&allocation, nullptr, *platformDevices[0])); } TEST(HeapSelectorTest, given32bitExternalAllocationWhenSelectingHeapThenExternalHeapIsUsed) { GraphicsAllocation allocation{nullptr, 0, 0, 0, false}; allocation.is32BitAllocation = true; - allocation.origin = AllocationOrigin::EXTERNAL_ALLOCATION; EXPECT_EQ(HeapIndex::HEAP_EXTERNAL, MemoryManager::selectHeap(&allocation, nullptr, *platformDevices[0])); } TEST(HeapSelectorTest, givenLimitedAddressSpaceWhenSelectingHeapForExternalAllocationThenLimitedHeapIsUsed) { GraphicsAllocation allocation{nullptr, 0, 0, 0, false}; - EXPECT_EQ(AllocationOrigin::EXTERNAL_ALLOCATION, allocation.origin); if (platformDevices[0]->capabilityTable.gpuAddressSpace == MemoryConstants::max48BitAddress) { return; } @@ -1650,7 +1648,6 @@ TEST(HeapSelectorTest, givenLimitedAddressSpaceWhenSelectingHeapForExternalAlloc TEST(HeapSelectorTest, givenFullAddressSpaceWhenSelectingHeapForExternalAllocationWithPtrThenSvmHeapIsUsed) { GraphicsAllocation allocation{nullptr, 0, 0, 0, false}; - EXPECT_EQ(AllocationOrigin::EXTERNAL_ALLOCATION, allocation.origin); if (platformDevices[0]->capabilityTable.gpuAddressSpace != MemoryConstants::max48BitAddress) { return; } @@ -1659,7 +1656,6 @@ TEST(HeapSelectorTest, givenFullAddressSpaceWhenSelectingHeapForExternalAllocati TEST(HeapSelectorTest, givenFullAddressSpaceWhenSelectingHeapForExternalAllocationWithoutPtrAndResourceIs64KSuitableThenStandard64kHeapIsUsed) { GraphicsAllocation allocation{nullptr, 0, 0, 0, false}; - EXPECT_EQ(AllocationOrigin::EXTERNAL_ALLOCATION, allocation.origin); auto gmm = std::make_unique(nullptr, 0, false); auto resourceInfo = static_cast(gmm->gmmResourceInfo.get()); resourceInfo->is64KBPageSuitableValue = true; @@ -1672,7 +1668,6 @@ TEST(HeapSelectorTest, givenFullAddressSpaceWhenSelectingHeapForExternalAllocati TEST(HeapSelectorTest, givenFullAddressSpaceWhenSelectingHeapForExternalAllocationWithoutPtrAndResourceIsNot64KSuitableThenStandardHeapIsUsed) { GraphicsAllocation allocation{nullptr, 0, 0, 0, false}; - EXPECT_EQ(AllocationOrigin::EXTERNAL_ALLOCATION, allocation.origin); auto gmm = std::make_unique(nullptr, 0, false); auto resourceInfo = static_cast(gmm->gmmResourceInfo.get()); resourceInfo->is64KBPageSuitableValue = false; diff --git a/unit_tests/mocks/linux/mock_drm_memory_manager.h b/unit_tests/mocks/linux/mock_drm_memory_manager.h index 8a021cfa0d..c95cffc87c 100644 --- a/unit_tests/mocks/linux/mock_drm_memory_manager.h +++ b/unit_tests/mocks/linux/mock_drm_memory_manager.h @@ -88,14 +88,10 @@ class TestedDrmMemoryManager : public DrmMemoryManager { Allocator32bit *getDrmInternal32BitAllocator() const { return internal32bitAllocator.get(); } AllocatorLimitedRange *getDrmLimitedRangeAllocator() const { return limitedGpuAddressRangeAllocator.get(); } - DrmAllocation *allocate32BitGraphicsMemory(size_t size, const void *ptr, AllocationOrigin allocationOrigin) { + DrmAllocation *allocate32BitGraphicsMemory(size_t size, const void *ptr, GraphicsAllocation::AllocationType allocationType) { bool allocateMemory = ptr == nullptr; AllocationData allocationData; - if (allocationOrigin == AllocationOrigin::EXTERNAL_ALLOCATION) { - getAllocationData(allocationData, MockAllocationProperties::getPropertiesFor32BitExternalAllocation(size, allocateMemory), {}, ptr); - } else { - getAllocationData(allocationData, MockAllocationProperties::getPropertiesFor32BitInternalAllocation(size, allocateMemory), {}, ptr); - } + getAllocationData(allocationData, MockAllocationProperties(allocateMemory, size, allocationType), {}, ptr); return allocate32BitGraphicsMemoryImpl(allocationData); } }; diff --git a/unit_tests/mocks/mock_allocation_properties.h b/unit_tests/mocks/mock_allocation_properties.h index 5ba915cc81..43d9493397 100644 --- a/unit_tests/mocks/mock_allocation_properties.h +++ b/unit_tests/mocks/mock_allocation_properties.h @@ -14,12 +14,6 @@ struct MockAllocationProperties : public AllocationProperties { MockAllocationProperties(size_t size, GraphicsAllocation::AllocationType allocationType) : AllocationProperties(size, allocationType) {} MockAllocationProperties(size_t size) : AllocationProperties(size, GraphicsAllocation::AllocationType::UNDECIDED) {} MockAllocationProperties(bool allocateMemory, size_t size) : AllocationProperties(allocateMemory, size, GraphicsAllocation::AllocationType::UNDECIDED) {} - - static AllocationProperties getPropertiesFor32BitInternalAllocation(size_t size, bool allocateMemory) { - return AllocationProperties{allocateMemory, size, GraphicsAllocation::AllocationType::INTERNAL_HEAP}; - } - static AllocationProperties getPropertiesFor32BitExternalAllocation(size_t size, bool allocateMemory) { - return AllocationProperties{allocateMemory, size, GraphicsAllocation::AllocationType::BUFFER}; - } + MockAllocationProperties(bool allocateMemory, size_t size, GraphicsAllocation::AllocationType allocationType) : AllocationProperties(allocateMemory, size, allocationType) {} }; } // namespace OCLRT diff --git a/unit_tests/mocks/mock_memory_manager.cpp b/unit_tests/mocks/mock_memory_manager.cpp index 85c40075e7..37aa4e772c 100644 --- a/unit_tests/mocks/mock_memory_manager.cpp +++ b/unit_tests/mocks/mock_memory_manager.cpp @@ -81,14 +81,11 @@ GraphicsAllocation *MockMemoryManager::allocateGraphicsMemoryWithAlignment(const allocationCreated = true; return OsAgnosticMemoryManager::allocateGraphicsMemoryWithAlignment(allocationData); } -GraphicsAllocation *MockMemoryManager::allocate32BitGraphicsMemory(size_t size, const void *ptr, AllocationOrigin allocationOrigin) { + +GraphicsAllocation *MockMemoryManager::allocate32BitGraphicsMemory(size_t size, const void *ptr, GraphicsAllocation::AllocationType allocationType) { bool allocateMemory = ptr == nullptr; AllocationData allocationData; - if (allocationOrigin == AllocationOrigin::EXTERNAL_ALLOCATION) { - getAllocationData(allocationData, MockAllocationProperties::getPropertiesFor32BitExternalAllocation(size, allocateMemory), {}, ptr); - } else { - getAllocationData(allocationData, MockAllocationProperties::getPropertiesFor32BitInternalAllocation(size, allocateMemory), {}, ptr); - } + getAllocationData(allocationData, MockAllocationProperties(allocateMemory, size, allocationType), {}, ptr); return allocate32BitGraphicsMemoryImpl(allocationData); } diff --git a/unit_tests/mocks/mock_memory_manager.h b/unit_tests/mocks/mock_memory_manager.h index 6ec61cee8f..d5c486a59a 100644 --- a/unit_tests/mocks/mock_memory_manager.h +++ b/unit_tests/mocks/mock_memory_manager.h @@ -23,6 +23,7 @@ class MockMemoryManager : public OsAgnosticMemoryManager { using MemoryManager::getAllocationData; using MemoryManager::multiContextResourceDestructor; using MemoryManager::registeredEngines; + using MemoryManager::useInternal32BitAllocator; using OsAgnosticMemoryManager::allocateGraphicsMemoryForImageFromHostPtr; using OsAgnosticMemoryManager::OsAgnosticMemoryManager; @@ -64,7 +65,7 @@ class MockMemoryManager : public OsAgnosticMemoryManager { unlockResourceCalled++; OsAgnosticMemoryManager::unlockResourceImpl(gfxAllocation); } - GraphicsAllocation *allocate32BitGraphicsMemory(size_t size, const void *ptr, AllocationOrigin allocationOrigin); + GraphicsAllocation *allocate32BitGraphicsMemory(size_t size, const void *ptr, GraphicsAllocation::AllocationType allocationType); uint32_t freeGraphicsMemoryCalled = 0u; uint32_t unlockResourceCalled = 0u; 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 616fbf04c7..64a5153770 100644 --- a/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp +++ b/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp @@ -762,7 +762,7 @@ TEST_F(DrmMemoryManagerTest, givenMemoryManagerWhenAskedFor32BitAllocationThen32 auto size = 10u; memoryManager->setForce32BitAllocations(true); - auto allocation = memoryManager->allocate32BitGraphicsMemory(size, nullptr, AllocationOrigin::EXTERNAL_ALLOCATION); + auto allocation = memoryManager->allocate32BitGraphicsMemory(size, nullptr, GraphicsAllocation::AllocationType::BUFFER); EXPECT_NE(nullptr, allocation); EXPECT_NE(nullptr, allocation->getUnderlyingBuffer()); EXPECT_GE(allocation->getUnderlyingBufferSize(), size); @@ -1002,7 +1002,7 @@ TEST_F(DrmMemoryManagerTest, givenMemoryManagerWhenAskedFor32BitAllocationWithHo auto size = 10u; void *host_ptr = reinterpret_cast(0x1000); memoryManager->setForce32BitAllocations(true); - auto allocation = memoryManager->allocate32BitGraphicsMemory(size, host_ptr, AllocationOrigin::EXTERNAL_ALLOCATION); + auto allocation = memoryManager->allocate32BitGraphicsMemory(size, host_ptr, GraphicsAllocation::AllocationType::BUFFER); EXPECT_EQ(nullptr, allocation); mock->ioctl_res_ext = &mock->NONE; @@ -1016,7 +1016,7 @@ TEST_F(DrmMemoryManagerTest, givenMemoryManagerWhenAskedFor32BitAllocationAndAll auto size = 10u; memoryManager->setForce32BitAllocations(true); - auto allocation = memoryManager->allocate32BitGraphicsMemory(size, nullptr, AllocationOrigin::EXTERNAL_ALLOCATION); + auto allocation = memoryManager->allocate32BitGraphicsMemory(size, nullptr, GraphicsAllocation::AllocationType::BUFFER); EXPECT_EQ(nullptr, allocation); mock->ioctl_res_ext = &mock->NONE; @@ -1030,7 +1030,7 @@ TEST_F(DrmMemoryManagerTest, givenLimitedRangeAllocatorWhenAskedForInternal32Bit auto size = 10u; memoryManager->forceLimitedRangeAllocator(0xFFFFFFFFF); - auto allocation = memoryManager->allocate32BitGraphicsMemory(size, nullptr, AllocationOrigin::INTERNAL_ALLOCATION); + auto allocation = memoryManager->allocate32BitGraphicsMemory(size, nullptr, GraphicsAllocation::AllocationType::INTERNAL_HEAP); EXPECT_EQ(nullptr, allocation); mock->ioctl_res_ext = &mock->NONE; @@ -1142,7 +1142,7 @@ TEST_F(DrmMemoryManagerTest, Given32BitDeviceWithMemoryManagerWhenInternalHeapIs EXPECT_NE(0llu, alloc); size_t allocationSize = 4 * 1024 * 1024 * 1024llu; - auto graphicsAllocation = memoryManager->allocate32BitGraphicsMemory(allocationSize, nullptr, AllocationOrigin::INTERNAL_ALLOCATION); + auto graphicsAllocation = memoryManager->allocate32BitGraphicsMemory(allocationSize, nullptr, GraphicsAllocation::AllocationType::INTERNAL_HEAP); EXPECT_EQ(nullptr, graphicsAllocation); EXPECT_TRUE(pDevice->getDeviceInfo().force32BitAddressess); } @@ -2014,7 +2014,7 @@ TEST_F(DrmMemoryManagerTest, given32BitAllocatorWithHeapAllocatorWhenLargerFragm size_t pages3size = 3 * MemoryConstants::pageSize; void *host_ptr = reinterpret_cast(0x1000); - DrmAllocation *graphicsAlloaction = memoryManager->allocate32BitGraphicsMemory(pages3size, host_ptr, AllocationOrigin::EXTERNAL_ALLOCATION); + DrmAllocation *graphicsAlloaction = memoryManager->allocate32BitGraphicsMemory(pages3size, host_ptr, GraphicsAllocation::AllocationType::BUFFER); auto bo = graphicsAlloaction->getBO(); EXPECT_EQ(allocationSize, bo->peekUnmapSize()); @@ -2097,7 +2097,7 @@ TEST_F(DrmMemoryManagerTest, givenMemoryManagerWhenAskedForInternalAllocationWit auto bufferSize = MemoryConstants::pageSize; void *ptr = nullptr; - auto drmAllocation = static_cast(memoryManager->allocate32BitGraphicsMemory(bufferSize, ptr, AllocationOrigin::INTERNAL_ALLOCATION)); + auto drmAllocation = static_cast(memoryManager->allocate32BitGraphicsMemory(bufferSize, ptr, GraphicsAllocation::AllocationType::INTERNAL_HEAP)); ASSERT_NE(nullptr, drmAllocation); auto internalAllocator = memoryManager->getDrmInternal32BitAllocator(); @@ -2134,7 +2134,7 @@ TEST_F(DrmMemoryManagerTest, givenLimitedRangeAllocatorWhenAskedForInternalAlloc auto bufferSize = MemoryConstants::pageSize; void *ptr = nullptr; - auto drmAllocation = static_cast(memoryManager->allocate32BitGraphicsMemory(bufferSize, ptr, AllocationOrigin::INTERNAL_ALLOCATION)); + auto drmAllocation = static_cast(memoryManager->allocate32BitGraphicsMemory(bufferSize, ptr, GraphicsAllocation::AllocationType::INTERNAL_HEAP)); ASSERT_NE(nullptr, drmAllocation); auto internalAllocator = memoryManager->getDrmInternal32BitAllocator(); @@ -2175,7 +2175,7 @@ TEST_F(DrmMemoryManagerTest, givenLimitedRangeAllocatorWhenAskedForExternalAlloc auto bufferSize = MemoryConstants::pageSize; void *ptr = nullptr; - auto drmAllocation = static_cast(memoryManager->allocate32BitGraphicsMemory(bufferSize, ptr, AllocationOrigin::EXTERNAL_ALLOCATION)); + auto drmAllocation = static_cast(memoryManager->allocate32BitGraphicsMemory(bufferSize, ptr, GraphicsAllocation::AllocationType::BUFFER)); ASSERT_NE(nullptr, drmAllocation); EXPECT_NE(nullptr, drmAllocation->getUnderlyingBuffer()); @@ -2189,7 +2189,7 @@ TEST_F(DrmMemoryManagerTest, givenLimitedRangeAllocatorWhenAskedForInternalAlloc auto bufferSize = 128 * MemoryConstants::megaByte + 4 * MemoryConstants::pageSize; void *ptr = nullptr; - auto drmAllocation = static_cast(memoryManager->allocate32BitGraphicsMemory(bufferSize, ptr, AllocationOrigin::INTERNAL_ALLOCATION)); + auto drmAllocation = static_cast(memoryManager->allocate32BitGraphicsMemory(bufferSize, ptr, GraphicsAllocation::AllocationType::INTERNAL_HEAP)); ASSERT_EQ(nullptr, drmAllocation); } @@ -2200,7 +2200,7 @@ TEST_F(DrmMemoryManagerTest, givenMemoryManagerWhenAskedForInternalAllocationWit auto bufferSize = MemoryConstants::pageSize; void *ptr = reinterpret_cast(0x100000); - auto drmAllocation = static_cast(memoryManager->allocate32BitGraphicsMemory(bufferSize, ptr, AllocationOrigin::INTERNAL_ALLOCATION)); + auto drmAllocation = static_cast(memoryManager->allocate32BitGraphicsMemory(bufferSize, ptr, GraphicsAllocation::AllocationType::INTERNAL_HEAP)); ASSERT_NE(nullptr, drmAllocation); auto internalAllocator = memoryManager->getDrmInternal32BitAllocator(); @@ -2606,7 +2606,7 @@ TEST(DrmMemoryManager, givenMemoryManagerWhenAllocate32BitGraphicsMemoryWithPtrI void *ptr = reinterpret_cast(0x1001); auto size = MemoryConstants::pageSize; - auto allocation = memoryManager->allocate32BitGraphicsMemory(size, ptr, AllocationOrigin::EXTERNAL_ALLOCATION); + auto allocation = memoryManager->allocate32BitGraphicsMemory(size, ptr, GraphicsAllocation::AllocationType::BUFFER); ASSERT_NE(nullptr, allocation); EXPECT_EQ(MemoryPool::System4KBPagesWith32BitGpuAddressing, allocation->getMemoryPool()); diff --git a/unit_tests/os_interface/windows/mock_wddm_memory_manager.h b/unit_tests/os_interface/windows/mock_wddm_memory_manager.h index 2a4d584fc8..f35871f425 100644 --- a/unit_tests/os_interface/windows/mock_wddm_memory_manager.h +++ b/unit_tests/os_interface/windows/mock_wddm_memory_manager.h @@ -33,14 +33,10 @@ class MockWddmMemoryManager : public WddmMemoryManager { bool validateAllocationMock(WddmAllocation *graphicsAllocation) { return this->validateAllocation(graphicsAllocation); } - GraphicsAllocation *allocate32BitGraphicsMemory(size_t size, const void *ptr, AllocationOrigin allocationOrigin) { + GraphicsAllocation *allocate32BitGraphicsMemory(size_t size, const void *ptr, GraphicsAllocation::AllocationType allocationType) { bool allocateMemory = ptr == nullptr; AllocationData allocationData; - if (allocationOrigin == AllocationOrigin::EXTERNAL_ALLOCATION) { - getAllocationData(allocationData, MockAllocationProperties::getPropertiesFor32BitExternalAllocation(size, allocateMemory), {}, ptr); - } else { - getAllocationData(allocationData, MockAllocationProperties::getPropertiesFor32BitInternalAllocation(size, allocateMemory), {}, ptr); - } + getAllocationData(allocationData, MockAllocationProperties(allocateMemory, size, allocationType), {}, ptr); return allocate32BitGraphicsMemoryImpl(allocationData); } }; diff --git a/unit_tests/os_interface/windows/wddm20_tests.cpp b/unit_tests/os_interface/windows/wddm20_tests.cpp index a62f589b35..01f11311b6 100644 --- a/unit_tests/os_interface/windows/wddm20_tests.cpp +++ b/unit_tests/os_interface/windows/wddm20_tests.cpp @@ -265,14 +265,14 @@ TEST_F(Wddm20Tests, createAllocation32bit) { delete gmm; } -TEST_F(Wddm20Tests, givenGraphicsAllocationWhenItIsMappedInHeap0ThenItHasGpuAddressWithingHeapInternalLimits) { +TEST_F(Wddm20Tests, givenGraphicsAllocationWhenItIsMappedInHeap0ThenItHasGpuAddressWithinHeapInternalLimits) { void *alignedPtr = (void *)0x12000; size_t alignedSize = 0x2000; WddmAllocation allocation(alignedPtr, alignedSize, nullptr, MemoryPool::MemoryNull, false); allocation.handle = ALLOCATION_HANDLE; allocation.gmm = GmmHelperFunctions::getGmm(allocation.getUnderlyingBuffer(), allocation.getUnderlyingBufferSize()); - allocation.origin = AllocationOrigin::INTERNAL_ALLOCATION; + allocation.setAllocationType(GraphicsAllocation::AllocationType::KERNEL_ISA); EXPECT_EQ(internalHeapIndex, MemoryManager::selectHeap(&allocation, allocation.getAlignedCpuPtr(), *hardwareInfoTable[wddm->getGfxPlatform()->eProductFamily])); bool ret = wddm->mapGpuVirtualAddress(&allocation, allocation.getAlignedCpuPtr()); EXPECT_TRUE(ret); 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 fabc09b878..5636e7871c 100644 --- a/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp +++ b/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp @@ -154,7 +154,7 @@ TEST_F(WddmMemoryManagerSimpleTest, givenMemoryManagerWhenAllocate32BitGraphicsM void *ptr = reinterpret_cast(0x1001); auto size = MemoryConstants::pageSize; - auto allocation = memoryManager->allocate32BitGraphicsMemory(size, ptr, AllocationOrigin::EXTERNAL_ALLOCATION); + auto allocation = memoryManager->allocate32BitGraphicsMemory(size, ptr, GraphicsAllocation::AllocationType::BUFFER); ASSERT_NE(nullptr, allocation); EXPECT_EQ(MemoryPool::System4KBPagesWith32BitGpuAddressing, allocation->getMemoryPool()); @@ -665,7 +665,7 @@ TEST_F(WddmMemoryManagerTest, GivenAlignedPointerWhenAllocate32BitMemoryThenGmmC MockWddmAllocation allocation; uint32_t size = 4096; void *ptr = reinterpret_cast(4096); - auto *gpuAllocation = memoryManager->allocate32BitGraphicsMemory(size, ptr, AllocationOrigin::EXTERNAL_ALLOCATION); + auto *gpuAllocation = memoryManager->allocate32BitGraphicsMemory(size, ptr, GraphicsAllocation::AllocationType::BUFFER); EXPECT_EQ(ptr, reinterpret_cast(gpuAllocation->gmm->resourceParams.pExistingSysMem)); EXPECT_EQ(size, gpuAllocation->gmm->resourceParams.ExistingSysMemSize); memoryManager->freeGraphicsMemory(gpuAllocation); @@ -675,7 +675,7 @@ TEST_F(WddmMemoryManagerTest, GivenUnAlignedPointerAndSizeWhenAllocate32BitMemor MockWddmAllocation allocation; uint32_t size = 0x1001; void *ptr = reinterpret_cast(0x1001); - auto *gpuAllocation = memoryManager->allocate32BitGraphicsMemory(size, ptr, AllocationOrigin::EXTERNAL_ALLOCATION); + auto *gpuAllocation = memoryManager->allocate32BitGraphicsMemory(size, ptr, GraphicsAllocation::AllocationType::BUFFER); EXPECT_EQ(reinterpret_cast(0x1000), reinterpret_cast(gpuAllocation->gmm->resourceParams.pExistingSysMem)); EXPECT_EQ(0x2000, gpuAllocation->gmm->resourceParams.ExistingSysMemSize); memoryManager->freeGraphicsMemory(gpuAllocation); @@ -696,7 +696,7 @@ TEST_F(WddmMemoryManagerTest, getMaxApplicationAddress) { } TEST_F(WddmMemoryManagerTest, Allocate32BitMemoryWithNullptr) { - auto *gpuAllocation = memoryManager->allocate32BitGraphicsMemory(3 * MemoryConstants::pageSize, nullptr, AllocationOrigin::EXTERNAL_ALLOCATION); + auto *gpuAllocation = memoryManager->allocate32BitGraphicsMemory(3 * MemoryConstants::pageSize, nullptr, GraphicsAllocation::AllocationType::BUFFER); ASSERT_NE(nullptr, gpuAllocation); EXPECT_LE(GmmHelper::canonize(wddm->getExternalHeapBase()), gpuAllocation->getGpuAddress()); @@ -707,7 +707,7 @@ TEST_F(WddmMemoryManagerTest, Allocate32BitMemoryWithNullptr) { } TEST_F(WddmMemoryManagerTest, given32BitAllocationWhenItIsCreatedThenItHasNonZeroGpuAddressToPatch) { - auto *gpuAllocation = memoryManager->allocate32BitGraphicsMemory(3 * MemoryConstants::pageSize, nullptr, AllocationOrigin::EXTERNAL_ALLOCATION); + auto *gpuAllocation = memoryManager->allocate32BitGraphicsMemory(3 * MemoryConstants::pageSize, nullptr, GraphicsAllocation::AllocationType::BUFFER); ASSERT_NE(nullptr, gpuAllocation); EXPECT_NE(0llu, gpuAllocation->getGpuAddressToPatch()); @@ -718,7 +718,7 @@ TEST_F(WddmMemoryManagerTest, Allocate32BitMemoryWithMisalignedHostPtrDoesNotDoT size_t misalignedSize = 0x2500; void *misalignedPtr = reinterpret_cast(0x12500); - auto *gpuAllocation = memoryManager->allocate32BitGraphicsMemory(misalignedSize, misalignedPtr, AllocationOrigin::EXTERNAL_ALLOCATION); + auto *gpuAllocation = memoryManager->allocate32BitGraphicsMemory(misalignedSize, misalignedPtr, GraphicsAllocation::AllocationType::BUFFER); ASSERT_NE(nullptr, gpuAllocation); @@ -737,7 +737,7 @@ TEST_F(WddmMemoryManagerTest, Allocate32BitMemoryWithMisalignedHostPtrDoesNotDoT } TEST_F(WddmMemoryManagerTest, Allocate32BitMemorySetsCannonizedGpuBaseAddress) { - auto *gpuAllocation = memoryManager->allocate32BitGraphicsMemory(3 * MemoryConstants::pageSize, nullptr, AllocationOrigin::EXTERNAL_ALLOCATION); + auto *gpuAllocation = memoryManager->allocate32BitGraphicsMemory(3 * MemoryConstants::pageSize, nullptr, GraphicsAllocation::AllocationType::BUFFER); ASSERT_NE(nullptr, gpuAllocation); @@ -856,7 +856,7 @@ TEST_F(WddmMemoryManagerTest, givenManagerWithEnabledDeferredDeleterWhenFirstAnd } TEST_F(WddmMemoryManagerTest, givenNullPtrAndSizePassedToCreateInternalAllocationWhenCallIsMadeThenAllocationIsCreatedIn32BitHeapInternal) { - auto wddmAllocation = static_cast(memoryManager->allocate32BitGraphicsMemory(MemoryConstants::pageSize, nullptr, AllocationOrigin::INTERNAL_ALLOCATION)); + auto wddmAllocation = static_cast(memoryManager->allocate32BitGraphicsMemory(MemoryConstants::pageSize, nullptr, GraphicsAllocation::AllocationType::INTERNAL_HEAP)); ASSERT_NE(nullptr, wddmAllocation); EXPECT_EQ(wddmAllocation->gpuBaseAddress, GmmHelper::canonize(memoryManager->getInternalHeapBaseAddress())); EXPECT_NE(nullptr, wddmAllocation->getUnderlyingBuffer()); @@ -875,7 +875,7 @@ TEST_F(WddmMemoryManagerTest, givenNullPtrAndSizePassedToCreateInternalAllocatio TEST_F(WddmMemoryManagerTest, givenPtrAndSizePassedToCreateInternalAllocationWhenCallIsMadeThenAllocationIsCreatedIn32BitHeapInternal) { auto ptr = reinterpret_cast(0x1000000); - auto wddmAllocation = static_cast(memoryManager->allocate32BitGraphicsMemory(MemoryConstants::pageSize, ptr, AllocationOrigin::INTERNAL_ALLOCATION)); + auto wddmAllocation = static_cast(memoryManager->allocate32BitGraphicsMemory(MemoryConstants::pageSize, ptr, GraphicsAllocation::AllocationType::INTERNAL_HEAP)); ASSERT_NE(nullptr, wddmAllocation); EXPECT_EQ(wddmAllocation->gpuBaseAddress, GmmHelper::canonize(memoryManager->getInternalHeapBaseAddress())); EXPECT_EQ(ptr, wddmAllocation->getUnderlyingBuffer());