Enable DDI Driver Path by Default (#361)

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

Author: nrspruit

CHANGELOG.md

@@ -1,4 +1,6 @@
 # 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

CMakeLists.txt

@@ -13,7 +13,7 @@ if(MSVC AND (MSVC_VERSION LESS 1900))
 endif()
 
 # This project follows semantic versioning (https://semver.org/)
-project(level-zero VERSION 1.23.2)
+project(level-zero VERSION 1.24.0)
 
 include(GNUInstallDirs)
 

PRODUCT_GUID.txt

@@ -1,2 +1,2 @@
-1.23.2
-7a2306e5-ca56-4ead-9c90-28db3a445afd
+1.24.0
+2ba535f4-fef9-45e1-9ff6-66c4e0f629ff

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,7 +459,18 @@ namespace loader
         loader::loaderZetDdiTable = new zet_dditable_t();
         loader::loaderZesDdiTable = new zes_dditable_t();
         debugTraceEnabled = getenv_tobool( "ZE_ENABLE_LOADER_DEBUG_TRACE" );
-        driverDDIPathDefault = getenv_tobool( "ZE_ENABLE_LOADER_DRIVER_DDI_PATH" );
+        // 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");
+        if (ddiPathConfig.empty()) {
+            driverDDIPathDefault = true;
+        } else if (strcmp(ddiPathConfig.c_str(), "1") == 0 || strcmp(ddiPathConfig.c_str(), "true") == 0) {
+            driverDDIPathDefault = true;
+        } else if (strcmp(ddiPathConfig.c_str(), "0") == 0 || strcmp(ddiPathConfig.c_str(), "false") == 0) {
+            driverDDIPathDefault = false;
+        } else {
+            driverDDIPathDefault = true; // fallback to the default for any other value
+        }
         auto discoveredDrivers = discoverEnabledDrivers();
         std::string loadLibraryErrorValue;
 
@@ -487,6 +498,10 @@ namespace loader
         if (debugTraceEnabled)
             debug_trace_message("Using Loader Library Path: ", loaderLibraryPath);
 
+        if (debugTraceEnabled && driverDDIPathDefault) {
+            debug_trace_message("DDI Driver Extension Path is Enabled", "");
+        }
+
         // To allow for two different sets of drivers to be in use between sysman and core/tools, we use and store the drivers in two vectors.
         // alldrivers stores all the drivers for cleanup when the library exits.
         zeDrivers.reserve( discoveredDrivers.size() + getenv_tobool( "ZE_ENABLE_NULL_DRIVER" ) );