[L0] Fixed profiling fault in e2e

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

Author: winstonzhang-intel

source/adapters/level_zero/context.cpp

@@ -564,7 +564,7 @@ ur_event_handle_t ur_context_handle_t_::getEventFromContextCache(
   std::scoped_lock<ur_mutex> Lock(EventCacheMutex);
   auto Cache = getEventCache(HostVisible, WithProfiling, Device);
   if (CounterBasedEventEnabled) {
-    Cache = getCounterBasedEventCache(UsingImmCmdList, Device);
+    Cache = getCounterBasedEventCache(WithProfiling, UsingImmCmdList, Device);
   }
   if (Cache->empty())
     return nullptr;
@@ -576,6 +576,7 @@ ur_event_handle_t ur_context_handle_t_::getEventFromContextCache(
   }
   Cache->erase(It);
   // We have to reset event before using it.
+  // if(!CounterBasedEventEnabled)
   Event->reset();
   return Event;
 }
@@ -590,6 +591,7 @@ void ur_context_handle_t_::addEventToContextCache(ur_event_handle_t Event) {
 
   if (Event->CounterBasedEventsEnabled) {
     auto Cache = getCounterBasedEventCache(
+        Event->isProfilingEnabled(),
         !(Event->UrQueue) || (Event->UrQueue)->UsingImmCmdLists, Device);
     Cache->emplace_back(Event);
   } else {

source/adapters/level_zero/context.hpp

@@ -235,6 +235,8 @@ struct ur_context_handle_t_ : _ur_object {
     HostInvisibleRegularCacheType,
     CounterBasedImmediateCacheType,
     CounterBasedRegularCacheType,
+    CounterBasedImmediateProfilingCacheType,
+    CounterBasedRegularProfilingCacheType,
     EventCacheTypeCount
   };
 
@@ -359,33 +361,41 @@ struct ur_context_handle_t_ : _ur_object {
       }
     }
   };
-  auto getCounterBasedEventCache(bool UsingImmediateCmdList,
+  auto getCounterBasedEventCache(bool WithProfiling, bool UsingImmediateCmdList,
                                  ur_device_handle_t Device) {
     if (UsingImmediateCmdList) {
       if (Device) {
         auto EventCachesMap =
-            &EventCachesDeviceMap[CounterBasedImmediateCacheType];
+            WithProfiling
+                ? &EventCachesDeviceMap[CounterBasedImmediateProfilingCacheType]
+                : &EventCachesDeviceMap[CounterBasedImmediateCacheType];
         if (EventCachesMap->find(Device) == EventCachesMap->end()) {
           EventCaches.emplace_back();
           EventCachesMap->insert(
               std::make_pair(Device, EventCaches.size() - 1));
         }
         return &EventCaches[(*EventCachesMap)[Device]];
       } else {
-        return &EventCaches[CounterBasedImmediateCacheType];
+        return WithProfiling
+                   ? &EventCaches[CounterBasedImmediateProfilingCacheType]
+                   : &EventCaches[CounterBasedImmediateCacheType];
       }
     } else {
       if (Device) {
         auto EventCachesMap =
-            &EventCachesDeviceMap[CounterBasedRegularCacheType];
+            WithProfiling
+                ? &EventCachesDeviceMap[CounterBasedRegularProfilingCacheType]
+                : &EventCachesDeviceMap[CounterBasedRegularCacheType];
         if (EventCachesMap->find(Device) == EventCachesMap->end()) {
           EventCaches.emplace_back();
           EventCachesMap->insert(
               std::make_pair(Device, EventCaches.size() - 1));
         }
         return &EventCaches[(*EventCachesMap)[Device]];
       } else {
-        return &EventCaches[CounterBasedRegularCacheType];
+        return WithProfiling
+                   ? &EventCaches[CounterBasedRegularProfilingCacheType]
+                   : &EventCaches[CounterBasedRegularCacheType];
       }
     }
   }