diff --git a/level_zero/core/source/helpers/api_specific_config_l0.cpp b/level_zero/core/source/helpers/api_specific_config_l0.cpp index 925b0ae59c..0244efe8ac 100644 --- a/level_zero/core/source/helpers/api_specific_config_l0.cpp +++ b/level_zero/core/source/helpers/api_specific_config_l0.cpp @@ -60,7 +60,7 @@ bool ApiSpecificConfig::isHostAllocationCacheEnabled() { } bool ApiSpecificConfig::isDeviceUsmPoolingEnabled() { - return false; + return true; } bool ApiSpecificConfig::isHostUsmPoolingEnabled() { diff --git a/level_zero/core/test/unit_tests/fixtures/memory_ipc_fixture.cpp b/level_zero/core/test/unit_tests/fixtures/memory_ipc_fixture.cpp index 8a68ba9672..1f10bf4169 100644 --- a/level_zero/core/test/unit_tests/fixtures/memory_ipc_fixture.cpp +++ b/level_zero/core/test/unit_tests/fixtures/memory_ipc_fixture.cpp @@ -175,7 +175,6 @@ ze_result_t ContextMemHandleMock::getImageAllocProperties(Image *image, } void MemoryExportImportWSLTest::SetUp() { - neoDevice = NEO::MockDevice::createWithNewExecutionEnvironment(NEO::defaultHwInfo.get()); auto mockBuiltIns = new MockBuiltins(); MockRootDeviceEnvironment::resetBuiltins(neoDevice->executionEnvironment->rootDeviceEnvironments[0].get(), mockBuiltIns); @@ -197,6 +196,8 @@ void MemoryExportImportWSLTest::SetUp() { } void MemoryExportImportWSLTest::TearDown() { + // clean usm device pool before replacing mem manager + neoDevice->cleanupUsmAllocationPool(); driverHandle->setMemoryManager(prevMemoryManager); delete currMemoryManager; } diff --git a/level_zero/core/test/unit_tests/sources/helper/api_specific_config_l0_tests.cpp b/level_zero/core/test/unit_tests/sources/helper/api_specific_config_l0_tests.cpp index e2f715d9df..b19dfcc24d 100644 --- a/level_zero/core/test/unit_tests/sources/helper/api_specific_config_l0_tests.cpp +++ b/level_zero/core/test/unit_tests/sources/helper/api_specific_config_l0_tests.cpp @@ -48,9 +48,9 @@ TEST(ApiSpecificConfigL0Tests, WhenCheckingIfHostDeviceAllocationCacheIsEnabledT EXPECT_FALSE(ApiSpecificConfig::isDeviceAllocationCacheEnabled()); } -TEST(ApiSpecificConfigL0Tests, WhenCheckingIfUsmAllocPoolingIsEnabledThenReturnFalse) { +TEST(ApiSpecificConfigL0Tests, WhenCheckingIfUsmAllocPoolingIsEnabledThenReturnCorrectValue) { EXPECT_FALSE(ApiSpecificConfig::isHostUsmPoolingEnabled()); - EXPECT_FALSE(ApiSpecificConfig::isDeviceUsmPoolingEnabled()); + EXPECT_TRUE(ApiSpecificConfig::isDeviceUsmPoolingEnabled()); } TEST(ApiSpecificConfigL0Tests, GivenDebugFlagCombinationsGetCorrectSharedAllocPrefetchEnabled) {