Add MultiGraphicsAllocation to MemObj class

use it to get allocation type and coherency status

Related-To: NEO-4672
Change-Id: Id1fdc358f7e2038e78c1225ebc986b2a7775c665
Signed-off-by: Mateusz Jablonski <[email protected]>

Author: JablonskiMateusz

opencl/source/kernel/kernel.cpp

@@ -1205,7 +1205,7 @@ bool Kernel::requiresCoherency() {
             if (Kernel::isMemObj(kernelArguments[argIndex].type)) {
                 auto clMem = const_cast<cl_mem>(static_cast<const _cl_mem *>(kernelArguments[argIndex].object));
                 auto memObj = castToObjectOrAbort<MemObj>(clMem);
-                if (memObj->getGraphicsAllocation()->isCoherent()) {
+                if (memObj->getMultiGraphicsAllocation().isCoherent()) {
                     return true;
                 }
             }
@@ -1303,7 +1303,7 @@ cl_int Kernel::setArgBuffer(uint32_t argIndex,
                 forceNonAuxMode = true;
             }
             disableL3 = (argIndex == 0);
-        } else if (buffer->getGraphicsAllocation()->getAllocationType() == GraphicsAllocation::AllocationType::BUFFER_COMPRESSED &&
+        } else if (buffer->getMultiGraphicsAllocation().getAllocationType() == GraphicsAllocation::AllocationType::BUFFER_COMPRESSED &&
                    !kernelArgInfo.pureStatefulBufferAccess) {
             forceNonAuxMode = true;
         }
@@ -2350,7 +2350,7 @@ void Kernel::fillWithBuffersForAuxTranslation(MemObjsForAuxTranslation &memObjsF
     for (uint32_t i = 0; i < getKernelArgsNumber(); i++) {
         if (BUFFER_OBJ == kernelArguments.at(i).type && !kernelInfo.kernelArgInfo.at(i).pureStatefulBufferAccess) {
             auto buffer = castToObject<Buffer>(getKernelArg(i));
-            if (buffer && buffer->getGraphicsAllocation()->getAllocationType() == GraphicsAllocation::AllocationType::BUFFER_COMPRESSED) {
+            if (buffer && buffer->getMultiGraphicsAllocation().getAllocationType() == GraphicsAllocation::AllocationType::BUFFER_COMPRESSED) {
                 memObjsForAuxTranslation.insert(buffer);
 
                 auto &context = this->program->getContext();

opencl/source/mem_obj/buffer.cpp

@@ -76,7 +76,7 @@ bool Buffer::isSubBuffer() {
 }
 
 bool Buffer::isValidSubBufferOffset(size_t offset) {
-    if (this->getGraphicsAllocation()->getAllocationType() == GraphicsAllocation::AllocationType::BUFFER_COMPRESSED) {
+    if (multiGraphicsAllocation.getAllocationType() == GraphicsAllocation::AllocationType::BUFFER_COMPRESSED) {
         // From spec: "origin value is aligned to the CL_DEVICE_MEM_BASE_ADDR_ALIGN value"
         if (!isAligned(offset, this->getContext()->getDevice(0)->getDeviceInfo().memBaseAddressAlign / 8u)) {
             return false;
@@ -650,7 +650,7 @@ bool Buffer::isCompressed() const {
     if (this->getGraphicsAllocation()->getDefaultGmm()) {
         return this->getGraphicsAllocation()->getDefaultGmm()->isRenderCompressed;
     }
-    if (this->getGraphicsAllocation()->getAllocationType() == GraphicsAllocation::AllocationType::BUFFER_COMPRESSED) {
+    if (multiGraphicsAllocation.getAllocationType() == GraphicsAllocation::AllocationType::BUFFER_COMPRESSED) {
         return true;
     }
 

opencl/source/mem_obj/mem_obj.cpp

@@ -42,7 +42,7 @@ MemObj::MemObj(Context *context,
     : context(context), memObjectType(memObjectType), memoryProperties(memoryProperties), flags(flags), flagsIntel(flagsIntel), size(size),
       memoryStorage(memoryStorage), hostPtr(hostPtr),
       isZeroCopy(zeroCopy), isHostPtrSVM(isHostPtrSVM), isObjectRedescribed(isObjectRedescribed),
-      graphicsAllocation(gfxAllocation) {
+      graphicsAllocation(gfxAllocation), multiGraphicsAllocation(graphicsAllocation ? graphicsAllocation->getRootDeviceIndex() : 0) {
 
     if (context) {
         context->incRefInternal();
@@ -51,6 +51,9 @@ MemObj::MemObj(Context *context,
         executionEnvironment = device->getExecutionEnvironment();
         rootDeviceEnvironment = executionEnvironment->rootDeviceEnvironments[device->getRootDeviceIndex()].get();
     }
+    if (graphicsAllocation) {
+        multiGraphicsAllocation.addAllocation(graphicsAllocation);
+    }
 }
 
 MemObj::~MemObj() {

opencl/source/mem_obj/mem_obj.h

@@ -7,6 +7,7 @@
 
 #pragma once
 #include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/memory_manager/multi_graphics_allocation.h"
 
 #include "opencl/extensions/public/cl_ext_private.h"
 #include "opencl/source/api/cl_types.h"
@@ -127,6 +128,7 @@ class MemObj : public BaseObject<_cl_mem> {
 
     const cl_mem_flags &getFlags() const { return flags; }
     const cl_mem_flags &getFlagsIntel() const { return flagsIntel; }
+    const MultiGraphicsAllocation &getMultiGraphicsAllocation() const { return multiGraphicsAllocation; }
 
   protected:
     void getOsSpecificMemObjectInfo(const cl_mem_info &paramName, size_t *srcParamSize, void **srcParam);
@@ -153,6 +155,7 @@ class MemObj : public BaseObject<_cl_mem> {
     bool isObjectRedescribed;
     MemoryManager *memoryManager = nullptr;
     GraphicsAllocation *graphicsAllocation;
+    MultiGraphicsAllocation multiGraphicsAllocation;
     GraphicsAllocation *mcsAllocation = nullptr;
     GraphicsAllocation *mapAllocation = nullptr;
     std::shared_ptr<SharingHandler> sharingHandler;

opencl/source/memory_manager/CMakeLists.txt

@@ -9,6 +9,7 @@ set(RUNTIME_SRCS_MEMORY_MANAGER
   ${CMAKE_CURRENT_SOURCE_DIR}/address_mapper.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/address_mapper.h
   ${CMAKE_CURRENT_SOURCE_DIR}/cpu_page_fault_manager_memory_sync.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/mem_obj_surface.h
   ${CMAKE_CURRENT_SOURCE_DIR}/memory_banks.h
   ${CMAKE_CURRENT_SOURCE_DIR}/os_agnostic_memory_manager.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/os_agnostic_memory_manager.h

opencl/source/memory_manager/mem_obj_surface.h

@@ -14,7 +14,7 @@ namespace NEO {
 
 class MemObjSurface : public Surface {
   public:
-    MemObjSurface(MemObj *memObj) : Surface(memObj->getGraphicsAllocation()->isCoherent()), memObj(memObj) {
+    MemObjSurface(MemObj *memObj) : Surface(memObj->getMultiGraphicsAllocation().isCoherent()), memObj(memObj) {
         memObj->incRefInternal();
     }
     ~MemObjSurface() override {