Correct event reset

Signed-off-by: Daria Hinz <daria.hinz@intel.com>

Author: daariahinz

level_zero/core/source/event/event.cpp

@@ -172,13 +172,13 @@ ze_result_t EventImp::calculateProfilingData() {
 
 void EventImp::assignTimestampData(void *address) {
     auto baseAddr = reinterpret_cast<uint64_t>(address);
+    uint32_t packetsToCopy = packetsInUse ? packetsInUse : NEO::TimestampPacketSizeControl::preferredPacketCount;
 
     auto copyData = [&](uint32_t &timestampField, auto tsAddr) {
         memcpy_s(static_cast<void *>(&timestampField), sizeof(uint32_t), reinterpret_cast<void *>(tsAddr), sizeof(uint32_t));
     };
 
-    for (uint32_t i = 0; i < packetsInUse; i++) {
-
+    for (uint32_t i = 0; i < packetsToCopy; i++) {
         auto &packet = timestampsData->packets[i];
         copyData(packet.globalStart, baseAddr + offsetof(TimestampPacketStorage::Packet, globalStart));
         copyData(packet.contextStart, baseAddr + offsetof(TimestampPacketStorage::Packet, contextStart));
@@ -223,10 +223,14 @@ ze_result_t EventImp::hostEventSetValueTimestamps(uint32_t eventVal) {
         }
     };
 
-    eventTsSetFunc(baseAddr + offsetof(TimestampPacketStorage::Packet, contextStart));
-    eventTsSetFunc(baseAddr + offsetof(TimestampPacketStorage::Packet, globalStart));
-    eventTsSetFunc(baseAddr + offsetof(TimestampPacketStorage::Packet, contextEnd));
-    eventTsSetFunc(baseAddr + offsetof(TimestampPacketStorage::Packet, globalEnd));
+    for (uint32_t i = 0; i < NEO::TimestampPacketSizeControl::preferredPacketCount; i++) {
+        eventTsSetFunc(baseAddr + offsetof(TimestampPacketStorage::Packet, contextStart));
+        eventTsSetFunc(baseAddr + offsetof(TimestampPacketStorage::Packet, globalStart));
+        eventTsSetFunc(baseAddr + offsetof(TimestampPacketStorage::Packet, contextEnd));
+        eventTsSetFunc(baseAddr + offsetof(TimestampPacketStorage::Packet, globalEnd));
+        baseAddr += sizeof(struct TimestampPacketStorage::Packet);
+    }
+    assignTimestampData(hostAddress);
 
     return ZE_RESULT_SUCCESS;
 }
@@ -288,6 +292,7 @@ ze_result_t EventImp::hostSynchronize(uint64_t timeout) {
 }
 
 ze_result_t EventImp::reset() {
+    resetPackets();
     return hostEventSetValue(Event::STATE_INITIAL);
 }
 

level_zero/core/source/event/event.h

@@ -54,7 +54,7 @@ struct Event : _ze_event_handle_t {
 
     void *hostAddress = nullptr;
     uint64_t gpuAddress;
-    uint32_t packetsInUse = 0;
+    uint32_t packetsInUse;
 
     ze_event_scope_flags_t signalScope = 0u;
     ze_event_scope_flags_t waitScope = 0u;
@@ -157,8 +157,8 @@ struct EventPoolImp : public EventPool {
     size_t numEvents;
 
   protected:
-    const uint32_t eventSize = static_cast<uint32_t>(NEO::TimestampPacketSizeControl::preferredPacketCount * alignUp(sizeof(struct TimestampPacketStorage::Packet),
-                                                                                                                     MemoryConstants::cacheLineSize));
+    const uint32_t eventSize = static_cast<uint32_t>(alignUp(NEO::TimestampPacketSizeControl::preferredPacketCount * sizeof(struct TimestampPacketStorage::Packet),
+                                                             MemoryConstants::cacheLineSize));
     const uint32_t eventAlignment = MemoryConstants::cacheLineSize;
 };
 

level_zero/core/test/unit_tests/sources/event/test_event.cpp

@@ -42,9 +42,8 @@ TEST_F(EventPoolCreate, givenTimestampEventsThenEventSizeSufficientForAllKernelT
 
     std::unique_ptr<L0::EventPool> eventPool(EventPool::create(driverHandle.get(), 0, nullptr, &eventPoolDesc));
     ASSERT_NE(nullptr, eventPool);
-
-    uint32_t kernelTimestampsSize = static_cast<uint32_t>(NEO::TimestampPacketSizeControl::preferredPacketCount *
-                                                          alignUp(sizeof(struct TimestampPacketStorage::Packet), MemoryConstants::cacheLineSize));
+    uint32_t packetsSize = NEO::TimestampPacketSizeControl::preferredPacketCount * sizeof(struct TimestampPacketStorage::Packet);
+    uint32_t kernelTimestampsSize = static_cast<uint32_t>(alignUp(packetsSize, MemoryConstants::cacheLineSize));
     EXPECT_EQ(kernelTimestampsSize, eventPool->getEventSize());
 }
 
@@ -196,6 +195,20 @@ TEST_F(TimestampEventCreate, givenEventCreatedWithTimestampThenIsTimestampEventF
     EXPECT_TRUE(event->isTimestampEvent);
 }
 
+TEST_F(TimestampEventCreate, givenEventTimestampsCreatedWhenResetIsInvokeThenCorrectDataAreSet) {
+    EXPECT_NE(nullptr, event->timestampsData);
+
+    for (auto i = 0u; i < NEO::TimestampPacketSizeControl::preferredPacketCount; i++) {
+        auto &packet = event->timestampsData->packets[i];
+        EXPECT_EQ(Event::State::STATE_INITIAL, packet.contextStart);
+        EXPECT_EQ(Event::State::STATE_INITIAL, packet.globalStart);
+        EXPECT_EQ(Event::State::STATE_INITIAL, packet.contextEnd);
+        EXPECT_EQ(Event::State::STATE_INITIAL, packet.globalEnd);
+    }
+
+    EXPECT_EQ(0u, event->getPacketsInUse());
+}
+
 TEST_F(TimestampEventCreate, givenSingleTimestampEventThenAllocationSizeCreatedForAllTimestamps) {
     auto allocation = &eventPool->getAllocation();
     ASSERT_NE(nullptr, allocation);