From patchwork Fri Aug 18 07:33:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Katarzyna Dec X-Patchwork-Id: 9907729 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1BB4660385 for ; Fri, 18 Aug 2017 07:33:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0DEA328C5B for ; Fri, 18 Aug 2017 07:33:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 02A6D28C5F; Fri, 18 Aug 2017 07:33: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=-4.2 required=2.0 tests=BAYES_00, 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 66FC128C5C for ; Fri, 18 Aug 2017 07:33:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9CB1E6E6BD; Fri, 18 Aug 2017 07:33:29 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id AAD336E6BD for ; Fri, 18 Aug 2017 07:33:28 +0000 (UTC) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP; 18 Aug 2017 00:33:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,391,1498546800"; d="scan'208";a="141781951" Received: from kdec5-desk.igk.intel.com ([172.28.171.39]) by fmsmga006.fm.intel.com with ESMTP; 18 Aug 2017 00:33:26 -0700 From: Katarzyna Dec To: intel-gfx@lists.freedesktop.org Date: Fri, 18 Aug 2017 09:33:11 +0200 Message-Id: <20170818073311.8924-1-katarzyna.dec@intel.com> X-Mailer: git-send-email 2.13.4 Subject: [Intel-gfx] [PATCH i-g-t] pm_rps: Changes in waitboost scenario X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 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 Waitboost and reset test cases were failing because maximum frequency is not always boost frequency (sometimes overcloking occurs). Moreover more time is needed for boost to be finished. Changed boost_freq function so boost occurred on the same engine as low load. Added function waiting for boost to be finished. Made test DRM master to make sure that the test isn't ran along Xorg Cc: Chris Wilson Cc: Jeff Mcgee Cc: Radoslaw Szwichtenberg Signed-off-by: Katarzyna Dec --- tests/pm_rps.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 50 insertions(+), 8 deletions(-) diff --git a/tests/pm_rps.c b/tests/pm_rps.c index f0455e78..08a73f5d 100644 --- a/tests/pm_rps.c +++ b/tests/pm_rps.c @@ -50,6 +50,7 @@ enum { RP0, RP1, RPn, + BOOST, NUMFREQ }; @@ -60,7 +61,7 @@ struct junk { const char *mode; FILE *filp; } stuff[] = { - { "cur", "r", NULL }, { "min", "rb+", NULL }, { "max", "rb+", NULL }, { "RP0", "r", NULL }, { "RP1", "r", NULL }, { "RPn", "r", NULL }, { NULL, NULL, NULL } + { "cur", "r", NULL }, { "min", "rb+", NULL }, { "max", "rb+", NULL }, { "RP0", "r", NULL }, { "RP1", "r", NULL }, { "RPn", "r", NULL }, { "boost", "rb+", NULL }, { NULL, NULL, NULL } }; static int readval(FILE *filp) @@ -556,25 +557,61 @@ static void stabilize_check(int *out) static void reset_gpu(void) { int fd = drm_open_driver(DRIVER_INTEL); + igt_post_hang_ring(fd, igt_hang_ring(fd, I915_EXEC_DEFAULT)); close(fd); } +static bool is_in_boost(void) +{ + char buf[1024]; + + igt_debugfs_read(drm_fd, "i915_rps_boost_info", buf); + return strstr(buf, "Boosts outstanding? 1"); +} + static void boost_freq(int fd, int *boost_freqs) { int64_t timeout = 1; - int ring = -1; igt_spin_t *load; + unsigned int engine; - load = igt_spin_batch_new(fd, ring, 0); - + /* put boost on the same engine as low load */ + engine = I915_EXEC_RENDER; + if (intel_gen(lh.devid) >= 6) + engine = I915_EXEC_BLT; + load = igt_spin_batch_new(fd, engine, 0); /* Waiting will grant us a boost to maximum */ gem_wait(fd, load->handle, &timeout); read_freqs(boost_freqs); dump(boost_freqs); + igt_assert_eq(is_in_boost(), 1); + /* Avoid downlocking till boost request is pending */ + igt_spin_batch_end(load); + gem_sync(fd, load->handle); igt_spin_batch_free(fd, load); + +} + +#define BOOST_WAIT_TIMESTEP_MSEC 250 +#define BOOST_WAIT_TIMEOUT_MSEC 15000 +static void fall_from_boost_wait(int *freqs) +{ + int wait = 0; + + do { + read_freqs(freqs); + dump(freqs); + if (!is_in_boost()) + break; + usleep(1000 * BOOST_WAIT_TIMESTEP_MSEC); + wait += BOOST_WAIT_TIMESTEP_MSEC; + + } while (wait < BOOST_WAIT_TIMEOUT_MSEC); + + igt_debug("Waited %d till falling from boost\n", wait); } static void waitboost(bool reset) @@ -601,6 +638,7 @@ static void waitboost(bool reset) * to maximum. */ boost_freq(fd, boost_freqs); + fall_from_boost_wait(post_freqs); igt_debug("Apply low load again...\n"); sleep(1); @@ -611,7 +649,7 @@ static void waitboost(bool reset) idle_check(); igt_assert_lt(pre_freqs[CUR], pre_freqs[MAX]); - igt_assert_eq(boost_freqs[CUR], boost_freqs[MAX]); + igt_assert_eq(boost_freqs[CUR], boost_freqs[BOOST]); igt_assert_lt(post_freqs[CUR], post_freqs[MAX]); close(fd); @@ -640,14 +678,15 @@ igt_main struct junk *junk = stuff; int ret; - /* Use drm_open_driver to verify device existence */ - drm_fd = drm_open_driver(DRIVER_INTEL); + /* Use drm_open_driver to to force running tests as drm master */ + drm_fd = drm_open_driver_master(DRIVER_INTEL); igt_require_gem(drm_fd); igt_require(gem_can_store_dword(drm_fd, 0)); do { int val = -1; char *path; + ret = asprintf(&path, sysfs_base_path, device, junk->name); igt_assert(ret != -1); junk->filp = fopen(path, junk->mode); @@ -657,7 +696,7 @@ igt_main val = readval(junk->filp); igt_assert(val >= 0); junk++; - } while(junk->name != NULL); + } while (junk->name != NULL); read_freqs(origfreqs); @@ -684,4 +723,7 @@ igt_main igt_subtest("reset") waitboost(true); + igt_fixture { + intel_register_access_fini(); + } }