From patchwork Tue Jan 5 22:09:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 12000373 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66A5EC433DB for ; Tue, 5 Jan 2021 22:09:55 +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 BB38F22D74 for ; Tue, 5 Jan 2021 22:09:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BB38F22D74 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 47AD6897C5; Tue, 5 Jan 2021 22:09:54 +0000 (UTC) Received: from fireflyinternet.com (unknown [77.68.26.236]) by gabe.freedesktop.org (Postfix) with ESMTPS id CDFA589175; Tue, 5 Jan 2021 22:09:52 +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 23512245-1500050 for multiple; Tue, 05 Jan 2021 22:09:43 +0000 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Tue, 5 Jan 2021 22:09:41 +0000 Message-Id: <20210105220941.3456706-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH i-g-t] i915/gem_ctx_engine: Prerun the spinner to bind offsets before use X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 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, Chris Wilson Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Set the spinner and target execbuf up before we start the test; this not only saves time in recreating the spinner on each loop, but it ensures that we don't antagonise ourselves by fighting over GTT offsets. Signed-off-by: Chris Wilson Cc: Venkata Sandeep Dhanalakota --- tests/i915/gem_ctx_engines.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/tests/i915/gem_ctx_engines.c b/tests/i915/gem_ctx_engines.c index eab0cc40a..4ce4fdf3e 100644 --- a/tests/i915/gem_ctx_engines.c +++ b/tests/i915/gem_ctx_engines.c @@ -333,31 +333,37 @@ static void execute_one(int i915) }; const uint32_t bbe = MI_BATCH_BUFFER_END; const struct intel_execution_engine2 *e; + igt_spin_t *spin; + + /* Prewarm the spinner */ + spin = igt_spin_new(i915, .ctx = param.ctx_id, + .flags = (IGT_SPIN_NO_PREEMPTION | + IGT_SPIN_POLL_RUN)); gem_write(i915, obj.handle, 0, &bbe, sizeof(bbe)); /* Unadulterated I915_EXEC_DEFAULT should work */ execbuf.flags = 0; gem_execbuf(i915, &execbuf); + obj.flags |= EXEC_OBJECT_PINNED; + + igt_spin_end(spin); gem_sync(i915, obj.handle); __for_each_physical_engine(i915, e) { struct drm_i915_gem_busy busy = { .handle = obj.handle }; - for (int i = -1; i <= I915_EXEC_RING_MASK; i++) { - igt_spin_t *spin; + igt_debug("Testing [%s...]\n", e->name); + for (int i = -1; i <= I915_EXEC_RING_MASK; i++) { memset(&engines, 0, sizeof(engines)); engine_class(&engines, 0) = e->class; engine_instance(&engines, 0) = e->instance; param.size = offsetof(typeof(engines), engines[1]); gem_context_set_param(i915, ¶m); - spin = igt_spin_new(i915, - .ctx = param.ctx_id, - .engine = 0, - .flags = (IGT_SPIN_NO_PREEMPTION | - IGT_SPIN_POLL_RUN)); + igt_spin_reset(spin); + gem_execbuf(i915, &spin->execbuf); igt_debug("Testing with map of %d engines\n", i + 1); memset(&engines.engines, -1, sizeof(engines.engines)); @@ -382,7 +388,7 @@ static void execute_one(int i915) igt_assert_eq(batch_busy(busy.busy), i != -1 ? 1 << e->class : 0); - igt_spin_free(i915, spin); + igt_spin_end(spin); gem_sync(i915, obj.handle); do_ioctl(i915, DRM_IOCTL_I915_GEM_BUSY, &busy); @@ -396,6 +402,8 @@ static void execute_one(int i915) execbuf.flags = 0; gem_execbuf(i915, &execbuf); + igt_spin_free(i915, spin); + gem_close(i915, obj.handle); gem_context_destroy(i915, param.ctx_id); }