Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH i-g-t v3 1/1] tests/intel/xe_eudebug: refactor exec-queue-placements test
@ 2025-01-17  8:20 Jan Sokolowski
  2025-01-17 11:04 ` ✗ i915.CI.BAT: failure for series starting with [i-g-t,v3,1/1] " Patchwork
                   ` (6 more replies)
  0 siblings, 7 replies; 8+ messages in thread
From: Jan Sokolowski @ 2025-01-17  8:20 UTC (permalink / raw)
  To: igt-dev; +Cc: Jan Sokolowski

In some cases, ccs_mode_all_engines can fail,
which will cause test fixture to not execute properly
and put the rest of the tests in an unstable state. Also,
ccs_mode_all_engines changes the state of the card for
other tests as well, thus it should clean after itself too,
which until now it didn't do.

Refactor exec-queue-placements test so that all possible
failure paths are serviced, and add a proper cleanup method,
ccs_mode_restore.

Signed-off-by: Jan Sokolowski <jan.sokolowski@intel.com>
---

v2: Forgot proper path in title
v3: More changes. Moved test back to where it originally was

---

 tests/intel/xe_eudebug.c | 41 ++++++++++++++++++++++++++++++++++------
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/tests/intel/xe_eudebug.c b/tests/intel/xe_eudebug.c
index 91e9ae885..9787183ed 100644
--- a/tests/intel/xe_eudebug.c
+++ b/tests/intel/xe_eudebug.c
@@ -2797,7 +2797,7 @@ static void ccs_mode_all_engines(int num_gt)
 
 		igt_assert(igt_sysfs_printf(gt_fd, "ccs_mode", "%u", num_slices) > 0);
 		igt_assert(igt_sysfs_scanf(gt_fd, "ccs_mode", "%u", &ccs_mode) > 0);
-		igt_assert(num_slices == ccs_mode);
+		igt_require(num_slices == ccs_mode);
 		close(gt_fd);
 	}
 
@@ -2805,6 +2805,25 @@ static void ccs_mode_all_engines(int num_gt)
 	igt_require(num_gts_with_ccs_mode > 0);
 }
 
+static void ccs_mode_restore(int num_gt)
+{
+	int fd, gt, gt_fd, ccs_mode, num_slices;
+
+	for (gt = 0; gt < num_gt; gt++) {
+		fd = drm_open_driver(DRIVER_XE);
+		gt_fd = xe_sysfs_gt_open(fd, gt);
+		close(fd);
+
+		if (igt_sysfs_scanf(gt_fd, "num_cslices", "%u", &num_slices) <= 0)
+			continue;
+
+		igt_assert(igt_sysfs_printf(gt_fd, "ccs_mode", "%u", 1) > 0);
+		igt_assert(igt_sysfs_scanf(gt_fd, "ccs_mode", "%u", &ccs_mode) > 0);
+		igt_assert(ccs_mode == 1);
+		close(gt_fd);
+	}
+}
+
 igt_main
 {
 	bool was_enabled;
@@ -2920,16 +2939,26 @@ igt_main
 		test_empty_discovery(fd, DISCOVERY_DESTROY_RESOURCES, 16);
 
 	igt_subtest_group {
-		igt_fixture {
+		bool restore_ccs = false;
+
+		igt_subtest("exec-queue-placements") {
 			drm_close_driver(fd);
+			fd = -1;
 			ccs_mode_all_engines(gt_count);
+			restore_ccs = true;
 			fd = drm_open_driver(DRIVER_XE);
-		}
-
-		igt_subtest("exec-queue-placements")
 			test_basic_sessions(fd, EXEC_QUEUES_PLACEMENTS, 1, true);
+		}
+		igt_fixture {
+			if (restore_ccs) {
+				drm_close_driver(fd);
+				fd = -1;
+				ccs_mode_restore(gt_count);
+			}
+			if (fd == -1)
+				fd = drm_open_driver(DRIVER_XE);
+		}
 	}
-
 	igt_fixture {
 		xe_eudebug_enable(fd, was_enabled);
 		drm_close_driver(fd);
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2025-01-20 16:00 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-17  8:20 [PATCH i-g-t v3 1/1] tests/intel/xe_eudebug: refactor exec-queue-placements test Jan Sokolowski
2025-01-17 11:04 ` ✗ i915.CI.BAT: failure for series starting with [i-g-t,v3,1/1] " Patchwork
2025-01-17 12:01 ` [PATCH i-g-t v3 1/1] " Manszewski, Christoph
2025-01-17 18:21 ` ✗ Xe.CI.Full: failure for series starting with [i-g-t,v3,1/1] " Patchwork
2025-01-20  6:18 ` ✓ Xe.CI.BAT: success for series starting with [i-g-t,v3,1/1] tests/intel/xe_eudebug: refactor exec-queue-placements test (rev2) Patchwork
2025-01-20  6:19 ` ✓ i915.CI.BAT: " Patchwork
2025-01-20  8:06 ` ✗ Xe.CI.Full: failure " Patchwork
2025-01-20 16:00 ` ✗ i915.CI.Full: " Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox