From patchwork Mon Sep 17 15:46:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 10602975 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 1249314DA for ; Mon, 17 Sep 2018 15:46:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 008CA29ECC for ; Mon, 17 Sep 2018 15:46:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E8D1F2A102; Mon, 17 Sep 2018 15:46:30 +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 6A18F2A0CC for ; Mon, 17 Sep 2018 15:46:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 627276E2A9; Mon, 17 Sep 2018 15:46:29 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9F0868919E for ; Mon, 17 Sep 2018 15:46:27 +0000 (UTC) Received: by mail-wm1-x341.google.com with SMTP id r1-v6so4982390wmh.0 for ; Mon, 17 Sep 2018 08:46:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GJZ4LfNCis3ihBqYw28H4eEgol5gQl30BQX4e4nMzFQ=; b=SP04qgmt2aov4y5bnGO1oHMZySWQyXfKo9JAugG0Yqq56PCwwwBE3gplzOQoyA+L3S EQllfGtlJ7NdM5O8oYo9tKuk8HJeSYPvV6dh5NSgLyqVs8G1pHtVfjZq1rY3Jd/Lk5Cf 2d44eayEs83KALYnUwUbE7tzDagsoEGgD9fRxwTFl+JduKtHDpysQ41NUr944mKOqxq8 bv6NxUUXCHwlniqDpjX2rlBuSQfzqvxxXrp6QnKdspFd0sbklGx1DmKvY5P/XUFEPPdr 1dNhO7pRBry6kr+z0V2YBuTVhOHiEmSc9KCSHWZ/VGSLbUkGVuwG6iQBK6ibAgpg6axv 2ZDg== X-Gm-Message-State: APzg51CRphkB+bhyJ65eynKzbOBCTZ702kf+f0+KLNRxZG9UYH9ATaxS pCxi4G+coMhjD9UnoWyNX28c8w== X-Google-Smtp-Source: ANB0VdYXt+Js/5JTlgQUvF675AiafY3cEb9LFyUaqEIbofVIVqF/PiFUmZBxdl63y5IDHFeddsK+8A== X-Received: by 2002:a1c:a507:: with SMTP id o7-v6mr12516671wme.45.1537199186150; Mon, 17 Sep 2018 08:46:26 -0700 (PDT) Received: from localhost.localdomain ([95.144.165.37]) by smtp.gmail.com with ESMTPSA id b10-v6sm7889751wmc.28.2018.09.17.08.46.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Sep 2018 08:46:25 -0700 (PDT) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: igt-dev@lists.freedesktop.org Date: Mon, 17 Sep 2018 16:46:19 +0100 Message-Id: <20180917154619.30261-2-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180917154619.30261-1-tvrtko.ursulin@linux.intel.com> References: <20180917154619.30261-1-tvrtko.ursulin@linux.intel.com> Subject: [Intel-gfx] [PATCH i-g-t 2/2] gem_ctx_exec: Remove lrc-lite-restore 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: Intel-gfx@lists.freedesktop.org MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Tvrtko Ursulin Lite restore is sufficiently covered in gem_exec_nop. At the same time tidy code in the test a bit to bring it closer to today's coding style. Signed-off-by: Tvrtko Ursulin Suggested-by: Chris Wilson Reviewed-by: Chris Wilson --- tests/gem_ctx_exec.c | 116 +++++++++++-------------------------------- 1 file changed, 28 insertions(+), 88 deletions(-) diff --git a/tests/gem_ctx_exec.c b/tests/gem_ctx_exec.c index 4ed6febe12b8..b0f7b61e90be 100644 --- a/tests/gem_ctx_exec.c +++ b/tests/gem_ctx_exec.c @@ -24,11 +24,6 @@ * Ben Widawsky * */ - -/* - * This test covers basic context switch functionality - */ - #include "igt.h" #include #include @@ -46,44 +41,32 @@ #include -IGT_TEST_DESCRIPTION("Test basic context switch functionality."); +IGT_TEST_DESCRIPTION("Test context batch buffer execution."); /* Copied from gem_exec_nop.c */ static int exec(int fd, uint32_t handle, int ring, int ctx_id) { - struct drm_i915_gem_execbuffer2 execbuf; - struct drm_i915_gem_exec_object2 gem_exec; - - gem_exec.handle = handle; - gem_exec.relocation_count = 0; - gem_exec.relocs_ptr = 0; - gem_exec.alignment = 0; - gem_exec.offset = 0; - gem_exec.flags = 0; - gem_exec.rsvd1 = 0; - gem_exec.rsvd2 = 0; - - execbuf.buffers_ptr = to_user_pointer(&gem_exec); - execbuf.buffer_count = 1; - execbuf.batch_start_offset = 0; - execbuf.batch_len = 8; - execbuf.cliprects_ptr = 0; - execbuf.num_cliprects = 0; - execbuf.DR1 = 0; - execbuf.DR4 = 0; - execbuf.flags = ring; + struct drm_i915_gem_exec_object2 obj = { .handle = handle }; + struct drm_i915_gem_execbuffer2 execbuf = { + .buffers_ptr = to_user_pointer(&obj), + .buffer_count = 1, + .flags = ring, + }; + i915_execbuffer2_set_context_id(execbuf, ctx_id); - execbuf.rsvd2 = 0; return __gem_execbuf(fd, &execbuf); } static void big_exec(int fd, uint32_t handle, int ring) { - struct drm_i915_gem_execbuffer2 execbuf; + int num_buffers = gem_global_aperture_size(fd) / 4096; + struct drm_i915_gem_execbuffer2 execbuf = { + .buffer_count = num_buffers, + .flags = ring, + }; struct drm_i915_gem_exec_object2 *gem_exec; uint32_t ctx_id1, ctx_id2; - int num_buffers = gem_global_aperture_size(fd) / 4096; int i; /* Make sure we only fill half of RAM with gem objects. */ @@ -93,33 +76,19 @@ static void big_exec(int fd, uint32_t handle, int ring) igt_assert(gem_exec); memset(gem_exec, 0, (num_buffers + 1) * sizeof(*gem_exec)); - ctx_id1 = gem_context_create(fd); ctx_id2 = gem_context_create(fd); gem_exec[0].handle = handle; - execbuf.buffers_ptr = to_user_pointer(gem_exec); - execbuf.buffer_count = num_buffers + 1; - execbuf.batch_start_offset = 0; - execbuf.batch_len = 8; - execbuf.cliprects_ptr = 0; - execbuf.num_cliprects = 0; - execbuf.DR1 = 0; - execbuf.DR4 = 0; - execbuf.flags = ring; - execbuf.rsvd2 = 0; execbuf.buffer_count = 1; i915_execbuffer2_set_context_id(execbuf, ctx_id1); gem_execbuf(fd, &execbuf); - for (i = 0; i < num_buffers; i++) { - uint32_t tmp_handle = gem_create(fd, 4096); - - gem_exec[i].handle = tmp_handle; - } + for (i = 0; i < num_buffers; i++) + gem_exec[i].handle = gem_create(fd, 4096); gem_exec[i].handle = handle; execbuf.buffer_count = i + 1; @@ -132,8 +101,7 @@ static void big_exec(int fd, uint32_t handle, int ring) igt_info("trying buffer count %i\n", i - 1); } - igt_info("reduced buffer count to %i from %i\n", - i - 1, num_buffers); + igt_info("reduced buffer count to %i from %i\n", i - 1, num_buffers); /* double check that it works */ gem_execbuf(fd, &execbuf); @@ -167,14 +135,13 @@ static void invalid_context(int fd, unsigned ring, uint32_t handle) } } -uint32_t handle; -uint32_t batch[2] = {0, MI_BATCH_BUFFER_END}; -uint32_t ctx_id, ctx_id2; -int fd; - igt_main { + const uint32_t batch[2] = { 0, MI_BATCH_BUFFER_END }; const struct intel_execution_engine *e; + uint32_t handle; + uint32_t ctx_id; + int fd; igt_fixture { fd = drm_open_driver_render(DRIVER_INTEL); @@ -188,16 +155,16 @@ igt_main igt_subtest("basic") { ctx_id = gem_context_create(fd); - igt_assert(exec(fd, handle, I915_EXEC_RENDER, ctx_id) == 0); + igt_assert(exec(fd, handle, 0, ctx_id) == 0); gem_sync(fd, handle); gem_context_destroy(fd, ctx_id); ctx_id = gem_context_create(fd); - igt_assert(exec(fd, handle, I915_EXEC_RENDER, ctx_id) == 0); + igt_assert(exec(fd, handle, 0, ctx_id) == 0); gem_sync(fd, handle); gem_context_destroy(fd, ctx_id); - igt_assert(exec(fd, handle, I915_EXEC_RENDER, ctx_id) < 0); + igt_assert(exec(fd, handle, 0, ctx_id) < 0); gem_sync(fd, handle); } @@ -209,7 +176,7 @@ igt_main } igt_subtest("eviction") - big_exec(fd, handle, I915_EXEC_RENDER); + big_exec(fd, handle, 0); igt_subtest("reset-pin-leak") { int i; @@ -229,40 +196,13 @@ igt_main * the last context is leaked at every reset. */ for (i = 0; i < 20; i++) { - igt_hang_t hang = igt_hang_ring(fd, I915_EXEC_RENDER); - igt_assert(exec(fd, handle, I915_EXEC_RENDER, 0) == 0); - igt_assert(exec(fd, handle, I915_EXEC_RENDER, ctx_id) == 0); - igt_post_hang_ring(fd, hang); - } - - gem_context_destroy(fd, ctx_id); - } - - igt_subtest("lrc-lite-restore") { - int i, j; - - /* - * Need 2 contexts to be able to replicate a lite restore, - * i.e. a running context is resubmitted. - */ - ctx_id = gem_context_create(fd); - ctx_id2 = gem_context_create(fd); - - /* - * Queue several small batchbuffers to be sure we'll send execlists - * with 2 valid context, and likely cause a lite restore when ctxB - * is resubmitted at the top of the new execlist. - */ - for (i = 0; i < 20; i++) { - for (j = 0; j < 200; j++) { - igt_assert(exec(fd, handle, I915_EXEC_RENDER, ctx_id) == 0); - igt_assert(exec(fd, handle, I915_EXEC_RENDER, ctx_id2) == 0); - } + igt_hang_t hang = igt_hang_ring(fd, 0); - gem_sync(fd, handle); + igt_assert_eq(exec(fd, handle, 0, 0), 0); + igt_assert_eq(exec(fd, handle, 0, ctx_id), 0); + igt_post_hang_ring(fd, hang); } gem_context_destroy(fd, ctx_id); - gem_context_destroy(fd, ctx_id2); } }