Skip to content

Commit 470c49b

Browse files
BartoszDunajskiCompute-Runtime-Automation
BartoszDunajski
authored and
Compute-Runtime-Automation
committed
Update TSP tests
Signed-off-by: Bartosz Dunajski <[email protected]>
1 parent 5c7955b commit 470c49b

File tree

6 files changed

+31
-22
lines changed

6 files changed

+31
-22
lines changed

‎level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_memory.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ HWTEST2_F(CommandListCreate, givenCopyCommandListWhenTimestampPassedToMemoryCopy
352352
eventDesc.wait = 0;
353353

354354
auto eventPool = std::unique_ptr<L0::EventPool>(L0::EventPool::create(driverHandle.get(), context, 0, nullptr, &eventPoolDesc));
355-
auto event = std::unique_ptr<L0::Event>(L0::Event::create<uint32_t>(eventPool.get(), &eventDesc, device));
355+
auto event = std::unique_ptr<L0::Event>(L0::Event::create<typename FamilyType::TimestampPacketType>(eventPool.get(), &eventDesc, device));
356356

357357
commandList.appendMemoryCopy(dstPtr, srcPtr, 0x100, event->toHandle(), 0, nullptr);
358358
EXPECT_GT(commandList.appendMemoryCopyBlitCalledTimes, 1u);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ TEST_F(EventPoolCreate, GivenEventPoolThenAllocationContainsAtLeast16Bytes) {
127127
minAllocationSize);
128128
}
129129

