Skip to content

Commit e5ec318

Browse files
shubskmrshubskmr
committed
fix: EUSS tests should not fail in case of overflow
Related-To: VLCLJ-2647 Signed-off-by: shubham kumar <shubham.kumar@intel.com>
1 parent e424b8e commit e5ec318

File tree

5 files changed

+40
-21
lines changed

5 files changed

+40
-21
lines changed

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

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,7 +1242,8 @@ LZT_TEST_F(
12421242
EXPECT_GT(rawDataSize, 0);
12431243
rawData.resize(rawDataSize);
12441244
lzt::metric_streamer_read_data(metricStreamerHandle, notifyEveryNReports,
1245-
rawDataSize, &rawData);
1245+
rawDataSize, &rawData,
1246+
groupInfo.metricGroupHandle);
12461247

12471248
LOG_INFO << "raw data size " << rawDataSize;
12481249
EXPECT_GT(rawDataSize, 0);
@@ -1339,8 +1340,9 @@ LZT_TEST_F(
13391340
EXPECT_GT(rawDataSize, 0);
13401341
rawData.resize(rawDataSize);
13411342
for (uint32_t count = 0; count < maxReadAttempts; count++) {
1342-
lzt::metric_streamer_read_data(
1343-
metricStreamerHandle, notifyEveryNReports, rawDataSize, &rawData);
1343+
lzt::metric_streamer_read_data(metricStreamerHandle,
1344+
notifyEveryNReports, rawDataSize,
1345+
&rawData, groupInfo.metricGroupHandle);
13441346
if (rawDataSize > 0) {
13451347
break;
13461348
} else {
@@ -2203,7 +2205,8 @@ LZT_TEST(
22032205
EXPECT_GT(rawDataSize, 0);
22042206
rawData.resize(rawDataSize);
22052207
lzt::metric_streamer_read_data(metricStreamerHandle, notifyEveryNReports,
2206-
rawDataSize, &rawData);
2208+
rawDataSize, &rawData,
2209+
groupInfo.metricGroupHandle);
22072210
lzt::validate_metrics(groupInfo.metricGroupHandle, rawDataSize,
22082211
rawData.data());
22092212

@@ -2290,7 +2293,8 @@ LZT_TEST(
22902293
EXPECT_GT(rawDataSize, 0);
22912294
rawData.resize(rawDataSize);
22922295
lzt::metric_streamer_read_data(metricStreamerHandle, notifyEveryNReports,
2293-
rawDataSize, &rawData);
2296+
rawDataSize, &rawData,
2297+
groupInfo.metricGroupHandle);
22942298
lzt::validate_metrics(groupInfo.metricGroupHandle, rawDataSize,
22952299
rawData.data());
22962300

@@ -2735,8 +2739,9 @@ LZT_TEST_F(
27352739
EXPECT_GT(rawDataSize, 0);
27362740
rawData.resize(rawDataSize);
27372741
for (uint32_t count = 0; count < maxReadAttempts; count++) {
2738-
lzt::metric_streamer_read_data(
2739-
metricStreamerHandle, notifyEveryNReports, rawDataSize, &rawData);
2742+
lzt::metric_streamer_read_data(metricStreamerHandle,
2743+
notifyEveryNReports, rawDataSize,
2744+
&rawData, groupInfo.metricGroupHandle);
27402745
if (rawDataSize > 0) {
27412746
break;
27422747
} else {
@@ -2834,8 +2839,9 @@ LZT_TEST_F(
28342839
EXPECT_GT(rawDataSize, 0);
28352840
rawData.resize(rawDataSize);
28362841
for (uint32_t count = 0; count < maxReadAttempts; count++) {
2837-
lzt::metric_streamer_read_data(
2838-
metricStreamerHandle, notifyEveryNReports, rawDataSize, &rawData);
2842+
lzt::metric_streamer_read_data(metricStreamerHandle,
2843+
notifyEveryNReports, rawDataSize,
2844+
&rawData, groupInfo.metricGroupHandle);
28392845
if (rawDataSize > 0) {
28402846
std::vector<zet_typed_value_t> metricValues;
28412847
std::vector<uint32_t> metricValueSets;

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,9 @@ LZT_TEST_F(
176176
EXPECT_GT(rawDataSize, 0);
177177
rawData.resize(rawDataSize);
178178
for (uint32_t count = 0; count < maxReadAttempts; count++) {
179-
lzt::metric_streamer_read_data(
180-
metricStreamerHandle, notifyEveryNReports, rawDataSize, &rawData);
179+
lzt::metric_streamer_read_data(metricStreamerHandle,
180+
notifyEveryNReports, rawDataSize,
181+
&rawData, groupInfo.metricGroupHandle);
181182
if (rawDataSize > 0) {
182183
break;
183184
} else {
@@ -276,8 +277,9 @@ LZT_TEST_F(
276277
EXPECT_GT(rawDataSize, 0);
277278
rawData.resize(rawDataSize);
278279
for (uint32_t count = 0; count < maxReadAttempts; count++) {
279-
lzt::metric_streamer_read_data(
280-
metricStreamerHandle, notifyEveryNReports, rawDataSize, &rawData);
280+
lzt::metric_streamer_read_data(metricStreamerHandle,
281+
notifyEveryNReports, rawDataSize,
282+
&rawData, groupInfo.metricGroupHandle);
281283
if (rawDataSize > 0) {
282284
std::vector<zet_typed_value_t> metricValues;
283285
std::vector<uint32_t> metricValueSets;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,8 @@ void metric_run_ip_sampling_with_validation(
344344
EXPECT_GT(rawDataSize, 0);
345345
rawData.resize(rawDataSize);
346346
lzt::metric_streamer_read_data(metricStreamerHandle, notifyEveryNReports,
347-
rawDataSize, &rawData);
347+
rawDataSize, &rawData,
348+
groupInfo.metricGroupHandle);
348349
lzt::validate_metrics(groupInfo.metricGroupHandle, rawDataSize,
349350
rawData.data(), false);
350351
rawData.resize(rawDataSize);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,8 @@ void metric_streamer_read_data(
143143

144144
void metric_streamer_read_data(
145145
zet_metric_streamer_handle_t metricStreamerHandle, uint32_t reports,
146-
size_t &rawDataSize, std::vector<uint8_t> *metricData);
146+
size_t &rawDataSize, std::vector<uint8_t> *metricData,
147+
zet_metric_group_handle_t metricGroupHandle = nullptr);
147148

148149
std::vector<zet_metric_group_handle_t>
149150
get_metric_groups_with_different_domains(const ze_device_handle_t device,

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

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -617,16 +617,25 @@ void metric_streamer_read_data(
617617

618618
void metric_streamer_read_data(
619619
zet_metric_streamer_handle_t metricStreamerHandle, uint32_t reports,
620-
size_t &rawDataSize, std::vector<uint8_t> *metricData) {
620+
size_t &rawDataSize, std::vector<uint8_t> *metricData,
621+
zet_metric_group_handle_t metricGroupHandle) {
621622
ASSERT_NE(nullptr, metricData);
623+
624+
// Check if this is an IP metric group when metricGroupHandle is provided
625+
bool isIpMetricGroup = false;
626+
if (metricGroupHandle != nullptr) {
627+
isIpMetricGroup = check_metric_type_ip(metricGroupHandle, false);
628+
}
629+
622630
ze_result_t result = zetMetricStreamerReadData(
623631
metricStreamerHandle, reports, &rawDataSize, metricData->data());
624-
if (result == ZE_RESULT_WARNING_DROPPED_DATA) {
625-
EXPECT_ZE_RESULT_SUCCESS(zetMetricStreamerReadData(
626-
metricStreamerHandle, reports, &rawDataSize, metricData->data()));
627-
} else {
628-
EXPECT_ZE_RESULT_SUCCESS(result);
632+
633+
if (isIpMetricGroup && result == ZE_RESULT_WARNING_DROPPED_DATA) {
634+
// Special handling for IP metric groups - allow retry on dropped data
635+
result = zetMetricStreamerReadData(metricStreamerHandle, reports,
636+
&rawDataSize, metricData->data());
629637
}
638+
EXPECT_ZE_RESULT_SUCCESS(result);
630639
}
631640

632641
void activate_metric_groups(

0 commit comments

Comments
 (0)