Add getAllocationDataExtra method

Change-Id: I99d9d55bf1b4116d7766f86471f6cd716374be5c
Signed-off-by: Maciej Dziuban <[email protected]>

Author: DziubanMaciejIntel

opencl/test/unit_test/helpers/unit_test_helper.h

@@ -46,6 +46,8 @@ struct UnitTestHelper {
 
     static uint64_t getMemoryAddress(const typename GfxFamily::MI_ATOMIC &atomic);
 
+    static bool requiresTimestampPacketsInSystemMemory();
+
     static const bool tiledImagesSupported;
 
     static const uint32_t smallestTestableSimdSize;

opencl/test/unit_test/helpers/unit_test_helper.inl

@@ -80,6 +80,11 @@ inline uint64_t UnitTestHelper<GfxFamily>::getMemoryAddress(const typename GfxFa
     return atomic.getMemoryAddress() | ((static_cast<uint64_t>(atomic.getMemoryAddressHigh())) << 32);
 }
 
+template <typename GfxFamily>
+inline bool UnitTestHelper<GfxFamily>::requiresTimestampPacketsInSystemMemory() {
+    return true;
+}
+
 template <typename GfxFamily>
 const bool UnitTestHelper<GfxFamily>::tiledImagesSupported = true;
 

opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl

@@ -629,7 +629,7 @@ TEST(OsAgnosticMemoryManager, givenMemoryManagerWhenAskedFor32BitAllocationWhenL
     memoryManager.forceLimitedRangeAllocator(0, 0xFFFFFFFFF);
 
     AllocationData allocationData;
-    MockMemoryManager::getAllocationData(allocationData, {0, MemoryConstants::pageSize, GraphicsAllocation::AllocationType::BUFFER}, nullptr, StorageInfo{});
+    memoryManager.getAllocationData(allocationData, {0, MemoryConstants::pageSize, GraphicsAllocation::AllocationType::BUFFER}, nullptr, StorageInfo{});
     auto gfxAllocation = memoryManager.allocateGraphicsMemoryWithAlignment(allocationData);
     ASSERT_NE(gfxAllocation, nullptr);
     EXPECT_NE(gfxAllocation->getGpuBaseAddress(), 0ull);
@@ -647,7 +647,7 @@ TEST(OsAgnosticMemoryManager, givenMemoryManagerWhenAskedForNon32BitAllocationWh
     memoryManager.forceLimitedRangeAllocator(0, 0xFFFFFFFFF);
 
     AllocationData allocationData;
-    MockMemoryManager::getAllocationData(allocationData, {0, MemoryConstants::pageSize, GraphicsAllocation::AllocationType::BUFFER}, nullptr, StorageInfo{});
+    memoryManager.getAllocationData(allocationData, {0, MemoryConstants::pageSize, GraphicsAllocation::AllocationType::BUFFER}, nullptr, StorageInfo{});
     auto gfxAllocation = memoryManager.allocateGraphicsMemoryWithAlignment(allocationData);
     ASSERT_NE(gfxAllocation, nullptr);
     EXPECT_EQ(gfxAllocation->getGpuBaseAddress(), 0ull);
@@ -1827,7 +1827,7 @@ TEST(MemoryManagerTest, givenAllocationTypesThatMayNeedL3FlushWhenCallingGetAllo
     MockMemoryManager mockMemoryManager;
     for (auto allocationType : allocationTypesThatMayNeedL3Flush) {
         properties.allocationType = allocationType;
-        MockMemoryManager::getAllocationData(allocData, properties, nullptr, mockMemoryManager.createStorageInfoFromProperties(properties));
+        mockMemoryManager.getAllocationData(allocData, properties, nullptr, mockMemoryManager.createStorageInfoFromProperties(properties));
         EXPECT_TRUE(allocData.flags.flushL3);
     }
 
@@ -1836,7 +1836,7 @@ TEST(MemoryManagerTest, givenAllocationTypesThatMayNeedL3FlushWhenCallingGetAllo
 
     for (auto allocationType : allocationTypesThatMayNeedL3Flush) {
         properties.allocationType = allocationType;
-        MockMemoryManager::getAllocationData(allocData, properties, nullptr, mockMemoryManager.createStorageInfoFromProperties(properties));
+        mockMemoryManager.getAllocationData(allocData, properties, nullptr, mockMemoryManager.createStorageInfoFromProperties(properties));
         EXPECT_FALSE(allocData.flags.flushL3);
     }
 }

opencl/test/unit_test/memory_manager/memory_manager_tests.cpp

@@ -32,6 +32,7 @@ set(NEO_CORE_MEMORY_MANAGER
   ${CMAKE_CURRENT_SOURCE_DIR}/local_memory_usage.h
   ${CMAKE_CURRENT_SOURCE_DIR}/memory_manager.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/memory_manager.h
+  ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/memory_manager_extra.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/memory_operations_handler.h
   ${CMAKE_CURRENT_SOURCE_DIR}/memory_operations_status.h
   ${CMAKE_CURRENT_SOURCE_DIR}/memory_pool.h

shared/source/memory_manager/CMakeLists.txt

@@ -295,6 +295,7 @@ bool MemoryManager::getAllocationData(AllocationData &allocationData, const Allo
     case GraphicsAllocation::AllocationType::TAG_BUFFER:
     case GraphicsAllocation::AllocationType::GLOBAL_FENCE:
     case GraphicsAllocation::AllocationType::INTERNAL_HOST_MEMORY:
+    case GraphicsAllocation::AllocationType::TIMESTAMP_PACKET_TAG_BUFFER:
         allocationData.flags.useSystemMemory = true;
     default:
         break;
@@ -347,6 +348,7 @@ bool MemoryManager::getAllocationData(AllocationData &allocationData, const Allo
 
     allocationData.rootDeviceIndex = properties.rootDeviceIndex;
 
+    getAllocationDataExtra(allocationData, properties);
     return true;
 }
 

shared/source/memory_manager/memory_manager.cpp

@@ -197,7 +197,8 @@ class MemoryManager {
         uint32_t rootDeviceIndex = 0;
     };
 
-    static bool getAllocationData(AllocationData &allocationData, const AllocationProperties &properties, const void *hostPtr, const StorageInfo &storageInfo);
+    bool getAllocationData(AllocationData &allocationData, const AllocationProperties &properties, const void *hostPtr, const StorageInfo &storageInfo);
+    void getAllocationDataExtra(AllocationData &allocationData, const AllocationProperties &properties);
     static void overrideAllocationData(AllocationData &allocationData, const AllocationProperties &properties);
     static bool useInternal32BitAllocator(GraphicsAllocation::AllocationType allocationType) {
         return allocationType == GraphicsAllocation::AllocationType::KERNEL_ISA ||

shared/source/memory_manager/memory_manager.h

@@ -0,0 +1,14 @@
+/*
+ * Copyright (C) 2020 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "shared/source/memory_manager/memory_manager.h"
+
+namespace NEO {
+void MemoryManager::getAllocationDataExtra(AllocationData &allocationData, const AllocationProperties &properties) {
+}
+
+} // namespace NEO