Skip to content

Commit 98e51dc

Browse files
narenbagrianarenbagria
authored
fix: get_metric_group_info (#210)
Related to VLCLJ-2430 Signed-off-by: Bagria, Narendra <[email protected]>
1 parent 59a90bf commit 98e51dc

File tree

3 files changed

+41
-37
lines changed

3 files changed

+41
-37
lines changed

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ TEST_F(
566566
zet_command_list_handle_t commandList = lzt::create_command_list(device);
567567

568568
auto metricGroupInfo = lzt::get_metric_group_info(
569-
device, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_EVENT_BASED, false);
569+
device, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_EVENT_BASED, false, true);
570570
ASSERT_GT(metricGroupInfo.size(), 0u) << "No query metric groups found";
571571
metricGroupInfo = lzt::optimize_metric_group_info_list(metricGroupInfo);
572572

@@ -665,7 +665,7 @@ void run_test(const ze_device_handle_t &device,
665665
commandList = lzt::create_command_list(device);
666666
}
667667
auto metricGroupInfo = lzt::get_metric_group_info(
668-
device, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_EVENT_BASED, false);
668+
device, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_EVENT_BASED, false, true);
669669
ASSERT_GT(metricGroupInfo.size(), 0u) << "No query metric groups found";
670670
metricGroupInfo =
671671
lzt::optimize_metric_group_info_list(metricGroupInfo, reset ? 1 : 20);
@@ -844,11 +844,11 @@ void run_multi_device_query_load_test(
844844
auto command_list_1 = lzt::create_command_list(device_1);
845845

846846
auto metric_group_info_0 = lzt::get_metric_group_info(
847-
device_0, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_EVENT_BASED, true);
847+
device_0, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_EVENT_BASED, true, true);
848848
ASSERT_GT(metric_group_info_0.size(), 0u)
849849
<< "No query metric groups found on device 0";
850850
auto metric_group_info_1 = lzt::get_metric_group_info(
851-
device_1, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_EVENT_BASED, true);
851+
device_1, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_EVENT_BASED, true, true);
852852
ASSERT_GT(metric_group_info_1.size(), 0u)
853853
<< "No query metric groups found on device 1";
854854

@@ -1024,7 +1024,7 @@ TEST_F(
10241024
zet_command_list_handle_t commandList = lzt::create_command_list(device);
10251025

10261026
auto metricGroupInfo = lzt::get_metric_group_info(
1027-
device, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_EVENT_BASED, false);
1027+
device, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_EVENT_BASED, false, true);
10281028
ASSERT_GT(metricGroupInfo.size(), 0u) << "No query metric groups found";
10291029
metricGroupInfo = lzt::optimize_metric_group_info_list(metricGroupInfo, 1);
10301030

@@ -1128,7 +1128,7 @@ TEST_F(
11281128
zet_command_list_handle_t commandList = lzt::create_command_list(device);
11291129

11301130
auto metricGroupInfo = lzt::get_metric_group_info(
1131-
device, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_TIME_BASED, true);
1131+
device, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_TIME_BASED, true, true);
11321132
ASSERT_GT(metricGroupInfo.size(), 0u) << "No metric groups found";
11331133
metricGroupInfo = lzt::optimize_metric_group_info_list(metricGroupInfo);
11341134

@@ -1201,7 +1201,7 @@ TEST_F(
12011201
zet_command_list_handle_t commandList = lzt::create_command_list(device);
12021202

12031203
auto metricGroupInfo = lzt::get_metric_group_info(
1204-
device, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_TIME_BASED, true);
1204+
device, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_TIME_BASED, true, true);
12051205
ASSERT_GT(metricGroupInfo.size(), 0u) << "No metric groups found";
12061206
metricGroupInfo = lzt::optimize_metric_group_info_list(metricGroupInfo);
12071207

@@ -1297,7 +1297,7 @@ TEST_F(
12971297
zet_command_list_handle_t commandList = lzt::create_command_list(device);
12981298

12991299
auto metricGroupInfo = lzt::get_metric_group_info(
1300-
device, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_TIME_BASED, true);
1300+
device, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_TIME_BASED, true, true);
13011301
ASSERT_GT(metricGroupInfo.size(), 0u) << "No metric groups found";
13021302
metricGroupInfo = lzt::optimize_metric_group_info_list(metricGroupInfo);
13031303

@@ -1394,7 +1394,7 @@ TEST_F(
13941394
zet_command_list_handle_t commandList = lzt::create_command_list(device);
13951395

13961396
auto metricGroupInfo = lzt::get_metric_group_info(
1397-
device, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_TIME_BASED, true);
1397+
device, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_TIME_BASED, true, true);
13981398
ASSERT_GT(metricGroupInfo.size(), 0u) << "No metric groups found";
13991399
metricGroupInfo = lzt::optimize_metric_group_info_list(metricGroupInfo);
14001400

