fix: handle not exisiting wsl compute helper library

#688 Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
intel · Nov 14, 2023 · c454e0d · c454e0d
1 parent 9a81387
commit c454e0d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/shared/source/os_interface/windows/wddm/create_um_km_data_translator.cpp b/shared/source/os_interface/windows/wddm/create_um_km_data_translator.cpp
@@ -282,10 +282,12 @@ std::unique_ptr<UmKmDataTranslator> createUmKmDataTranslator(const Gdi &gdi, D3D
             path.append(Os::fileSeparator);
             path.append(wslComputeHelperLibNameToLoad);
         }
-        return std::make_unique<WslComputeHelperUmKmDataTranslator>(std::unique_ptr<OsLibrary>(OsLibrary::load(path)));
-    } else {
-        return std::make_unique<UmKmDataTranslator>();
+        std::unique_ptr<OsLibrary> lib{OsLibrary::load(path)};
+        if ((nullptr != lib) && (lib->isLoaded())) {
+            return std::make_unique<WslComputeHelperUmKmDataTranslator>(std::move(lib));
+        }
     }
+    return std::make_unique<UmKmDataTranslator>();
 }
 
 } // namespace NEO
diff --git a/shared/test/unit_test/os_interface/windows/um_km_data_translator_tests.cpp b/shared/test/unit_test/os_interface/windows/um_km_data_translator_tests.cpp
@@ -216,6 +216,19 @@ TEST(UmKmDataTranslator, givenToggledDebugKeyWhenCreatingDefaultTranslatorThenTr
     EXPECT_TRUE(translator->enabled());
 }
 
+TEST(UmKmDataTranslator, givenToggledDebugKeyAndNotExistingLibWhenCreatingDefaultTranslatorThenTranslationIsDisabled) {
+    DebugManagerStateRestore debugSettingsRestore;
+
+    NEO::DebugManager.flags.UseUmKmDataTranslator.set(true);
+    NEO::wslComputeHelperLibNameToLoad = "dummyLib";
+    NEO::Gdi gdi;
+    auto handle = validHandle;
+    gdi.queryAdapterInfo.mFunc = QueryAdapterInfoMock::queryadapterinfo;
+
+    auto translator = NEO::createUmKmDataTranslator(gdi, handle);
+    EXPECT_FALSE(translator->enabled());
+}
+
 TEST(WslUmKmDataTranslator, whenQueryingForTranslationThenQueryIsForwardedToWslComputeHelper) {
     DebugManagerStateRestore debugSettingsRestore;