From patchwork Thu Mar 24 14:26:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matthew Auld X-Patchwork-Id: 12790747 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id D40C7C433EF for ; Thu, 24 Mar 2022 14:26:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 667C910E8BF; Thu, 24 Mar 2022 14:26:46 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id BD3D010E8BB; Thu, 24 Mar 2022 14:26:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1648132001; x=1679668001; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ykLz4uy2qHCv8w+f8VuX9UwX3gC+ANosLklclpVTgm4=; b=ACF29DU/5coz7sKBTjn1U/i0DFVLjLgJg63+S+ecXIRb03m2PMjq6m6I 0PAS43VlGaWPeQQEUxfXi0kkavsf2B+AEM63zcJ6uH/TFRt9/p3vn8x/J EVB2xTXCSGlUyCCRm3YYbvn9/jW+l+pVAyzxJKyicZ0t35bHiF2E8IOOU VaV90pcmFK/12GMI3U7hQ7/Cp1WwkjVoSPTYLXAsErfKCWDGmMEsADLLO fcn31IKSslSBbtrV/qIZpBryaobKqfJb4wQT1i1EIRc4V+nJZf/SlakK6 /m7lK9uRFg0edo3xSF/8sUhiAM9lPvUpD2+AlR+2HYic89x9J2SEYTIZX A==; X-IronPort-AV: E=McAfee;i="6200,9189,10295"; a="283249719" X-IronPort-AV: E=Sophos;i="5.90,207,1643702400"; d="scan'208";a="283249719" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Mar 2022 07:26:41 -0700 X-IronPort-AV: E=Sophos;i="5.90,207,1643702400"; d="scan'208";a="501409755" Received: from smurkank-mobl.ger.corp.intel.com (HELO mwauld-desk1.intel.com) ([10.252.19.102]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Mar 2022 07:26:40 -0700 From: Matthew Auld To: igt-dev@lists.freedesktop.org Date: Thu, 24 Mar 2022 14:26:18 +0000 Message-Id: <20220324142621.347452-2-matthew.auld@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220324142621.347452-1-matthew.auld@intel.com> References: <20220324142621.347452-1-matthew.auld@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH i-g-t 1/4] test/gem_lmem_swapping: account for object rounding 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: =?utf-8?q?Thomas_Hellstr=C3=B6m?= , intel-gfx@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On DG2 the object size might be rounded when allocating lmem. Make sure we account for any rounding up. Signed-off-by: Matthew Auld Cc: Thomas Hellström Cc: Nirmoy Das Reviewed-by: Ashutosh Dixit Reviewed-by: Thomas Hellström --- tests/i915/gem_lmem_swapping.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/i915/gem_lmem_swapping.c b/tests/i915/gem_lmem_swapping.c index 582111dd..193ff370 100644 --- a/tests/i915/gem_lmem_swapping.c +++ b/tests/i915/gem_lmem_swapping.c @@ -72,7 +72,7 @@ struct object { }; static uint32_t create_bo(int i915, - uint64_t size, + uint64_t *size, struct drm_i915_gem_memory_class_instance *region, bool do_oom_test) { @@ -80,7 +80,7 @@ static uint32_t create_bo(int i915, int ret; retry: - ret = __gem_create_in_memory_region_list(i915, &handle, &size, region, 1); + ret = __gem_create_in_memory_region_list(i915, &handle, size, region, 1); if (do_oom_test && ret == -ENOMEM) goto retry; igt_assert_eq(ret, 0); @@ -172,7 +172,7 @@ static void __do_evict(int i915, __gem_context_set_persistence(i915, 0, false); size = 4096; - batch = create_bo(i915, size, region, params->oom_test); + batch = create_bo(i915, &size, region, params->oom_test); gem_write(i915, batch, 0, &bbe, sizeof(bbe)); @@ -199,7 +199,7 @@ static void __do_evict(int i915, params->count = i; break; } - obj->handle = create_bo(i915, obj->size, region, params->oom_test); + obj->handle = create_bo(i915, &obj->size, region, params->oom_test); move_to_lmem(i915, objects + i, 1, batch, engine, params->oom_test); @@ -270,7 +270,7 @@ static void fill_params(int i915, struct params *params, if (flags & TEST_RANDOM) { params->size.min = 4096; - handle = create_bo(i915, params->size.min, ®ion->region, + handle = create_bo(i915, ¶ms->size.min, ®ion->region, do_oom_test); gem_close(i915, handle); params->size.max = 2 * size + params->size.min; From patchwork Thu Mar 24 14:26:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matthew Auld X-Patchwork-Id: 12790748 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id A25D2C433F5 for ; Thu, 24 Mar 2022 14:26:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 152BE10E8C0; Thu, 24 Mar 2022 14:26:47 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7845A10E8BB; Thu, 24 Mar 2022 14:26:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1648132003; x=1679668003; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ikKlsV7jfLZzb2NlMBb6FsZrfxeuzSO5ezVwKVLtFCM=; b=jJBIRrkfEZnL/orMxh14l92dPi6j8jaIOYijMHAu4mACVnPHyxZ1gYg6 qIVaYipY5q+lZSznwGGidRaEcsvQ5sj5GkoHIpDW5lj3+ciZ4A5GMrXCQ bs9zSRbogUGhA1RUBb8NP2ZUvJw29Nzoj043OsPfZC7OY5aS+ei5m8Hcv 8ar1GWCOEheRiucpyK8K4CIX/wELgufNu6V1Awd8lQoONnbgr1BoHuz0A 4taU35FI8AZA8S9nAvymIn/Q1AFS7oYJNzS6KusyqJVhnGmiLwggHXOcG diiK9pgdiuASPL+0n7Nfx4NhVy8KXs9AO98HPzuxiueZc64trhbohbVQT Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10295"; a="283249726" X-IronPort-AV: E=Sophos;i="5.90,207,1643702400"; d="scan'208";a="283249726" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Mar 2022 07:26:43 -0700 X-IronPort-AV: E=Sophos;i="5.90,207,1643702400"; d="scan'208";a="501409761" Received: from smurkank-mobl.ger.corp.intel.com (HELO mwauld-desk1.intel.com) ([10.252.19.102]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Mar 2022 07:26:41 -0700 From: Matthew Auld To: igt-dev@lists.freedesktop.org Date: Thu, 24 Mar 2022 14:26:19 +0000 Message-Id: <20220324142621.347452-3-matthew.auld@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220324142621.347452-1-matthew.auld@intel.com> References: <20220324142621.347452-1-matthew.auld@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH i-g-t 2/4] test/gem_lmem_swapping: fix physical engine usage 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: =?utf-8?q?Thomas_Hellstr=C3=B6m?= , intel-gfx@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" DG2 seems to have too many physical engines, and during execbuf just hits: "execbuf with unknown ring: 5" Convert the test over to using the non-legacy API where we instead fill the ctx with all the physical engines and then engine/ring becomes the index into this. Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/5192 Signed-off-by: Matthew Auld Cc: Thomas Hellström Cc: Nirmoy Das --- tests/i915/gem_lmem_swapping.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/tests/i915/gem_lmem_swapping.c b/tests/i915/gem_lmem_swapping.c index 193ff370..995a663f 100644 --- a/tests/i915/gem_lmem_swapping.c +++ b/tests/i915/gem_lmem_swapping.c @@ -126,6 +126,7 @@ verify_object(int i915, const struct object *obj, unsigned int flags) } static void move_to_lmem(int i915, + const intel_ctx_t *ctx, struct object *list, unsigned int num, uint32_t batch, @@ -137,6 +138,7 @@ static void move_to_lmem(int i915, .buffers_ptr = to_user_pointer(obj), .buffer_count = 1 + num, .flags = I915_EXEC_NO_RELOC | I915_EXEC_HANDLE_LUT | engine, + .rsvd1 = ctx->id, }; unsigned int i, ret; @@ -156,6 +158,7 @@ retry: } static void __do_evict(int i915, + const intel_ctx_t *ctx, struct drm_i915_gem_memory_class_instance *region, struct params *params, unsigned int seed) @@ -170,7 +173,6 @@ static void __do_evict(int i915, struct timespec t = {}; unsigned int num; - __gem_context_set_persistence(i915, 0, false); size = 4096; batch = create_bo(i915, &size, region, params->oom_test); @@ -201,7 +203,7 @@ static void __do_evict(int i915, } obj->handle = create_bo(i915, &obj->size, region, params->oom_test); - move_to_lmem(i915, objects + i, 1, batch, engine, + move_to_lmem(i915, ctx, objects + i, 1, batch, engine, params->oom_test); if (params->flags & TEST_VERIFY) init_object(i915, obj, rand(), params->flags); @@ -226,7 +228,7 @@ static void __do_evict(int i915, idx = (idx + 1) % params->count; } - move_to_lmem(i915, list, num, batch, engine, params->oom_test); + move_to_lmem(i915, ctx, list, num, batch, engine, params->oom_test); if (params->flags & TEST_ENGINES) engine = (engine + 1) % __num_engines__; @@ -342,6 +344,7 @@ static void fill_params(int i915, struct params *params, } static void test_evict(int i915, + const intel_ctx_t *ctx, struct drm_i915_memory_region_info *region, unsigned int flags) { @@ -353,14 +356,17 @@ static void test_evict(int i915, if (flags & TEST_PARALLEL) { int fd = gem_reopen_driver(i915); + ctx = intel_ctx_create_all_physical(fd); + __gem_context_set_persistence(i915, ctx->id, false); + igt_fork(child, nproc) - __do_evict(fd, ®ion->region, ¶ms, + __do_evict(fd, ctx, ®ion->region, ¶ms, params.seed + child + 1); igt_waitchildren(); close(fd); } else { - __do_evict(i915, ®ion->region, ¶ms, params.seed); + __do_evict(i915, ctx, ®ion->region, ¶ms, params.seed); } } @@ -399,6 +405,7 @@ static void smem_oom_exit_handler(int sig) } static void test_smem_oom(int i915, + const intel_ctx_t *ctx, struct drm_i915_memory_region_info *region) { const uint64_t smem_size = intel_get_total_ram_mb() + @@ -421,7 +428,7 @@ static void test_smem_oom(int i915, fill_params(i915, ¶ms, region, 0, 1, true); igt_install_exit_handler(smem_oom_exit_handler); - __do_evict(fd, ®ion->region, ¶ms, + __do_evict(fd, ctx, ®ion->region, ¶ms, params.seed + child + 1); close(fd); @@ -513,6 +520,7 @@ igt_main_args("", long_options, help_str, opt_handler, NULL) { "parallel-multi", TEST_PARALLEL | TEST_RANDOM | TEST_VERIFY | TEST_ENGINES | TEST_MULTI }, { } }; + const intel_ctx_t *ctx; int i915 = -1; igt_fixture { @@ -528,17 +536,20 @@ igt_main_args("", long_options, help_str, opt_handler, NULL) for_each_physical_engine(i915, e) __num_engines__++; igt_require(__num_engines__); + ctx = intel_ctx_create_all_physical(i915); + __gem_context_set_persistence(i915, ctx->id, false); + } for (test = tests; test->name; test++) { igt_describe("Exercise local memory swapping to system memory"); dynamic_lmem_subtest(region, regions, test->name) - test_evict(i915, region, test->flags); + test_evict(i915, ctx, region, test->flags); } igt_describe("Exercise local memory swapping during exhausting system memory"); dynamic_lmem_subtest(region, regions, "smem-oom") - test_smem_oom(i915, region); + test_smem_oom(i915, ctx, region); igt_fixture { free(regions); From patchwork Thu Mar 24 14:26:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matthew Auld X-Patchwork-Id: 12790749 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 677E0C4332F for ; Thu, 24 Mar 2022 14:26:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B352A10E8C5; Thu, 24 Mar 2022 14:26:47 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2FED710E8BD; Thu, 24 Mar 2022 14:26:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1648132005; x=1679668005; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=VgfN0S0POpNcxJUoS75KYtzJd+QYoepk3hsgHbwFE3Q=; b=kkUvY7Ia/Z9rsVYgKKaf1Qqzi2aJcBGbpKLDhJF/34/1As/Q5KAhz+KJ cPV4LwG5guNp1J6zBlVMR07rXkZEjdopxF0NseYAjtBiydZRI5Es68wYB XUvNpkToejpoQ9coSPTHC0jVcJJgEnVJvOmxJ++P28vdTYyB0mhv4FPYR W7hyu64LWHAgSeOtnS5nncnFs/ugmpwd+Z9XoD37NvE3braG91P6vgWDJ K3CSffiNGoo4/E4jEQW2dVvbGT1Euxivjk3L68Qg39vnC+LrBbrLLcVUu ZNtUfoPUYV81UNVD3fz60HuX2HL/R1swQJf0RicNl0G5aGzxenZ3FiTbG A==; X-IronPort-AV: E=McAfee;i="6200,9189,10295"; a="283249733" X-IronPort-AV: E=Sophos;i="5.90,207,1643702400"; d="scan'208";a="283249733" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Mar 2022 07:26:44 -0700 X-IronPort-AV: E=Sophos;i="5.90,207,1643702400"; d="scan'208";a="501409770" Received: from smurkank-mobl.ger.corp.intel.com (HELO mwauld-desk1.intel.com) ([10.252.19.102]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Mar 2022 07:26:43 -0700 From: Matthew Auld To: igt-dev@lists.freedesktop.org Date: Thu, 24 Mar 2022 14:26:20 +0000 Message-Id: <20220324142621.347452-4-matthew.auld@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220324142621.347452-1-matthew.auld@intel.com> References: <20220324142621.347452-1-matthew.auld@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH i-g-t 3/4] tests/gem_lmem_swapping: limit lmem to 4G 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: =?utf-8?q?Thomas_Hellstr=C3=B6m?= , intel-gfx@lists.freedesktop.org, CQ Tang Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: CQ Tang On some systems lmem can be as large as 16G, which seems to trigger various CI timeouts, and in the best case just takes a long time. For the purposes of the test we should be able to limit to 4G, without any big loss in coverage. Signed-off-by: CQ Tang Signed-off-by: Matthew Auld Cc: Thomas Hellström Cc: Nirmoy Das Reviewed-by: Thomas Hellström Reviewed-by: Nirmoy Das --- tests/i915/gem_lmem_swapping.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/i915/gem_lmem_swapping.c b/tests/i915/gem_lmem_swapping.c index 995a663f..ad1c989c 100644 --- a/tests/i915/gem_lmem_swapping.c +++ b/tests/i915/gem_lmem_swapping.c @@ -526,7 +526,13 @@ igt_main_args("", long_options, help_str, opt_handler, NULL) igt_fixture { struct intel_execution_engine2 *e; - i915 = drm_open_driver(DRIVER_INTEL); + igt_i915_driver_unload(); + if (igt_i915_driver_load("lmem_size=4096")) { + igt_debug("i915 missing lmem_size modparam support\n"); + igt_assert_eq(igt_i915_driver_load(NULL), 0); + } + + i915 = __drm_open_driver(DRIVER_INTEL); igt_require_gem(i915); igt_require(gem_has_lmem(i915)); @@ -554,6 +560,7 @@ igt_main_args("", long_options, help_str, opt_handler, NULL) igt_fixture { free(regions); close(i915); + igt_i915_driver_unload(); } igt_exit(); From patchwork Thu Mar 24 14:26:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matthew Auld X-Patchwork-Id: 12790750 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 67756C433F5 for ; Thu, 24 Mar 2022 14:26:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CFEE610E8B9; Thu, 24 Mar 2022 14:26:57 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id A0B2610E8C0; Thu, 24 Mar 2022 14:26:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1648132006; x=1679668006; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/p5Aa6XbfnzxcI3FoX1qobFC2tWz6303M5novF6uXho=; b=b4FMFKhxEDBvbeQJnEAp6mSOWApn955H1uukZ8h/JJewgAeP2R9obolQ qEiJjEhFbXUWmzGHGMHs2zjjJ7S+1gtB/Npw/1Ef+9qr8a5F4wMDjsnvx rD5MISSchF08Q3eHP8lT5kqriT/dxavGQI/los3YuaRbxfec6C2B3fU4M 2xV+TwG4HyOX3NUyGP0aSvoWDBKlBPmSzGcEMV42FxlTP6hikOn6L1YI5 u6lRinTEHTtJNW0bjuDPhaAtyrZ6+x17uv3kokZoXVsfIqNxPOrZAllcs mJbYiMEAmdomJY7jIDs72pihg6lDOdfMQjnXZGem22Gt25bHzPg8OfKli g==; X-IronPort-AV: E=McAfee;i="6200,9189,10295"; a="283249740" X-IronPort-AV: E=Sophos;i="5.90,207,1643702400"; d="scan'208";a="283249740" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Mar 2022 07:26:46 -0700 X-IronPort-AV: E=Sophos;i="5.90,207,1643702400"; d="scan'208";a="501409771" Received: from smurkank-mobl.ger.corp.intel.com (HELO mwauld-desk1.intel.com) ([10.252.19.102]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Mar 2022 07:26:45 -0700 From: Matthew Auld To: igt-dev@lists.freedesktop.org Date: Thu, 24 Mar 2022 14:26:21 +0000 Message-Id: <20220324142621.347452-5-matthew.auld@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220324142621.347452-1-matthew.auld@intel.com> References: <20220324142621.347452-1-matthew.auld@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH i-g-t 4/4] tests/gem_lmem_swapping: reduce the timeout 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: =?utf-8?q?Thomas_Hellstr=C3=B6m?= , intel-gfx@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" 300s is way too much for some BAT test. Drop it down to 45s. Signed-off-by: Matthew Auld Cc: Thomas Hellström Cc: Nirmoy Das Reviewed-by: Thomas Hellström --- tests/i915/gem_lmem_swapping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/i915/gem_lmem_swapping.c b/tests/i915/gem_lmem_swapping.c index ad1c989c..6c47bff2 100644 --- a/tests/i915/gem_lmem_swapping.c +++ b/tests/i915/gem_lmem_swapping.c @@ -219,7 +219,7 @@ static void __do_evict(int i915, * For TEST_MULTI runs, make each object counts a loop to * avoid excessive run times. */ - for (l = 0; l < params->loops && igt_seconds_elapsed(&t) < 300; l += num) { + for (l = 0; l < params->loops && igt_seconds_elapsed(&t) < 45; l += num) { unsigned int idx = rand() % params->count; num = params->flags & TEST_MULTI ? rand() % max_swap_in + 1 : 1;