Remove preload of all drivers given zeInitDrivers and update unit tes…

…ts (#218) Signed-off-by: Neil R. Spruit <[email protected]>
oneapi-src · Oct 15, 2024 · 0f25fdc · 0f25fdc
1 parent 8065e6f
commit 0f25fdc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/source/lib/ze_libapi.cpp b/source/lib/ze_libapi.cpp
@@ -192,12 +192,8 @@ zeInitDrivers(
     )
 {
     static ze_result_t result = ZE_RESULT_SUCCESS;
-    std::call_once(ze_lib::context->initOnceDrivers, []() {
-        ze_init_flags_t all_enabled = UINT32_MAX;
-        ze_init_driver_type_desc_t all_enabled_desc = {ZE_STRUCTURE_TYPE_INIT_DRIVER_TYPE_DESC};
-        all_enabled_desc.pNext = nullptr;
-        all_enabled_desc.flags = UINT32_MAX;
-        result = ze_lib::context->Init(all_enabled, false, &all_enabled_desc);
+    std::call_once(ze_lib::context->initOnceDrivers, [desc]() {
+        result = ze_lib::context->Init(0, false, desc);
         return result;
     });
 

diff --git a/test/loader_api.cpp b/test/loader_api.cpp
@@ -59,9 +59,11 @@ TEST(
   putenv_safe( const_cast<char *>( "ZEL_TEST_NULL_DRIVER_TYPE=GPU" ) );
   EXPECT_EQ(ZE_RESULT_SUCCESS, zeInitDrivers(&pCount, nullptr, &desc));
   EXPECT_GT(pCount, 0);
+  pCount = 0;
   desc.flags = UINT32_MAX;
   EXPECT_EQ(ZE_RESULT_SUCCESS, zeInitDrivers(&pCount, nullptr, &desc));
   EXPECT_GT(pCount, 0);
+  pCount = 0;
   desc.flags = ZE_INIT_DRIVER_TYPE_FLAG_GPU | ZE_INIT_DRIVER_TYPE_FLAG_NPU;
   EXPECT_EQ(ZE_RESULT_SUCCESS, zeInitDrivers(&pCount, nullptr, &desc));
   EXPECT_GT(pCount, 0);
@@ -78,9 +80,11 @@ TEST(
   putenv_safe( const_cast<char *>( "ZEL_TEST_NULL_DRIVER_TYPE=NPU" ) );
   EXPECT_EQ(ZE_RESULT_SUCCESS, zeInitDrivers(&pCount, nullptr, &desc));
   EXPECT_GT(pCount, 0);
+  pCount = 0;
   desc.flags = UINT32_MAX;
   EXPECT_EQ(ZE_RESULT_SUCCESS, zeInitDrivers(&pCount, nullptr, &desc));
   EXPECT_GT(pCount, 0);
+  pCount = 0;
   desc.flags = ZE_INIT_DRIVER_TYPE_FLAG_GPU | ZE_INIT_DRIVER_TYPE_FLAG_NPU;
   EXPECT_EQ(ZE_RESULT_SUCCESS, zeInitDrivers(&pCount, nullptr, &desc));
   EXPECT_GT(pCount, 0);
@@ -97,12 +101,15 @@ TEST(
   putenv_safe( const_cast<char *>( "ZEL_TEST_NULL_DRIVER_TYPE=ALL" ) );
   EXPECT_EQ(ZE_RESULT_SUCCESS, zeInitDrivers(&pCount, nullptr, &desc));
   EXPECT_GT(pCount, 0);
+  pCount = 0;
   desc.flags = UINT32_MAX;
   EXPECT_EQ(ZE_RESULT_SUCCESS, zeInitDrivers(&pCount, nullptr, &desc));
   EXPECT_GT(pCount, 0);
+  pCount = 0;
   desc.flags = ZE_INIT_DRIVER_TYPE_FLAG_GPU;
   EXPECT_EQ(ZE_RESULT_SUCCESS, zeInitDrivers(&pCount, nullptr, &desc));
   EXPECT_GT(pCount, 0);
+  pCount = 0;
   desc.flags = ZE_INIT_DRIVER_TYPE_FLAG_GPU | ZE_INIT_DRIVER_TYPE_FLAG_NPU;
   EXPECT_EQ(ZE_RESULT_SUCCESS, zeInitDrivers(&pCount, nullptr, &desc));
   EXPECT_GT(pCount, 0);