tests/i915/gem_exec_capture: Adding Local memory support
PATCH 1/1 tests/i915/gem_exec_capture: Adding Local memory support
From: Ch Sai Gowtham <[email protected]>
Adding local memory support to many-4K-zero subtest
--- tests/i915/gem_exec_capture.c | 36 +++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-)
tests/i915/gem_exec_capture.c +22 -14
@@ -415,7 +415,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 {
@@ -436,7 +436,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 );
@@ -459,7 +459,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 );
@@ -585,7 +585,7 @@ __captureN(int fd, int dir, uint64_t ahnd, const intel_ctx_t *ctx, saved =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;
@@ -607,7 +607,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",
@@ -620,7 +620,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 region) {const uint32_t bbe =MI_BATCH_BUFFER_END ;struct drm_i915_gem_exec_object2 obj = {
@@ -677,7 +677,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, region));put_ahnd (ahnd);write (link[1 ], &fd,sizeof (fd));/* wake the parent up */
@@ -767,6 +767,7 @@ igt_mainstruct 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;
@@ -803,29 +804,36 @@ 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 */
@@ -837,7 +845,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);
Signature · 1 line
2.35.1
Patchwork
CI[igt-dev] ✗ Fi.CI.BAT: failure for tests/i915/gem_exec_capture: Adding Local memory support (rev4)
== Series Details ==
== Series Details ==
Series: tests/i915/gem_exec_capture: Adding Local memory support (rev4)
URL : https://patchwork.freedesktop.org/series/98446/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_11277 -> IGTPW_6695
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with IGTPW_6695 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in IGTPW_6695, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6695/index.html
Participating hosts (45 -> 42)
------------------------------
Additional (1): bat-adlp-4
Missing (4): fi-kbl-soraka fi-bsw-cyan fi-icl-u2 fi-bdw-samus
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in IGTPW_6695:
### IGT changes ###
#### Possible regressions ####
* igt@i915_selftest@live@gt_engines:
- fi-rkl-guc: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11277/fi-rkl-guc/igt@i915_selftest@live@gt_engines.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6695/fi-rkl-guc/igt@i915_selftest@live@gt_engines.html
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@i915_selftest@live:
- {bat-dg2-8}: NOTRUN -> [FAIL][3]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6695/bat-dg2-8/igt@[email protected]
Known issues
------------
Here are the changes found in IGTPW_6695 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_cs_nop@fork-compute0:
- fi-ivb-3770: NOTRUN -> [SKIP][4] ([fdo#109271]) +17 similar issues
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6695/fi-ivb-3770/igt@amdgpu/[email protected]
* igt@gem_exec_suspend@basic-s3@smem:
- fi-skl-6600u: [PASS][5] -> [INCOMPLETE][6] ([i915#4547])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11277/fi-skl-6600u/igt@gem_exec_suspend@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6695/fi-skl-6600u/igt@gem_exec_suspend@[email protected]
* igt@gem_lmem_swapping@basic:
- bat-adlp-4: NOTRUN -> [SKIP][7] ([i915#4613]) +3 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6695/bat-adlp-4/igt@[email protected]
* igt@gem_tiled_pread_basic:
- bat-adlp-4: NOTRUN -> [SKIP][8] ([i915#3282])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6695/bat-adlp-4/igt@gem_tiled_pread_basic.html
* igt@i915_selftest@live@hangcheck:
- fi-snb-2600: [PASS][9] -> [INCOMPLETE][10] ([i915#3921])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11277/fi-snb-2600/igt@i915_selftest@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6695/fi-snb-2600/igt@i915_selftest@[email protected]
* igt@kms_busy@basic@modeset:
- bat-adlp-4: NOTRUN -> [DMESG-WARN][11] ([i915#3576]) +1 similar issue
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6695/bat-adlp-4/igt@kms_busy@[email protected]
* igt@kms_chamelium@dp-crc-fast:
- bat-adlp-4: NOTRUN -> [SKIP][12] ([fdo#111827]) +8 similar issues
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6695/bat-adlp-4/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- bat-adlp-4: NOTRUN -> [SKIP][13] ([i915#4103]) +1 similar issue
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6695/bat-adlp-4/igt@[email protected]
* igt@kms_force_connector_basic@force-load-detect:
- bat-adlp-4: NOTRUN -> [SKIP][14] ([fdo#109285])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6695/bat-adlp-4/igt@[email protected]
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-b:
- fi-cfl-8109u: [PASS][15] -> [DMESG-WARN][16] ([i915#295]) +12 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11277/fi-cfl-8109u/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6695/fi-cfl-8109u/igt@[email protected]
* igt@prime_vgem@basic-fence-read:
- bat-adlp-4: NOTRUN -> [SKIP][17] ([i915#3291] / [i915#3708]) +2 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6695/bat-adlp-4/igt@[email protected]
* igt@prime_vgem@basic-userptr:
- bat-adlp-4: NOTRUN -> [SKIP][18] ([i915#3301] / [i915#3708])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6695/bat-adlp-4/igt@[email protected]
* igt@runner@aborted:
- fi-rkl-guc: NOTRUN -> [FAIL][19] ([i915#4312])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6695/fi-rkl-guc/igt@[email protected]
#### Possible fixes ####
* igt@i915_selftest@live@hangcheck:
- fi-ivb-3770: [INCOMPLETE][20] ([i915#3303]) -> [PASS][21]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11277/fi-ivb-3770/igt@i915_selftest@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6695/fi-ivb-3770/igt@i915_selftest@[email protected]
* igt@kms_busy@basic@modeset:
- {bat-adlp-6}: [DMESG-WARN][22] ([i915#3576]) -> [PASS][23]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11277/bat-adlp-6/igt@kms_busy@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6695/bat-adlp-6/igt@kms_busy@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#295]: https://gitlab.freedesktop.org/drm/intel/issues/295
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3303]: https://gitlab.freedesktop.org/drm/intel/issues/3303
[i915#3576]: https://gitlab.freedesktop.org/drm/intel/issues/3576
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#3921]: https://gitlab.freedesktop.org/drm/intel/issues/3921
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4547]: https://gitlab.freedesktop.org/drm/intel/issues/4547
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_6355 -> IGTPW_6695
CI-20190529: 20190529
CI_DRM_11277: a9d1ffee8dbe2c5506cccf9077eab8fe439eea46 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_6695: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6695/index.html
IGT_6355: 83ec34916bd8268bc331105cf77c4d3d3cd352be @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6695/index.html
Quoted 51 lines · On Thu, Feb 24, 2022 at 10:50:02AM +0530, [email protected] wrote:
From: Ch Sai Gowtham <[email protected]>
Adding local memory support to many-4K-zero subtest
Signed-off-by Ch Sai Gowtham <[email protected]>Cc Zbigniew Kempczyński <[email protected]>--- tests/i915/gem_exec_capture.c | 36 +++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-)tests/i915/gem_exec_capture.c +4
-4@@ -415,7 +415,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 {@@ -436,7 +436,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 );@@ -459,7 +459,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 );@@ -585,7 +585,7 @@ __captureN(int fd, int dir, uint64_t ahnd, const intel_ctx_t *ctx, saved =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;
tests/i915/gem_exec_capture.c static void many(int fd, int dir, uint64_t size, unsigned int flags) · line 610
Quoted 5 lines
tests/i915/gem_exec_capture.c +1
-1@@ -607,7 +607,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);
I'm sorry you had wait so long for the review.
Number of object is too big for lmem because count is calculated looking at min(gtt,ram), not min(gtt,lmem) when region is lmem.
I mean:
gtt = gem_aperture_size(fd) / size;
ram = (intel_get_avail_ram_mb() << 20) / size;
igt_debug("Available objects in GTT:%"PRIu64", RAM:%"PRIu64"\n",
gtt, ram);
count = min(gtt, ram) / 4; <----- should depend on region sizeWith limited count it works for me. I'm little bit surprised for DG2 with relocs enabled I observe hang (we got such igt-enablement patch on core-for-CI branch). But softpin version works fine.
--
Zbigniew
Quoted 84 lines
tests/i915/gem_exec_capture.c +17
-9blobs =check_error_state (dir, offsets, count, size, !!(flags &INCREMENTAL )); igt_info("Captured %lu %"PRId64"-blobs out of a total of %lu\n",@@ -620,7 +620,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 region) {const uint32_t bbe =MI_BATCH_BUFFER_END ;struct drm_i915_gem_exec_object2 obj = {@@ -677,7 +677,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, region));put_ahnd (ahnd);write (link[1 ], &fd,sizeof (fd));/* wake the parent up */ @@ -767,6 +767,7 @@ igt_mainstruct 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;@@ -803,29 +804,36 @@ 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 */ @@ -837,7 +845,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);Signature · 1 line
2.35.1