From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,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 D2493C2D0F7 for ; Tue, 12 May 2020 17:20:00 +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 91604206A5 for ; Tue, 12 May 2020 17:20:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 91604206A5 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 E20126E1A4; Tue, 12 May 2020 17:19:59 +0000 (UTC) Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0D6856E1A4; Tue, 12 May 2020 17:19:57 +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 21176133-1500050 for multiple; Tue, 12 May 2020 18:19:48 +0100 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Tue, 12 May 2020 18:19:47 +0100 Message-Id: <20200512171947.730859-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200512102447.9249-1-janusz.krzysztofik@linux.intel.com> References: <20200512102447.9249-1-janusz.krzysztofik@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH i-g-t] i915/gem_exec_nop: Specify timeout in milliseconds 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Our 'headless' subtest requires fairly precise measurements to determine the impact of the dmc upon request latency. The test cannot be effective if we cannot execute requests quickly, so add a very short pre-pass to check the test requirements. For this we want to specify the baseline measurement timeout in milliseconds, allowing us to speed up our other baseline measurements elsewhere as well. Signed-off-by: Chris Wilson --- tests/i915/gem_exec_nop.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/tests/i915/gem_exec_nop.c b/tests/i915/gem_exec_nop.c index 4051e0fd7..21a937c83 100644 --- a/tests/i915/gem_exec_nop.c +++ b/tests/i915/gem_exec_nop.c @@ -64,7 +64,7 @@ static double elapsed(const struct timespec *start, const struct timespec *end) static double nop_on_ring(int fd, uint32_t handle, const struct intel_execution_engine2 *e, - int timeout, + int timeout_ms, unsigned long *out) { struct drm_i915_gem_execbuffer2 execbuf; @@ -94,7 +94,7 @@ static double nop_on_ring(int fd, uint32_t handle, count++; clock_gettime(CLOCK_MONOTONIC, &now); - } while (elapsed(&start, &now) < timeout); + } while (elapsed(&start, &now) < timeout_ms * 1e-3); igt_assert_eq(intel_detect_and_clear_missed_interrupts(fd), 0); *out = count; @@ -348,14 +348,15 @@ static void single(int fd, uint32_t handle, double time; unsigned long count; - time = nop_on_ring(fd, handle, e, 20, &count); + time = nop_on_ring(fd, handle, e, 20000, &count); igt_info("%s: %'lu cycles: %.3fus\n", e->name, count, time*1e6 / count); } static double stable_nop_on_ring(int fd, uint32_t handle, - const struct intel_execution_engine2 *e, int timeout, + const struct intel_execution_engine2 *e, + int timeout_ms, int reps) { igt_stats_t s; @@ -370,7 +371,7 @@ stable_nop_on_ring(int fd, uint32_t handle, unsigned long count; double time; - time = nop_on_ring(fd, handle, e, timeout, &count); + time = nop_on_ring(fd, handle, e, timeout_ms, &count); igt_stats_push_float(&s, time / count); } @@ -390,9 +391,10 @@ static void headless(int fd, uint32_t handle, const struct intel_execution_engine2 *e) { unsigned int nr_connected = 0; + double n_display, n_headless; drmModeConnector *connector; + unsigned long count; drmModeRes *res; - double n_display, n_headless; res = drmModeGetResources(fd); igt_require(res); @@ -409,8 +411,11 @@ static void headless(int fd, uint32_t handle, /* set graphics mode to prevent blanking */ kmstest_set_vt_graphics_mode(); + nop_on_ring(fd, handle, e, 10, &count); + igt_require_f(count > 100, "submillisecond precision required\n"); + /* benchmark nops */ - n_display = stable_nop_on_ring(fd, handle, e, 1, 5); + n_display = stable_nop_on_ring(fd, handle, e, 500, 5); igt_info("With one display connected: %.2fus\n", n_display * 1e6); @@ -418,7 +423,7 @@ static void headless(int fd, uint32_t handle, kmstest_unset_all_crtcs(fd, res); /* benchmark nops again */ - n_headless = stable_nop_on_ring(fd, handle, e, 1, 5); + n_headless = stable_nop_on_ring(fd, handle, e, 500, 5); igt_info("Without a display connected (headless): %.2fus\n", n_headless * 1e6); @@ -444,7 +449,7 @@ static void parallel(int fd, uint32_t handle, int timeout) engines[nengine] = e->flags; names[nengine++] = strdup(e->name); - time = nop_on_ring(fd, handle, e, 1, &count) / count; + time = nop_on_ring(fd, handle, e, 250, &count) / count; sum += time; igt_debug("%s: %.3fus\n", e->name, 1e6*time); } @@ -506,7 +511,7 @@ static void independent(int fd, uint32_t handle, int timeout) engines[nengine] = e->flags; names[nengine++] = strdup(e->name); - time = nop_on_ring(fd, handle, e, 1, &count) / count; + time = nop_on_ring(fd, handle, e, 250, &count) / count; sum += time; igt_debug("%s: %.3fus\n", e->name, 1e6*time); } @@ -626,7 +631,7 @@ static void series(int fd, uint32_t handle, int timeout) nengine = 0; __for_each_physical_engine(fd, e) { - time = nop_on_ring(fd, handle, e, 1, &count) / count; + time = nop_on_ring(fd, handle, e, 250, &count) / count; if (time > max) { name = e->name; max = time; @@ -705,7 +710,7 @@ static void sequential(int fd, uint32_t handle, unsigned flags, int timeout) __for_each_physical_engine(fd, e) { unsigned long count; - time = nop_on_ring(fd, handle, e, 1, &count) / count; + time = nop_on_ring(fd, handle, e, 250, &count) / count; sum += time; igt_debug("%s: %.3fus\n", e->name, 1e6*time); -- 2.26.2 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx