Fix zellow world tracing for multiple drivers

Signed-off-by: Neil R. Spruit <neil.r.spruit@intel.com>

Author: nrspruit

samples/zello_world/zello_world.cpp

@@ -98,16 +98,6 @@ int main( int argc, char *argv[] )
             }
         }
 
-        if (tracing_enabled) {
-            zel_tracer_desc_t tracer_desc = {ZEL_STRUCTURE_TYPE_TRACER_EXP_DESC, nullptr,
-                nullptr};
-            status = zelTracerCreate(&tracer_desc, &tracer);
-            if(status != ZE_RESULT_SUCCESS) {
-                std::cout << "zelTracerCreate Failed with return code: " << to_string(status) << std::endl;
-                exit(1);
-            }
-        }
-
         if (legacy_init) {
             status = zeDriverGet(&driverCount, nullptr);
             if(status != ZE_RESULT_SUCCESS) {
@@ -154,6 +144,15 @@ int main( int argc, char *argv[] )
             std::cout << "No valid device found for Driver #" << driver_idx << std::endl;
             continue;
         }
+        if (tracing_enabled) {
+            zel_tracer_desc_t tracer_desc = {ZEL_STRUCTURE_TYPE_TRACER_EXP_DESC, nullptr,
+                nullptr};
+            status = zelTracerCreate(&tracer_desc, &tracer);
+            if(status != ZE_RESULT_SUCCESS) {
+                std::cout << "zelTracerCreate Failed with return code: " << to_string(status) << std::endl;
+                exit(1);
+            }
+        }
         pDriver = drivers[driver_idx];
         pDevice = devices_per_driver[driver_idx];
         std::cout << "Executing on Driver #" << driver_idx << ", Device #" << 0 << std::endl;

source/loader/ze_loader.cpp

@@ -324,8 +324,9 @@ namespace loader
                     continue;
                 }
             } else {
+                res = ZE_RESULT_ERROR_UNINITIALIZED;
                 if (debugTraceEnabled) {
-                    std::string message = "driverSorting " + driver.name + " zeDriverGet and zeInitDrivers not supported, skipping driver";
+                    std::string message = "driverSorting " + driver.name + " zeDriverGet and zeInitDrivers not supported, skipping driver with error ";
                     debug_trace_message(message, loader::to_string(res));
                 }
                 continue;
@@ -544,31 +545,27 @@ namespace loader
                     std::string message = "init driver " + driver.name + " failed, zeloaderInitDriverDDITables returned ";
                     debug_trace_message(message, loader::to_string(res));
                 }
-                return res;
             }
             res = loader::zesloaderInitDriverDDITables(&driver);
             if (res != ZE_RESULT_SUCCESS) {
                 if (debugTraceEnabled) {
                     std::string message = "init driver " + driver.name + " failed, zesloaderInitDriverDDITables returned ";
                     debug_trace_message(message, loader::to_string(res));
                 }
-                return res;
             }
             res = loader::zetloaderInitDriverDDITables(&driver);
             if (res != ZE_RESULT_SUCCESS) {
                 if (debugTraceEnabled) {
                     std::string message = "init driver " + driver.name + " failed, zetloaderInitDriverDDITables returned ";
                     debug_trace_message(message, loader::to_string(res));
                 }
-                return res;
             }
             res = loader::zerloaderInitDriverDDITables(&driver);
             if (res != ZE_RESULT_SUCCESS) {
                 if (debugTraceEnabled) {
                     std::string message = "init driver " + driver.name + " failed, zerloaderInitDriverDDITables returned ";
                     debug_trace_message(message, loader::to_string(res));
                 }
-                return res;
             }
             driver.ddiInitialized = true;
         }
@@ -676,29 +673,6 @@ namespace loader
             allDrivers.emplace_back();
             allDrivers.rbegin()->handle = nullptr;
             allDrivers.rbegin()->name = name;
-//             auto handle = LOAD_DRIVER_LIBRARY( name.c_str() );
-//             if( NULL != handle )
-//             {
-//                 if (debugTraceEnabled) {
-//                     std::string message = "Loading Driver " + name + " succeeded";
-// #if !defined(_WIN32) && !defined(ANDROID)
-//                     // TODO: implement same message for windows, move dlinfo to ze_util.h as a macro
-//                     struct link_map *dlinfo_map;
-//                     if (dlinfo(handle, RTLD_DI_LINKMAP, &dlinfo_map) == 0) {
-//                         message += " from: " + std::string(dlinfo_map->l_name);
-//                     }
-// #endif
-//                     debug_trace_message(message, "");
-//                 }
-//                 allDrivers.emplace_back();
-//                 allDrivers.rbegin()->handle = handle;
-//                 allDrivers.rbegin()->name = name;
-//             } else if (debugTraceEnabled) {
-//                 GET_LIBRARY_ERROR(loadLibraryErrorValue);
-//                 std::string errorMessage = "Load Library of " + name + " failed with ";
-//                 debug_trace_message(errorMessage, loadLibraryErrorValue);
-//                 loadLibraryErrorValue.clear();
-//             }
         }
         if(allDrivers.size()==0){
             if (debugTraceEnabled) {
@@ -777,7 +751,7 @@ namespace loader
         driverEnvironmentQueried = true;
 
         // Set default driver handle and DDI table to the first driver in the list before sorting.
-        loader::context->defaultZerDriverHandle = &loader::context->zeDrivers.front().zerDriverHandle;
+        loader::context->defaultZerDriverHandle = loader::context->zeDrivers.front().zerDriverHandle;
         loader::defaultZerDdiTable = &loader::context->zeDrivers.front().dditable.zer;
 
         zel_logger->log_info("zeInit succeeded");

source/loader/zer_ldrddi.cpp

@@ -142,14 +142,7 @@ zerGetGlobalProcAddrTableFromDriver(loader::driver_t *driver)
         GET_FUNCTION_PTR( driver->handle, "zerGetGlobalProcAddrTable") );
     if(!getTable) 
         return driver->initStatus;
-    auto getTableResult = getTable( loader::context->ddi_init_version, &driver->dditable.zer.Global);
-    if(getTableResult == ZE_RESULT_SUCCESS) {
-        loader::context->configured_version = loader::context->ddi_init_version;
-    } else
-        driver->initStatus = getTableResult;
-    if (driver->dditable.ze.Global.pfnInitDrivers) {
-        loader::context->initDriversSupport = true;
-    }
+    result = getTable( loader::context->ddi_init_version, &driver->dditable.zer.Global);
     return result;
 }
 ///////////////////////////////////////////////////////////////////////////////