Merge branch 'master' into ddi_driver_ext_default

Author: nrspruit

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Level zero loader changelog
 ## v1.24.0
 * Enable DDI Driver Extension path by default.
+## v1.23.2
+* fix: Avoid invalid casting into loader objects when DDI extension is supported
+* Fix potential SIOF issue with checker layers
 ## v1.23.1
 * Fix Sysman only DDI Init for zesDriver compatability
 ## v1.23.0

source/drivers/null/ze_null.cpp

@@ -166,6 +166,17 @@ namespace driver
             return ZE_RESULT_SUCCESS;
         };
 
+        //////////////////////////////////////////////////////////////////////////
+        zeDdiTable.CommandList.pfnCreateImmediate = [](
+            ze_context_handle_t,
+            ze_device_handle_t,
+            const ze_command_queue_desc_t* desc,
+            ze_command_list_handle_t* phCommandListImmediate )
+        {
+            *phCommandListImmediate = reinterpret_cast<ze_command_list_handle_t>(context.get());
+            return ZE_RESULT_SUCCESS;
+        };
+
         //////////////////////////////////////////////////////////////////////////
         zeDdiTable.CommandQueue.pfnCreate = [](
             ze_context_handle_t,

source/layers/validation/checkers/certification/zel_certification_checker.cpp

@@ -38,7 +38,7 @@ certificationChecker::certificationChecker() {
     certification_checker.zeValidation = zeChecker;
     certification_checker.zetValidation = zetChecker;
     certification_checker.zesValidation = zesChecker;
-    validation_layer::context.validationHandlers.push_back(
+    validation_layer::context.getInstance().validationHandlers.push_back(
         &certification_checker);
   }
 }

source/lib/ze_lib.cpp

@@ -397,7 +397,7 @@ namespace ze_lib
                     debug_trace_message(message, to_string(register_teardown_result));
                 } else {
                     loaderTeardownRegistrationEnabled = true;
-                    std::string message = "ze_lib Context Init() zelRegisterTeardownCallback completed for the static loader with";
+                    std::string message = "ze_lib Context Init() zelRegisterTeardownCallback completed for the static loader with ";
                     debug_trace_message(message, to_string(register_teardown_result));
                 }
             }

source/loader/ze_loader.cpp

@@ -459,9 +459,21 @@ namespace loader
         loader::loaderZetDdiTable = new zet_dditable_t();
         loader::loaderZesDdiTable = new zes_dditable_t();
         debugTraceEnabled = getenv_tobool( "ZE_ENABLE_LOADER_DEBUG_TRACE" );
-        // Set to true if the env is not set
+        // DDI Driver Extension Path is enabled by default.
+        // This can be overridden by the environment variable ZE_ENABLE_LOADER_DRIVER_DDI_PATH.
         std::string ddiPathConfig = getenv_string("ZE_ENABLE_LOADER_DRIVER_DDI_PATH");
-        driverDDIPathDefault = (ddiPathConfig.empty()) ? true : getenv_tobool("ZE_ENABLE_LOADER_DRIVER_DDI_PATH");
+        if (ddiPathConfig.empty()) {
+            driverDDIPathDefault = true;
+        } else if (ddiPathConfig == "1" || ddiPathConfig == "true") {
+            driverDDIPathDefault = true;
+        } else if (ddiPathConfig == "0" || ddiPathConfig == "false") {
+            driverDDIPathDefault = false;
+        } else {
+            driverDDIPathDefault = true; // fallback to the default for any other value
+        }
+        if (debugTraceEnabled && driverDDIPathDefault) {
+            debug_trace_message("DDI Driver Extension Path is Enabled", "");
+        }
         auto discoveredDrivers = discoverEnabledDrivers();
         std::string loadLibraryErrorValue;