@@ -1503,7 +1503,7 @@ TEST_F(
15031503
}
15041504

15051505
auto metricGroupInfo = lzt::get_metric_group_info(
1506-
device, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_TIME_BASED, true);
1506+
device, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_TIME_BASED, true, true);
15071507
ASSERT_GT(metricGroupInfo.size(), 0u) << "No metric groups found";
15081508
metricGroupInfo = lzt::optimize_metric_group_info_list(metricGroupInfo);
15091509

@@ -2066,7 +2066,7 @@ TEST_F(
20662066
zet_command_list_handle_t commandList = lzt::create_command_list(device);
20672067

20682068
auto metricGroupInfo = lzt::get_metric_group_info(
2069-
device, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_TIME_BASED, false);
2069+
device, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_TIME_BASED, false, true);
20702070
ASSERT_GT(metricGroupInfo.size(), 0u) << "No metric groups found";
20712071
metricGroupInfo = lzt::optimize_metric_group_info_list(metricGroupInfo);
20722072

@@ -2179,7 +2179,7 @@ TEST_F(
21792179
zet_command_list_handle_t commandList = lzt::create_command_list(device);
21802180

21812181
auto metricGroupInfo = lzt::get_metric_group_info(
2182-
device, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_TIME_BASED, false);
2182+
device, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_TIME_BASED, false, true);
21832183
ASSERT_GT(metricGroupInfo.size(), 0u) << "No metric groups found";
21842184
metricGroupInfo = lzt::optimize_metric_group_info_list(metricGroupInfo);
21852185

@@ -2363,7 +2363,7 @@ TEST_F(
23632363
zet_command_list_handle_t commandList = lzt::create_command_list(device);
23642364

23652365
auto metricGroupInfo = lzt::get_metric_group_info(
2366-
device, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_TIME_BASED, false);
2366+
device, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_TIME_BASED, false, true);
23672367
ASSERT_GT(metricGroupInfo.size(), 0u) << "No metric groups found";
23682368
metricGroupInfo = lzt::optimize_metric_group_info_list(metricGroupInfo, 1);
23692369

@@ -2464,7 +2464,7 @@ TEST(
24642464

24652465
// setup monitor
24662466
auto metricGroupInfo = lzt::get_metric_group_info(
2467-
device, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_TIME_BASED, true);
2467+
device, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_TIME_BASED, true, true);
24682468
ASSERT_GT(metricGroupInfo.size(), 0u) << "No metric groups found";
24692469
metricGroupInfo = lzt::optimize_metric_group_info_list(metricGroupInfo);
24702470

@@ -2548,7 +2548,7 @@ TEST(
25482548

25492549
// setup monitor
25502550
auto metricGroupInfo = lzt::get_metric_group_info(
2551-
device, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_TIME_BASED, true);
2551+
device, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_TIME_BASED, true, true);
25522552
ASSERT_GT(metricGroupInfo.size(), 0u) << "No metric groups found";
25532553
metricGroupInfo = lzt::optimize_metric_group_info_list(metricGroupInfo);
25542554

@@ -2655,7 +2655,7 @@ TEST_F(
26552655
lzt::create_immediate_command_list(device);
26562656

26572657
auto metricGroupInfo = lzt::get_metric_group_info(
2658-
device, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_TIME_BASED, false);
2658+
device, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_TIME_BASED, false, true);
26592659
ASSERT_GT(metricGroupInfo.size(), 0u) << "No metric groups found";
26602660
metricGroupInfo = lzt::optimize_metric_group_info_list(metricGroupInfo, 1);
26612661

@@ -2783,11 +2783,11 @@ void run_multi_device_streamer_test(
27832783
auto command_list_1 = lzt::create_command_list(device_1);
27842784

27852785
auto metric_group_info_0 = lzt::get_metric_group_info(
2786-
device_0, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_TIME_BASED, true);
2786+
device_0, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_TIME_BASED, true, true);
27872787
ASSERT_GT(metric_group_info_0.size(), 0u)
27882788
<< "No metric groups found on device 0";
27892789
auto metric_group_info_1 = lzt::get_metric_group_info(
2790-
device_1, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_TIME_BASED, true);
2790+
device_1, ZET_METRIC_GROUP_SAMPLING_TYPE_FLAG_TIME_BASED, true, true);
27912791
ASSERT_GT(metric_group_info_1.size(), 0u)
27922792
<< "No metric groups found on device 1";
27932793

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ std::vector<metricGroupInfo_t> get_metric_type_ip_group_info(
3939
std::vector<metricGroupInfo_t>
4040
get_metric_group_info(ze_device_handle_t device,
4141
zet_metric_group_sampling_type_flags_t samplingType,
42-
bool includeExpFeature);
42+
bool includeExpFeature, bool one_group_per_domain);
4343

