Fix SysMan driver get testing (#83)

Signed-off-by: Neil R. Spruit <[email protected]>

Author: nrspruit

conformance_tests/sysman/test_sysman_device/src/test_sysman_device_helper.cpp

@@ -96,8 +96,18 @@ int main(int argc, char **argv) {
     exit(1);
   }
   LOG_INFO << "Child Process : Sysman initialized";
-
-  auto sysman_devices = lzt::get_zes_devices();
+  // We must retrieve the SysMan Drivers on the system, then verify that the driver has valid devices.
+  // The first driver with valid devices will be used.
+  auto zes_drivers = lzt::get_all_zes_driver_handles();
+  zes_driver_handle_t zes_driver_used;
+  for (const auto &zes_driver : zes_drivers) {
+    auto device_count = lzt::get_zes_device_count(zes_driver);
+    if (device_count > 0) {
+      zes_driver_used = zes_driver;
+      break;
+    }
+  }
+  auto sysman_devices = lzt::get_zes_devices(lzt::get_zes_device_count(zes_driver_used), zes_driver_used);
   EXPECT_FALSE(sysman_devices.empty());
 
   std::vector<UUID> sysman_device_uuids{};

conformance_tests/sysman/test_sysman_init/src/test_init_sysman_after_core.cpp

@@ -27,10 +27,10 @@ TEST(
   }
   ASSERT_EQ(ZE_RESULT_SUCCESS, zeInit(0));
   uint32_t zeInitCount = 0;
-  ASSERT_EQ(ZE_RESULT_SUCCESS, zeDriverGet(&zeInitCount, nullptr));
-  ASSERT_GT(zeInitCount, 0);
   ASSERT_EQ(ZE_RESULT_SUCCESS, zesInit(0));
   uint32_t zesInitCount = 0;
+  ASSERT_EQ(ZE_RESULT_SUCCESS, zeDriverGet(&zeInitCount, nullptr));
+  ASSERT_GT(zeInitCount, 0);
   ASSERT_EQ(ZE_RESULT_SUCCESS, zesDriverGet(&zesInitCount, nullptr));
   ASSERT_GT(zesInitCount, 0);
   if (is_sysman_enabled != nullptr && strcmp(is_sysman_enabled, "1") == 0) {

conformance_tests/sysman/test_sysman_init/src/test_init_sysman_before_core.cpp

@@ -19,10 +19,10 @@ namespace {
 TEST(SysmanInitTests, GivenSysmanInitializedThenCallingCoreInitSucceeds) {
   ASSERT_EQ(ZE_RESULT_SUCCESS, zesInit(0));
   uint32_t zesInitCount = 0;
-  ASSERT_EQ(ZE_RESULT_SUCCESS, zesDriverGet(&zesInitCount, nullptr));
-  ASSERT_GT(zesInitCount, 0);
   ASSERT_EQ(ZE_RESULT_SUCCESS, zeInit(0));
   uint32_t zeInitCount = 0;
+  ASSERT_EQ(ZE_RESULT_SUCCESS, zesDriverGet(&zesInitCount, nullptr));
+  ASSERT_GT(zesInitCount, 0);
   ASSERT_EQ(ZE_RESULT_SUCCESS, zeDriverGet(&zeInitCount, nullptr));
   ASSERT_GT(zeInitCount, 0);
 }

utils/test_harness/sysman/include/test_harness_sysman_device.hpp

@@ -21,6 +21,9 @@ get_sysman_device_properties(zes_device_handle_t device);
 
 zes_uuid_t get_sysman_device_uuid(zes_device_handle_t device);
 
+uint32_t get_zes_device_count(zes_driver_handle_t driver);
+std::vector<zes_device_handle_t> get_zes_devices(uint32_t count,
+                                                 zes_driver_handle_t driver);
 std::vector<zes_subdevice_exp_properties_t>
 get_sysman_subdevice_properties(zes_device_handle_t device, uint32_t &count);
 

utils/utils/include/utils/utils.hpp

@@ -23,6 +23,7 @@ namespace level_zero_tests {
 zes_driver_handle_t get_default_zes_driver();
 
 ze_context_handle_t get_default_context();
+std::vector<zes_driver_handle_t> get_all_zes_driver_handles();
 ze_device_handle_t get_default_device(ze_driver_handle_t driver);
 ze_device_handle_t find_device(ze_driver_handle_t &driver,
                                const char *device_id, bool sub_device);