From patchwork Mon Nov 4 16:30:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: oscar.mateo@intel.com X-Patchwork-Id: 3136511 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9C46C9F3C4 for ; Mon, 4 Nov 2013 16:35:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 72EE3204E3 for ; Mon, 4 Nov 2013 16:35:42 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 3D9E4204E2 for ; Mon, 4 Nov 2013 16:35:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F07F9FA9AB; Mon, 4 Nov 2013 08:35:37 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id B0012FA9A9 for ; Mon, 4 Nov 2013 08:35:35 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 04 Nov 2013 08:35:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.93,633,1378882800"; d="scan'208";a="427711762" Received: from unknown (HELO omateolo-haswell.isw.intel.com) ([10.102.226.164]) by fmsmga002.fm.intel.com with ESMTP; 04 Nov 2013 08:35:34 -0800 From: oscar.mateo@intel.com To: intel-gfx@lists.freedesktop.org Date: Mon, 4 Nov 2013 16:30:47 +0000 Message-Id: <1383582649-2841-2-git-send-email-oscar.mateo@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1383582649-2841-1-git-send-email-oscar.mateo@intel.com> References: <1383582649-2841-1-git-send-email-oscar.mateo@intel.com> Subject: [Intel-gfx] [PATCH 2/4] lib: Add igt_drop_caches_set() X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Oscar Mateo This is basically a "drop cache" interface to the igt_debugfs facilities. Also, update existing users. Signed-off-by: Oscar Mateo Cc: Damien Lespiau --- lib/igt_debugfs.c | 28 ++++++++++++++++++++++++++++ lib/igt_debugfs.h | 15 +++++++++++++++ tests/gem_persistent_relocs.c | 15 ++++----------- tests/gem_reloc_vs_gpu.c | 15 ++++----------- 4 files changed, 51 insertions(+), 22 deletions(-) diff --git a/lib/igt_debugfs.c b/lib/igt_debugfs.c index 0319eff..fc274fd 100644 --- a/lib/igt_debugfs.c +++ b/lib/igt_debugfs.c @@ -316,3 +316,31 @@ igt_pipe_crc_get_crcs(igt_pipe_crc_t *pipe_crc, int n_crcs, *out_crcs = crcs; } + +/* + * Drop caches + */ + +int igt_drop_caches_set(uint64_t val) +{ + igt_debugfs_t debugfs; + int fd; + char data[19]; + size_t nbytes; + int ret = -1; + + sprintf(data, "0x%" PRIx64, val); + + igt_debugfs_init(&debugfs); + fd = igt_debugfs_open(&debugfs, "i915_gem_drop_caches", O_WRONLY); + + if (fd >= 0) + { + nbytes = write(fd, data, strlen(data) + 1); + if (nbytes == strlen(data) + 1) + ret = 0; + close(fd); + } + + return ret; +} diff --git a/lib/igt_debugfs.h b/lib/igt_debugfs.h index c2810ee..02f4afa 100644 --- a/lib/igt_debugfs.h +++ b/lib/igt_debugfs.h @@ -79,4 +79,19 @@ void igt_pipe_crc_stop(igt_pipe_crc_t *pipe_crc); void igt_pipe_crc_get_crcs(igt_pipe_crc_t *pipe_crc, int n_crcs, igt_crc_t **out_crcs); +/* + * Drop caches + */ + +#define DROP_UNBOUND 0x1 +#define DROP_BOUND 0x2 +#define DROP_RETIRE 0x4 +#define DROP_ACTIVE 0x8 +#define DROP_ALL (DROP_UNBOUND | \ + DROP_BOUND | \ + DROP_RETIRE | \ + DROP_ACTIVE) + +int igt_drop_caches_set(uint64_t val); + #endif /* __IGT_DEBUGFS_H__ */ diff --git a/tests/gem_persistent_relocs.c b/tests/gem_persistent_relocs.c index 34d8492..863f464 100644 --- a/tests/gem_persistent_relocs.c +++ b/tests/gem_persistent_relocs.c @@ -42,6 +42,7 @@ #include "intel_bufmgr.h" #include "intel_batchbuffer.h" #include "intel_gpu_tools.h" +#include "igt_debugfs.h" /* * Testcase: Persistent relocations as used by uxa/libva @@ -287,21 +288,13 @@ static void do_forked_test(int fd, unsigned flags) struct igt_helper_process thrasher = {}; if (flags & (THRASH | THRASH_INACTIVE)) { - char fname[FILENAME_MAX]; - int drop_caches_fd; - const char *data = (flags & THRASH_INACTIVE) ? "0x7" : "0xf"; - - snprintf(fname, FILENAME_MAX, "%s/%i/%s", - "/sys/kernel/debug/dri", drm_get_card(), - "i915_gem_drop_caches"); - - drop_caches_fd = open(fname, O_WRONLY); - igt_require(drop_caches_fd >= 0); + uint64_t val = (flags & THRASH_INACTIVE) ? + (DROP_RETIRE | DROP_BOUND | DROP_UNBOUND) : DROP_ALL; igt_fork_helper(&thrasher) { while (1) { usleep(1000); - igt_assert(write(drop_caches_fd, data, strlen(data) + 1) == strlen(data) + 1); + do_or_die(igt_drop_caches_set(val)); } } } diff --git a/tests/gem_reloc_vs_gpu.c b/tests/gem_reloc_vs_gpu.c index bbfdc3a..9508b1c 100644 --- a/tests/gem_reloc_vs_gpu.c +++ b/tests/gem_reloc_vs_gpu.c @@ -42,6 +42,7 @@ #include "intel_bufmgr.h" #include "intel_batchbuffer.h" #include "intel_gpu_tools.h" +#include "igt_debugfs.h" /* * Testcase: Kernel relocations vs. gpu races @@ -282,21 +283,13 @@ static void do_forked_test(int fd, unsigned flags) struct igt_helper_process thrasher = {}; if (flags & (THRASH | THRASH_INACTIVE)) { - char fname[FILENAME_MAX]; - int drop_caches_fd; - const char *data = (flags & THRASH_INACTIVE) ? "0x7" : "0xf"; - - snprintf(fname, FILENAME_MAX, "%s/%i/%s", - "/sys/kernel/debug/dri", drm_get_card(), - "i915_gem_drop_caches"); - - drop_caches_fd = open(fname, O_WRONLY); - igt_require(drop_caches_fd >= 0); + uint64_t val = (flags & THRASH_INACTIVE) ? + (DROP_RETIRE | DROP_BOUND | DROP_UNBOUND) : DROP_ALL; igt_fork_helper(&thrasher) { while (1) { usleep(1000); - igt_assert(write(drop_caches_fd, data, strlen(data) + 1) == strlen(data) + 1); + do_or_die(igt_drop_caches_set(val)); } } }