130-
TEST_F(EventPoolCreate, givenTimestampEventsThenEventSizeSufficientForAllKernelTimestamps) {
130+
HWTEST_F(EventPoolCreate, givenTimestampEventsThenEventSizeSufficientForAllKernelTimestamps) {
131131
ze_event_pool_desc_t eventPoolDesc = {};
132132
eventPoolDesc.count = 1;
133133
eventPoolDesc.flags = ZE_EVENT_POOL_FLAG_KERNEL_TIMESTAMP;
@@ -136,7 +136,7 @@ TEST_F(EventPoolCreate, givenTimestampEventsThenEventSizeSufficientForAllKernelT
136136
ASSERT_NE(nullptr, eventPool);
137137
uint32_t maxKernelSplit = 3;
138138
uint32_t packetsSize = maxKernelSplit * NEO::TimestampPacketSizeControl::preferredPacketCount *
139-
static_cast<uint32_t>(NEO::TimestampPackets<uint32_t>::getSinglePacketSize());
139+
static_cast<uint32_t>(NEO::TimestampPackets<typename FamilyType::TimestampPacketType>::getSinglePacketSize());
140140
uint32_t kernelTimestampsSize = static_cast<uint32_t>(alignUp(packetsSize, 4 * MemoryConstants::cacheLineSize));
141141
EXPECT_EQ(kernelTimestampsSize, eventPool->getEventSize());
142142
}

‎opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ struct CommandStreamReceiverTagTests : public ::testing::Test {
294294
template <typename FamilyType>
295295
using AubWithTbx = CommandStreamReceiverWithAUBDump<TbxCommandStreamReceiverHw<FamilyType>>;
296296

297-
template <typename CsrT, typename... Args>
297+
template <typename CsrT, typename FamilyType, typename... Args>
298298
bool isTimestampPacketNodeReleasable(Args &&...args) {
299299
CsrT csr(std::forward<Args>(args)...);
300300
auto hwInfo = csr.peekExecutionEnvironment().rootDeviceEnvironments[0]->getHardwareInfo();
@@ -305,7 +305,7 @@ struct CommandStreamReceiverTagTests : public ::testing::Test {
305305
auto allocator = csr.getTimestampPacketAllocator();
306306
auto tag = allocator->getTag();
307307

308-
uint32_t zeros[4] = {};
308+
typename FamilyType::TimestampPacketType zeros[4] = {};
309309

310310
for (uint32_t i = 0; i < TimestampPacketSizeControl::preferredPacketCount; i++) {
311311
tag->assignDataToAllTimestamps(i, zeros);
@@ -342,10 +342,17 @@ struct CommandStreamReceiverTagTests : public ::testing::Test {
342342
};
343343

344344
HWTEST_F(CommandStreamReceiverTagTests, givenCsrTypeWhenCreatingTimestampPacketAllocatorThenSetDefaultCompletionCheckType) {
345-
EXPECT_TRUE(isTimestampPacketNodeReleasable<CommandStreamReceiverHw<FamilyType>>(*executionEnvironment, 0, 1));
346-
EXPECT_FALSE(isTimestampPacketNodeReleasable<AUBCommandStreamReceiverHw<FamilyType>>(fileName, false, *executionEnvironment, 0, 1));
347-
EXPECT_FALSE(isTimestampPacketNodeReleasable<AubWithHw<FamilyType>>(fileName, *executionEnvironment, 0, 1));
348-
EXPECT_FALSE(isTimestampPacketNodeReleasable<AubWithTbx<FamilyType>>(fileName, *executionEnvironment, 0, 1));
345+
bool result = isTimestampPacketNodeReleasable<CommandStreamReceiverHw<FamilyType>, FamilyType>(*executionEnvironment, 0, 1);
346+
EXPECT_TRUE(result);
347+
348+
result = isTimestampPacketNodeReleasable<AUBCommandStreamReceiverHw<FamilyType>, FamilyType>(fileName, false, *executionEnvironment, 0, 1);
349+
EXPECT_FALSE(result);
350+
351+
result = isTimestampPacketNodeReleasable<AubWithHw<FamilyType>, FamilyType>(fileName, *executionEnvironment, 0, 1);
352+
EXPECT_FALSE(result);
353+
354+
result = isTimestampPacketNodeReleasable<AubWithTbx<FamilyType>, FamilyType>(fileName, *executionEnvironment, 0, 1);
355+
EXPECT_FALSE(result);
349356
}
350357

351358
HWTEST_F(CommandStreamReceiverTagTests, givenCsrTypeWhenAskingForTagPoolSizeThenReturnOneForAubTbxMode) {

‎opencl/test/unit_test/helpers/timestamp_packet_1_tests.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ TEST_F(TimestampPacketSimpleTests, givenTimestampPacketContainerWhenMovedThenMov
109109
EXPECT_EQ(1u, node1.returnCalls);
110110
}
111111

112-
TEST_F(TimestampPacketSimpleTests, whenNewTagIsTakenThenReinitialize) {
112+
HWTEST_F(TimestampPacketSimpleTests, whenNewTagIsTakenThenReinitialize) {
113113
MockExecutionEnvironment executionEnvironment(defaultHwInfo.get());
114114
MockMemoryManager memoryManager(executionEnvironment);
115115
MockTagAllocator<MockTimestampPacketStorage> allocator(0, &memoryManager, 1);
@@ -125,7 +125,7 @@ TEST_F(TimestampPacketSimpleTests, whenNewTagIsTakenThenReinitialize) {
125125
packet.globalEnd = i++;
126126
}
127127

128-
setTagToReadyState(firstNode);
128+
setTagToReadyState<FamilyType>(firstNode);
129129
allocator.returnTag(firstNode);
130130

131131
auto secondNode = allocator.getTag();
@@ -230,7 +230,7 @@ HWTEST_F(TimestampPacketTests, givenDebugFlagSetWhenCreatingTimestampPacketAlloc
230230
EXPECT_EQ(1u, csr.getPreferredTagPoolSize());
231231

232232
auto tag = csr.getTimestampPacketAllocator()->getTag();
233-
setTagToReadyState(tag);
233+
setTagToReadyState<FamilyType>(tag);
234234

235235
EXPECT_FALSE(tag->canBeReleased());
236236
}
@@ -525,8 +525,8 @@ HWTEST_F(TimestampPacketTests, givenTimestampPacketWriteEnabledWhenEnqueueingThe
525525
EXPECT_EQ(node1, mockTagAllocator->releaseReferenceNodes.at(0));
526526

527527
EXPECT_NE(node1, node2);
528-
setTagToReadyState(node1);
529-
setTagToReadyState(node2);
528+
setTagToReadyState<FamilyType>(node1);
529+
setTagToReadyState<FamilyType>(node2);
530530

531531
clReleaseEvent(event2);
532532
EXPECT_EQ(0u, mockTagAllocator->returnedToFreePoolNodes.size()); // nothing returned. cmdQ owns node2

‎opencl/test/unit_test/helpers/timestamp_packet_tests.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@ struct TimestampPacketSimpleTests : public ::testing::Test {
2525
using TimestampPackets<uint32_t>::packets;
2626
};
2727

28+
template <typename FamilyType>
2829
void setTagToReadyState(TagNodeBase *tagNode) {
2930
auto packetsUsed = tagNode->getPacketsUsed();
3031
tagNode->initialize();
3132

32-
uint32_t zeros[4] = {};
33+
typename FamilyType::TimestampPacketType zeros[4] = {};
3334

3435
for (uint32_t i = 0; i < TimestampPacketSizeControl::preferredPacketCount; i++) {
3536
tagNode->assignDataToAllTimestamps(i, zeros);

‎opencl/test/unit_test/kernel/kernel_tests.cpp‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1919,6 +1919,7 @@ TEST(KernelConfigTests, givenTwoKernelConfigsWhenCompareThenResultsAreCorrect) {
19191919
}
19201920

19211921
HWTEST_F(KernelResidencyTest, givenEnableFullKernelTuningWhenPerformTunningThenKernelConfigDataIsTracked) {
1922+
using TimestampPacketType = typename FamilyType::TimestampPacketType;
19221923
DebugManagerStateRestore restorer;
19231924
DebugManager.flags.EnableKernelTunning.set(2u);
19241925

@@ -1957,9 +1958,9 @@ HWTEST_F(KernelResidencyTest, givenEnableFullKernelTuningWhenPerformTunningThenK
19571958
EXPECT_EQ(result->second.status, MockKernel::TunningStatus::SUBDEVICE_TUNNING_IN_PROGRESS);
19581959
EXPECT_FALSE(mockKernel.mockKernel->singleSubdevicePreferredInCurrentEnqueue);
19591960

1960-
uint32_t data[4] = {static_cast<uint32_t>(container.getNode(0u)->getContextStartValue(0)),
1961-
static_cast<uint32_t>(container.getNode(0u)->getGlobalStartValue(0)),
1962-
2, 2};
1961+
TimestampPacketType data[4] = {static_cast<TimestampPacketType>(container.getNode(0u)->getContextStartValue(0)),
1962+
static_cast<TimestampPacketType>(container.getNode(0u)->getGlobalStartValue(0)),
1963+
2, 2};
19631964

19641965
container.getNode(0u)->assignDataToAllTimestamps(0, data);
19651966

@@ -1970,8 +1971,8 @@ HWTEST_F(KernelResidencyTest, givenEnableFullKernelTuningWhenPerformTunningThenK
19701971
EXPECT_EQ(result->second.status, MockKernel::TunningStatus::SUBDEVICE_TUNNING_IN_PROGRESS);
19711972
EXPECT_FALSE(mockKernel.mockKernel->singleSubdevicePreferredInCurrentEnqueue);
19721973

1973-
data[0] = static_cast<uint32_t>(subdeviceContainer.getNode(0u)->getContextStartValue(0));
1974-
data[1] = static_cast<uint32_t>(subdeviceContainer.getNode(0u)->getGlobalStartValue(0));
1974+
data[0] = static_cast<TimestampPacketType>(subdeviceContainer.getNode(0u)->getContextStartValue(0));
1975+
data[1] = static_cast<TimestampPacketType>(subdeviceContainer.getNode(0u)->getGlobalStartValue(0));
19751976
data[2] = 2;
19761977
data[3] = 2;
19771978

@@ -1986,8 +1987,8 @@ HWTEST_F(KernelResidencyTest, givenEnableFullKernelTuningWhenPerformTunningThenK
19861987
EXPECT_EQ(result->second.status, MockKernel::TunningStatus::SUBDEVICE_TUNNING_IN_PROGRESS);
19871988
EXPECT_FALSE(mockKernel.mockKernel->singleSubdevicePreferredInCurrentEnqueue);
19881989

1989-
data[0] = static_cast<uint32_t>(subdeviceContainer.getNode(1u)->getContextStartValue(0));
1990-
data[1] = static_cast<uint32_t>(subdeviceContainer.getNode(1u)->getGlobalStartValue(0));
1990+
data[0] = static_cast<TimestampPacketType>(subdeviceContainer.getNode(1u)->getContextStartValue(0));
1991+
data[1] = static_cast<TimestampPacketType>(subdeviceContainer.getNode(1u)->getGlobalStartValue(0));
19911992
data[2] = 2;
19921993
data[3] = 2;
19931994

0 commit comments

Comments
 (0)