All of lore.kernel.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH i-g-t 1/7] tests/gem_exec_reloc: Remove banned tests
@ 2021-06-08  9:40 Daniel Vetter
  2021-06-08  9:40 ` [igt-dev] [PATCH i-g-t 2/7] Revert "test/i915/gem_exec_reloc: Restore interclient testings" Daniel Vetter
                   ` (11 more replies)
  0 siblings, 12 replies; 22+ messages in thread
From: Daniel Vetter @ 2021-06-08  9:40 UTC (permalink / raw)
  To: IGT development; +Cc: Petri Latvala, Daniel Vetter

These have been banned across all CI for over 2 years, realistically
that's not going to change and they're just in the way.

Cc: Jason Ekstrand <jason@jlekstrand.net>
Cc: Petri Latvala <petri.latvala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 tests/i915/gem_exec_reloc.c  | 31 +++++--------------------------
 tests/intel-ci/blacklist.txt |  1 -
 2 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/tests/i915/gem_exec_reloc.c b/tests/i915/gem_exec_reloc.c
index 397c335e4d3c..cb4899fe6e1e 100644
--- a/tests/i915/gem_exec_reloc.c
+++ b/tests/i915/gem_exec_reloc.c
@@ -614,8 +614,6 @@ static bool has_64b_reloc(int fd)
 
 #define NORELOC 1
 #define ACTIVE 2
-#define INTERRUPTIBLE 4
-#define HANG 8
 static void basic_reloc(int fd, unsigned before, unsigned after, unsigned flags)
 {
 #define OBJSZ 8192
@@ -678,8 +676,7 @@ static void basic_reloc(int fd, unsigned before, unsigned after, unsigned flags)
 			spin = igt_spin_new(fd,
 					    .engine = I915_EXEC_DEFAULT,
 					    .dependency = obj.handle);
-			if (!(flags & HANG))
-				igt_spin_set_timeout(spin, NSEC_PER_SEC/100);
+
 			igt_assert(gem_bo_busy(fd, obj.handle));
 		}
 
@@ -746,8 +743,6 @@ static void basic_reloc(int fd, unsigned before, unsigned after, unsigned flags)
 			spin = igt_spin_new(fd,
 					    .engine = I915_EXEC_DEFAULT,
 					    .dependency = obj.handle);
-			if (!(flags & HANG))
-				igt_spin_set_timeout(spin, NSEC_PER_SEC/100);
 			igt_assert(gem_bo_busy(fd, obj.handle));
 		}
 
@@ -873,8 +868,6 @@ static void basic_range(int fd, unsigned flags)
 
 	if (flags & ACTIVE) {
 		spin = igt_spin_new(fd, .dependency = obj[n].handle);
-		if (!(flags & HANG))
-			igt_spin_set_timeout(spin, NSEC_PER_SEC/100);
 		igt_assert(gem_bo_busy(fd, obj[n].handle));
 	}
 
@@ -1468,8 +1461,6 @@ igt_main
 		{ "", 0 , true},
 		{ "-noreloc", NORELOC, true },
 		{ "-active", ACTIVE, true },
-		{ "-interruptible", ACTIVE | INTERRUPTIBLE },
-		{ "-hang", ACTIVE | HANG },
 		{ },
 	}, *f;
 	uint64_t size;
