From patchwork Wed Nov 29 12:07:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abdiel Janulgue X-Patchwork-Id: 10082021 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 CAB006020B for ; Wed, 29 Nov 2017 12:13:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B4B52296E9 for ; Wed, 29 Nov 2017 12:13:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A9911296ED; Wed, 29 Nov 2017 12:13:04 +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 EADEE296E9 for ; Wed, 29 Nov 2017 12:13:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 898BB6E61F; Wed, 29 Nov 2017 12:13:03 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id BFDFB6E3BC for ; Wed, 29 Nov 2017 12:12:59 +0000 (UTC) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Nov 2017 04:12:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,473,1505804400"; d="scan'208";a="7488055" Received: from skylake-nuc.fi.intel.com ([10.237.72.185]) by fmsmga004.fm.intel.com with ESMTP; 29 Nov 2017 04:12:58 -0800 From: Abdiel Janulgue To: intel-gfx@lists.freedesktop.org Date: Wed, 29 Nov 2017 14:07:58 +0200 Message-Id: <1511957278-21903-3-git-send-email-abdiel.janulgue@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511957278-21903-1-git-send-email-abdiel.janulgue@linux.intel.com> References: <1511957278-21903-1-git-send-email-abdiel.janulgue@linux.intel.com> Subject: [Intel-gfx] [PATCH i-g-t v2 3/3] tests/gem_seqno_wrap: Drop gem_seqno_wrap.c 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 gem_seqno_wrap is defunct as the debug API withered away. The handling of wraparound under many different workloads is tested by gem_exec_whisper (Chris). Signed-off-by: Abdiel Janulgue Reviewed-by: Joonas Lahtinen --- tests/Makefile.sources | 1 - tests/gem_seqno_wrap.c | 483 ------------------------------------------------- tests/meson.build | 1 - 3 files changed, 485 deletions(-) delete mode 100644 tests/gem_seqno_wrap.c diff --git a/tests/Makefile.sources b/tests/Makefile.sources index 4f936e7..e4e06d0 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -132,7 +132,6 @@ TESTS_progs = \ gem_ring_sync_copy \ gem_ring_sync_loop \ gem_ringfill \ - gem_seqno_wrap \ gem_set_tiling_vs_blt \ gem_set_tiling_vs_gtt \ gem_set_tiling_vs_pwrite \ diff --git a/tests/gem_seqno_wrap.c b/tests/gem_seqno_wrap.c deleted file mode 100644 index c8cad5f..0000000 --- a/tests/gem_seqno_wrap.c +++ /dev/null @@ -1,483 +0,0 @@ -/* - * Copyright (c) 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. - * - * Authors: - * Mika Kuoppala - * - */ - -/* - * This test runs blitcopy -> rendercopy with multiple buffers over wrap - * boundary. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "igt.h" -#include "igt_sysfs.h" -#include "intel_bufmgr.h" - -IGT_TEST_DESCRIPTION("Runs blitcopy -> rendercopy with multiple buffers over" - " wrap boundary."); - -static int drm_fd; -static int debugfs; -static int devid; -static int card_index = 0; -static uint32_t last_seqno = 0; - -static struct intel_batchbuffer *batch_blt; -static struct intel_batchbuffer *batch_3d; - -struct option_struct { - int rounds; - int background; - int timeout; - int dontwrap; - int prewrap_space; - int random; - int buffers; -}; - -static struct option_struct options; - -static void init_buffer(drm_intel_bufmgr *bufmgr, - struct igt_buf *buf, - drm_intel_bo *bo, - int width, int height) -{ - /* buf->bo = drm_intel_bo_alloc(bufmgr, "", size, 4096); */ - buf->bo = bo; - buf->size = width * height * 4; - igt_assert(buf->bo); - buf->tiling = I915_TILING_NONE; - buf->num_tiles = width * height * 4; - buf->stride = width * 4; -} - -static void -set_bo(drm_intel_bo *bo, uint32_t val, int width, int height) -{ - int size = width * height; - uint32_t *vaddr; - - drm_intel_gem_bo_start_gtt_access(bo, true); - vaddr = bo->virtual; - while (size--) - *vaddr++ = val; -} - -static void -cmp_bo(drm_intel_bo *bo, uint32_t val, int width, int height) -{ - int size = width * height; - uint32_t *vaddr; - - drm_intel_gem_bo_start_gtt_access(bo, false); - vaddr = bo->virtual; - while (size--) { - igt_assert_f(*vaddr++ == val, - "%d: 0x%x differs from assumed 0x%x\n" - "seqno_before_test 0x%x, " - " approximated seqno on test fail 0x%x\n", - width * height - size, *vaddr-1, val, - last_seqno, last_seqno + val * 2); - } -} - -static drm_intel_bo * -create_bo(drm_intel_bufmgr *bufmgr, uint32_t val, int width, int height) -{ - drm_intel_bo *bo; - - bo = drm_intel_bo_alloc(bufmgr, "bo", width * height * 4, 0); - igt_assert(bo); - - /* gtt map doesn't have a write parameter, so just keep the mapping - * around (to avoid the set_domain with the gtt write domain set) and - * manually tell the kernel when we start access the gtt. */ - drm_intel_gem_bo_map_gtt(bo); - - set_bo(bo, val, width, height); - - return bo; -} - -static void release_bo(drm_intel_bo *bo) -{ - drm_intel_gem_bo_unmap_gtt(bo); - drm_intel_bo_unreference(bo); -} - -static void render_copyfunc(struct igt_buf *src, - struct igt_buf *dst, - int width, - int height) -{ - const int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; - igt_render_copyfunc_t rendercopy = igt_get_render_copyfunc(devid); - static int warned = 0; - - if (rendercopy) { - rendercopy(batch_3d, NULL, - src, src_x, src_y, - width, height, - dst, dst_x, dst_y); - intel_batchbuffer_flush(batch_3d); - } else { - if (!warned) { - igt_info("No render copy found for this gen, ""test is shallow!\n"); - warned = 1; - } - igt_assert(dst->bo); - igt_assert(src->bo); - intel_copy_bo(batch_blt, dst->bo, src->bo, width*height*4); - intel_batchbuffer_flush(batch_blt); - } -} - -static void exchange_uint(void *array, unsigned i, unsigned j) -{ - unsigned *i_arr = array; - - igt_swap(i_arr[i], i_arr[j]); -} - -static bool has_seqno_wrap(void) -{ - int ret = igt_sysfs_printf(debugfs, "i915_next_seqno", "0x1"); - errno = 0; - return ret == 1; -} - -static void run_sync_test(int num_buffers, bool verify) -{ - drm_intel_bufmgr *bufmgr; - int max; - drm_intel_bo **src, **dst1, **dst2; - int width = 128, height = 128; - int i; - unsigned int *p_dst1, *p_dst2; - struct igt_buf *s_src, *s_dst; - - max = gem_aperture_size (drm_fd) / (1024 * 1024) / 2; - if (num_buffers > max) - num_buffers = max; - - bufmgr = drm_intel_bufmgr_gem_init(drm_fd, 4096); - drm_intel_bufmgr_gem_enable_reuse(bufmgr); - batch_blt = intel_batchbuffer_alloc(bufmgr, intel_get_drm_devid(drm_fd)); - igt_assert(batch_blt); - batch_3d = intel_batchbuffer_alloc(bufmgr, intel_get_drm_devid(drm_fd)); - igt_assert(batch_3d); - - src = malloc(num_buffers * sizeof(*src)); - igt_assert(src); - - dst1 = malloc(num_buffers * sizeof(*dst1)); - igt_assert(dst1); - - dst2 = malloc(num_buffers * sizeof(*dst2)); - igt_assert(dst2); - - s_src = malloc(num_buffers * sizeof(*s_src)); - igt_assert(s_src); - - s_dst = malloc(num_buffers * sizeof(*s_dst)); - igt_assert(s_dst); - - p_dst1 = malloc(num_buffers * sizeof(unsigned int)); - igt_assert(p_dst1); - - p_dst2 = malloc(num_buffers * sizeof(unsigned int)); - igt_assert(p_dst2); - - for (i = 0; i < num_buffers; i++) { - p_dst1[i] = p_dst2[i] = i; - src[i] = create_bo(bufmgr, i, width, height); - igt_assert(src[i]); - dst1[i] = create_bo(bufmgr, ~i, width, height); - igt_assert(dst1[i]); - dst2[i] = create_bo(bufmgr, ~i, width, height); - igt_assert(dst2[i]); - init_buffer(bufmgr, &s_src[i], src[i], width, height); - init_buffer(bufmgr, &s_dst[i], dst1[i], width, height); - } - - igt_permute_array(p_dst1, num_buffers, exchange_uint); - igt_permute_array(p_dst2, num_buffers, exchange_uint); - - for (i = 0; i < num_buffers; i++) - render_copyfunc(&s_src[i], &s_dst[p_dst1[i]], width, height); - - /* Only sync between buffers if this is actual test run and - * not a seqno filler */ - if (verify) { - for (i = 0; i < num_buffers; i++) - intel_copy_bo(batch_blt, dst2[p_dst2[i]], dst1[p_dst1[i]], - width*height*4); - - for (i = 0; i < num_buffers; i++) { - cmp_bo(dst2[p_dst2[i]], i, width, height); - } - } - - for (i = 0; i < num_buffers; i++) { - release_bo(src[i]); - release_bo(dst1[i]); - release_bo(dst2[i]); - } - - intel_batchbuffer_free(batch_3d); - intel_batchbuffer_free(batch_blt); - drm_intel_bufmgr_destroy(bufmgr); - - free(p_dst1); - free(p_dst2); - free(s_dst); - free(s_src); - free(dst2); - free(dst1); - free(src); - - gem_quiescent_gpu(drm_fd); -} - -static int __read_seqno(uint32_t *seqno) -{ - if (igt_sysfs_scanf(debugfs, "i915_next_seqno", "%x", seqno) != 1) - return -1; - - igt_debug("next_seqno: 0x%x\n", *seqno); - return 0; -} - -static int read_seqno(void) -{ - uint32_t seqno = 0; - int r; - int wrap = 0; - - r = __read_seqno(&seqno); - igt_assert_eq(r, 0); - - if (last_seqno > seqno) - wrap++; - - last_seqno = seqno; - - return wrap; -} - -static void write_seqno(uint32_t seqno) -{ - uint32_t rb = -1; - - if (options.dontwrap) - return; - - igt_sysfs_printf(debugfs, "i915_next_seqno", "0x%x", seqno); - igt_debug("next_seqno set to: 0x%x\n", seqno); - last_seqno = seqno; - - igt_assert_eq(__read_seqno(&rb), 0); - igt_assert_f(rb == seqno, - "seqno readback differs, read 0x%x, expected 0x%x\n", - rb, seqno); -} - -static uint32_t calc_prewrap_val(void) -{ - const int pval = options.prewrap_space; - - if (options.random == 0) - return pval; - - if (pval == 0) - return 0; - - return (random() % pval); -} - -static void run_test(void) -{ - run_sync_test(options.buffers, true); -} - -static void preset_run_once(void) -{ - write_seqno(1); - run_test(); - - write_seqno(0x7fffffff); - run_test(); - - write_seqno(0xffffffff); - run_test(); - - write_seqno(0xfffffff0); - run_test(); -} - -static void random_run_once(void) -{ - uint32_t val; - - do { - val = random() % UINT32_MAX; - if (RAND_MAX < UINT32_MAX) - val += random(); - } while (val == 0); - - write_seqno(val); - run_test(); -} - -static void wrap_run_once(void) -{ - const uint32_t pw_val = calc_prewrap_val(); - - write_seqno(UINT32_MAX - pw_val); - while (!read_seqno()) - run_test(); -} - -static void background_run_once(void) -{ - const uint32_t pw_val = calc_prewrap_val(); - - write_seqno(UINT32_MAX - pw_val); - while (!read_seqno()) - sleep(3); -} - -static int parse_options(int opt, int opt_index, void *data) -{ - switch(opt) { - case 'b': - options.background = 1; - igt_info("running in background inducing wraps\n"); - break; - case 'd': - options.dontwrap = 1; - igt_info("won't wrap after testruns\n"); - break; - case 'n': - options.rounds = atoi(optarg); - igt_info("running %d rounds\n", options.rounds); - break; - case 'i': - options.buffers = atoi(optarg); - igt_info("buffers %d\n", options.buffers); - break; - case 't': - options.timeout = atoi(optarg); - if (options.timeout == 0) - options.timeout = 10; - igt_info("setting timeout to %d seconds\n", options.timeout); - break; - case 'r': - options.random = 0; - break; - case 'p': - options.prewrap_space = atoi(optarg); - igt_info("prewrap set to %d (0x%x)\n", options.prewrap_space, UINT32_MAX - options.prewrap_space); - break; - } - - return 0; -} - -int main(int argc, char **argv) -{ - int wcount = 0; - - static struct option long_options[] = { - {"rounds", required_argument, 0, 'n'}, - {"background", no_argument, 0, 'b'}, - {"timeout", required_argument, 0, 't'}, - {"dontwrap", no_argument, 0, 'd'}, - {"prewrap", required_argument, 0, 'p'}, - {"norandom", no_argument, 0, 'r'}, - {"buffers", required_argument, 0, 'i'}, - { 0, 0, 0, 0 } - }; - - const char *help = - " -b --background run in background inducing wraps\n" - " -n --rounds=num run num times across wrap boundary, 0 == forever\n" - " -t --timeout=sec set timeout to wait for testrun to sec seconds\n" - " -d --dontwrap don't wrap just run the test\n" - " -p --prewrap=n set seqno to WRAP - n for each testrun\n" - " -r --norandom dont randomize prewrap space\n" - " -i --buffers number of buffers to copy\n"; - - options.rounds = SLOW_QUICK(50, 2); - options.background = 0; - options.dontwrap = 0; - options.timeout = 20; - options.random = 1; - options.prewrap_space = 21; - options.buffers = 10; - - igt_simple_init_parse_opts(&argc, argv, "n:bvt:dp:ri:", long_options, - help, parse_options, NULL); - - drm_fd = drm_open_driver(DRIVER_INTEL); - debugfs = igt_debugfs_dir(drm_fd); - igt_require(has_seqno_wrap()); - - gem_quiescent_gpu(drm_fd); - - devid = intel_get_drm_devid(drm_fd); - card_index = drm_get_card(); - - srandom(time(NULL)); - - while(options.rounds == 0 || wcount < options.rounds) { - if (options.background) { - background_run_once(); - } else { - preset_run_once(); - random_run_once(); - wrap_run_once(); - } - - wcount++; - - igt_debug("%s done: %d\n", - options.dontwrap ? "tests" : "wraps", wcount); - } - - igt_assert_eq(options.rounds, wcount); - - igt_exit(); -} diff --git a/tests/meson.build b/tests/meson.build index 99c1eef..155a99f 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -110,7 +110,6 @@ test_progs = [ 'gem_ring_sync_copy', 'gem_ring_sync_loop', 'gem_ringfill', - 'gem_seqno_wrap', 'gem_set_tiling_vs_blt', 'gem_set_tiling_vs_gtt', 'gem_set_tiling_vs_pwrite',