4444
uint32_t get_metric_group_handles_count(ze_device_handle_t device);
4545
std::vector<zet_metric_group_handle_t>
@@ -257,7 +257,7 @@ void destroy_metric_handles_list(
257257
void destroy_metric_group_handles_list(
258258
std::vector<zet_metric_group_handle_t> &metric_group_handles_list);
259259

260-
std::vector<zet_metric_group_handle_t> get_concurrent_metric_group(
260+
std::vector<zet_metric_group_handle_t> get_one_metric_group_per_domain(
261261
ze_device_handle_t device,
262262
std::vector<zet_metric_group_handle_t> &metricGroupHandleList);
263263

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

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ bool check_metric_type_ip(ze_device_handle_t device, std::string groupName,
197197
return check_metric_type_ip(groupHandle, includeExpFeature);
198198
}
199199

200-
std::vector<zet_metric_group_handle_t> get_concurrent_metric_group(
200+
std::vector<zet_metric_group_handle_t> get_one_metric_group_per_domain(
201201
ze_device_handle_t device,
202202
std::vector<zet_metric_group_handle_t> &metricGroupHandleList) {
203203
std::vector<zet_metric_group_handle_t> concurrentMetricGroupList{};
@@ -285,7 +285,7 @@ std::vector<metricGroupInfo_t> optimize_metric_group_info_list(
285285
std::vector<metricGroupInfo_t>
286286
get_metric_group_info(ze_device_handle_t device,
287287
zet_metric_group_sampling_type_flags_t metricSamplingType,
288-
bool includeExpFeature) {
288+
bool includeExpFeature, bool one_group_per_domain) {
289289

290290
ze_result_t result = zeInit(0);
291291
if (result) {
@@ -315,26 +315,30 @@ get_metric_group_info(ze_device_handle_t device,
315315
<< "Test includes ZET_METRIC_TYPE_IP Metric Type - Skipped...";
316316
continue;
317317
}
318-
319-
concurrentMetricGroupHandles.push_back(metricGroupHandle);
318+
if (one_group_per_domain) {
319+
concurrentMetricGroupHandles.push_back(metricGroupHandle);
320+
}
320321
matchedGroupsInfo.emplace_back(
321322
metricGroupHandle, metricGroupProp.name, metricGroupProp.description,
322323
metricGroupProp.domain, metricGroupProp.metricCount);
323324
}
324-
325-
concurrentMetricGroupHandles =
326-
get_concurrent_metric_group(device, concurrentMetricGroupHandles);
327-
std::vector<metricGroupInfo_t> concurrentMatchedGroupsInfo;
328-
329-
for (auto groupsInfo : matchedGroupsInfo) {
330-
if (count(concurrentMetricGroupHandles.begin(),
331-
concurrentMetricGroupHandles.end(),
332-
groupsInfo.metricGroupHandle)) {
333-
concurrentMatchedGroupsInfo.push_back(groupsInfo);
325+
if (one_group_per_domain) {
326+
concurrentMetricGroupHandles =
327+
get_one_metric_group_per_domain(device, concurrentMetricGroupHandles);
328+
std::vector<metricGroupInfo_t> concurrentMatchedGroupsInfo;
329+
330+
for (auto groupsInfo : matchedGroupsInfo) {
331+
if (count(concurrentMetricGroupHandles.begin(),
332+
concurrentMetricGroupHandles.end(),
333+
groupsInfo.metricGroupHandle)) {
334+
concurrentMatchedGroupsInfo.push_back(groupsInfo);
335+
}
334336
}
335-
}
336337

337-
return concurrentMatchedGroupsInfo;
338+
return concurrentMatchedGroupsInfo;
339+
} else {
340+
return matchedGroupsInfo;
341+
}
338342
}
339343

340344
std::vector<metricGroupInfo_t> get_metric_type_ip_group_info(
@@ -1157,7 +1161,7 @@ void generate_device_list_with_activatable_metric_group_handles(
11571161
lzt::display_device_properties(device);
11581162

11591163
auto metric_group_info =
1160-
lzt::get_metric_group_info(device, sampling_type, true);
1164+
lzt::get_metric_group_info(device, sampling_type, true, true);
11611165
if (metric_group_info.size() == 0) {
11621166
continue;
11631167
}

0 commit comments

Comments
 (0)