From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1A5C410E309 for ; Fri, 31 Dec 2021 05:55:31 +0000 (UTC) From: sai.gowtham.ch@intel.com Date: Fri, 31 Dec 2021 11:25:26 +0530 Message-Id: <20211231055526.7586-1-sai.gowtham.ch@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Subject: [igt-dev] [PATCH i-g-t] tests/i915/gem_exec_capture: Adding Local memory support. List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org, sai.gowtham.ch@intel.com, zbigniew.kempczynski@intel.com List-ID: From: Ch Sai Gowtham Adding local memory support to many-4K-zero subtest. Signed-off-by: Ch Sai Gowtham Cc: Zbigniew Kempczyński --- tests/i915/gem_exec_capture.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/tests/i915/gem_exec_capture.c b/tests/i915/gem_exec_capture.c index 9beb36fc..19cfa53d 100644 --- a/tests/i915/gem_exec_capture.c +++ b/tests/i915/gem_exec_capture.c @@ -406,7 +406,7 @@ static struct offset * __captureN(int fd, int dir, uint64_t ahnd, const intel_ctx_t *ctx, const struct intel_execution_engine2 *e, unsigned int size, int count, - unsigned int flags, int *_fence_out) + unsigned int flags, int *_fence_out, uint32_t region) #define INCREMENTAL 0x1 #define ASYNC 0x2 { @@ -426,7 +426,7 @@ __captureN(int fd, int dir, uint64_t ahnd, const intel_ctx_t *ctx, obj = calloc(count + 2, sizeof(*obj)); igt_assert(obj); - obj[0].handle = gem_create(fd, 4096); + obj[0].handle = gem_create_in_memory_regions(fd, 4096, region); obj[0].offset = get_offset(ahnd, obj[0].handle, 4096, 0); obj[0].flags = EXEC_OBJECT_WRITE | (ahnd ? EXEC_OBJECT_PINNED : 0); @@ -449,7 +449,7 @@ __captureN(int fd, int dir, uint64_t ahnd, const intel_ctx_t *ctx, } } - obj[count + 1].handle = gem_create(fd, 4096); + obj[count + 1].handle = gem_create_in_memory_regions(fd, 4096, region); obj[count + 1].relocs_ptr = (uintptr_t)reloc; obj[count + 1].relocation_count = !ahnd ? ARRAY_SIZE(reloc) : 0; obj[count + 1].offset = get_offset(ahnd, obj[count + 1].handle, 4096, 0); @@ -573,7 +573,7 @@ __captureN(int fd, int dir, uint64_t ahnd, const intel_ctx_t *ctx, configure_hangs(fd, e, ctx->id); \ } while(0) -static void many(int fd, int dir, uint64_t size, unsigned int flags) +static void many(int fd, int dir, uint64_t size, unsigned int flags, uint32_t region) { const struct intel_execution_engine2 *e; const intel_ctx_t *ctx; @@ -594,7 +594,7 @@ static void many(int fd, int dir, uint64_t size, unsigned int flags) intel_require_memory(count, size, CHECK_RAM); ahnd = get_reloc_ahnd(fd, ctx->id); - offsets = __captureN(fd, dir, ahnd, ctx, e, size, count, flags, NULL); + offsets = __captureN(fd, dir, ahnd, ctx, e, size, count, flags, NULL, region); blobs = check_error_state(dir, offsets, count, size, !!(flags & INCREMENTAL)); igt_info("Captured %lu %"PRId64"-blobs out of a total of %lu\n", @@ -605,7 +605,7 @@ static void many(int fd, int dir, uint64_t size, unsigned int flags) } static void prioinv(int fd, int dir, const intel_ctx_t *ctx, - const struct intel_execution_engine2 *e) + const struct intel_execution_engine2 *e, uint32_t system_region) { const uint32_t bbe = MI_BATCH_BUFFER_END; struct drm_i915_gem_exec_object2 obj = { @@ -659,7 +659,7 @@ static void prioinv(int fd, int dir, const intel_ctx_t *ctx, /* Reopen the allocator in the new process. */ ahnd = get_reloc_ahnd(fd, ctx2->id); - free(__captureN(fd, dir, ahnd, ctx2, e, size, count, ASYNC, &fence_out)); + free(__captureN(fd, dir, ahnd, ctx2, e, size, count, ASYNC, &fence_out, system_region)); put_ahnd(ahnd); write(link[1], &fd, sizeof(fd)); /* wake the parent up */ @@ -744,6 +744,7 @@ igt_main struct igt_collection *regions, *set; char *sub_name; uint32_t region; + uint32_t system_region = INTEL_MEMORY_REGION_ID(I915_SYSTEM_MEMORY, 0); igt_fixture { int gen; @@ -780,29 +781,35 @@ igt_main } } - igt_subtest_f("many-4K-zero") { + igt_subtest_with_dynamic("many-4K-zero") { igt_require(gem_can_store_dword(fd, 0)); - many(fd, dir, 1<<12, 0); + for_each_combination(regions, 1, set) { + sub_name = memregion_dynamic_subtest_name(regions); + region = igt_collection_get_value(regions, 0); + igt_dynamic_f("%s", sub_name) + many(fd, dir, 1<<12, 0, region); + free(sub_name); + } } igt_subtest_f("many-4K-incremental") { igt_require(gem_can_store_dword(fd, 0)); - many(fd, dir, 1<<12, INCREMENTAL); + many(fd, dir, 1<<12, INCREMENTAL, system_region); } igt_subtest_f("many-2M-zero") { igt_require(gem_can_store_dword(fd, 0)); - many(fd, dir, 2<<20, 0); + many(fd, dir, 2<<20, 0, system_region); } igt_subtest_f("many-2M-incremental") { igt_require(gem_can_store_dword(fd, 0)); - many(fd, dir, 2<<20, INCREMENTAL); + many(fd, dir, 2<<20, INCREMENTAL, system_region); } igt_subtest_f("many-256M-incremental") { igt_require(gem_can_store_dword(fd, 0)); - many(fd, dir, 256<<20, INCREMENTAL); + many(fd, dir, 256<<20, INCREMENTAL, system_region); } /* And check we can read from different types of objects */ @@ -814,7 +821,7 @@ igt_main test_each_engine("pi", fd, ctx, e) igt_dynamic_f("%s", (e)->name) - prioinv(fd, dir, ctx, e); + prioinv(fd, dir, ctx, e, system_region); igt_fixture { close(dir); -- 2.32.0