[igt-dev] [PATCH i-g-t 2/2] tests/xe: Add GT id to identify failures

[Riana Tauro]

Add GT id to igt assertions in xe_guc_pc that
checks if a GT is in a required C State.
This helps to identify which GT is causing a failure.

No functional changes.

Signed-off-by: Riana Tauro <riana.tauro at intel.com>
---
 tests/intel/xe_guc_pc.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/tests/intel/xe_guc_pc.c b/tests/intel/xe_guc_pc.c
index 032816921..151e6cb0a 100644
--- a/tests/intel/xe_guc_pc.c
+++ b/tests/intel/xe_guc_pc.c
@@ -240,7 +240,8 @@ static void test_freq_fixed(int fd, int gt_id, bool gt_idle)
 
 	if (gt_idle) {
 		/* Wait for GT to go in C6 as previous get_freq wakes up GT*/
-		igt_assert(igt_wait(xe_is_gt_in_c6(fd, gt_id), 1000, 10));
+		igt_assert_f(igt_wait(xe_is_gt_in_c6(fd, gt_id), 1000, 10),
+			     "GT %d should be in C6\n", gt_id);
 		igt_assert(get_freq(fd, gt_id, "act") == 0);
 	} else {
 		igt_assert(get_freq(fd, gt_id, "act") == rpn);
@@ -252,7 +253,8 @@ static void test_freq_fixed(int fd, int gt_id, bool gt_idle)
 	igt_assert(get_freq(fd, gt_id, "cur") == rpe);
 
 	if (gt_idle) {
-		igt_assert(igt_wait(xe_is_gt_in_c6(fd, gt_id), 1000, 10));
+		igt_assert_f(igt_wait(xe_is_gt_in_c6(fd, gt_id), 1000, 10),
+			     "GT %d should be in C6\n", gt_id);
 		igt_assert(get_freq(fd, gt_id, "act") == 0);
 	} else {
 		igt_assert(get_freq(fd, gt_id, "act") == rpe);
@@ -269,7 +271,8 @@ static void test_freq_fixed(int fd, int gt_id, bool gt_idle)
 	igt_assert(get_freq(fd, gt_id, "cur") == rp0);
 
 	if (gt_idle) {
-		igt_assert(igt_wait(xe_is_gt_in_c6(fd, gt_id), 1000, 10));
+		igt_assert_f(igt_wait(xe_is_gt_in_c6(fd, gt_id), 1000, 10),
+			     "GT %d should be in C6\n", gt_id);
 		igt_assert(get_freq(fd, gt_id, "act") == 0);
 	}
 
@@ -301,7 +304,8 @@ static void test_freq_range(int fd, int gt_id, bool gt_idle)
 	igt_assert(rpn <= cur && cur <= rpe);
 
 	if (gt_idle) {
-		igt_assert(igt_wait(xe_is_gt_in_c6(fd, gt_id), 1000, 10));
+		igt_assert_f(igt_wait(xe_is_gt_in_c6(fd, gt_id), 1000, 10),
+			     "GT %d should be in C6\n", gt_id);
 		igt_assert(get_freq(fd, gt_id, "act") == 0);
 	} else {
 		act = get_freq(fd, gt_id, "act");
@@ -411,7 +415,8 @@ igt_main
 
 	igt_subtest("freq_fixed_idle") {
 		xe_for_each_gt(fd, gt) {
-			igt_require(igt_wait(xe_is_gt_in_c6(fd, gt), 1000, 10));
+			igt_require_f(igt_wait(xe_is_gt_in_c6(fd, gt), 1000, 10),
+				      "GT %d should be in C6\n", gt);
 			test_freq_fixed(fd, gt, true);
 		}
 	}
@@ -432,7 +437,8 @@ igt_main
 
 	igt_subtest("freq_range_idle") {
 		xe_for_each_gt(fd, gt) {
-			igt_require(igt_wait(xe_is_gt_in_c6(fd, gt), 1000, 10));
+			igt_require_f(igt_wait(xe_is_gt_in_c6(fd, gt), 1000, 10),
+				      "GT %d should be in C6\n", gt);
 			test_freq_range(fd, gt, true);
 		}
 	}
-- 
2.40.0