Merge pull request #1768 from raiyanla/enable-in-order-default

[L0] Enable default support for L0 in-order lists

Author: kbenzie

source/adapters/level_zero/command_buffer.cpp

@@ -27,31 +27,6 @@ template <typename T> T *getPointerFromVector(std::vector<T> &V) {
   return V.size() == 0 ? nullptr : V.data();
 }
 
-/**
- * Checks the version of the level-zero driver.
- * @param[in] Context Execution context
- * @param[in] VersionMajor Major version number to compare to.
- * @param[in] VersionMinor Minor version number to compare to.
- * @param[in] VersionBuild Build version number to compare to.
- * @return true if the version of the driver is higher than or equal to the
- * compared version.
- */
-bool isDriverVersionNewerOrSimilar(ur_context_handle_t Context,
-                                   uint32_t VersionMajor, uint32_t VersionMinor,
-                                   uint32_t VersionBuild) {
-  ZeStruct<ze_driver_properties_t> ZeDriverProperties;
-  ZE2UR_CALL(zeDriverGetProperties,
-             (Context->getPlatform()->ZeDriver, &ZeDriverProperties));
-  uint32_t DriverVersion = ZeDriverProperties.driverVersion;
-  auto DriverVersionMajor = (DriverVersion & 0xFF000000) >> 24;
-  auto DriverVersionMinor = (DriverVersion & 0x00FF0000) >> 16;
-  auto DriverVersionBuild = DriverVersion & 0x0000FFFF;
-
-  return ((DriverVersionMajor >= VersionMajor) &&
-          (DriverVersionMinor >= VersionMinor) &&
-          (DriverVersionBuild >= VersionBuild));
-}
-
 /**
  * Default to using compute engine for fill operation, but allow to override
  * this with an environment variable. Disable the copy engine if the pattern
@@ -637,7 +612,8 @@ ur_result_t createMainCommandList(ur_context_handle_t Context,
 bool canBeInOrder(ur_context_handle_t Context,
                   const ur_exp_command_buffer_desc_t *CommandBufferDesc) {
   // In-order command-lists are not available in old driver version.
-  bool CompatibleDriver = isDriverVersionNewerOrSimilar(Context, 1, 3, 28454);
+  bool CompatibleDriver = isDriverVersionNewerOrSimilar(
+      Context->getPlatform()->ZeDriver, 1, 3, L0_DRIVER_INORDER_MIN_VERSION);
   return CompatibleDriver
              ? (CommandBufferDesc ? CommandBufferDesc->isInOrder : false)
              : false;

source/adapters/level_zero/common.cpp

@@ -67,6 +67,28 @@ ur_result_t ze2urResult(ze_result_t ZeResult) {
   }
 }
 
+/// Checks the version of the level-zero driver.
+/// @param ZeDriver Level Zero Driver handle
+/// @param VersionMajor Major verion number to compare to.
+/// @param VersionMinor Minor verion number to compare to.
+/// @param VersionBuild Build verion number to compare to.
+/// @return true is the version of the driver is higher than or equal to the
+/// compared version
+bool isDriverVersionNewerOrSimilar(ze_driver_handle_t ZeDriver,
+                                   uint32_t VersionMajor, uint32_t VersionMinor,
+                                   uint32_t VersionBuild) {
+  ZeStruct<ze_driver_properties_t> ZeDriverProperties;
+  ZE2UR_CALL(zeDriverGetProperties, (ZeDriver, &ZeDriverProperties));
+  uint32_t DriverVersion = ZeDriverProperties.driverVersion;
+  auto DriverVersionMajor = (DriverVersion & 0xFF000000) >> 24;
+  auto DriverVersionMinor = (DriverVersion & 0x00FF0000) >> 16;
+  auto DriverVersionBuild = DriverVersion & 0x0000FFFF;
+
+  return ((DriverVersionMajor >= VersionMajor) &&
+          (DriverVersionMinor >= VersionMinor) &&
+          (DriverVersionBuild >= VersionBuild));
+}
+
 // This function will ensure compatibility with both Linux and Windows for
 // setting environment variables.
 bool setEnvVar(const char *name, const char *value) {

source/adapters/level_zero/common.hpp

@@ -317,6 +317,11 @@ bool setEnvVar(const char *name, const char *value);
 // Map Level Zero runtime error code to UR error code.
 ur_result_t ze2urResult(ze_result_t ZeResult);
 
+/// Checks the version of the level-zero driver.
+bool isDriverVersionNewerOrSimilar(ze_driver_handle_t ZeDriver,
+                                   uint32_t VersionMajor, uint32_t VersionMinor,
+                                   uint32_t VersionBuild);
+
 // Trace a call to Level-Zero RT
 #define ZE2UR_CALL(ZeName, ZeArgs)                                             \
   {                                                                            \
@@ -506,3 +511,5 @@ extern thread_local int32_t ErrorAdapterNativeCode;
 [[maybe_unused]] void setErrorMessage(const char *pMessage,
                                       ur_result_t ErrorCode,
                                       int32_t AdapterErrorCode);
+
+#define L0_DRIVER_INORDER_MIN_VERSION 29534

source/adapters/level_zero/device.cpp

@@ -1107,10 +1107,15 @@ bool ur_device_handle_t_::useRelaxedAllocationLimits() {
 bool ur_device_handle_t_::useDriverInOrderLists() {
   // Use in-order lists implementation from L0 driver instead
   // of adapter's implementation.
-  static const bool UseDriverInOrderLists = [] {
+
+  ze_driver_handle_t ZeDriver = this->Platform->ZeDriver;
+
+  static const bool UseDriverInOrderLists = [&] {
     const char *UrRet = std::getenv("UR_L0_USE_DRIVER_INORDER_LISTS");
+    bool CompatibleDriver = isDriverVersionNewerOrSimilar(
+        ZeDriver, 1, 3, L0_DRIVER_INORDER_MIN_VERSION);
     if (!UrRet)
-      return false;
+      return CompatibleDriver;
     return std::atoi(UrRet) != 0;
   }();