@@ -1483,14 +1474,7 @@ igt_main
 	}
 
 	for (f = flags; f->name; f++) {
-		igt_hang_t hang;
-
 		igt_subtest_group {
-			igt_fixture {
-				if (f->flags & HANG)
-					hang = igt_allow_hang(fd, 0, 0);
-			}
-
 			for (m = modes; m->name; m++) {
 				igt_subtest_f("%s%s%s",
 					      f->basic ? "basic-" : "",
@@ -1498,22 +1482,17 @@ igt_main
 					      f->name) {
 					if ((m->before | m->after) & I915_GEM_DOMAIN_WC)
 						igt_require(gem_mmap__has_wc(fd));
-					igt_while_interruptible(f->flags & INTERRUPTIBLE)
-						basic_reloc(fd, m->before, m->after, f->flags);
+
+					basic_reloc(fd, m->before, m->after, f->flags);
 				}
 			}
 
 			if (!(f->flags & NORELOC)) {
 				igt_subtest_f("%srange%s",
 					      f->basic ? "basic-" : "", f->name) {
-					igt_while_interruptible(f->flags & INTERRUPTIBLE)
-						basic_range(fd, f->flags);
-				}
-			}
 
-			igt_fixture {
-				if (f->flags & HANG)
-					igt_disallow_hang(fd, hang);
+					basic_range(fd, f->flags);
+				}
 			}
 		}
 	}
diff --git a/tests/intel-ci/blacklist.txt b/tests/intel-ci/blacklist.txt
index 33f92e37f602..4d2555f8adb3 100644
--- a/tests/intel-ci/blacklist.txt
+++ b/tests/intel-ci/blacklist.txt
@@ -30,7 +30,6 @@ igt@gem_exec_flush@(?!.*basic).*
 igt@gem_exec_latency(@.*)?
 igt@gem_exec_lut_handle(@.*)?
 igt@gem_exec_nop@(?!.*basic).*
-igt@gem_exec_reloc@(?!.*basic).*
 igt@gem_exec_suspend@(?!.*basic).*
 igt@gem_exec_whisper@(?!basic).*
 igt@gem_fd_exhaustion(@.*)?
