[SYCL] Support for >1 Level-Zero drivers (#3418)

Signed-off-by: Sergey V Maslov <[email protected]>

Author: smaslov-intel

sycl/plugins/level_zero/pi_level_zero.cpp

@@ -74,7 +74,7 @@ std::mutex ZeCall::GlobalLock;
 // Controls PI level tracing prints.
 static bool PrintPiTrace = false;
 
-// Map Level Zero runtime error code to PI error code
+// Map Level Zero runtime error code to PI error code.
 static pi_result mapError(ze_result_t ZeResult) {
   // TODO: these mapping need to be clarified and synced with the PI API return
   // values, which is TBD.
@@ -592,6 +592,26 @@ pi_result _pi_queue::resetCommandListFenceEntry(
   return PI_SUCCESS;
 }
 
+// Maximum Number of Command Lists that can be created.
+// This Value is initialized to 20000, but can be changed by the user
+// thru the environment variable SYCL_PI_LEVEL_ZERO_MAX_COMMAND_LIST_CACHE
+// ie SYCL_PI_LEVEL_ZERO_MAX_COMMAND_LIST_CACHE =10000.
+static const int ZeMaxCommandListCacheSize = [] {
+  const char *CommandListCacheSize =
+      std::getenv("SYCL_PI_LEVEL_ZERO_MAX_COMMAND_LIST_CACHE");
+  pi_uint32 CommandListCacheSizeValue;
+  try {
+    CommandListCacheSizeValue =
+        CommandListCacheSize ? std::stoi(CommandListCacheSize) : 20000;
+  } catch (std::exception const &) {
+    zePrint(
+        "SYCL_PI_LEVEL_ZERO_MAX_COMMAND_LIST_CACHE: invalid value provided, "
+        "default set.\n");
+    CommandListCacheSizeValue = 20000;
+  }
+  return CommandListCacheSizeValue;
+}();
+
 static const pi_uint32 ZeCommandListBatchSize = [] {
   // Default value of 0. This specifies to use dynamic batch size adjustment.
   pi_uint32 BatchSizeVal = 0;
@@ -692,7 +712,7 @@ pi_result _pi_context::getAvailableCommandList(
   // map.
   if ((*ZeCommandList == nullptr) &&
       (Queue->Device->Platform->ZeGlobalCommandListCount <
-       Queue->Device->Platform->ZeMaxCommandListCache)) {
+       ZeMaxCommandListCacheSize)) {
     ZE_CALL(zeCommandListCreate,
             (Queue->Context->ZeContext, Queue->Device->ZeDevice,
              &ZeCommandListDesc, ZeCommandList));
@@ -982,6 +1002,27 @@ static bool setEnvVar(const char *name, const char *value) {
   return true;
 }
 
+pi_result _pi_platform::initialize() {
+  // Cache driver properties
+  ze_driver_properties_t ZeDriverProperties;
+  ZE_CALL(zeDriverGetProperties, (ZeDriver, &ZeDriverProperties));
+  uint32_t DriverVersion = ZeDriverProperties.driverVersion;
+  // Intel Level-Zero GPU driver stores version as:
+  // | 31 - 24 | 23 - 16 | 15 - 0 |
+  // |  Major  |  Minor  | Build  |
+  auto VersionMajor = std::to_string((DriverVersion & 0xFF000000) >> 24);
+  auto VersionMinor = std::to_string((DriverVersion & 0x00FF0000) >> 16);
+  auto VersionBuild = std::to_string(DriverVersion & 0x0000FFFF);
+  ZeDriverVersion = VersionMajor + "." + VersionMinor + "." + VersionBuild;
+
+  ze_api_version_t ZeApiVersion;
+  ZE_CALL(zeDriverGetApiVersion, (ZeDriver, &ZeApiVersion));
+  ZeDriverApiVersion = std::to_string(ZE_MAJOR_VERSION(ZeApiVersion)) + "." +
+                       std::to_string(ZE_MINOR_VERSION(ZeApiVersion));
+
+  return PI_SUCCESS;
+}
+
 pi_result piPlatformsGet(pi_uint32 NumEntries, pi_platform *Platforms,
                          pi_uint32 *NumPlatforms) {
 
@@ -1048,58 +1089,27 @@ pi_result piPlatformsGet(pi_uint32 NumEntries, pi_platform *Platforms,
 
   const std::lock_guard<sycl::detail::SpinLock> Lock{*PiPlatformsCacheMutex};
   if (!PiPlatformCachePopulated) {
-    const char *CommandListCacheSize =
-        std::getenv("SYCL_PI_LEVEL_ZERO_MAX_COMMAND_LIST_CACHE");
-    pi_uint32 CommandListCacheSizeValue;
     try {
-      CommandListCacheSizeValue =
-          CommandListCacheSize ? std::stoi(CommandListCacheSize) : 20000;
-    } catch (std::exception const &) {
-      zePrint(
-          "SYCL_PI_LEVEL_ZERO_MAX_COMMAND_LIST_CACHE: invalid value provided, "
-          "default set.\n");
-      CommandListCacheSizeValue = 20000;
-    }
-
-    try {
-
       // Level Zero does not have concept of Platforms, but Level Zero driver is
       // the closest match.
       uint32_t ZeDriverCount = 0;
       ZE_CALL(zeDriverGet, (&ZeDriverCount, nullptr));
       if (ZeDriverCount == 0) {
         PiPlatformCachePopulated = true;
       } else {
-        ze_driver_handle_t ZeDriver;
-        PI_ASSERT(ZeDriverCount == 1, PI_INVALID_VALUE);
-
-        ZE_CALL(zeDriverGet, (&ZeDriverCount, &ZeDriver));
-        pi_platform Platform = new _pi_platform(ZeDriver);
-
-        // Cache driver properties
-        ze_driver_properties_t ZeDriverProperties;
-        ZE_CALL(zeDriverGetProperties, (ZeDriver, &ZeDriverProperties));
-        uint32_t ZeDriverVersion = ZeDriverProperties.driverVersion;
-        // Intel Level-Zero GPU driver stores version as:
-        // | 31 - 24 | 23 - 16 | 15 - 0 |
-        // |  Major  |  Minor  | Build  |
-        auto VersionMajor =
-            std::to_string((ZeDriverVersion & 0xFF000000) >> 24);
-        auto VersionMinor =
-            std::to_string((ZeDriverVersion & 0x00FF0000) >> 16);
-        auto VersionBuild = std::to_string(ZeDriverVersion & 0x0000FFFF);
-        Platform->ZeDriverVersion =
-            VersionMajor + "." + VersionMinor + "." + VersionBuild;
-
-        ze_api_version_t ZeApiVersion;
-        ZE_CALL(zeDriverGetApiVersion, (ZeDriver, &ZeApiVersion));
-        Platform->ZeDriverApiVersion =
-            std::to_string(ZE_MAJOR_VERSION(ZeApiVersion)) + "." +
-            std::to_string(ZE_MINOR_VERSION(ZeApiVersion));
-
-        Platform->ZeMaxCommandListCache = CommandListCacheSizeValue;
-        // Save a copy in the cache for future uses.
-        PiPlatformsCache->push_back(Platform);
+        std::vector<ze_driver_handle_t> ZeDrivers;
+        ZeDrivers.resize(ZeDriverCount);
+
+        ZE_CALL(zeDriverGet, (&ZeDriverCount, ZeDrivers.data()));
+        for (uint32_t I = 0; I < ZeDriverCount; ++I) {
+          pi_platform Platform = new _pi_platform(ZeDrivers[I]);
+          pi_result Result = Platform->initialize();
+          if (Result != PI_SUCCESS) {
+            return Result;
+          }
+          // Save a copy in the cache for future uses.
+          PiPlatformsCache->push_back(Platform);
+        }
         PiPlatformCachePopulated = true;
       }
     } catch (const std::bad_alloc &) {
@@ -1109,16 +1119,10 @@ pi_result piPlatformsGet(pi_uint32 NumEntries, pi_platform *Platforms,
     }
   }
 
-  if (Platforms && NumEntries > 0) {
-    uint32_t I = 0;
-    for (const pi_platform &CachedPlatform : *PiPlatformsCache) {
-      if (I < NumEntries) {
-        *Platforms++ = CachedPlatform;
-        I++;
-      } else {
-        break;
-      }
-    }
+  // Populate returned platforms from the cache.
+  if (Platforms) {
+    PI_ASSERT(NumEntries <= PiPlatformsCache->size(), PI_INVALID_PLATFORM);
+    std::copy_n(PiPlatformsCache->begin(), NumEntries, Platforms);
   }
 
   if (NumPlatforms)

sycl/plugins/level_zero/pi_level_zero.hpp

@@ -68,6 +68,8 @@ struct _pi_object {
 
 struct _pi_platform {
   _pi_platform(ze_driver_handle_t Driver) : ZeDriver{Driver} {}
+  // Performs initialization of a newly constructed PI platform.
+  pi_result initialize();
 
   // Level Zero lacks the notion of a platform, but there is a driver, which is
   // a pretty good fit to keep here.
@@ -83,12 +85,6 @@ struct _pi_platform {
   pi_device getDeviceFromNativeHandle(ze_device_handle_t);
   bool DeviceCachePopulated = false;
 
-  // Maximum Number of Command Lists that can be created.
-  // This Value is initialized to 20000, but can be changed by the user
-  // thru the environment variable SYCL_PI_LEVEL_ZERO_MAX_COMMAND_LIST_CACHE
-  // ie SYCL_PI_LEVEL_ZERO_MAX_COMMAND_LIST_CACHE =10000.
-  int ZeMaxCommandListCache = 0;
-
   // Current number of L0 Command Lists created on this platform.
   // this number must not exceed ZeMaxCommandListCache.
   std::atomic<int> ZeGlobalCommandListCount{0};