Fix null driver init and driver init checks

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

Author: nrspruit

scripts/templates/ldrddi.cpp.mako

@@ -76,13 +76,16 @@ namespace loader
             if(drv.initStatus != ZE_RESULT_SUCCESS)
                 continue;
             %endif
-            if (!drv.handle) {
+            if (!drv.handle || !drv.ddiInitialized) {
                 %if namespace != "zes":
                 bool sysmanInit = false;
                 %else:
                 bool sysmanInit = true;
                 %endif
-                loader::context->init_driver( drv, flags, nullptr, nullptr, nullptr, sysmanInit );
+                auto res = loader::context->init_driver( drv, flags, nullptr, nullptr, nullptr, sysmanInit );
+                if (res != ZE_RESULT_SUCCESS) {
+                    continue;
+                }
             }
         %if re.match(r"Init", obj['name']) and namespace == "zes":
             if (!drv.dditable.${n}.${th.get_table_name(n, tags, obj)}.${th.make_pfn_name(n, tags, obj)}) {

scripts/templates/ze_loader_internal.h.mako

@@ -135,6 +135,7 @@ namespace loader
         dditable_t tracing_dditable = {};
         std::shared_ptr<Logger> zel_logger;
         ze_driver_handle_t* defaultZerDriverHandle = nullptr;
+        bool ddiInitialized = false;
     };
 
     extern ze_handle_t* loaderDispatch;

source/loader/ze_ldrddi.cpp

@@ -153,9 +153,12 @@ namespace loader
         {
             if(drv.initStatus != ZE_RESULT_SUCCESS)
                 continue;
-            if (!drv.handle) {
+            if (!drv.handle || !drv.ddiInitialized) {
                 bool sysmanInit = false;
-                loader::context->init_driver( drv, flags, nullptr, nullptr, nullptr, sysmanInit );
+                auto res = loader::context->init_driver( drv, flags, nullptr, nullptr, nullptr, sysmanInit );
+                if (res != ZE_RESULT_SUCCESS) {
+                    continue;
+                }
             }
             drv.initStatus = drv.dditable.ze.Global.pfnInit( flags );
             if(drv.initStatus == ZE_RESULT_SUCCESS)

source/loader/ze_loader.cpp

@@ -509,10 +509,6 @@ namespace loader
             if( NULL != handle )
             {
                 driver.handle = handle;
-                loader::zeloaderInitDriverDDITables(&driver);
-                loader::zesloaderInitDriverDDITables(&driver);
-                loader::zetloaderInitDriverDDITables(&driver);
-                loader::zerloaderInitDriverDDITables(&driver);
             } else {
                 std::string loadLibraryErrorValue;
                 GET_LIBRARY_ERROR(loadLibraryErrorValue);
@@ -524,6 +520,42 @@ namespace loader
             }
         }
 
+        if (driver.handle && !driver.ddiInitialized) {
+            auto res = loader::zeloaderInitDriverDDITables(&driver);
+            if (res != ZE_RESULT_SUCCESS) {
+                if (debugTraceEnabled) {
+                    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;
+        }
+
         return ZE_RESULT_SUCCESS;
     }
 

source/loader/ze_loader_internal.h

@@ -171,6 +171,7 @@ namespace loader
         dditable_t tracing_dditable = {};
         std::shared_ptr<Logger> zel_logger;
         ze_driver_handle_t* defaultZerDriverHandle = nullptr;
+        bool ddiInitialized = false;
     };
 
     extern ze_handle_t* loaderDispatch;

source/loader/zes_ldrddi.cpp

@@ -129,9 +129,12 @@ namespace loader
         {
             if(drv.initStatus != ZE_RESULT_SUCCESS || drv.initSysManStatus != ZE_RESULT_SUCCESS)
                 continue;
-            if (!drv.handle) {
+            if (!drv.handle || !drv.ddiInitialized) {
                 bool sysmanInit = true;
-                loader::context->init_driver( drv, flags, nullptr, nullptr, nullptr, sysmanInit );
+                auto res = loader::context->init_driver( drv, flags, nullptr, nullptr, nullptr, sysmanInit );
+                if (res != ZE_RESULT_SUCCESS) {
+                    continue;
+                }
             }
             if (!drv.dditable.zes.Global.pfnInit) {
                 drv.initSysManStatus = ZE_RESULT_ERROR_UNINITIALIZED;