-- 
2.24.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply related	[flat|nested] 22+ messages in thread
* [igt-dev] [PATCH i-g-t 1/7] tests/gem_exec_reloc: Remove banned tests
@ 2021-06-08  9:38 Daniel Vetter
  2021-06-08  9:38 ` [igt-dev] [PATCH i-g-t 6/7] Revert "i915/gem_exec_reloc: Check that relocations do not block" Daniel Vetter
  0 siblings, 1 reply; 22+ messages in thread
From: Daniel Vetter @ 2021-06-08  9:38 UTC (permalink / raw)
  To: IGT development; +Cc: Petri Latvala, Daniel Vetter

These have been banned across all CI for over 2 years, realistically
that's not going to change and they're just in the way.

Cc: Jason Ekstrand <jason@jlekstrand.net>
Cc: Petri Latvala <petri.latvala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 tests/i915/gem_exec_reloc.c  | 31 +++++--------------------------
 tests/intel-ci/blacklist.txt |  1 -
 2 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/tests/i915/gem_exec_reloc.c b/tests/i915/gem_exec_reloc.c
index 397c335e4d3c..cb4899fe6e1e 100644
--- a/tests/i915/gem_exec_reloc.c
+++ b/tests/i915/gem_exec_reloc.c
@@ -614,8 +614,6 @@ static bool has_64b_reloc(int fd)
 
 #define NORELOC 1
 #define ACTIVE 2
-#define INTERRUPTIBLE 4
-#define HANG 8
 static void basic_reloc(int fd, unsigned before, unsigned after, unsigned flags)
 {
 #define OBJSZ 8192
@@ -678,8 +676,7 @@ static void basic_reloc(int fd, unsigned before, unsigned after, unsigned flags)
 			spin = igt_spin_new(fd,
 					    .engine = I915_EXEC_DEFAULT,
 					    .dependency = obj.handle);
-			if (!(flags & HANG))
-				igt_spin_set_timeout(spin, NSEC_PER_SEC/100);
+
 			igt_assert(gem_bo_busy(fd, obj.handle));
 		}
 
@@ -746,8 +743,6 @@ static void basic_reloc(int fd, unsigned before, unsigned after, unsigned flags)
 			spin = igt_spin_new(fd,
 					    .engine = I915_EXEC_DEFAULT,
 					    .dependency = obj.handle);
-			if (!(flags & HANG))
-				igt_spin_set_timeout(spin, NSEC_PER_SEC/100);
 			igt_assert(gem_bo_busy(fd, obj.handle));
 		}
 
@@ -873,8 +868,6 @@ static void basic_range(int fd, unsigned flags)
 
 	if (flags & ACTIVE) {
 		spin = igt_spin_new(fd, .dependency = obj[n].handle);
-		if (!(flags & HANG))
-			igt_spin_set_timeout(spin, NSEC_PER_SEC/100);
 		igt_assert(gem_bo_busy(fd, obj[n].handle));
 	}
 
@@ -1468,8 +1461,6 @@ igt_main
 		{ "", 0 , true},
 		{ "-noreloc", NORELOC, true },
 		{ "-active", ACTIVE, true },
-		{ "-interruptible", ACTIVE | INTERRUPTIBLE },
-		{ "-hang", ACTIVE | HANG },
 		{ },
 	}, *f;
 	uint64_t size;
@@ -1483,14 +1474,7 @@ igt_main
 	}
 
 	for (f = flags; f->name; f++) {
-		igt_hang_t hang;
-
 		igt_subtest_group {
-			igt_fixture {
-				if (f->flags & HANG)
-					hang = igt_allow_hang(fd, 0, 0);
-			}
-
 			for (m = modes; m->name; m++) {
 				igt_subtest_f("%s%s%s",
 					      f->basic ? "basic-" : "",
@@ -1498,22 +1482,17 @@ igt_main
 					      f->name) {
 					if ((m->before | m->after) & I915_GEM_DOMAIN_WC)
 						igt_require(gem_mmap__has_wc(fd));
-					igt_while_interruptible(f->flags & INTERRUPTIBLE)
-						basic_reloc(fd, m->before, m->after, f->flags);
+
+					basic_reloc(fd, m->before, m->after, f->flags);
 				}
 			}
 
 			if (!(f->flags & NORELOC)) {
 				igt_subtest_f("%srange%s",
 					      f->basic ? "basic-" : "", f->name) {
-					igt_while_interruptible(f->flags & INTERRUPTIBLE)
-						basic_range(fd, f->flags);
-				}
-			}
 
-			igt_fixture {
-				if (f->flags & HANG)
-					igt_disallow_hang(fd, hang);
+					basic_range(fd, f->flags);
+				}
 			}
 		}
 	}
diff --git a/tests/intel-ci/blacklist.txt b/tests/intel-ci/blacklist.txt
index 33f92e37f602..4d2555f8adb3 100644
--- a/tests/intel-ci/blacklist.txt
+++ b/tests/intel-ci/blacklist.txt
@@ -30,7 +30,6 @@ igt@gem_exec_flush@(?!.*basic).*
 igt@gem_exec_latency(@.*)?
 igt@gem_exec_lut_handle(@.*)?
 igt@gem_exec_nop@(?!.*basic).*
-igt@gem_exec_reloc@(?!.*basic).*
 igt@gem_exec_suspend@(?!.*basic).*
 igt@gem_exec_whisper@(?!basic).*
 igt@gem_fd_exhaustion(@.*)?
-- 
2.24.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply related	[flat|nested] 22+ messages in thread
* [igt-dev] [PATCH i-g-t 1/7] tests/gem_exec_reloc: Remove banned tests
@ 2021-06-07  9:29 Daniel Vetter
  2021-06-07  9:29 ` [igt-dev] [PATCH i-g-t 6/7] Revert "i915/gem_exec_reloc: Check that relocations do not block" Daniel Vetter
  0 siblings, 1 reply; 22+ messages in thread
From: Daniel Vetter @ 2021-06-07  9:29 UTC (permalink / raw)
  To: IGT development; +Cc: Petri Latvala, Daniel Vetter

These have been banned across all CI for over 2 years, realistically
that's not going to change and they're just in the way.

