Introduce DrmMemoryManager::createMultiHostAllocation() method

Signed-off-by: Igor Venevtsev <[email protected]>

Author: ivvenevt

opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp

@@ -4434,4 +4434,12 @@ TEST_F(DrmMemoryManagerTest, givenDrmAllocationWithWithAlignmentFromUserptrWhenI
     auto allocation = static_cast<DrmAllocation *>(memoryManager->createAllocWithAlignmentFromUserptr(allocationData, size, 0, 0, 0x1000));
     EXPECT_EQ(allocation, nullptr);
 }
+
+TEST_F(DrmMemoryManagerTest, givenAllocateGraphicsMemoryWithPropertiesCalledWithDebugSurfaceTypeThenDebugSurfaceIsCreated) {
+    AllocationProperties debugSurfaceProperties{0, true, MemoryConstants::pageSize, NEO::GraphicsAllocation::AllocationType::DEBUG_CONTEXT_SAVE_AREA, false, false, 0b1011};
+    auto debugSurface = static_cast<DrmAllocation *>(memoryManager->allocateGraphicsMemoryWithProperties(debugSurfaceProperties));
+
+    EXPECT_NE(nullptr, debugSurface);
+    memoryManager->freeGraphicsMemory(debugSurface);
+}
 } // namespace NEO

shared/source/os_interface/linux/CMakeLists.txt

@@ -68,11 +68,13 @@ set(NEO_CORE_OS_INTERFACE_LINUX
 if(SUPPORT_DG1 AND "${BRANCH_TYPE}" STREQUAL "")
   list(APPEND NEO_CORE_OS_INTERFACE_LINUX
        ${CMAKE_CURRENT_SOURCE_DIR}/drm_memory_manager_allocate_in_device_pool_dg1.cpp
+       ${CMAKE_CURRENT_SOURCE_DIR}/drm_memory_manager_create_multi_host_allocation_dg1.cpp
        ${CMAKE_CURRENT_SOURCE_DIR}/drm_query_dg1.cpp
   )
 else()
   list(APPEND NEO_CORE_OS_INTERFACE_LINUX
        ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_memory_manager_allocate_in_device_pool.cpp
+       ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_memory_manager_create_multi_host_allocation.cpp
        ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_query.cpp
   )
 endif()

shared/source/os_interface/linux/drm_memory_manager.cpp

@@ -227,6 +227,14 @@ DrmAllocation *DrmMemoryManager::createGraphicsAllocation(OsHandleStorage &handl
 }
 
 DrmAllocation *DrmMemoryManager::allocateGraphicsMemoryWithAlignment(const AllocationData &allocationData) {
+    if (allocationData.type == NEO::GraphicsAllocation::AllocationType::DEBUG_CONTEXT_SAVE_AREA) {
+        return createMultiHostAllocation(allocationData);
+    }
+
+    return allocateGraphicsMemoryWithAlignmentImpl(allocationData);
+}
+
+DrmAllocation *DrmMemoryManager::allocateGraphicsMemoryWithAlignmentImpl(const AllocationData &allocationData) {
     const size_t minAlignment = getUserptrAlignment();
     size_t cAlignment = alignUp(std::max(allocationData.alignment, minAlignment), minAlignment);
     // When size == 0 allocate allocationAlignment

shared/source/os_interface/linux/drm_memory_manager.h

@@ -88,9 +88,11 @@ class DrmMemoryManager : public MemoryManager {
     DrmAllocation *createGraphicsAllocation(OsHandleStorage &handleStorage, const AllocationData &allocationData) override;
     DrmAllocation *allocateGraphicsMemoryForNonSvmHostPtr(const AllocationData &allocationData) override;
     DrmAllocation *allocateGraphicsMemoryWithAlignment(const AllocationData &allocationData) override;
+    DrmAllocation *allocateGraphicsMemoryWithAlignmentImpl(const AllocationData &allocationData);
     DrmAllocation *createUSMHostAllocationFromSharedHandle(osHandle handle, const AllocationProperties &properties);
     DrmAllocation *createAllocWithAlignmentFromUserptr(const AllocationData &allocationData, size_t size, size_t alignment, size_t alignedSVMSize, uint64_t gpuAddress);
     DrmAllocation *createAllocWithAlignment(const AllocationData &allocationData, size_t size, size_t alignment, size_t alignedSize, uint64_t gpuAddress);
+    DrmAllocation *createMultiHostAllocation(const AllocationData &allocationData);
     void obtainGpuAddress(const AllocationData &allocationData, BufferObject *bo, uint64_t gpuAddress);
     DrmAllocation *allocateUSMHostGraphicsMemory(const AllocationData &allocationData) override;
     DrmAllocation *allocateGraphicsMemoryWithHostPtr(const AllocationData &allocationData) override;

shared/source/os_interface/linux/drm_memory_manager_create_multi_host_allocation.cpp

@@ -0,0 +1,14 @@
+/*
+ * Copyright (C) 2021 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "shared/source/os_interface/linux/drm_memory_manager.h"
+
+namespace NEO {
+DrmAllocation *DrmMemoryManager::createMultiHostAllocation(const AllocationData &allocationData) {
+    return allocateGraphicsMemoryWithAlignmentImpl(allocationData);
+}
+} // namespace NEO

shared/source/os_interface/linux/drm_memory_manager_create_multi_host_allocation_dg1.cpp

@@ -0,0 +1,14 @@
+/*
+ * Copyright (C) 2021 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "shared/source/os_interface/linux/drm_memory_manager.h"
+
+namespace NEO {
+DrmAllocation *DrmMemoryManager::createMultiHostAllocation(const AllocationData &allocationData) {
+    return allocateGraphicsMemoryWithAlignmentImpl(allocationData);
+}
+} // namespace NEO

shared/test/common/mocks/linux/mock_drm_memory_manager.h

@@ -73,6 +73,7 @@ class TestedDrmMemoryManager : public MemoryManagerCreate<DrmMemoryManager> {
     using DrmMemoryManager::createAllocWithAlignment;
     using DrmMemoryManager::createAllocWithAlignmentFromUserptr;
     using DrmMemoryManager::createGraphicsAllocation;
+    using DrmMemoryManager::createMultiHostAllocation;
     using DrmMemoryManager::eraseSharedBufferObject;
     using DrmMemoryManager::getDefaultDrmContextId;
     using DrmMemoryManager::getDrm;
@@ -115,5 +116,11 @@ class TestedDrmMemoryManager : public MemoryManagerCreate<DrmMemoryManager> {
         size = sharingBufferObjects.size();
         return size;
     }
+    void *alignedMallocWrapper(size_t size, size_t alignment) override {
+        alignedMallocSizeRequired = size;
+        return alignedMallocShouldFail ? nullptr : DrmMemoryManager::alignedMallocWrapper(size, alignment);
+    }
+    bool alignedMallocShouldFail = false;
+    size_t alignedMallocSizeRequired = 0u;
 };
 } // namespace NEO