[L0] Refactoring of boolean event parameters

Reverted deleted section.

Signed-off-by: Winston Zhang <[email protected]>

Author: winstonzhang-intel

source/adapters/level_zero/common.hpp

@@ -218,6 +218,13 @@ enum {
   UrL0SerializeBlock =
       2, // blocking UR calls, where supported (usually in enqueue commands)
 };
+typedef enum {
+  COUNTER_BASED = 1 << 0,
+  USING_IMM_CMDLIST = 1 << 1,
+  HOST_VISIBLE = 1 << 2,
+  ENABLE_PROFILER = 1 << 3,
+  MULTIDEVICE = 1 << 4
+} EventFlags;
 
 static const uint32_t UrL0Serialize = [] {
   const char *ZeSerializeMode = std::getenv("ZE_SERIALIZE");

source/adapters/level_zero/context.cpp

@@ -470,9 +470,8 @@ static const uint32_t MaxNumEventsPerPool = [] {
 }();
 
 ur_result_t ur_context_handle_t_::getFreeSlotInExistingOrNewPool(
-    ze_event_pool_handle_t &Pool, size_t &Index, bool HostVisible,
-    bool ProfilingEnabled, ur_device_handle_t Device,
-    bool CounterBasedEventEnabled, bool UsingImmCmdList) {
+    ze_event_pool_handle_t &Pool, size_t &Index, EventFlags Flags,
+    ur_device_handle_t Device) {
   // Lock while updating event pool machinery.
   std::scoped_lock<ur_mutex> Lock(ZeEventPoolCacheMutex);
 
@@ -482,8 +481,7 @@ ur_result_t ur_context_handle_t_::getFreeSlotInExistingOrNewPool(
     ZeDevice = Device->ZeDevice;
   }
   std::list<ze_event_pool_handle_t> *ZePoolCache =
-      getZeEventPoolCache(HostVisible, ProfilingEnabled,
-                          CounterBasedEventEnabled, UsingImmCmdList, ZeDevice);
+      getZeEventPoolCache(Flags, ZeDevice);
 
   if (!ZePoolCache->empty()) {
     if (NumEventsAvailableInEventPool[ZePoolCache->front()] == 0) {
@@ -514,14 +512,14 @@ ur_result_t ur_context_handle_t_::getFreeSlotInExistingOrNewPool(
     ZeEventPoolDesc.count = MaxNumEventsPerPool;
     ZeEventPoolDesc.flags = 0;
     ZeEventPoolDesc.pNext = nullptr;
-    if (HostVisible)
+    if (Flags & HOST_VISIBLE)
       ZeEventPoolDesc.flags |= ZE_EVENT_POOL_FLAG_HOST_VISIBLE;
-    if (ProfilingEnabled)
+    if (Flags & ENABLE_PROFILER)
       ZeEventPoolDesc.flags |= ZE_EVENT_POOL_FLAG_KERNEL_TIMESTAMP;
     logger::debug("ze_event_pool_desc_t flags set to: {}",
                   ZeEventPoolDesc.flags);
-    if (CounterBasedEventEnabled) {
-      if (UsingImmCmdList) {
+    if (Flags & COUNTER_BASED) {
+      if (Flags & USING_IMM_CMDLIST) {
         counterBasedExt.flags = ZE_EVENT_POOL_COUNTER_BASED_EXP_FLAG_IMMEDIATE;
       } else {
         counterBasedExt.flags =
@@ -553,17 +551,17 @@ ur_result_t ur_context_handle_t_::getFreeSlotInExistingOrNewPool(
   return UR_RESULT_SUCCESS;
 }
 
-ur_event_handle_t ur_context_handle_t_::getEventFromContextCache(
-    bool HostVisible, bool WithProfiling, ur_device_handle_t Device,
-    bool CounterBasedEventEnabled) {
+ur_event_handle_t
+ur_context_handle_t_::getEventFromContextCache(EventFlags Flags,
+                                               ur_device_handle_t Device) {
   std::scoped_lock<ur_mutex> Lock(EventCacheMutex);
-  auto Cache = getEventCache(HostVisible, WithProfiling, Device);
+  auto Cache = getEventCache(Flags, Device);
   if (Cache->empty())
     return nullptr;
 
   auto It = Cache->begin();
   ur_event_handle_t Event = *It;
-  if (Event->CounterBasedEventsEnabled != CounterBasedEventEnabled) {
+  if (Event->CounterBasedEventsEnabled != Flags & COUNTER_BASED) {
     return nullptr;
   }
   Cache->erase(It);
@@ -580,8 +578,11 @@ void ur_context_handle_t_::addEventToContextCache(ur_event_handle_t Event) {
     Device = Event->UrQueue->Device;
   }
 
-  auto Cache = getEventCache(Event->isHostVisible(),
-                             Event->isProfilingEnabled(), Device);
+  EventFlags Flags = static_cast<EventFlags>(
+      Event->isHostVisible()            ? HOST_VISIBLE
+      : 0 | Event->isProfilingEnabled() ? ENABLE_PROFILER
+                                        : 0);
+  auto Cache = getEventCache(Flags, Device);
   Cache->emplace_back(Event);
 }
 
@@ -604,9 +605,14 @@ ur_context_handle_t_::decrementUnreleasedEventsInPool(ur_event_handle_t Event) {
     ZeDevice = Event->UrQueue->Device->ZeDevice;
   }
 
-  std::list<ze_event_pool_handle_t> *ZePoolCache = getZeEventPoolCache(
-      Event->isHostVisible(), Event->isProfilingEnabled(),
-      Event->CounterBasedEventsEnabled, UsingImmediateCommandlists, ZeDevice);
+  EventFlags Flags = static_cast<EventFlags>(
+      Event->isHostVisible()                 ? HOST_VISIBLE
+      : 0 | Event->isProfilingEnabled()      ? ENABLE_PROFILER
+      : 0 | Event->CounterBasedEventsEnabled ? COUNTER_BASED
+      : 0 | UsingImmediateCommandlists       ? USING_IMM_CMDLIST
+                                             : 0);
+  std::list<ze_event_pool_handle_t> *ZePoolCache =
+      getZeEventPoolCache(Flags, ZeDevice);
 
   // Put the empty pool to the cache of the pools.
   if (NumEventsUnreleasedInEventPool[Event->ZeEventPool] == 0)

source/adapters/level_zero/context.hpp

@@ -197,17 +197,12 @@ struct ur_context_handle_t_ : _ur_object {
   // slot for a host-visible event. The ProfilingEnabled tells is we need a
   // slot for an event with profiling capabilities.
   ur_result_t getFreeSlotInExistingOrNewPool(ze_event_pool_handle_t &, size_t &,
-                                             bool HostVisible,
-                                             bool ProfilingEnabled,
-                                             ur_device_handle_t Device,
-                                             bool CounterBasedEventEnabled,
-                                             bool UsingImmCmdList);
+                                             EventFlags Flags,
+                                             ur_device_handle_t Device);
 
   // Get ur_event_handle_t from cache.
-  ur_event_handle_t getEventFromContextCache(bool HostVisible,
-                                             bool WithProfiling,
-                                             ur_device_handle_t Device,
-                                             bool CounterBasedEventEnabled);
+  ur_event_handle_t getEventFromContextCache(EventFlags Flags,
+                                             ur_device_handle_t Device);
 
   // Add ur_event_handle_t to cache.
   void addEventToContextCache(ur_event_handle_t);
@@ -222,45 +217,42 @@ struct ur_context_handle_t_ : _ur_object {
   };
 
   std::list<ze_event_pool_handle_t> *
-  getZeEventPoolCache(bool HostVisible, bool WithProfiling,
-                      bool CounterBasedEventEnabled, bool UsingImmediateCmdList,
-                      ze_device_handle_t ZeDevice) {
+  getZeEventPoolCache(EventFlags Flags, ze_device_handle_t ZeDevice) {
     EventPoolCacheType CacheType;
 
-    calculateCacheIndex(HostVisible, CounterBasedEventEnabled,
-                        UsingImmediateCmdList, CacheType);
+    calculateCacheIndex(Flags, CacheType);
     if (ZeDevice) {
       auto ZeEventPoolCacheMap =
-          WithProfiling ? &ZeEventPoolCacheDeviceMap[CacheType * 2]
-                        : &ZeEventPoolCacheDeviceMap[CacheType * 2 + 1];
+          Flags & ENABLE_PROFILER
+              ? &ZeEventPoolCacheDeviceMap[CacheType * 2]
+              : &ZeEventPoolCacheDeviceMap[CacheType * 2 + 1];
       if (ZeEventPoolCacheMap->find(ZeDevice) == ZeEventPoolCacheMap->end()) {
         ZeEventPoolCache.emplace_back();
         ZeEventPoolCacheMap->insert(
             std::make_pair(ZeDevice, ZeEventPoolCache.size() - 1));
       }
       return &ZeEventPoolCache[(*ZeEventPoolCacheMap)[ZeDevice]];
     } else {
-      return WithProfiling ? &ZeEventPoolCache[CacheType * 2]
-                           : &ZeEventPoolCache[CacheType * 2 + 1];
+      return Flags & ENABLE_PROFILER ? &ZeEventPoolCache[CacheType * 2]
+                                     : &ZeEventPoolCache[CacheType * 2 + 1];
     }
   }
 
-  ur_result_t calculateCacheIndex(bool HostVisible,
-                                  bool CounterBasedEventEnabled,
-                                  bool UsingImmediateCmdList,
+  ur_result_t calculateCacheIndex(EventFlags Flags,
                                   EventPoolCacheType &CacheType) {
-    if (CounterBasedEventEnabled && HostVisible && !UsingImmediateCmdList) {
+    if (Flags & COUNTER_BASED && Flags & HOST_VISIBLE &&
+        !(Flags & USING_IMM_CMDLIST)) {
       CacheType = HostVisibleCounterBasedRegularCacheType;
-    } else if (CounterBasedEventEnabled && !HostVisible &&
-               !UsingImmediateCmdList) {
+    } else if (Flags & COUNTER_BASED && !(Flags & HOST_VISIBLE) &&
+               !(Flags & USING_IMM_CMDLIST)) {
       CacheType = HostInvisibleCounterBasedRegularCacheType;
-    } else if (CounterBasedEventEnabled && HostVisible &&
-               UsingImmediateCmdList) {
+    } else if (Flags & COUNTER_BASED && Flags & HOST_VISIBLE &&
+               Flags & USING_IMM_CMDLIST) {
       CacheType = HostVisibleCounterBasedImmediateCacheType;
-    } else if (CounterBasedEventEnabled && !HostVisible &&
-               UsingImmediateCmdList) {
+    } else if (Flags & COUNTER_BASED && !Flags & HOST_VISIBLE &&
+               Flags & USING_IMM_CMDLIST) {
       CacheType = HostInvisibleCounterBasedImmediateCacheType;
-    } else if (!CounterBasedEventEnabled && HostVisible) {
+    } else if (!(Flags & COUNTER_BASED) && Flags & HOST_VISIBLE) {
       CacheType = HostVisibleCacheType;
     } else {
       CacheType = HostInvisibleCacheType;
@@ -304,33 +296,34 @@ struct ur_context_handle_t_ : _ur_object {
 
 private:
   // Get the cache of events for a provided scope and profiling mode.
-  auto getEventCache(bool HostVisible, bool WithProfiling,
-                     ur_device_handle_t Device) {
-    if (HostVisible) {
+  auto getEventCache(EventFlags Flags, ur_device_handle_t Device) {
+    if (Flags & HOST_VISIBLE) {
       if (Device) {
-        auto EventCachesMap =
-            WithProfiling ? &EventCachesDeviceMap[0] : &EventCachesDeviceMap[1];
+        auto EventCachesMap = Flags & ENABLE_PROFILER
+                                  ? &EventCachesDeviceMap[0]
+                                  : &EventCachesDeviceMap[1];
         if (EventCachesMap->find(Device) == EventCachesMap->end()) {
           EventCaches.emplace_back();
           EventCachesMap->insert(
               std::make_pair(Device, EventCaches.size() - 1));
         }
         return &EventCaches[(*EventCachesMap)[Device]];
       } else {
-        return WithProfiling ? &EventCaches[0] : &EventCaches[1];
+        return Flags & ENABLE_PROFILER ? &EventCaches[0] : &EventCaches[1];
       }
     } else {
       if (Device) {
-        auto EventCachesMap =
-            WithProfiling ? &EventCachesDeviceMap[2] : &EventCachesDeviceMap[3];
+        auto EventCachesMap = Flags & ENABLE_PROFILER
+                                  ? &EventCachesDeviceMap[2]
+                                  : &EventCachesDeviceMap[3];
         if (EventCachesMap->find(Device) == EventCachesMap->end()) {
           EventCaches.emplace_back();
           EventCachesMap->insert(
               std::make_pair(Device, EventCaches.size() - 1));
         }
         return &EventCaches[(*EventCachesMap)[Device]];
       } else {
-        return WithProfiling ? &EventCaches[2] : &EventCaches[3];
+        return Flags & ENABLE_PROFILER ? &EventCaches[2] : &EventCaches[3];
       }
     }
   }

source/adapters/level_zero/event.cpp

@@ -1229,15 +1229,21 @@ ur_result_t EventCreate(ur_context_handle_t Context, ur_queue_handle_t Queue,
   bool ProfilingEnabled =
       ForceDisableProfiling ? false : (!Queue || Queue->isProfilingEnabled());
   bool UsingImmediateCommandlists = !Queue || Queue->UsingImmCmdLists;
+  EventFlags Flags = static_cast<EventFlags>(
+      ProfilingEnabled                 ? ENABLE_PROFILER
+      : 0 | UsingImmediateCommandlists ? USING_IMM_CMDLIST
+      : 0 | HostVisible                ? HOST_VISIBLE
+      : 0 | IsMultiDevice              ? MULTIDEVICE
+      : 0 | CounterBasedEventEnabled   ? COUNTER_BASED
+                                       : 0);
 
   ur_device_handle_t Device = nullptr;
 
-  if (!IsMultiDevice && Queue) {
+  if (Flags & MULTIDEVICE && Queue) {
     Device = Queue->Device;
   }
 
-  if (auto CachedEvent = Context->getEventFromContextCache(
-          HostVisible, ProfilingEnabled, Device, CounterBasedEventEnabled)) {
+  if (auto CachedEvent = Context->getEventFromContextCache(Flags, Device)) {
     *RetEvent = CachedEvent;
     return UR_RESULT_SUCCESS;
   }
@@ -1247,16 +1253,15 @@ ur_result_t EventCreate(ur_context_handle_t Context, ur_queue_handle_t Queue,
 
   size_t Index = 0;
 
-  if (auto Res = Context->getFreeSlotInExistingOrNewPool(
-          ZeEventPool, Index, HostVisible, ProfilingEnabled, Device,
-          CounterBasedEventEnabled, UsingImmediateCommandlists))
+  if (auto Res = Context->getFreeSlotInExistingOrNewPool(ZeEventPool, Index,
+                                                         Flags, Device))
     return Res;
 
   ZeStruct<ze_event_desc_t> ZeEventDesc;
   ZeEventDesc.index = Index;
   ZeEventDesc.wait = 0;
 
-  if (HostVisible || CounterBasedEventEnabled) {
+  if (Flags & USING_IMM_CMDLIST || Flags & COUNTER_BASED) {
     ZeEventDesc.signal = ZE_EVENT_SCOPE_FLAG_HOST;
   } else {
     //
@@ -1281,8 +1286,8 @@ ur_result_t EventCreate(ur_context_handle_t Context, ur_queue_handle_t Queue,
   } catch (...) {
     return UR_RESULT_ERROR_UNKNOWN;
   }
-  (*RetEvent)->CounterBasedEventsEnabled = CounterBasedEventEnabled;
-  if (HostVisible)
+  (*RetEvent)->CounterBasedEventsEnabled = Flags & COUNTER_BASED;
+  if (Flags & HOST_VISIBLE)
     (*RetEvent)->HostVisibleEvent =
         reinterpret_cast<ur_event_handle_t>(*RetEvent);
 

source/adapters/level_zero/event.hpp

@@ -132,6 +132,7 @@ struct ur_event_handle_t_ : _ur_object {
     OwnNativeHandle = OwnZeEvent;
   }
 
+  EventFlags flags;
   // Level Zero event handle.
   ze_event_handle_t ZeEvent;