Cc: Jason Ekstrand <jason@jlekstrand.net>
Cc: Petri Latvala <petri.latvala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 tests/i915/gem_exec_reloc.c  | 31 +++++--------------------------
 tests/intel-ci/blacklist.txt |  1 -
 2 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/tests/i915/gem_exec_reloc.c b/tests/i915/gem_exec_reloc.c
index 397c335e4d3c..cb4899fe6e1e 100644
--- a/tests/i915/gem_exec_reloc.c
+++ b/tests/i915/gem_exec_reloc.c
@@ -614,8 +614,6 @@ static bool has_64b_reloc(int fd)
 
 #define NORELOC 1
 #define ACTIVE 2
-#define INTERRUPTIBLE 4
-#define HANG 8
 static void basic_reloc(int fd, unsigned before, unsigned after, unsigned flags)
 {
 #define OBJSZ 8192
@@ -678,8 +676,7 @@ static void basic_reloc(int fd, unsigned before, unsigned after, unsigned flags)
 			spin = igt_spin_new(fd,
 					    .engine = I915_EXEC_DEFAULT,
 					    .dependency = obj.handle);
-			if (!(flags & HANG))
-				igt_spin_set_timeout(spin, NSEC_PER_SEC/100);
+
 			igt_assert(gem_bo_busy(fd, obj.handle));
 		}
 
@@ -746,8 +743,6 @@ static void basic_reloc(int fd, unsigned before, unsigned after, unsigned flags)
 			spin = igt_spin_new(fd,
 					    .engine = I915_EXEC_DEFAULT,
 					    .dependency = obj.handle);
-			if (!(flags & HANG))
-				igt_spin_set_timeout(spin, NSEC_PER_SEC/100);
 			igt_assert(gem_bo_busy(fd, obj.handle));
 		}
 
@@ -873,8 +868,6 @@ static void basic_range(int fd, unsigned flags)
 
 	if (flags & ACTIVE) {
 		spin = igt_spin_new(fd, .dependency = obj[n].handle);
-		if (!(flags & HANG))
-			igt_spin_set_timeout(spin, NSEC_PER_SEC/100);
 		igt_assert(gem_bo_busy(fd, obj[n].handle));
 	}
 
@@ -1468,8 +1461,6 @@ igt_main
 		{ "", 0 , true},
 		{ "-noreloc", NORELOC, true },
 		{ "-active", ACTIVE, true },
-		{ "-interruptible", ACTIVE | INTERRUPTIBLE },
-		{ "-hang", ACTIVE | HANG },
 		{ },
 	}, *f;
 	uint64_t size;
@@ -1483,14 +1474,7 @@ igt_main
 	}
 
 	for (f = flags; f->name; f++) {
-		igt_hang_t hang;
-
 		igt_subtest_group {
-			igt_fixture {
-				if (f->flags & HANG)
-					hang = igt_allow_hang(fd, 0, 0);
-			}
-
 			for (m = modes; m->name; m++) {
 				igt_subtest_f("%s%s%s",
 					      f->basic ? "basic-" : "",
@@ -1498,22 +1482,17 @@ igt_main
 					      f->name) {
 					if ((m->before | m->after) & I915_GEM_DOMAIN_WC)
 						igt_require(gem_mmap__has_wc(fd));
-					igt_while_interruptible(f->flags & INTERRUPTIBLE)
-						basic_reloc(fd, m->before, m->after, f->flags);
+
+					basic_reloc(fd, m->before, m->after, f->flags);
 				}
 			}
 
 			if (!(f->flags & NORELOC)) {
 				igt_subtest_f("%srange%s",
 					      f->basic ? "basic-" : "", f->name) {
-					igt_while_interruptible(f->flags & INTERRUPTIBLE)
-						basic_range(fd, f->flags);
-				}
-			}
 
-			igt_fixture {
-				if (f->flags & HANG)
-					igt_disallow_hang(fd, hang);
+					basic_range(fd, f->flags);
+				}
 			}
 		}
 	}
