Apply memory flag when creating Gmm with image info

Resolves: NEO-3294

Change-Id: I2702611c5b3b2ccd8d48219b90479a6fd3fbe1f7
Signed-off-by: Mateusz Jablonski <[email protected]>

Author: JablonskiMateusz

runtime/gmm_helper/gmm.cpp

@@ -56,9 +56,10 @@ Gmm::Gmm(GMM_RESOURCE_INFO *inputGmm) {
     gmmResourceInfo.reset(GmmResourceInfo::create(inputGmm));
 }
 
-Gmm::Gmm(ImageInfo &inputOutputImgInfo) {
+Gmm::Gmm(ImageInfo &inputOutputImgInfo, StorageInfo storageInfo) {
     this->resourceParams = {};
     setupImageResourceParams(inputOutputImgInfo);
+    applyMemoryFlags(!inputOutputImgInfo.useLocalMemory, storageInfo);
     this->gmmResourceInfo.reset(GmmResourceInfo::create(&this->resourceParams));
     UNRECOVERABLE_IF(this->gmmResourceInfo == nullptr);
 

runtime/gmm_helper/gmm.h

@@ -25,7 +25,7 @@ class Gmm {
   public:
     virtual ~Gmm() = default;
     Gmm() = delete;
-    Gmm(ImageInfo &inputOutputImgInfo);
+    Gmm(ImageInfo &inputOutputImgInfo, StorageInfo storageInfo);
     Gmm(const void *alignedPtr, size_t alignedSize, bool uncacheable);
     Gmm(const void *alignedPtr, size_t alignedSize, bool uncacheable, bool preferRenderCompressed, bool systemMemoryPool, StorageInfo storageInfo);
     Gmm(GMM_RESOURCE_INFO *inputGmm);

runtime/mem_obj/image.cpp

@@ -208,7 +208,7 @@ Image *Image::create(Context *context,
             if (memoryManager->peekVirtualPaddingSupport() && (imageDesc->image_type == CL_MEM_OBJECT_IMAGE2D)) {
                 // Retrieve sizes from GMM and apply virtual padding if buffer storage is not big enough
                 auto queryGmmImgInfo(imgInfo);
-                std::unique_ptr<Gmm> gmm(new Gmm(queryGmmImgInfo));
+                std::unique_ptr<Gmm> gmm(new Gmm(queryGmmImgInfo, StorageInfo{}));
                 auto gmmAllocationSize = gmm->gmmResourceInfo->getSizeAllocation();
                 if (gmmAllocationSize > memory->getUnderlyingBufferSize()) {
                     memory = memoryManager->createGraphicsAllocationWithPadding(memory, gmmAllocationSize);
@@ -236,7 +236,7 @@ Image *Image::create(Context *context,
                         }
                     }
                 } else {
-                    gmm = new Gmm(imgInfo);
+                    gmm = new Gmm(imgInfo, StorageInfo{});
                     memory = memoryManager->allocateGraphicsMemoryWithProperties({false, imgInfo.size, GraphicsAllocation::AllocationType::SHARED_CONTEXT_IMAGE}, hostPtr);
                     memory->setDefaultGmm(gmm);
                     zeroCopy = true;
@@ -646,7 +646,7 @@ cl_int Image::getImageParams(Context *context,
     imgInfo.imgDesc = &imageDescriptor;
     imgInfo.surfaceFormat = surfaceFormat;
 
-    std::unique_ptr<Gmm> gmm(new Gmm(imgInfo)); // query imgInfo
+    std::unique_ptr<Gmm> gmm(new Gmm(imgInfo, StorageInfo{})); // query imgInfo
 
     *imageRowPitch = imgInfo.rowPitch;
     *imageSlicePitch = imgInfo.slicePitch;

runtime/memory_manager/memory_manager.cpp

@@ -355,7 +355,7 @@ GraphicsAllocation *MemoryManager::allocateGraphicsMemory(const AllocationData &
 }
 
 GraphicsAllocation *MemoryManager::allocateGraphicsMemoryForImage(const AllocationData &allocationData) {
-    auto gmm = std::make_unique<Gmm>(*allocationData.imgInfo);
+    auto gmm = std::make_unique<Gmm>(*allocationData.imgInfo, allocationData.storageInfo);
 
     // AllocationData needs to be reconfigured for System Memory paths
     AllocationData allocationDataWithSize = allocationData;

runtime/memory_manager/os_agnostic_memory_manager.cpp

@@ -145,7 +145,7 @@ GraphicsAllocation *OsAgnosticMemoryManager::createGraphicsAllocationFromSharedH
     graphicsAllocation->set32BitAllocation(requireSpecificBitness);
 
     if (properties.imgInfo) {
-        Gmm *gmm = new Gmm(*properties.imgInfo);
+        Gmm *gmm = new Gmm(*properties.imgInfo, createStorageInfoFromProperties(properties));
         graphicsAllocation->setDefaultGmm(gmm);
     }
 

runtime/os_interface/linux/drm_memory_manager.cpp

@@ -521,7 +521,7 @@ GraphicsAllocation *DrmMemoryManager::createGraphicsAllocationFromSharedHandle(o
         ((void)(ret));
 
         properties.imgInfo->tilingMode = TilingModeHelper::convert(getTiling.tiling_mode);
-        Gmm *gmm = new Gmm(*properties.imgInfo);
+        Gmm *gmm = new Gmm(*properties.imgInfo, createStorageInfoFromProperties(properties));
         drmAllocation->setDefaultGmm(gmm);
     }
     return drmAllocation;

unit_tests/d3d_sharing/d3d9_tests.cpp

@@ -48,7 +48,7 @@ class D3D9Tests : public PlatformFixture, public ::testing::Test {
             return alloc;
         }
         GraphicsAllocation *allocateGraphicsMemoryForImage(const AllocationData &allocationData) override {
-            auto gmm = std::make_unique<Gmm>(*allocationData.imgInfo);
+            auto gmm = std::make_unique<Gmm>(*allocationData.imgInfo, StorageInfo{});
             AllocationProperties properties(nullptr, false, GraphicsAllocation::AllocationType::SHARED_IMAGE);
             auto alloc = OsAgnosticMemoryManager::createGraphicsAllocationFromSharedHandle(1, properties, false);
             alloc->setDefaultGmm(forceGmm);

unit_tests/gmm_helper/gmm_helper_tests.cpp

@@ -304,7 +304,7 @@ TEST_F(GmmTests, givenTilingModeSetToTileYWhenHwSupportsTilingThenTileYFlagIsSet
 
     auto imgInfo = MockGmm::initImgInfo(imgDesc, 0, nullptr);
     imgInfo.tilingMode = TilingMode::TILE_Y;
-    auto gmm = std::make_unique<Gmm>(imgInfo);
+    auto gmm = std::make_unique<Gmm>(imgInfo, StorageInfo{});
 
     auto &hwHelper = HwHelper::get(GmmHelper::getInstance()->getHardwareInfo()->platform.eRenderCoreFamily);
     bool supportsYTiling = hwHelper.supportsYTiling();
@@ -327,7 +327,7 @@ TEST_F(GmmTests, givenTilingModeSetToNonTiledWhenCreatingGmmThenLinearFlagIsSet)
 
     auto imgInfo = MockGmm::initImgInfo(imgDesc, 0, nullptr);
     imgInfo.tilingMode = TilingMode::NON_TILED;
-    auto gmm = std::make_unique<Gmm>(imgInfo);
+    auto gmm = std::make_unique<Gmm>(imgInfo, StorageInfo{});
 
     EXPECT_EQ(gmm->resourceParams.Flags.Info.Linear, 1u);
     EXPECT_EQ(gmm->resourceParams.Flags.Info.TiledY, 0u);
@@ -343,7 +343,7 @@ TEST_F(GmmTests, givenTilingModeSetToTileXWhenCreatingGmmThenUnrecoverableIfIsCa
     auto imgInfo = MockGmm::initImgInfo(imgDesc, 0, nullptr);
     imgInfo.tilingMode = TilingMode::TILE_X;
 
-    EXPECT_THROW(new Gmm(imgInfo), std::exception);
+    EXPECT_THROW(new Gmm(imgInfo, {}), std::exception);
 }
 
 TEST_F(GmmTests, givenZeroRowPitchWhenQueryImgFromBufferParamsThenCalculate) {

unit_tests/mocks/mock_gmm.h

@@ -21,7 +21,7 @@ static SurfaceFormatInfo mockSurfaceFormat;
 class MockGmm : public Gmm {
   public:
     static std::unique_ptr<Gmm> queryImgParams(ImageInfo &imgInfo) {
-        return std::unique_ptr<Gmm>(new Gmm(imgInfo));
+        return std::unique_ptr<Gmm>(new Gmm(imgInfo, {}));
     }
 
     static ImageInfo initImgInfo(cl_image_desc &imgDesc, int baseMipLevel, const SurfaceFormatInfo *surfaceFormat) {