From b2688554ce50c81fc2fdf19bf643d06954f0e240 Mon Sep 17 00:00:00 2001 From: Jaime Arteaga Date: Tue, 19 May 2020 20:38:36 -0700 Subject: [PATCH] Correct alignment of events Change-Id: I967bb5e201df5b881c4d1914d74258e6ceda373f Signed-off: Jaime Arteaga --- level_zero/core/source/event/event.cpp | 3 ++- level_zero/core/test/unit_tests/sources/event/test_event.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/level_zero/core/source/event/event.cpp b/level_zero/core/source/event/event.cpp index f78fa1864b..eda33a556b 100644 --- a/level_zero/core/source/event/event.cpp +++ b/level_zero/core/source/event/event.cpp @@ -162,7 +162,8 @@ struct EventPoolImp : public EventPool { std::queue lastEventPoolOffsetUsed; protected: - const uint32_t eventSize = sizeof(struct KernelTimestampEvent); + const uint32_t eventSize = static_cast(alignUp(sizeof(struct KernelTimestampEvent), + MemoryConstants::cacheLineSize)); const uint32_t eventAlignment = MemoryConstants::cacheLineSize; }; diff --git a/level_zero/core/test/unit_tests/sources/event/test_event.cpp b/level_zero/core/test/unit_tests/sources/event/test_event.cpp index 801886874d..956d2fc7d3 100644 --- a/level_zero/core/test/unit_tests/sources/event/test_event.cpp +++ b/level_zero/core/test/unit_tests/sources/event/test_event.cpp @@ -42,7 +42,8 @@ TEST_F(EventPoolCreate, givenTimestampEventsThenEventSizeSufficientForAllKernelT std::unique_ptr eventPool(EventPool::create(driverHandle.get(), 0, nullptr, &eventPoolDesc)); ASSERT_NE(nullptr, eventPool); - uint32_t kernelTimestampsSize = sizeof(struct KernelTimestampEvent); + uint32_t kernelTimestampsSize = static_cast(alignUp(sizeof(struct KernelTimestampEvent), + MemoryConstants::cacheLineSize)); EXPECT_EQ(kernelTimestampsSize, eventPool->getEventSize()); }