From d3f30b40461051d4531191ea04ba9704b5d39e66 Mon Sep 17 00:00:00 2001
From: Szymon Morek <szymon.morek@intel.com>
Date: Mon, 10 Oct 2022 10:20:54 +0000
Subject: [PATCH] Remove not needed access to atomic variable

Signed-off-by: Szymon Morek <szymon.morek@intel.com>
---
 level_zero/core/source/event/event.h        |  1 +
 level_zero/core/source/event/event_impl.inl | 22 ++++++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/level_zero/core/source/event/event.h b/level_zero/core/source/event/event.h
index 4cdaabc4da..e14b0ce17d 100644
--- a/level_zero/core/source/event/event.h
+++ b/level_zero/core/source/event/event.h
@@ -200,6 +200,7 @@ struct EventImp : public Event {
     uint64_t getGpuAddress(Device *device) override;
 
     void resetPackets() override;
+    void resetDeviceCompletionData();
     uint64_t getPacketAddress(Device *device) override;
     uint32_t getPacketsInUse() override;
     uint32_t getPacketsUsedInLastKernel() override;
diff --git a/level_zero/core/source/event/event_impl.inl b/level_zero/core/source/event/event_impl.inl
index 678f677ef6..92568821f4 100644
--- a/level_zero/core/source/event/event_impl.inl
+++ b/level_zero/core/source/event/event_impl.inl
@@ -43,7 +43,7 @@ Event *Event::create(EventPool *eventPool, const ze_event_desc_t *desc, Device *
     // do not reset even if it has been imported, since event pool
     // might have been imported after events being already signaled
     if (eventPoolImp->isImportedIpcPool == false) {
-        event->reset();
+        event->resetDeviceCompletionData();
     }
 
     return event;
@@ -285,18 +285,22 @@ ze_result_t EventImp<TagSizeT>::hostSynchronize(uint64_t timeout) {
 
 template <typename TagSizeT>
 ze_result_t EventImp<TagSizeT>::reset() {
-    kernelCount = EventPacketsCount::maxKernelSplit;
-    for (uint32_t i = 0; i < kernelCount; i++) {
-        kernelEventCompletionData[i].setPacketsUsed(NEO::TimestampPacketSizeControl::preferredPacketCount);
-    }
-    hostEventSetValue(Event::STATE_INITIAL);
-    resetPackets();
-    resetCompletion();
-
+    this->resetCompletion();
+    this->resetDeviceCompletionData();
     this->l3FlushAppliedOnKernel.reset();
     return ZE_RESULT_SUCCESS;
 }
 
+template <typename TagSizeT>
+void EventImp<TagSizeT>::resetDeviceCompletionData() {
+    this->kernelCount = EventPacketsCount::maxKernelSplit;
+    for (uint32_t i = 0; i < kernelCount; i++) {
+        this->kernelEventCompletionData[i].setPacketsUsed(NEO::TimestampPacketSizeControl::preferredPacketCount);
+    }
+    this->hostEventSetValue(Event::STATE_INITIAL);
+    this->resetPackets();
+}
+
 template <typename TagSizeT>
 ze_result_t EventImp<TagSizeT>::queryKernelTimestamp(ze_kernel_timestamp_result_t *dstptr) {