[L0] Enable CB events only on PVC+ and immCmdLists

Now counter based events will be enabled by default only on PVC+, and
only enabled for immCmdLists.

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

Author: winstonzhang-intel

source/adapters/level_zero/context.cpp

@@ -716,12 +716,6 @@ ur_result_t ur_context_handle_t_::getAvailableCommandList(
   // command list is available for reuse.
   ur_result_t ur_result = UR_RESULT_ERROR_OUT_OF_RESOURCES;
 
-  // As a limitation of regular command list, when counter based events are used
-  // the command list in the cache still has the potential of having events that
-  // are still associated with another command list. We disable cache for
-  // regular command list when counter based events are enabled to avoid race
-  // condition.
-  if (!Queue->CounterBasedEventsEnabled)
   // Initally, we need to check if a command list has already been created
   // on this device that is available for use. If so, then reuse that
   // Level-Zero Command List and Fence for this PI call.

source/adapters/level_zero/queue.cpp

@@ -959,14 +959,14 @@ ur_queue_handle_t_::ur_queue_handle_t_(
       ZeCommandListBatchComputeConfig.startSize();
   CopyCommandBatch.QueueBatchSize = ZeCommandListBatchCopyConfig.startSize();
 
-  static const bool useDriverCounterBasedEvents = [] {
+  static const bool useDriverCounterBasedEvents = [Device] {
     const char *UrRet = std::getenv("UR_L0_USE_DRIVER_COUNTER_BASED_EVENTS");
-    if (!UrRet)
+    if (!UrRet && Device->isPVC())
       return true;
     return std::atoi(UrRet) != 0;
   }();
   this->CounterBasedEventsEnabled =
-      isInOrderQueue() && Device->useDriverInOrderLists() &&
+      UsingImmCmdLists && isInOrderQueue() && Device->useDriverInOrderLists() &&
       useDriverCounterBasedEvents &&
       Device->Platform->ZeDriverEventPoolCountingEventsExtensionFound;
 }
@@ -1644,9 +1644,6 @@ ur_result_t ur_queue_handle_t_::executeOpenCommandList(bool IsCopy) {
 ur_result_t ur_queue_handle_t_::resetCommandList(
     ur_command_list_ptr_t CommandList, bool MakeAvailable,
     std::vector<ur_event_handle_t> &EventListToCleanup, bool CheckStatus) {
-  bool CounterBasedEventsResetable = CounterBasedEventsEnabled &&
-                                     Device->useDriverInOrderLists() &&
-                                     isInOrderQueue() && !UsingImmCmdLists;
   bool UseCopyEngine = CommandList->second.isCopy(this);
 
   // Immediate commandlists do not have an associated fence.
@@ -1655,8 +1652,7 @@ ur_result_t ur_queue_handle_t_::resetCommandList(
     // Reset the fence and put the command list into a cache for reuse in PI
     // calls.
     ZE2UR_CALL(zeFenceReset, (CommandList->second.ZeFence));
-    if (!CounterBasedEventsResetable)
-      ZE2UR_CALL(zeCommandListReset, (CommandList->first));
+    ZE2UR_CALL(zeCommandListReset, (CommandList->first));
     CommandList->second.ZeFenceInUse = false;
     CommandList->second.IsClosed = false;
   }