Extend the reset stats query tests to exercise the reset count value.
Assert that the reset count increases when an engine reset occurs.
Signed-off-by: Jonathan Cavitt <jonathan.cavitt@xxxxxxxxx>
---
tests/intel/xe_query.c | 52 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 52 insertions(+)
diff --git a/tests/intel/xe_query.c b/tests/intel/xe_query.c
index 9862ea87d9..1a9a583a9a 100644
--- a/tests/intel/xe_query.c
+++ b/tests/intel/xe_query.c
@@ -1161,6 +1161,57 @@ static void test_query_reset_stats(int fd)
free(qrs);
}
+/**
+ * SUBTEST: query-reset-stats-reset
+ * Description: Assert reset stats query tracks reset count
+ *
+ * SUBTEST: multigpu-query-reset-stats-reset
+ * Description: Assert reset stats query tracks reset count for all GPU devices
+ * Sub-category: MultiGPU
+ */
+static void
+test_query_reset_stats_reset(int fd)
+{
+ struct drm_xe_engine_class_instance *hwe;
+ struct drm_xe_query_reset_stats *qrs;
+ struct drm_xe_device_query query = {
+ .extensions = 0,
+ .query = DRM_XE_DEVICE_QUERY_RESET_STATS,
+ .size = 0,
+ .data = 0,
+ };
+ u64 resets1, resets2;
+
+ igt_skip_on(!query_reset_stats_supported(fd));
+ igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), 0);
+
+ qrs = malloc(query.size);
+ igt_assert(qrs);
+
+ query.data = to_user_pointer(qrs);
+ igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), 0);
+ resets1 = qrs->reset_count;
+ free(qrs);
+
+ query.size = 0;
+ query.data = 0;
+
+ xe_for_each_engine(fd, hwe)
+ xe_force_gt_reset_sync(fd, hwe->gt_id);
+
+ igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), 0);
+
+ qrs = malloc(query.size);
+ igt_assert(qrs);
+
+ query.data = to_user_pointer(qrs);
+ igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), 0);
+ resets2 = qrs->reset_count;
+ free(qrs);
+
+ igt_assert_lt(resets1, resets2);
+}
+
igt_main
{
const struct {
@@ -1179,6 +1230,7 @@ igt_main
{ "query-uc-fw-version-huc", test_query_uc_fw_version_huc },
{ "query-oa-units", test_query_oa_units },
{ "query-reset-stats", test_query_reset_stats },
+ { "query-reset-stats-reset", test_query_reset_stats_reset },
{ "query-invalid-cs-cycles", test_engine_cycles_invalid },
{ "query-invalid-query", test_query_invalid_query },
{ "query-invalid-size", test_query_invalid_size },
--
2.43.0
