Enable local memory for images for DG2 + WSL

Change GMM resource info params, so that buffers
remain in system memory while images are being
routed to local memory additionally, fixes single
sku builds


Related-To: NEO-6391

Signed-off-by: Kamil Diedrich <[email protected]>

Author: kamdiedrich

shared/source/gmm_helper/gmm.cpp

@@ -66,6 +66,12 @@ Gmm::Gmm(GmmClientContext *clientContext, const void *alignedPtr, size_t aligned
     applyAppResource(storageInfo);
     applyDebugOverrides();
 
+    auto hardwareInfo = clientContext->getHardwareInfo();
+    if (HwInfoConfig::get(hardwareInfo->platform.eProductFamily)->overrideResourceInfoParamsForWsl(clientContext->getDriverModelType())) {
+        resourceParams.Flags.Info.NonLocalOnly = 1;
+        resourceParams.Flags.Info.LocalOnly = 0;
+    }
+
     gmmResourceInfo.reset(GmmResourceInfo::create(clientContext, &resourceParams));
 }
 
@@ -380,10 +386,6 @@ void Gmm::applyMemoryFlags(bool systemMemoryPool, StorageInfo &storageInfo) {
             resourceParams.MultiTileArch.LocalMemEligibilitySet = static_cast<uint8_t>(tileSelected);
         }
     }
-
-    if (HwInfoConfig::get(hardwareInfo->platform.eProductFamily)->overrideResourceInfoParamsForWsl(clientContext->getDriverModelType())) {
-        resourceParams.Flags.Info.NonLocalOnly = 1;
-    }
 }
 
 void Gmm::applyDebugOverrides() {

shared/test/unit_test/os_interface/wddm_linux/configure_device_address_space_drm_or_wddm_test.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/gmm_helper/gmm_helper.h"
+#include "shared/source/helpers/surface_format_info.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/linux/os_time_linux.h"
 #include "shared/source/os_interface/os_interface.h"
@@ -17,6 +18,7 @@
 #include "shared/source/os_interface/windows/wddm_memory_manager.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
+#include "shared/test/common/mocks/mock_gmm.h"
 #include "shared/test/common/mocks/mock_gmm_client_context.h"
 #include "shared/test/common/test_macros/test.h"
 
@@ -239,11 +241,34 @@ using GmmTestsDG2 = WddmLinuxTest;
 
 HWTEST_EXCLUDE_PRODUCT(GmmTests, givenGmmWithForceLocalMemThenNonLocalIsSetToFalse, IGFX_XE_HPG_CORE);
 
-DG2TEST_F(GmmTestsDG2, givenGmmWithForceLocalMemThenNonLocalIsSetToTrue) {
+HWTEST2_F(GmmTestsDG2, givenGmmForBufferWithForceLocalMemThenNonLocalIsSetToTrue, IsDG2) {
     void *pSysMem = nullptr;
     std::unique_ptr<NEO::Gmm> gmm(new NEO::Gmm(mockExecEnv.rootDeviceEnvironments[0]->getGmmClientContext(), pSysMem, 4096, 0, false, false, false, {}));
 
     EXPECT_EQ(gmm->resourceParams.Flags.Info.NonLocalOnly, 1u);
+    EXPECT_EQ(gmm->resourceParams.Flags.Info.LocalOnly, 0u);
+}
+
+HWTEST2_F(GmmTestsDG2, givenGmmForImageWithForceLocalMemThenNonLocalIsSetToFalseAndoLocalOnlyIsSetToTrue, IsDG2) {
+    const_cast<NEO::HardwareInfo *>(mockExecEnv.rootDeviceEnvironments[0]->getHardwareInfo())->featureTable.flags.ftrLocalMemory = 1u;
+
+    NEO::ImageDescriptor imgDesc = {};
+    imgDesc.imageType = NEO::ImageType::Image2DArray;
+    imgDesc.imageWidth = 60;
+    imgDesc.imageHeight = 1;
+    imgDesc.imageDepth = 1;
+    imgDesc.imageArraySize = 10;
+
+    NEO::ImageInfo imgInfo = NEO::MockGmm::initImgInfo(imgDesc, 0, nullptr);
+    imgInfo.useLocalMemory = true;
+
+    NEO::StorageInfo storageInfo = {};
+    storageInfo.localOnlyRequired = true;
+
+    std::unique_ptr<NEO::Gmm> gmm(new NEO::Gmm(mockExecEnv.rootDeviceEnvironments[0]->getGmmClientContext(), imgInfo, storageInfo, false));
+
+    EXPECT_EQ(gmm->resourceParams.Flags.Info.NonLocalOnly, 0u);
+    EXPECT_EQ(gmm->resourceParams.Flags.Info.LocalOnly, 1u);
 }
 
 using WddmLinuxConfigureDeviceAddressSpaceTest = WddmLinuxTest;