From patchwork Tue Sep 17 13:09:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 11148809 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3916276 for ; Tue, 17 Sep 2019 13:09:53 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 21ABC216C8 for ; Tue, 17 Sep 2019 13:09:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 21ABC216C8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=chris-wilson.co.uk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 80C6C89DA6; Tue, 17 Sep 2019 13:09:52 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6460289DA6; Tue, 17 Sep 2019 13:09:50 +0000 (UTC) X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.65.138; Received: from haswell.alporthouse.com (unverified [78.156.65.138]) by fireflyinternet.com (Firefly Internet (M1)) with ESMTP id 18519645-1500050 for multiple; Tue, 17 Sep 2019 14:09:16 +0100 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Tue, 17 Sep 2019 14:09:13 +0100 Message-Id: <20190917130913.31702-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH i-g-t] i915/gem_mmap_gtt: Replace forked-mmaped tests with a lighter variant X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: igt-dev@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Introduce a new 2-process fork test that is bound to a single cpu to exercise contention during pagefaults. This is a much lighter variant of the all-cpus test intended to be viable even on the legendary frozen lakes of molasses. References: https://bugs.freedesktop.org/show_bug.cgi?id=110882 Signed-off-by: Chris Wilson Cc: Mika Kuoppala Cc: Martin Peres Reviewed-by: Mika Kuoppala --- tests/i915/gem_mmap_gtt.c | 36 +++++++++++++++++++++++++----------- tests/intel-ci/blacklist.txt | 2 +- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/tests/i915/gem_mmap_gtt.c b/tests/i915/gem_mmap_gtt.c index ac439cdf8..0428a1372 100644 --- a/tests/i915/gem_mmap_gtt.c +++ b/tests/i915/gem_mmap_gtt.c @@ -792,9 +792,6 @@ test_huge_copy(int fd, int huge, int tiling_a, int tiling_b, int ncpus) uint64_t huge_object_size, i; unsigned mode = CHECK_RAM; - igt_fail_on_f(intel_gen(devid) >= 11 && ncpus > 1, - "Please adjust your expectations, https://bugs.freedesktop.org/show_bug.cgi?id=110882\n"); - switch (huge) { case -2: huge_object_size = gem_mappable_aperture_size() / 4; @@ -1138,17 +1135,34 @@ igt_main for (const struct copy_mode *m = copy_modes; m->suffix; m++) { igt_subtest_f("%s-copy%s", s->prefix, m->suffix) test_huge_copy(fd, - s->size, - m->tiling_x, - m->tiling_y, - 1); + s->size, + m->tiling_x, + m->tiling_y, + 1); + + igt_subtest_f("cpuset-%s-copy%s", s->prefix, m->suffix) { + cpu_set_t cpu, old; + + sched_getaffinity(0, sizeof(old), &old); + + CPU_ZERO(&cpu); + CPU_SET(0, &cpu); + igt_assert(sched_setaffinity(0, sizeof(cpu), &cpu) == 0); + test_huge_copy(fd, + s->size, + m->tiling_x, + m->tiling_y, + 2); + + igt_assert(sched_setaffinity(0, sizeof(old), &old) == 0); + } igt_subtest_f("forked-%s-copy%s", s->prefix, m->suffix) test_huge_copy(fd, - s->size, - m->tiling_x, - m->tiling_y, - ncpus); + s->size, + m->tiling_x, + m->tiling_y, + ncpus); } } diff --git a/tests/intel-ci/blacklist.txt b/tests/intel-ci/blacklist.txt index 8e3dafa98..5fa91105f 100644 --- a/tests/intel-ci/blacklist.txt +++ b/tests/intel-ci/blacklist.txt @@ -47,7 +47,7 @@ igt@gem_gtt_hog(@.*)? igt@gem_gtt_speed(@.*)? igt@gem_hangcheck_forcewake(@.*)? igt@gem_lut_handle(@.*)? -igt@gem_mmap_gtt@.*(huge|swap|clflush).* +igt@gem_mmap_gtt@.*(huge|swap|clflush|forked).* igt@gem_mmap@.*(swap|huge).* igt@gem_mocs_settings@.*(suspend|hibernate).* igt@gem_pin(@.*)?