Skip to content

Commit 7398612

Browse files
shubskmrshubskmr
committed
fix: Enhance streamer tests
Related-To: VLCLJ-2365 Signed-off-by: shubham kumar <[email protected]>
1 parent 91c6a8a commit 7398612

File tree

3 files changed

+34
-49
lines changed

3 files changed

+34
-49
lines changed

‎conformance_tests/tools/metrics/src/test_metric.cpp‎

Lines changed: 18 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1110,20 +1110,9 @@ TEST_F(
11101110

11111111
lzt::execute_command_lists(commandQueue, 1, &commandList, nullptr);
11121112
lzt::synchronize(commandQueue, std::numeric_limits<uint64_t>::max());
1113-
ze_result_t eventResult;
1114-
eventResult = zeEventQueryStatus(eventHandle);
1115-
1116-
if (ZE_RESULT_SUCCESS == eventResult) {
1117-
LOG_DEBUG << "Event triggered";
1118-
} else if (ZE_RESULT_NOT_READY == eventResult) {
1119-
LOG_WARNING << "wait on event returned ZE_RESULT_NOT_READY";
1120-
} else {
1121-
FAIL() << "zeEventQueryStatus() FAILED with " << eventResult;
1122-
}
11231113

11241114
std::vector<uint8_t> rawData;
11251115
lzt::metric_streamer_read_data(metricStreamerHandle, &rawData);
1126-
11271116
lzt::metric_streamer_close(metricStreamerHandle);
11281117
lzt::deactivate_metric_groups(device);
11291118
lzt::destroy_function(function);
@@ -1195,9 +1184,9 @@ TEST_F(
11951184
lzt::execute_command_lists(commandQueue, 1, &commandList, nullptr);
11961185
lzt::event_host_synchronize(eventHandle, UINT64_MAX);
11971186
std::vector<uint8_t> rawData;
1198-
uint32_t rawDataSize = 0;
1199-
lzt::metric_streamer_read_data(metricStreamerHandle, rawDataSize,
1200-
&rawData);
1187+
size_t rawDataSize = 0;
1188+
lzt::metric_streamer_read_data(metricStreamerHandle, notifyEveryNReports,
1189+
rawDataSize, &rawData);
12011190

12021191
LOG_INFO << "raw data size " << rawDataSize;
12031192
EXPECT_GT(rawDataSize, 0);
@@ -1225,7 +1214,8 @@ TEST_F(
12251214
zetMetricStreamerTest,
12261215
GivenValidMetricGroupWhenTimerBasedStreamerIsCreatedThenExpectStreamerToSucceed) {
12271216

1228-
notifyEveryNReports = 5000;
1217+
uint32_t notifyEveryNReports = 256;
1218+
uint32_t samplingPeriod = 1000000000;
12291219
for (auto device : devices) {
12301220

12311221
ze_device_properties_t deviceProperties = {
@@ -1271,25 +1261,15 @@ TEST_F(
12711261

12721262
lzt::execute_command_lists(commandQueue, 1, &commandList, nullptr);
12731263
lzt::synchronize(commandQueue, std::numeric_limits<uint64_t>::max());
1274-
ze_result_t eventResult;
1275-
eventResult = zeEventQueryStatus(eventHandle);
1276-
1277-
if (ZE_RESULT_SUCCESS == eventResult) {
1278-
LOG_DEBUG << "Event triggered";
1279-
} else if (ZE_RESULT_NOT_READY == eventResult) {
1280-
LOG_WARNING << "wait on event returned ZE_RESULT_NOT_READY";
1281-
} else {
1282-
FAIL() << "zeEventQueryStatus() FAILED with " << eventResult;
1283-
}
12841264

12851265
std::vector<uint8_t> rawData;
1286-
uint32_t rawDataSize = 0;
1287-
lzt::metric_streamer_read_data(metricStreamerHandle, rawDataSize,
1288-
&rawData);
1266+
size_t rawDataSize = 0;
1267+
lzt::metric_streamer_read_data(metricStreamerHandle, notifyEveryNReports,
1268+
rawDataSize, &rawData);
1269+
12891270
LOG_INFO << "rawDataSize " << rawDataSize;
12901271
lzt::validate_metrics(groupInfo.metricGroupHandle, rawDataSize,
12911272
rawData.data());
1292-
12931273
lzt::metric_streamer_close(metricStreamerHandle);
12941274
lzt::deactivate_metric_groups(device);
12951275
lzt::destroy_function(function);
@@ -1755,20 +1735,9 @@ void run_ip_sampling_with_validation(
17551735

17561736
lzt::execute_command_lists(commandQueue, 1, &commandList, nullptr);
17571737
lzt::synchronize(commandQueue, std::numeric_limits<uint64_t>::max());
1758-
ze_result_t eventResult;
1759-
eventResult = zeEventQueryStatus(eventHandle);
1760-
1761-
if (ZE_RESULT_SUCCESS == eventResult) {
1762-
LOG_DEBUG << "Event triggered";
1763-
} else if (ZE_RESULT_NOT_READY == eventResult) {
1764-
LOG_WARNING << "wait on event returned ZE_RESULT_NOT_READY";
1765-
} else {
1766-
FAIL() << "zeEventQueryStatus() FAILED with " << eventResult;
1767-
}
17681738

17691739
std::chrono::steady_clock::time_point endTime =
17701740
std::chrono::steady_clock::now();
1771-
17721741
uint64_t elapsedTime =
17731742
std::chrono::duration_cast<std::chrono::nanoseconds>(endTime -
17741743
startTime)
@@ -1781,9 +1750,9 @@ void run_ip_sampling_with_validation(
17811750
}
17821751

17831752
std::vector<uint8_t> rawData;
1784-
uint32_t rawDataSize = 0;
1785-
lzt::metric_streamer_read_data(metricStreamerHandle, rawDataSize,
1786-
&rawData);
1753+
size_t rawDataSize = 0;
1754+
lzt::metric_streamer_read_data(metricStreamerHandle, notifyEveryNReports,
1755+
rawDataSize, &rawData);
17871756
lzt::validate_metrics(groupInfo.metricGroupHandle, rawDataSize,
17881757
rawData.data(), false);
17891758
rawData.resize(rawDataSize);
@@ -1829,15 +1798,13 @@ void run_ip_sampling_with_validation(
18291798
TEST_F(
18301799
zetMetricStreamerTest,
18311800
GivenValidTypeIpMetricGroupWhenTimerBasedStreamerIsCreatedAndOverflowTriggeredThenExpectStreamerValidateError) {
1832-
18331801
run_ip_sampling_with_validation(true, devices, notifyEveryNReports,
18341802
samplingPeriod, TimeForNReportsComplete);
18351803
}
18361804

18371805
TEST_F(
18381806
zetMetricStreamerTest,
18391807
GivenValidTypeIpMetricGroupWhenTimerBasedStreamerIsCreatedWithNoOverflowThenValidateStallSampleData) {
1840-
18411808
run_ip_sampling_with_validation(false, devices, notifyEveryNReports,
18421809
samplingPeriod, TimeForNReportsComplete);
18431810
}
@@ -2316,8 +2283,9 @@ TEST(
23162283
EXPECT_GE(allReportsSize / oneReportSize, notifyEveryNReports);
23172284

23182285
std::vector<uint8_t> rawData;
2319-
uint32_t rawDataSize = 0;
2320-
lzt::metric_streamer_read_data(metricStreamerHandle, rawDataSize, &rawData);
2286+
size_t rawDataSize = 0;
2287+
lzt::metric_streamer_read_data(metricStreamerHandle, notifyEveryNReports,
2288+
rawDataSize, &rawData);
23212289
lzt::validate_metrics(groupInfo.metricGroupHandle, rawDataSize,
23222290
rawData.data());
23232291

@@ -2397,8 +2365,9 @@ TEST(
23972365
EXPECT_GE(allReportsSize / oneReportSize, notifyEveryNReports);
23982366

23992367
std::vector<uint8_t> rawData;
2400-
uint32_t rawDataSize = 0;
2401-
lzt::metric_streamer_read_data(metricStreamerHandle, rawDataSize, &rawData);
2368+
size_t rawDataSize = 0;
2369+
lzt::metric_streamer_read_data(metricStreamerHandle, notifyEveryNReports,
2370+
rawDataSize, &rawData);
24022371
lzt::validate_metrics(groupInfo.metricGroupHandle, rawDataSize,
24032372
rawData.data());
24042373

‎utils/test_harness/tools/include/test_harness_metric.hpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,10 @@ void metric_streamer_read_data(
141141
zet_metric_streamer_handle_t metricStreamerHandle, uint32_t &rawDataSize,
142142
std::vector<uint8_t> *metricData);
143143

144+
void metric_streamer_read_data(
145+
zet_metric_streamer_handle_t metricStreamerHandle, uint32_t reports,
146+
size_t &rawDataSize, std::vector<uint8_t> *metricData);
147+
144148
std::vector<zet_metric_group_handle_t>
145149
get_metric_groups_with_different_domains(const ze_device_handle_t device,
146150
uint32_t metric_groups_per_domain);

‎utils/test_harness/tools/src/test_harness_metric.cpp‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -582,6 +582,18 @@ void metric_streamer_read_data(
582582
rawDataSize = metricSize;
583583
}
584584

585+
void metric_streamer_read_data(
586+
zet_metric_streamer_handle_t metricStreamerHandle, uint32_t reports,
587+
size_t &rawDataSize, std::vector<uint8_t> *metricData) {
588+
ASSERT_NE(nullptr, metricData);
589+
rawDataSize = metric_streamer_read_data_size(metricStreamerHandle, reports);
590+
EXPECT_GT(rawDataSize, 0);
591+
metricData->resize(rawDataSize);
592+
EXPECT_EQ(ZE_RESULT_SUCCESS,
593+
zetMetricStreamerReadData(metricStreamerHandle, reports,
594+
&rawDataSize, metricData->data()));
595+
}
596+
585597
void activate_metric_groups(
586598
ze_device_handle_t device, uint32_t count,
587599
zet_metric_group_handle_t *ptr_matched_group_handle) {

0 commit comments

Comments
 (0)