From patchwork Fri Sep 7 09:30:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 10591939 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 387316CB for ; Fri, 7 Sep 2018 09:30:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C16B2AC68 for ; Fri, 7 Sep 2018 09:30:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0F17C2AC82; Fri, 7 Sep 2018 09:30:21 +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 7004A2AC68 for ; Fri, 7 Sep 2018 09:30:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 531026E8A2; Fri, 7 Sep 2018 09:30:18 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2AF386E89B for ; Fri, 7 Sep 2018 09:30:16 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id f21-v6so14044808wmc.5 for ; Fri, 07 Sep 2018 02:30:16 -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:mime-version :content-transfer-encoding; bh=x3jwm7b27zW2vXR5EXKX9kzQ5rLKkLqKdiw4mMbV5mc=; b=E1Qhy2LIuxmdO4QbmbhEiqhqIVLvBqmo2eZRF6yXXOKffdlkYPZtNQg+/odE1kyD48 aZrtiYmrRuLP0TC/5vZgMy/zXiPqgJz36aK4YTOLLykbGPBKEK0QNWhaVbF+Rf02WgvF 0Jz4r/FGLtV75KojAnQD1BcMJMq3/DdK/5bPCh9ig30fq494LGs5x/xEq0MjadBgu9mO +TVD55BPvSwDiugHphuBtIZkxkdkARhQRYJtd+6IiPrnRgTX99COi2mMO6gzH+x4c80v vWrdB76mCVaiOPl/Z/icZRnms8GH3PLLiFAId+Jlu3lUUuepSCfimRTjNK4sMOjHqIcl tD5A== X-Gm-Message-State: APzg51C8Y3gFjoIcreFWvlfdKTgAqT52jcYOaoJvETeYTchjGKVdo2lK wad23Aet5+dezub63uOvb/qcr0Uw+fI= X-Google-Smtp-Source: ANB0VdZBFIGmbtXSXd1llNllp4LOMPs/yvh8VOFiutMvUQ95VLiIY/39nEJVzqSAPycrtebJvC8naQ== X-Received: by 2002:a1c:200c:: with SMTP id g12-v6mr4883095wmg.102.1536312614681; Fri, 07 Sep 2018 02:30:14 -0700 (PDT) Received: from localhost.localdomain ([95.144.165.37]) by smtp.gmail.com with ESMTPSA id g129-v6sm8933602wmf.42.2018.09.07.02.30.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Sep 2018 02:30:14 -0700 (PDT) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: igt-dev@lists.freedesktop.org Date: Fri, 7 Sep 2018 10:30:07 +0100 Message-Id: <20180907093008.12414-1-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Subject: [Intel-gfx] [PATH i-g-t 1/2] tests/gem_ctx_bad_exec: Consolidate to gem_ctx_exec 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 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Tvrtko Ursulin Move a really small test that invalid context is rejected under the gem_ctx_exec umbrella. Signed-off-by: Tvrtko Ursulin --- tests/Makefile.sources | 1 - tests/gem_ctx_bad_exec.c | 60 ---------------------------------------- tests/gem_ctx_exec.c | 22 +++++++++++++++ tests/meson.build | 1 - 4 files changed, 22 insertions(+), 62 deletions(-) delete mode 100644 tests/gem_ctx_bad_exec.c diff --git a/tests/Makefile.sources b/tests/Makefile.sources index f8f2c8d67d72..6765143bf344 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -51,7 +51,6 @@ TESTS_progs = \ gem_cs_prefetch \ gem_cs_tlb \ gem_ctx_bad_destroy \ - gem_ctx_bad_exec \ gem_ctx_create \ gem_ctx_exec \ gem_ctx_isolation \ diff --git a/tests/gem_ctx_bad_exec.c b/tests/gem_ctx_bad_exec.c deleted file mode 100644 index e3ccc5be46a0..000000000000 --- a/tests/gem_ctx_bad_exec.c +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright © 2012 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - * - */ - -#include "igt.h" - -IGT_TEST_DESCRIPTION("Test that context cannot be submitted to any ring"); - -static int exec(int fd, unsigned ring) -{ - struct drm_i915_gem_execbuffer2 execbuf; - struct drm_i915_gem_exec_object2 obj; - - memset(&obj, 0, sizeof(obj)); - memset(&execbuf, 0, sizeof(execbuf)); - - execbuf.buffers_ptr = to_user_pointer(&obj); - execbuf.buffer_count = 1; - i915_execbuffer2_set_context_id(execbuf, 1); - - return __gem_execbuf(fd, &execbuf); -} - -igt_main -{ - const struct intel_execution_engine *e; - int fd = -1; - - igt_skip_on_simulation(); - - igt_fixture - fd = drm_open_driver_render(DRIVER_INTEL); - - for (e = intel_execution_engines; e->name; e++) { - igt_subtest_f("%s", e->name) { - gem_require_ring(fd, e->exec_id | e->flags); - igt_assert_eq(exec(fd, e->exec_id | e->flags), -ENOENT); - } - } -} diff --git a/tests/gem_ctx_exec.c b/tests/gem_ctx_exec.c index 1f8ed64d4bd3..b35ec9f64775 100644 --- a/tests/gem_ctx_exec.c +++ b/tests/gem_ctx_exec.c @@ -142,6 +142,19 @@ static void big_exec(int fd, uint32_t handle, int ring) gem_sync(fd, handle); } +static void invalid_context(int fd, unsigned ring) +{ + struct drm_i915_gem_exec_object2 obj = { }; + struct drm_i915_gem_execbuffer2 execbuf = { + .buffers_ptr = to_user_pointer(&obj), + .buffer_count = 1, + }; + + i915_execbuffer2_set_context_id(execbuf, 1); + + igt_assert_eq(__gem_execbuf(fd, &execbuf), -ENOENT); +} + uint32_t handle; uint32_t batch[2] = {0, MI_BATCH_BUFFER_END}; uint32_t ctx_id, ctx_id2; @@ -149,6 +162,8 @@ int fd; igt_main { + const struct intel_execution_engine *e; + igt_fixture { fd = drm_open_driver_render(DRIVER_INTEL); igt_require_gem(fd); @@ -174,6 +189,13 @@ igt_main gem_sync(fd, handle); } + for (e = intel_execution_engines; e->name; e++) { + igt_subtest_f("invalid-context-%s", e->name) { + gem_require_ring(fd, e->exec_id | e->flags); + invalid_context(fd, e->exec_id | e->flags); + } + } + igt_subtest("eviction") big_exec(fd, handle, I915_EXEC_RENDER); diff --git a/tests/meson.build b/tests/meson.build index 9319fa4e19b4..f70c859f1a62 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -28,7 +28,6 @@ test_progs = [ 'gem_cs_prefetch', 'gem_cs_tlb', 'gem_ctx_bad_destroy', - 'gem_ctx_bad_exec', 'gem_ctx_create', 'gem_ctx_exec', 'gem_ctx_isolation', From patchwork Fri Sep 7 09:30:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 10591941 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 D2C6D13BB for ; Fri, 7 Sep 2018 09:30:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C125A2AC66 for ; Fri, 7 Sep 2018 09:30:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B5AC62AC6F; Fri, 7 Sep 2018 09:30:21 +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 212792AC66 for ; Fri, 7 Sep 2018 09:30:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 28DB06E8A1; Fri, 7 Sep 2018 09:30:18 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0726D6E89B for ; Fri, 7 Sep 2018 09:30:16 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id s12-v6so14085375wmc.0 for ; Fri, 07 Sep 2018 02:30:16 -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=Rb7tkkGvFzc3b4rICMJwipl9+YuWbSkYNcBZMIQVg3I=; b=dRymWdwXXo/cIY2mmWRbeKPm236o+X4KEXMtqdJ0lzLHJhjncW4zYGXchPb7ygCe/P CSiRs2J3sLY2u24FLQ85RC3gY3584oFDbpPoRo3LpGCizZRYQ0+mBKkPE3ZNXsolMhft cNiSQttmzOazpjPr5+kWP7u6aYtUS2XphH/tjXRlMeMTrJ6yWDrQSGdKKlhlOvYi9/HG QqRg6QKAwMw4WJZSlGWgLhAaGe/C4TpKkkPQSOC1JoKnIO4qvs1xfcO1RLsPfl47iVRp R8VNjbz3Zf30LK7SnyDs6FQox0TCJvOC9si4+WDhPBc+OVqof/5b89VOxzW1Rvlz8ikU f/Vg== X-Gm-Message-State: APzg51C2379Ds0cg0lGz1lIMa5pf/h+XEkdO1BxxKAkzIoQAhjgqwWgO lZZ72x0u87yjnD2bU9nc3u20gF0nPIg= X-Google-Smtp-Source: ANB0VdbSktc+FnKut2Njtth1mIBRymecIz3Gpx6mMQvuTTm4jP+94CM5JXB8lukiGUnA1fR2RHxicA== X-Received: by 2002:a1c:f03:: with SMTP id 3-v6mr4534605wmp.129.1536312615474; Fri, 07 Sep 2018 02:30:15 -0700 (PDT) Received: from localhost.localdomain ([95.144.165.37]) by smtp.gmail.com with ESMTPSA id g129-v6sm8933602wmf.42.2018.09.07.02.30.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Sep 2018 02:30:15 -0700 (PDT) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: igt-dev@lists.freedesktop.org Date: Fri, 7 Sep 2018 10:30:08 +0100 Message-Id: <20180907093008.12414-2-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180907093008.12414-1-tvrtko.ursulin@linux.intel.com> References: <20180907093008.12414-1-tvrtko.ursulin@linux.intel.com> Subject: [Intel-gfx] [PATH i-g-t 2/2] tests/gem_ctx_exec: Move lrc-lite-restore to gem_ctx_switch 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 New home is more appropriate for this test. At the same time tidy code a tiny bit. Signed-off-by: Tvrtko Ursulin --- tests/gem_ctx_exec.c | 75 +++++++----------------------------------- tests/gem_ctx_switch.c | 46 ++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 63 deletions(-) diff --git a/tests/gem_ctx_exec.c b/tests/gem_ctx_exec.c index b35ec9f64775..b9173e9e2b17 100644 --- a/tests/gem_ctx_exec.c +++ b/tests/gem_ctx_exec.c @@ -25,10 +25,6 @@ * */ -/* - * This test covers basic context switch functionality - */ - #include "igt.h" #include #include @@ -45,34 +41,18 @@ #include -IGT_TEST_DESCRIPTION("Test basic context switch functionality."); +IGT_TEST_DESCRIPTION("Test context batch 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); } @@ -92,13 +72,11 @@ 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; @@ -155,14 +133,13 @@ static void invalid_context(int fd, unsigned ring) igt_assert_eq(__gem_execbuf(fd, &execbuf), -ENOENT); } -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); @@ -225,32 +202,4 @@ igt_main 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); - } - - gem_sync(fd, handle); - } - - gem_context_destroy(fd, ctx_id); - gem_context_destroy(fd, ctx_id2); - } } diff --git a/tests/gem_ctx_switch.c b/tests/gem_ctx_switch.c index 1208cb8d7fe2..7ad7b31ea183 100644 --- a/tests/gem_ctx_switch.c +++ b/tests/gem_ctx_switch.c @@ -83,6 +83,20 @@ static int measure_qlen(int fd, return qlen; } +static int exec(int fd, uint32_t handle, int ring, int ctx_id) +{ + 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); + + return __gem_execbuf(fd, &execbuf); +} + static void single(int fd, uint32_t handle, const struct intel_execution_engine *e, unsigned flags, @@ -318,6 +332,38 @@ igt_main igt_subtest("basic-all-heavy") all(fd, heavy, 0, 5); + igt_subtest("lrc-lite-restore") { + uint32_t ctx[2]; + int i, j; + + /* + * Need 2 contexts to be able to replicate a lite restore, + * i.e. a running context is resubmitted. + */ + ctx[0] = gem_context_create(fd); + ctx[1] = 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_eq(exec(fd, light, I915_EXEC_RENDER, + ctx[0]), 0); + igt_assert_eq(exec(fd, light, I915_EXEC_RENDER, + ctx[1]), 0); + } + + gem_sync(fd, light); + } + + gem_context_destroy(fd, ctx[0]); + gem_context_destroy(fd, ctx[1]); + } + igt_fixture { igt_stop_hang_detector(); gem_close(fd, heavy);