diff --git a/tests/intel-ci/blacklist.txt b/tests/intel-ci/blacklist.txt
index 33f92e37f602..4d2555f8adb3 100644
--- a/tests/intel-ci/blacklist.txt
+++ b/tests/intel-ci/blacklist.txt
@@ -30,7 +30,6 @@ igt@gem_exec_flush@(?!.*basic).*
 igt@gem_exec_latency(@.*)?
 igt@gem_exec_lut_handle(@.*)?
 igt@gem_exec_nop@(?!.*basic).*
-igt@gem_exec_reloc@(?!.*basic).*
 igt@gem_exec_suspend@(?!.*basic).*
 igt@gem_exec_whisper@(?!basic).*
 igt@gem_fd_exhaustion(@.*)?
-- 
2.24.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply related	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2021-06-14 11:19 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-08  9:40 [igt-dev] [PATCH i-g-t 1/7] tests/gem_exec_reloc: Remove banned tests Daniel Vetter
2021-06-08  9:40 ` [igt-dev] [PATCH i-g-t 2/7] Revert "test/i915/gem_exec_reloc: Restore interclient testings" Daniel Vetter
2021-06-09 17:56   ` Jason Ekstrand
2021-06-14 10:40   ` Arkadiusz Hiler
2021-06-08  9:40 ` [igt-dev] [PATCH i-g-t 3/7] Revert "i915/gem_exec_reloc: Verify engine isolation" Daniel Vetter
2021-06-09 17:59   ` Jason Ekstrand
2021-06-08  9:40 ` [igt-dev] [PATCH i-g-t 4/7] Revert "i915/gem_exec_reloc: Exercise concurrent relocations" Daniel Vetter
2021-06-09 18:12   ` Jason Ekstrand
2021-06-08  9:40 ` [igt-dev] [PATCH i-g-t 5/7] Revert "i915/gem_exec_reloc: Flood the ring with GPU relocs" Daniel Vetter
2021-06-09 18:05   ` Jason Ekstrand
2021-06-08  9:40 ` [igt-dev] [PATCH i-g-t 6/7] Revert "i915/gem_exec_reloc: Check that relocations do not block" Daniel Vetter
2021-06-09 18:03   ` Jason Ekstrand
2021-06-08  9:40 ` [igt-dev] [PATCH i-g-t 7/7] tests/gem_exec_schedule: Use store_dword_plug again Daniel Vetter
2021-06-08 11:22 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/7] tests/gem_exec_reloc: Remove banned tests Patchwork
2021-06-08 16:02 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2021-06-08 19:25 ` [igt-dev] [PATCH i-g-t] " Daniel Vetter
2021-06-09 17:53   ` Jason Ekstrand
2021-06-08 19:44 ` [igt-dev] ✗ GitLab.Pipeline: warning for series starting with [i-g-t] tests/gem_exec_reloc: Remove banned tests (rev2) Patchwork
2021-06-08 20:08 ` [igt-dev] ✓ Fi.CI.BAT: success " Patchwork
2021-06-09  0:49 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
  -- strict thread matches above, loose matches on Subject: below --
2021-06-08  9:38 [igt-dev] [PATCH i-g-t 1/7] tests/gem_exec_reloc: Remove banned tests Daniel Vetter
2021-06-08  9:38 ` [igt-dev] [PATCH i-g-t 6/7] Revert "i915/gem_exec_reloc: Check that relocations do not block" Daniel Vetter
2021-06-07  9:29 [igt-dev] [PATCH i-g-t 1/7] tests/gem_exec_reloc: Remove banned tests Daniel Vetter
2021-06-07  9:29 ` [igt-dev] [PATCH i-g-t 6/7] Revert "i915/gem_exec_reloc: Check that relocations do not block" Daniel Vetter

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.