test: create dedicated mock object for timestamp packet

Related-To: NEO-6871

Signed-off-by: Zbigniew Zdanowicz <[email protected]>

Author: zzdanowicz

level_zero/core/test/unit_tests/gen12lp/test_events_gen12lp.cpp

@@ -1,10 +1,11 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/test/common/mocks/mock_timestamp_packet.h"
 #include "shared/test/common/test_macros/test.h"
 
 #include "level_zero/core/source/driver/driver_handle_imp.h"
@@ -15,12 +16,6 @@
 namespace L0 {
 namespace ult {
 struct TimestampEvent : public Test<DeviceFixture> {
-  public:
-    class MockTimestampPackets32 : public TimestampPackets<uint32_t> {
-      public:
-        using typename TimestampPackets<uint32_t>::Packet;
-    };
-
     void SetUp() override {
         DeviceFixture::SetUp();
         ze_event_pool_desc_t eventPoolDesc = {};

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

@@ -11,6 +11,7 @@
 #include "shared/test/common/mocks/mock_csr.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/mocks/mock_memory_operations_handler.h"
+#include "shared/test/common/mocks/mock_timestamp_packet.h"
 #include "shared/test/common/test_macros/test.h"
 
 #include "level_zero/core/source/context/context_imp.h"
@@ -1150,11 +1151,6 @@ TEST_F(EventQueryTimestampExpWithSubDevice, givenEventWhenQuerytimestampExpWithS
     event = std::unique_ptr<L0::EventImp<uint32_t>>(static_cast<L0::EventImp<uint32_t> *>(L0::Event::create<uint32_t>(eventPool.get(), &eventDesc, subdevice)));
     ASSERT_NE(nullptr, event);
 
-    class MockTimestampPackets32 : public TimestampPackets<uint32_t> {
-      public:
-        using typename TimestampPackets<uint32_t>::Packet;
-    };
-
     typename MockTimestampPackets32::Packet packetData[2];
     event->setPacketsInUse(2u);
 
@@ -1194,11 +1190,6 @@ TEST_F(EventQueryTimestampExpWithSubDevice, givenEventWhenQuerytimestampExpWithS
 }
 
 HWCMDTEST_F(IGFX_GEN9_CORE, TimestampEventCreate, givenEventTimestampsWhenQueryKernelTimestampThenCorrectDataAreSet) {
-    class MockTimestampPackets32 : public TimestampPackets<uint32_t> {
-      public:
-        using typename TimestampPackets<uint32_t>::Packet;
-    };
-
     typename MockTimestampPackets32::Packet data = {};
     data.contextStart = 1u;
     data.contextEnd = 2u;
@@ -1216,11 +1207,6 @@ HWCMDTEST_F(IGFX_GEN9_CORE, TimestampEventCreate, givenEventTimestampsWhenQueryK
 }
 
 TEST_F(TimestampEventCreate, givenEventWhenQueryingTimestampExpThenCorrectDataSet) {
-    class MockTimestampPackets32 : public TimestampPackets<uint32_t> {
-      public:
-        using typename TimestampPackets<uint32_t>::Packet;
-    };
-
     typename MockTimestampPackets32::Packet packetData[2];
     event->setPacketsInUse(2u);
 

level_zero/core/test/unit_tests/xe_hp_core/test_cmdlist_xe_hp_core.cpp

@@ -12,6 +12,7 @@
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/helpers/unit_test_helper.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
+#include "shared/test/common/mocks/mock_timestamp_packet.h"
 #include "shared/test/common/test_macros/test.h"
 
 #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h"
@@ -355,11 +356,6 @@ HWTEST2_F(CommandListAppendLaunchKernelL3Flush, givenKernelWithEventZeroScopeWit
 HWTEST2_F(CommandListAppendLaunchKernelL3Flush, givenKernelWithEventHostScopeWithoutWalkerPartitionThenSkipOddPacketsDuringQuery, IsXeHpCore) {
     using MI_LOAD_REGISTER_IMM = typename FamilyType::MI_LOAD_REGISTER_IMM;
 
-    class MockTimestampPackets32 : public TimestampPackets<uint32_t> {
-      public:
-        using typename TimestampPackets<uint32_t>::Packet;
-    };
-
     Mock<::L0::Kernel> kernel;
     auto pMockModule = std::unique_ptr<Module>(new Mock<Module>(device, nullptr));
     kernel.module = pMockModule.get();

opencl/test/unit_test/helpers/timestamp_packet_1_tests.cpp

@@ -112,9 +112,9 @@ TEST_F(TimestampPacketSimpleTests, givenTimestampPacketContainerWhenMovedThenMov
 HWTEST_F(TimestampPacketSimpleTests, whenNewTagIsTakenThenReinitialize) {
     MockExecutionEnvironment executionEnvironment(defaultHwInfo.get());
     MockMemoryManager memoryManager(executionEnvironment);
-    MockTagAllocator<MockTimestampPacketStorage> allocator(0, &memoryManager, 1);
+    MockTagAllocator<MockTimestampPackets32> allocator(0, &memoryManager, 1);
 
-    using MockNode = TagNode<MockTimestampPacketStorage>;
+    using MockNode = TagNode<MockTimestampPackets32>;
 
     auto firstNode = static_cast<MockNode *>(allocator.getTag());
     auto i = 0u;
@@ -141,7 +141,7 @@ HWTEST_F(TimestampPacketSimpleTests, whenNewTagIsTakenThenReinitialize) {
 }
 
 TEST_F(TimestampPacketSimpleTests, whenObjectIsCreatedThenInitializeAllStamps) {
-    MockTimestampPacketStorage timestampPacketStorage;
+    MockTimestampPackets32 timestampPacketStorage;
     EXPECT_EQ(TimestampPacketSizeControl::preferredPacketCount * sizeof(timestampPacketStorage.packets[0]), sizeof(timestampPacketStorage.packets));
 
     for (const auto &packet : timestampPacketStorage.packets) {

opencl/test/unit_test/helpers/timestamp_packet_tests.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,6 +9,7 @@
 
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/unit_test_helper.h"
+#include "shared/test/common/mocks/mock_timestamp_packet.h"
 #include "shared/test/common/test_macros/test.h"
 
 #include "opencl/test/unit_test/mocks/mock_cl_device.h"
@@ -20,11 +21,6 @@
 using namespace NEO;
 
 struct TimestampPacketSimpleTests : public ::testing::Test {
-    class MockTimestampPacketStorage : public TimestampPackets<uint32_t> {
-      public:
-        using TimestampPackets<uint32_t>::packets;
-    };
-
     template <typename FamilyType>
     void setTagToReadyState(TagNodeBase *tagNode) {
         auto packetsUsed = tagNode->getPacketsUsed();

opencl/test/unit_test/utilities/tag_allocator_tests.cpp

@@ -12,6 +12,7 @@
 #include "shared/test/common/helpers/engine_descriptor_helper.h"
 #include "shared/test/common/libult/ult_command_stream_receiver.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
+#include "shared/test/common/mocks/mock_timestamp_packet.h"
 #include "shared/test/common/mocks/ult_device_factory.h"
 #include "shared/test/common/test_macros/test.h"
 
@@ -22,23 +23,6 @@
 using namespace NEO;
 
 struct TagAllocatorTest : public Test<MemoryAllocatorFixture> {
-    class MockTimestampPackets32 : public TimestampPackets<uint32_t> {
-      public:
-        void setTagToReadyState() {
-            initialize();
-
-            uint32_t zeros[4] = {};
-
-            for (uint32_t i = 0; i < TimestampPacketSizeControl::preferredPacketCount; i++) {
-                assignDataToAllTimestamps(i, zeros);
-            }
-        }
-
-        void setToNonReadyState() {
-            packets[0].contextEnd = 1;
-        }
-    };
-
     void SetUp() override {
         DebugManager.flags.CreateMultipleSubDevices.set(4);
         MemoryAllocatorFixture::SetUp();

shared/test/common/mocks/CMakeLists.txt

@@ -81,6 +81,7 @@ set(NEO_CORE_tests_mocks
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_tbx_csr.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_tbx_stream.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_timestamp_container.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_timestamp_packet.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ult_device_factory.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ult_device_factory.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_client_context.cpp

shared/test/common/mocks/mock_timestamp_packet.h

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2022 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#pragma once
+#include "shared/source/helpers/timestamp_packet.h"
+
+namespace NEO {
+
+class MockTimestampPackets32 : public TimestampPackets<uint32_t> {
+  public:
+    using typename TimestampPackets<uint32_t>::Packet;
+    using TimestampPackets<uint32_t>::packets;
+
+    void setTagToReadyState() {
+        initialize();
+
+        uint32_t zeros[4] = {};
+
+        for (uint32_t i = 0; i < TimestampPacketSizeControl::preferredPacketCount; i++) {
+            assignDataToAllTimestamps(i, zeros);
+        }
+    }
+
+    void setToNonReadyState() {
+        packets[0].contextEnd = 1;
+    }
+};
+
+} // namespace NEO