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 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 84B49C433F5 for ; Thu, 24 Mar 2022 14:46:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C66EB10E8B9; Thu, 24 Mar 2022 14:46:52 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 98E4310E8B9; Thu, 24 Mar 2022 14:46:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1648133211; x=1679669211; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=7CweFIuRYSjoW5+LBxFw2DdnOSmzaXQfb5G+K3lm1lc=; b=VXG+F/MFxH+PYpSh9DM+25fyOpvATrgfwZNEYvcFCRWFIAk0dhH3CAGG 30aDLW3nkjj9e9tdDkOxRoUq+rh8sobEGw00eSxzpJALXkrYxVw+qYWOn AZflUk++v1evTa9BEG3IoEGYQDAUleqktr37BDNA1hPHk+nAhSPFJPbuG fMM2C/1W9DZhvpaFm9fNBZOFv46oRceN7vu3NKp7rpgbGlENItkfIqklL fDjTu4pD6z+fo/myI+dFy276iqZ65txgbTR86S3ZC7jvTHgZkuzwA0klN uyf7CxRpG7RgFchc5JlKtW7DXxcaqoq2edLePrAGmmx+mreS0IzX38wNC w==; X-IronPort-AV: E=McAfee;i="6200,9189,10295"; a="238999287" X-IronPort-AV: E=Sophos;i="5.90,207,1643702400"; d="scan'208";a="238999287" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Mar 2022 07:46:51 -0700 X-IronPort-AV: E=Sophos;i="5.90,207,1643702400"; d="scan'208";a="501418133" Received: from keithgra-mobl.ger.corp.intel.com (HELO [10.213.230.179]) ([10.213.230.179]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Mar 2022 07:46:49 -0700 Message-ID: Date: Thu, 24 Mar 2022 14:46:45 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Content-Language: en-US To: Matthew Auld , igt-dev@lists.freedesktop.org References: <20220324142621.347452-1-matthew.auld@intel.com> <20220324142621.347452-3-matthew.auld@intel.com> From: Tvrtko Ursulin Organization: Intel Corporation UK Plc In-Reply-To: <20220324142621.347452-3-matthew.auld@intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [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" On 24/03/2022 14:26, Matthew Auld wrote: > DG2 seems to have too many physical engines, and during execbuf just hits: FWIW it's not that DG2 has too many engines but the test was apparently broken (because considering legacy eb ring selector as consecutive index namespace within total number of engines is wrong) during porting to upstream codebase. Regards, Tvrtko > > "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);