From patchwork Tue Apr 16 15:01:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mika Kuoppala X-Patchwork-Id: 10903299 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E7F33922 for ; Tue, 16 Apr 2019 15:02:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF0C62873D for ; Tue, 16 Apr 2019 15:02:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE6D728969; Tue, 16 Apr 2019 15:02:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CB6752873D for ; Tue, 16 Apr 2019 15:02:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BA46889AEB; Tue, 16 Apr 2019 15:02:10 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8AD7C89AEB for ; Tue, 16 Apr 2019 15:02:09 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Apr 2019 08:02:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,358,1549958400"; d="scan'208";a="338141171" Received: from rosetta.fi.intel.com ([10.237.72.186]) by fmsmga005.fm.intel.com with ESMTP; 16 Apr 2019 08:02:07 -0700 Received: by rosetta.fi.intel.com (Postfix, from userid 1000) id 578EC8400FF; Tue, 16 Apr 2019 18:01:59 +0300 (EEST) From: Mika Kuoppala To: intel-gfx@lists.freedesktop.org Date: Tue, 16 Apr 2019 18:01:58 +0300 Message-Id: <20190416150158.23416-1-mika.kuoppala@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <155542514280.25605.16703785038972529984@skylake-alporthouse-com> References: <155542514280.25605.16703785038972529984@skylake-alporthouse-com> Subject: [Intel-gfx] [PATCH i-g-t] i915/gem_spin_batch: Add test to resend spinner 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: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Add subtests to resend the same spinner to same context and to other context. v2: other engines (Chris) Cc: Chris Wilson Signed-off-by: Mika Kuoppala Reviewed-by: Chris Wilson --- tests/i915/gem_spin_batch.c | 67 ++++++++++++++++++++++++++++++++----- 1 file changed, 58 insertions(+), 9 deletions(-) diff --git a/tests/i915/gem_spin_batch.c b/tests/i915/gem_spin_batch.c index 52410010..9afdbe09 100644 --- a/tests/i915/gem_spin_batch.c +++ b/tests/i915/gem_spin_batch.c @@ -66,6 +66,48 @@ static void spin(int fd, unsigned int engine, unsigned int timeout_sec) assert_within_epsilon(timeout_100ms * loops, elapsed, MAX_ERROR); } +#define RESUBMIT_NEW_CTX (1 << 0) +#define RESUBMIT_ALL_ENGINES (1 << 1) + +static void spin_resubmit(int fd, unsigned int engine, unsigned int flags) +{ + const uint32_t ctx0 = gem_context_create(fd); + const uint32_t ctx1 = (flags & RESUBMIT_NEW_CTX) ? + gem_context_create(fd) : ctx0; + igt_spin_t *spin = __igt_spin_batch_new(fd, .ctx = ctx0, .engine = engine); + unsigned int other; + + struct drm_i915_gem_execbuffer2 eb = { + .buffer_count = 1, + .buffers_ptr = to_user_pointer(&spin->obj[1]), + .rsvd1 = ctx1, + }; + + if (flags & RESUBMIT_ALL_ENGINES) { + for_each_physical_engine(fd, other) { + if (other == engine) + continue; + + eb.flags = other; + gem_execbuf(fd, &eb); + } + } else { + eb.flags = engine; + gem_execbuf(fd, &eb); + } + + igt_spin_batch_end(spin); + + gem_sync(fd, spin->obj[1].handle); + + igt_spin_batch_free(fd, spin); + + if (ctx1 != ctx0) + gem_context_destroy(fd, ctx1); + + gem_context_destroy(fd, ctx0); +} + static void spin_exit_handler(int sig) { igt_terminate_spin_batches(); @@ -96,22 +138,29 @@ igt_main fd = drm_open_driver(DRIVER_INTEL); igt_require_gem(fd); igt_fork_hang_detector(fd); - intel_detect_and_clear_missed_interrupts(fd); } for (e = intel_execution_engines; e->name; e++) { - igt_subtest_f("basic-%s", e->name) { - intel_detect_and_clear_missed_interrupts(fd); + igt_subtest_f("basic-%s", e->name) spin(fd, e->exec_id, 3); - igt_assert_eq(intel_detect_and_clear_missed_interrupts(fd), 0); - } + + igt_subtest_f("resubmit-%s", e->name) + spin_resubmit(fd, e->exec_id, 0); + + igt_subtest_f("resubmit-new-%s", e->name) + spin_resubmit(fd, e->exec_id, RESUBMIT_NEW_CTX); + + igt_subtest_f("resubmit-all-%s", e->name) + spin_resubmit(fd, e->exec_id, RESUBMIT_ALL_ENGINES); + + igt_subtest_f("resubmit-new-all-%s", e->name) + spin_resubmit(fd, e->exec_id, + RESUBMIT_NEW_CTX | + RESUBMIT_ALL_ENGINES); } - igt_subtest("spin-each") { - intel_detect_and_clear_missed_interrupts(fd); + igt_subtest("spin-each") spin_on_all_engines(fd, 3); - igt_assert_eq(intel_detect_and_clear_missed_interrupts(fd), 0); - } igt_fixture { igt_stop_hang_detector();