[L0] Rebased off of top of main and addressed comments

Signed-off-by: Zhang, Winston <winston.zhang@intel.com>

Author: winstonzhang-intel

source/adapters/level_zero/context.cpp

@@ -574,8 +574,9 @@ ur_event_handle_t ur_context_handle_t_::getEventFromContextCache(
     bool HostVisible, bool WithProfiling, ur_device_handle_t Device,
     bool CounterBasedEventEnabled, bool InterruptBasedEventEnabled) {
   std::scoped_lock<ur_mutex> Lock(EventCacheMutex);
-  auto Cache = getEventCache(HostVisible, WithProfiling, Device,
-                             CounterBasedEventEnabled);
+  auto Cache =
+      getEventCache(HostVisible, WithProfiling, Device,
+                    CounterBasedEventEnabled, InterruptBasedEventEnabled);
   if (Cache->empty()) {
     logger::info("Cache empty (Host Visible: {}, Profiling: {}, Counter: {}, "
                  "Device: {})",
@@ -611,9 +612,9 @@ void ur_context_handle_t_::addEventToContextCache(ur_event_handle_t Event) {
     Device = Event->UrQueue->Device;
   }
 
-  auto Cache =
-      getEventCache(Event->isHostVisible(), Event->isProfilingEnabled(), Device,
-                    Event->CounterBasedEventsEnabled);
+  auto Cache = getEventCache(
+      Event->isHostVisible(), Event->isProfilingEnabled(), Device,
+      Event->CounterBasedEventsEnabled, Event->InterruptBasedEventsEnabled);
   logger::info("Inserting {} event (Host Visible: {}, Profiling: {}, Counter: "
                "{}, Device: {}) into cache {}",
                Event, Event->HostVisibleEvent, Event->isProfilingEnabled(),

source/adapters/level_zero/context.hpp

@@ -374,9 +374,10 @@ struct ur_context_handle_t_ : _ur_object {
     EVENT_FLAG_HOST_VISIBLE = UR_BIT(0),
     EVENT_FLAG_WITH_PROFILING = UR_BIT(1),
     EVENT_FLAG_COUNTER = UR_BIT(2),
-    EVENT_FLAG_DEVICE = UR_BIT(3), // if set, subsequent bits are device id
+    EVENT_FLAG_INTERRUPT = UR_BIT(3),
+    EVENT_FLAG_DEVICE = UR_BIT(5), // if set, subsequent bits are device id
     MAX_EVENT_FLAG_BITS =
-        4, // this is used as an offset for embedding device id
+        6, // this is used as an offset for embedding device id
   };
 
   // Mutex to control operations on event caches.
@@ -388,7 +389,8 @@ struct ur_context_handle_t_ : _ur_object {
 
   // Get the cache of events for a provided scope and profiling mode.
   EventCache *getEventCache(bool HostVisible, bool WithProfiling,
-                            ur_device_handle_t Device, bool Counter) {
+                            ur_device_handle_t Device, bool Counter,
+                            bool Interrupt) {
 
     size_t index = 0;
     if (HostVisible) {
@@ -400,6 +402,9 @@ struct ur_context_handle_t_ : _ur_object {
     if (Counter) {
       index |= EVENT_FLAG_COUNTER;
     }
+    if (Interrupt) {
+      index |= EVENT_FLAG_INTERRUPT;
+    }
     if (Device) {
       index |= EVENT_FLAG_DEVICE | (*Device->Id << MAX_EVENT_FLAG_BITS);
     }

source/adapters/level_zero/device.cpp

@@ -1157,8 +1157,6 @@ ur_result_t urDeviceGetInfo(
     return ReturnValue(true);
   case UR_DEVICE_INFO_USM_POOL_SUPPORT:
     return ReturnValue(true);
-  case UR_DEVICE_INFO_LOW_POWER_EVENTS_EXP:
-    return ReturnValue(false);
   case UR_DEVICE_INFO_2D_BLOCK_ARRAY_CAPABILITIES_EXP: {
 #ifdef ZE_INTEL_DEVICE_BLOCK_ARRAY_EXP_NAME
     const auto ZeDeviceBlockArrayFlags =

source/adapters/level_zero/event.cpp

@@ -457,8 +457,9 @@ ur_result_t urEnqueueEventsWaitWithBarrierExt(
                   ///< this particular command instance.
 ) {
   bool InterruptBased =
-      EnqueueExtProp &&
-      (EnqueueExtProp->flags & UR_EXP_ENQUEUE_EXT_FLAG_LOW_POWER_EVENTS);
+      EnqueueExtProp
+          ? (EnqueueExtProp->flags & UR_EXP_ENQUEUE_EXT_FLAG_LOW_POWER_EVENTS)
+          : false;
   if (InterruptBased) {
     // Create the event with interrupt-based properties
     return static_cast<ur_result_t (*)(
@@ -470,7 +471,7 @@ ur_result_t urEnqueueEventsWaitWithBarrierExt(
         ur_queue_handle_t, uint32_t, const ur_event_handle_t *,
         ur_event_handle_t *, bool)>(EnqueueEventsWaitWithBarrier)(
         Queue, NumEventsInWaitList, EventWaitList, OutEvent,
-        Queue ? Queue->InterruptBasedEventsEnabled : false);
+        Queue->InterruptBasedEventsEnabled || false);
   }
 }
 

source/adapters/level_zero/queue.cpp

@@ -1192,20 +1192,12 @@ ur_queue_handle_t_::ur_queue_handle_t_(
     }
     return std::atoi(UrRet) != 0;
   }();
-  static const bool useInterruptBasedEvents = [] {
-    const char *UrRet = std::getenv("UR_L0_USE_INTERRUPT_BASED_EVENTS");
-    if (!UrRet) {
-      return true;
-    }
-    return std::atoi(UrRet) != 0;
-  }();
   this->CounterBasedEventsEnabled =
       UsingImmCmdLists && isInOrderQueue() && Device->useDriverInOrderLists() &&
       useDriverCounterBasedEvents &&
       Device->Platform->ZeDriverEventPoolCountingEventsExtensionFound;
-  this->InterruptBasedEventsEnabled = useInterruptBasedEvents &&
-                                      isLowPowerEvents() && isInOrderQueue() &&
-                                      Device->useDriverInOrderLists();
+  this->InterruptBasedEventsEnabled =
+      isLowPowerEvents() && isInOrderQueue() && Device->useDriverInOrderLists();
 }
 
 void ur_queue_handle_t_::adjustBatchSizeForFullBatch(bool IsCopy) {