From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by gabe.freedesktop.org (Postfix) with ESMTPS id 147F76E1A2 for ; Tue, 8 Jun 2021 19:25:48 +0000 (UTC) Received: by mail-wr1-x42b.google.com with SMTP id m18so22808447wrv.2 for ; Tue, 08 Jun 2021 12:25:47 -0700 (PDT) From: Daniel Vetter Date: Tue, 8 Jun 2021 21:25:33 +0200 Message-Id: <20210608192533.28684-1-daniel.vetter@ffwll.ch> In-Reply-To: <20210608094020.21598-1-daniel.vetter@ffwll.ch> References: <20210608094020.21598-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t] tests/gem_exec_reloc: Remove banned tests List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: IGT development Cc: Petri Latvala , Daniel Vetter List-ID: 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. v2: Keep the !HANG parts (CI) Cc: Jason Ekstrand Cc: Petri Latvala Signed-off-by: Daniel Vetter --- tests/i915/gem_exec_reloc.c | 33 +++++++-------------------------- tests/intel-ci/blacklist.txt | 1 - 2 files changed, 7 insertions(+), 27 deletions(-) diff --git a/tests/i915/gem_exec_reloc.c b/tests/i915/gem_exec_reloc.c index 397c335e4d3c..0e75a5e52cc4 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_spin_set_timeout(spin, NSEC_PER_SEC/100); igt_assert(gem_bo_busy(fd, obj.handle)); } @@ -746,8 +743,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_spin_set_timeout(spin, NSEC_PER_SEC/100); igt_assert(gem_bo_busy(fd, obj.handle)); } @@ -873,8 +869,7 @@ 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_spin_set_timeout(spin, NSEC_PER_SEC/100); igt_assert(gem_bo_busy(fd, obj[n].handle)); } @@ -1468,8 +1463,6 @@ igt_main { "", 0 , true}, { "-noreloc", NORELOC, true }, { "-active", ACTIVE, true }, - { "-interruptible", ACTIVE | INTERRUPTIBLE }, - { "-hang", ACTIVE | HANG }, { }, }, *f; uint64_t size; @@ -1483,14 +1476,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 +1484,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