[L0] Rebased against top of tree instead of CB events patch

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

Author: winstonzhang-intel

source/adapters/level_zero/context.cpp

@@ -561,9 +561,6 @@ ur_context_handle_t_::getEventFromContextCache(ur_event_flags_t Flags,
                                                ur_device_handle_t Device) {
   std::scoped_lock<ur_mutex> Lock(EventCacheMutex);
   auto Cache = getEventCache(Flags, Device);
-  if (Flags & COUNTER_BASED) {
-    Cache = getCounterBasedEventCache(Flags, Device);
-  }
   if (Cache->empty())
     return nullptr;
 
@@ -593,13 +590,8 @@ void ur_context_handle_t_::addEventToContextCache(ur_event_handle_t Event) {
   if (Event->isProfilingEnabled())
     Flags |= ENABLE_PROFILER;
 
-  if (Event->CounterBasedEventsEnabled) {
-    auto Cache = getCounterBasedEventCache(Flags, Device);
-    Cache->emplace_back(Event);
-  } else {
-    auto Cache = getEventCache(Flags, Device);
-    Cache->emplace_back(Event);
-  }
+  auto Cache = getEventCache(Flags, Device);
+  Cache->emplace_back(Event);
 }
 
 ur_result_t

source/adapters/level_zero/context.hpp

@@ -325,34 +325,6 @@ struct ur_context_handle_t_ : _ur_object {
       }
     }
   };
-  auto getCounterBasedEventCache(ur_event_flags_t Flags,
-                                 ur_device_handle_t Device) {
-    if (Flags & USING_IMM_CMDLIST) {
-      if (Device) {
-        auto EventCachesMap =
-            (Flags & ENABLE_PROFILER)
-                ? &EventCachesDeviceMap[CounterBasedImmediateProfilingCacheType]
-                : &EventCachesDeviceMap[CounterBasedImmediateCacheType];
-        return &EventCaches[(*EventCachesMap)[Device]];
-      } else {
-        return (Flags & ENABLE_PROFILER)
-                   ? &EventCaches[CounterBasedImmediateProfilingCacheType]
-                   : &EventCaches[CounterBasedImmediateCacheType];
-      }
-    } else {
-      if (Device) {
-        auto EventCachesMap =
-            (Flags & ENABLE_PROFILER)
-                ? &EventCachesDeviceMap[CounterBasedRegularProfilingCacheType]
-                : &EventCachesDeviceMap[CounterBasedRegularCacheType];
-        return &EventCaches[(*EventCachesMap)[Device]];
-      } else {
-        return (Flags & ENABLE_PROFILER)
-                   ? &EventCaches[CounterBasedRegularProfilingCacheType]
-                   : &EventCaches[CounterBasedRegularCacheType];
-      }
-    }
-  }
 };
 
 // Helper function to release the context, a caller must lock the platform-level