tests/i915/gem_sync: Add support for local memory
PATCH 1/1 tests/i915/gem_sync: Add support for local memory
From: Ch Sai Gowtham <[email protected]>
Add support for local memory region (Device memory)
--- lib/igt_dummyload.h | 1 + tests/i915/gem_sync.c | 206 ++++++++++++++++++++++++++---------------- 2 files changed, 129 insertions(+), 78 deletions(-)
lib/igt_dummyload.h +1 -0
@@ -81,6 +81,7 @@ typedef struct igt_spin_factory {unsigned int flags;int fence;uint64_t ahnd; +uint32_t region; } igt_spin_factory_t;#define IGT_SPIN_FENCE_IN (1 << 0)
tests/i915/gem_sync.c +128 -78
483 lines not on this page · raw message
Signature · 1 line
2.32.0
Patchwork
CI[igt-dev] ✗ Fi.CI.BAT: failure for tests/i915/gem_sync: Add support for local memory (rev3)
== Series Details ==
== Series Details ==
Series: tests/i915/gem_sync: Add support for local memory (rev3)
URL : https://patchwork.freedesktop.org/series/95437/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_11066 -> IGTPW_6551
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with IGTPW_6551 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in IGTPW_6551, 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_6551/index.html
Participating hosts (43 -> 41)
------------------------------
Missing (2): fi-bsw-cyan fi-bdw-samus
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in IGTPW_6551:
### IGT changes ###
#### Possible regressions ####
* igt@i915_selftest@live@evict:
- fi-kbl-soraka: [PASS][1] -> [DMESG-WARN][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11066/fi-kbl-soraka/igt@i915_selftest@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6551/fi-kbl-soraka/igt@i915_selftest@[email protected]
New tests
---------
New tests have been introduced between CI_DRM_11066 and IGTPW_6551:
### New IGT tests (4) ###
* igt@gem_sync@basic-all@lmem0:
- Statuses : 1 pass(s)
- Exec time: [5.74] s
* igt@gem_sync@basic-all@smem:
- Statuses : 38 pass(s)
- Exec time: [2.04, 5.74] s
* igt@gem_sync@basic-each@lmem0:
- Statuses : 1 pass(s)
- Exec time: [2.58] s
* igt@gem_sync@basic-each@smem:
- Statuses : 38 pass(s)
- Exec time: [2.05, 3.91] s
Known issues
------------
Here are the changes found in IGTPW_6551 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_cs_nop@sync-fork-gfx0:
- fi-skl-6600u: NOTRUN -> [SKIP][3] ([fdo#109271]) +21 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6551/fi-skl-6600u/igt@amdgpu/[email protected]
* igt@gem_huc_copy@huc-copy:
- fi-skl-6600u: NOTRUN -> [SKIP][4] ([fdo#109271] / [i915#2190])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6551/fi-skl-6600u/igt@[email protected]
* igt@gem_lmem_swapping@verify-random:
- fi-skl-6600u: NOTRUN -> [SKIP][5] ([fdo#109271] / [i915#4613]) +3 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6551/fi-skl-6600u/igt@[email protected]
* igt@kms_chamelium@vga-edid-read:
- fi-skl-6600u: NOTRUN -> [SKIP][6] ([fdo#109271] / [fdo#111827]) +8 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6551/fi-skl-6600u/igt@[email protected]
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- fi-skl-6600u: NOTRUN -> [SKIP][7] ([fdo#109271] / [i915#533])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6551/fi-skl-6600u/igt@[email protected]
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s3@smem:
- fi-tgl-1115g4: [FAIL][8] ([i915#1888]) -> [PASS][9]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11066/fi-tgl-1115g4/igt@gem_exec_suspend@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6551/fi-tgl-1115g4/igt@gem_exec_suspend@[email protected]
* igt@kms_flip@basic-flip-vs-wf_vblank@a-vga1:
- fi-bwr-2160: [FAIL][10] ([i915#2122]) -> [PASS][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11066/fi-bwr-2160/igt@kms_flip@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6551/fi-bwr-2160/igt@kms_flip@[email protected]
* igt@kms_frontbuffer_tracking@basic:
- fi-cml-u2: [DMESG-WARN][12] ([i915#4269]) -> [PASS][13]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11066/fi-cml-u2/igt@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6551/fi-cml-u2/igt@[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#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1888]: https://gitlab.freedesktop.org/drm/intel/issues/1888
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#4269]: https://gitlab.freedesktop.org/drm/intel/issues/4269
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_6326 -> IGTPW_6551
CI-20190529: 20190529
CI_DRM_11066: fc076e8fc52ed40fee33f416a4475a57219011a5 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_6551: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6551/index.html
IGT_6326: ec75f64fcbcf4aac58fbf1bf629e8f59b19db4ce @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6551/index.html
Patchwork
CI[igt-dev] ✗ GitLab.Pipeline: warning for tests/i915/gem_sync: Add support for local memory (rev3)
In reply to [email protected]== Series Details ==
== Series Details ==
Series: tests/i915/gem_sync: Add support for local memory (rev3)
URL : https://patchwork.freedesktop.org/series/95437/
State : warning
== Summary ==
Pipeline status: FAILED.
see https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/pipelines/481560 for the overview.
build-containers:build-debian-mips has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/17488613):
Authenticating with credentials from job payload (GitLab Registry)
Pulling docker image registry.freedesktop.org/wayland/ci-templates/buildah:2019-08-13.0 ...
Using docker image sha256:594aa868d31ee3304dee8cae8a3433c89a6fcfcf6c7d420c04cce22f60147176 for registry.freedesktop.org/wayland/ci-templates/buildah:2019-08-13.0 with digest registry.freedesktop.org/wayland/ci-templates/buildah@sha256:7dbcf22cd2c1c7d49db0dc7b4ab207c3d6a4a09bd81cc3b71a688d3727d8749f ... section_end:1641921629:prepare_executor
section_start:1641921629:prepare_script
Preparing environment
Running on runner-zbmz6-qr-project-3185-concurrent-0 via fdo-packet-m1xl-1...
section_end:1641921632:prepare_script
section_start:1641921632:get_sources
Getting source from Git repository
$ eval "$CI_PRE_CLONE_SCRIPT" Fetching changes... Reinitialized existing Git repository in /builds/gfx-ci/igt-ci-tags/.git/ fatal: unable to access 'https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags.git/': The requested URL returned error: 504 section_end:1641923434:get_sources section_start:1641923434:cleanup_file_variables Cleaning up file based variables section_end:1641923435:cleanup_file_variables ERROR: Job failed: exit code 1
build-containers:build-fedora has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/17488614):
Authenticating with credentials from job payload (GitLab Registry)
Pulling docker image registry.freedesktop.org/wayland/ci-templates/buildah:2019-08-13.0 ...
Using docker image sha256:594aa868d31ee3304dee8cae8a3433c89a6fcfcf6c7d420c04cce22f60147176 for registry.freedesktop.org/wayland/ci-templates/buildah:2019-08-13.0 with digest registry.freedesktop.org/wayland/ci-templates/buildah@sha256:7dbcf22cd2c1c7d49db0dc7b4ab207c3d6a4a09bd81cc3b71a688d3727d8749f ... section_end:1641921834:prepare_executor
section_start:1641921834:prepare_script
Preparing environment
Running on runner-lb3m2qse-project-3185-concurrent-2 via fdo-packet-m1xl-3...
section_end:1641921837:prepare_script
section_start:1641921837:get_sources
Getting source from Git repository
$ eval "$CI_PRE_CLONE_SCRIPT" Fetching changes... Reinitialized existing Git repository in /builds/gfx-ci/igt-ci-tags/.git/ fatal: unable to access 'https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags.git/': The requested URL returned error: 504 section_end:1641923640:get_sources section_start:1641923640:cleanup_file_variables Cleaning up file based variables section_end:1641923642:cleanup_file_variables ERROR: Job failed: exit code 1
== Logs ==
For more details see: https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/pipelines/481560
Quoted 16 lines · On Tue, Jan 11, 2022 at 10:26:00PM +0530, [email protected] wrote:
From: Ch Sai Gowtham <[email protected]>
Add support for local memory region (Device memory)
Signed-off-by Ch Sai Gowtham <[email protected]>Cc Zbigniew Kempczyński <[email protected]>--- lib/igt_dummyload.h | 1 + tests/i915/gem_sync.c | 206 ++++++++++++++++++++++++++---------------- 2 files changed, 129 insertions(+), 78 deletions(-)lib/igt_dummyload.h +0
-0
lib/igt_dummyload.h typedef struct igt_spin_factory { · line 85
Quoted 5 lines
lib/igt_dummyload.h +1
-0@@ -81,6 +81,7 @@ typedef struct igt_spin_factory {unsigned int flags;int fence;uint64_t ahnd; +uint32_t region; } igt_spin_factory_t;
You've added region as part of structure and spinner code can use it but spinner object still comes from system memory.
Take a look to handle_create() and emit_recursive_batch() from igt_dummyload.c. Be aware userptr excludes regioning so add appropriate assertion there.
Also use gem_detect_safe_alignment() when allocating offsets from allocator in igt_dummyload.c for spinner.
Quoted 11 lines
lib/igt_dummyload.h +0
-0#define IGT_SPIN_FENCE_IN (1 << 0)tests/i915/gem_sync.c +1
-0@@ -143,9 +143,20 @@ static void xchg_engine(void *array, unsigned i, unsigned j)igt_swap (E [i],E [j]); } +static uint32_t batch_create (int fd,uint32_t batch_size,uint32_t region)
tests/i915/gem_sync.c static void xchg_engine(void *array, unsigned i, unsigned j) · line 156
Quoted 10 lines
tests/i915/gem_sync.c +10
-0+{ +const uint32_t bbe =MI_BATCH_BUFFER_END ; +uint32_t handle; + + handle =gem_create_in_memory_regions (fd, batch_size, region); +gem_write (fd, handle,0 , &bbe,sizeof (bbe)); + +return handle; +} +
Ok, we can have common helper code. It will bite us soon due to requested object size can be smaller than object size created. So passing requested size to allocator will create overlapped allocations and -ENOSPC. But don't worry about this right now.
Quoted 89 lines
tests/i915/gem_sync.c +7
-14static void sync_ring (int fd,const intel_ctx_t *ctx, -unsigned ring,int num_children,int timeout) +unsigned ring,int num_children,int timeout,uint32_t region) {struct intel_engine_data ied;@@ -155,15 +166,13 @@ sync_ring(int fd, const intel_ctx_t *ctx,intel_detect_and_clear_missed_interrupts (fd); igt_fork(child, num_children) { -const uint32_t bbe =MI_BATCH_BUFFER_END ;struct drm_i915_gem_exec_object2 object;struct drm_i915_gem_execbuffer2 execbuf;double start, elapsed;unsigned long cycles;memset (&object,0 ,sizeof (object)); - object.handle =gem_create (fd,4096 ); -gem_write (fd, object.handle,0 , &bbe,sizeof (bbe)); + object.handle =batch_create (fd,4096 , region);memset (&execbuf,0 ,sizeof (execbuf)); execbuf.buffers_ptr =to_user_pointer (&object);@@ -193,9 +202,8 @@ sync_ring(int fd, const intel_ctx_t *ctx,static void idle_ring (int fd,const intel_ctx_t *ctx,unsigned int ring, -int num_children,int timeout) +int num_children,int timeout,uint32_t region) { -const uint32_t bbe =MI_BATCH_BUFFER_END ;struct drm_i915_gem_exec_object2 object;struct drm_i915_gem_execbuffer2 execbuf;double start, elapsed;@@ -204,8 +212,7 @@ idle_ring(int fd, const intel_ctx_t *ctx, unsigned int ring,gem_require_ring (fd, ring);memset (&object,0 ,sizeof (object)); - object.handle =gem_create (fd,4096 ); -gem_write (fd, object.handle,0 , &bbe,sizeof (bbe)); + object.handle =batch_create (fd,4096 , region);memset (&execbuf,0 ,sizeof (execbuf)); execbuf.buffers_ptr =to_user_pointer (&object);@@ -234,7 +241,7 @@ idle_ring(int fd, const intel_ctx_t *ctx, unsigned int ring,static void wakeup_ring (int fd,const intel_ctx_t *ctx,unsigned ring, -int timeout,int wlen) +int timeout,int wlen,uint32_t region) {struct intel_engine_data ied;uint64_t ahnd =get_reloc_ahnd (fd, ctx->id);@@ -244,7 +251,6 @@ wakeup_ring(int fd, const intel_ctx_t *ctx, unsigned ring,intel_detect_and_clear_missed_interrupts (fd); igt_fork(child, ied.nengines) { -const uint32_t bbe =MI_BATCH_BUFFER_END ;struct drm_i915_gem_exec_object2 object;struct drm_i915_gem_execbuffer2 execbuf;double end, this, elapsed, now, baseline;@@ -254,11 +260,10 @@ wakeup_ring(int fd, const intel_ctx_t *ctx, unsigned ring, ahnd =get_reloc_ahnd (fd, ctx->id);memset (&object,0 ,sizeof (object)); - object.handle =gem_create (fd,4096 ); + object.handle =batch_create (fd,4096 , region); object.offset =get_offset (ahnd, object.handle,4096 ,0 );if (ahnd) object.flags =EXEC_OBJECT_PINNED ; -gem_write (fd, object.handle,0 , &bbe,sizeof (bbe));memset (&execbuf,0 ,sizeof (execbuf)); execbuf.buffers_ptr =to_user_pointer (&object);@@ -339,7 +344,7 @@ wakeup_ring(int fd, const intel_ctx_t *ctx, unsigned ring, }static void active_ring (int fd,const intel_ctx_t *ctx,unsigned int ring, -int num_children,int timeout) +int num_children,int timeout,uint32_t region) {struct intel_engine_data ied;uint64_t ahnd =get_reloc_ahnd (fd, ctx->id);@@ -359,13 +364,15 @@ static void active_ring(int fd, const intel_ctx_t *ctx, unsigned int ring, .ahnd = ahnd, .ctx = ctx, .engine = ied_flags(&ied, child), - .flags = IGT_SPIN_FAST);
tests/i915/gem_sync.c static void active_ring(int fd, const intel_ctx_t *ctx, unsigned int ring, · line 375
Quoted 10 lines
tests/i915/gem_sync.c +4
-1+ .flags = IGT_SPIN_FAST, + .region = region); spin[1] = __igt_spin_new(fd, .ahnd = ahnd, .ctx = ctx, .engine = ied_flags(&ied, child), - .flags =IGT_SPIN_FAST ); + .flags = IGT_SPIN_FAST, + .region = region);
Passing region here looks correct.
Quoted 21 lines
tests/i915/gem_sync.c +1
-2start =gettime (); end = start + timeout;@@ -398,7 +405,7 @@ static void active_ring(int fd, const intel_ctx_t *ctx, unsigned int ring,static void active_wakeup_ring (int fd,const intel_ctx_t *ctx,unsigned ring, -int timeout,int wlen) +int timeout,int wlen,uint32_t region) {struct intel_engine_data ied;uint64_t ahnd0 =get_reloc_ahnd (fd,0 );@@ -409,7 +416,6 @@ active_wakeup_ring(int fd, const intel_ctx_t *ctx, unsigned ring,intel_detect_and_clear_missed_interrupts (fd); igt_fork(child, ied.nengines) { -const uint32_t bbe =MI_BATCH_BUFFER_END ;struct drm_i915_gem_exec_object2 object;struct drm_i915_gem_execbuffer2 execbuf;double end, this, elapsed, now, baseline;
tests/i915/gem_sync.c active_wakeup_ring(int fd, const intel_ctx_t *ctx, unsigned ring, · line 427
Quoted 9 lines
tests/i915/gem_sync.c +1
-2@@ -420,11 +426,10 @@ active_wakeup_ring(int fd, const intel_ctx_t *ctx, unsigned ring, ahnd =get_reloc_ahnd (fd, ctx->id);memset (&object,0 ,sizeof (object)); - object.handle =gem_create (fd,4096 ); + object.handle =batch_create (fd,4096 , region); object.offset =get_offset (ahnd, object.handle,4096 ,0 );if (ahnd) object.offset =EXEC_OBJECT_PINNED ; -gem_write (fd, object.handle,0 , &bbe,sizeof (bbe));
These spinners also can be instantiated from region passed as an argument.
Quoted 83 lines
tests/i915/gem_sync.c +7
-12memset (&execbuf,0 ,sizeof (execbuf)); execbuf.buffers_ptr =to_user_pointer (&object);@@ -529,7 +534,7 @@ active_wakeup_ring(int fd, const intel_ctx_t *ctx, unsigned ring,static void store_ring (int fd,const intel_ctx_t *ctx,unsigned ring, -int num_children,int timeout) +int num_children,int timeout,uint32_t region) {const unsigned int gen =intel_gen (intel_get_drm_devid (fd));struct intel_engine_data ied;@@ -541,7 +546,6 @@ store_ring(int fd, const intel_ctx_t *ctx, unsigned ring,intel_detect_and_clear_missed_interrupts (fd); igt_fork(child, num_children) { -const uint32_t bbe =MI_BATCH_BUFFER_END ;struct drm_i915_gem_exec_object2 object[2 ];struct drm_i915_gem_relocation_entry reloc[1024 ];struct drm_i915_gem_execbuffer2 execbuf;@@ -559,14 +563,13 @@ store_ring(int fd, const intel_ctx_t *ctx, unsigned ring, execbuf.rsvd1 = ctx->id;memset (object,0 ,sizeof (object)); - object[0 ].handle =gem_create (fd,4096 ); -gem_write (fd, object[0 ].handle,0 , &bbe,sizeof (bbe)); + object[0 ].handle =batch_create (fd,4096 , region); execbuf.buffer_count =1 ;gem_execbuf (fd, &execbuf); object[0 ].flags |=EXEC_OBJECT_WRITE ; object[0 ].flags |= has_relocs ?0 :EXEC_OBJECT_PINNED ; - object[1 ].handle =gem_create (fd,20 *1024 ); + object[1 ].handle =gem_create_in_memory_regions (fd,20 *1024 , region); object[1 ].relocs_ptr =to_user_pointer (reloc); object[1 ].relocation_count = has_relocs ?1024 :0 ;@@ -629,7 +632,7 @@ store_ring(int fd, const intel_ctx_t *ctx, unsigned ring,static void switch_ring (int fd,const intel_ctx_t *ctx,unsigned ring, -int num_children,int timeout) +int num_children,int timeout,uint32_t region) {const unsigned int gen =intel_gen (intel_get_drm_devid (fd));struct intel_engine_data ied;@@ -653,7 +656,6 @@ switch_ring(int fd, const intel_ctx_t *ctx, unsigned ring,unsigned long cycles;for (int i =0 ; i <ARRAY_SIZE (contexts); i++) { -const uint32_t bbe =MI_BATCH_BUFFER_END ;const uint32_t sz =32 <<10 ;struct context *c = &contexts[i];uint32_t *batch, *b;@@ -670,13 +672,12 @@ switch_ring(int fd, const intel_ctx_t *ctx, unsigned ring, c->execbuf.rsvd1 = c->ctx->id;memset (c->object,0 ,sizeof (c->object)); - c->object[0 ].handle =gem_create (fd,4096 ); -gem_write (fd, c->object[0 ].handle,0 , &bbe,sizeof (bbe)); + c->object[0 ].handle =batch_create (fd,4096 , region); c->execbuf.buffer_count =1 ;gem_execbuf (fd, &c->execbuf); c->object[0 ].flags |=EXEC_OBJECT_WRITE ; - c->object[1 ].handle =gem_create (fd, sz); + c->object[1 ].handle =gem_create_in_memory_regions (fd, sz, region); c->object[1 ].relocs_ptr =to_user_pointer (c->reloc); c->object[1 ].relocation_count = has_relocs ?1024 * i :0 ;@@ -813,10 +814,9 @@ static void *waiter(void *arg)static void __store_many (int fd,const intel_ctx_t *ctx,unsigned ring, -int timeout,unsigned long *cycles) +int timeout,unsigned long *cycles,uint32_t region) {const unsigned int gen =intel_gen (intel_get_drm_devid (fd)); -const uint32_t bbe =MI_BATCH_BUFFER_END ;struct drm_i915_gem_exec_object2 object[2 ];struct drm_i915_gem_execbuffer2 execbuf;struct drm_i915_gem_relocation_entry reloc[1024 ];
tests/i915/gem_sync.c __store_many(int fd, const intel_ctx_t *ctx, unsigned ring, · line 842
Quoted 9 lines
tests/i915/gem_sync.c +1
-2@@ -836,8 +836,7 @@ __store_many(int fd, const intel_ctx_t *ctx, unsigned ring, execbuf.rsvd1 = ctx->id;memset (object,0 ,sizeof (object)); - object[0 ].handle =gem_create (fd,4096 ); -gem_write (fd, object[0 ].handle,0 , &bbe,sizeof (bbe)); + object[0 ].handle =batch_create (fd,4096 , region); execbuf.buffer_count =1 ;gem_execbuf (fd, &execbuf); object[0 ].flags |=EXEC_OBJECT_WRITE ;
Interesting code from this function is:
for (int i = 0; i < ARRAY_SIZE(threads); i++) {
threads[i].fd = fd;
threads[i].object = object[1];
threads[i].object.handle = gem_create(fd, 20*1024);
gem_write(fd, threads[i].object.handle, 0, batch, 20*1024);
pthread_cond_init(&threads[i].cond, NULL);
pthread_mutex_init(&threads[i].mutex, NULL);
threads[i].done = &done;
threads[i].ready = 0;
pthread_create(&threads[i].thread, NULL, waiter, &threads[i]);
order[i] = i;
}Currently all interesting objects are from smem. I would juggle with memory region used for creating those objects - for i % 2 I would use region, otherwise normal gem_create().
Quoted 124 lines
tests/i915/gem_sync.c +13
-16@@ -945,7 +944,7 @@ __store_many(int fd, const intel_ctx_t *ctx, unsigned ring,static void store_many (int fd,const intel_ctx_t *ctx,unsigned int ring, -int num_children,int timeout) +int num_children,int timeout,uint32_t region) {struct intel_engine_data ied;unsigned long *shared;@@ -963,7 +962,8 @@ store_many(int fd, const intel_ctx_t *ctx, unsigned int ring,__store_many (fd, ctx,ied_flags (&ied, n), timeout, - &shared[n]); + &shared[n], + region); }igt_waitchildren ();@@ -976,7 +976,7 @@ store_many(int fd, const intel_ctx_t *ctx, unsigned int ring, }static void -sync_all (int fd,const intel_ctx_t *ctx,int num_children,int timeout) +sync_all (int fd,const intel_ctx_t *ctx,int num_children,int timeout,uint32_t region) {struct intel_engine_data ied;@@ -985,15 +985,13 @@ sync_all(int fd, const intel_ctx_t *ctx, int num_children, int timeout)intel_detect_and_clear_missed_interrupts (fd); igt_fork(child, num_children) { -const uint32_t bbe =MI_BATCH_BUFFER_END ;struct drm_i915_gem_exec_object2 object;struct drm_i915_gem_execbuffer2 execbuf;double start, elapsed;unsigned long cycles;memset (&object,0 ,sizeof (object)); - object.handle =gem_create (fd,4096 ); -gem_write (fd, object.handle,0 , &bbe,sizeof (bbe)); + object.handle =batch_create (fd,4096 , region);memset (&execbuf,0 ,sizeof (execbuf)); execbuf.buffers_ptr =to_user_pointer (&object);@@ -1023,7 +1021,7 @@ sync_all(int fd, const intel_ctx_t *ctx, int num_children, int timeout) }static void -store_all (int fd,const intel_ctx_t *ctx,int num_children,int timeout) +store_all (int fd,const intel_ctx_t *ctx,int num_children,int timeout,uint32_t region) {const unsigned int gen =intel_gen (intel_get_drm_devid (fd));struct intel_engine_data ied;@@ -1034,7 +1032,6 @@ store_all(int fd, const intel_ctx_t *ctx, int num_children, int timeout)intel_detect_and_clear_missed_interrupts (fd); igt_fork(child, num_children) { -const uint32_t bbe =MI_BATCH_BUFFER_END ;struct drm_i915_gem_exec_object2 object[2 ];struct drm_i915_gem_relocation_entry reloc[1024 ];struct drm_i915_gem_execbuffer2 execbuf;@@ -1051,14 +1048,13 @@ store_all(int fd, const intel_ctx_t *ctx, int num_children, int timeout) execbuf.rsvd1 = ctx->id;memset (object,0 ,sizeof (object)); - object[0 ].handle =gem_create (fd,4096 ); -gem_write (fd, object[0 ].handle,0 , &bbe,sizeof (bbe)); + object[0 ].handle =batch_create (fd,4096 , region); execbuf.buffer_count =1 ;gem_execbuf (fd, &execbuf); object[0 ].flags |=EXEC_OBJECT_WRITE ; object[0 ].flags |= has_relocs ?0 :EXEC_OBJECT_PINNED ; - object[1 ].handle =gem_create (fd,1024 *16 +4096 ); + object[1 ].handle =gem_create_in_memory_regions (fd,1024 *16 +4096 , region); object[1 ].relocs_ptr =to_user_pointer (reloc); object[1 ].relocation_count = has_relocs ?1024 :0 ;@@ -1126,7 +1122,7 @@ store_all(int fd, const intel_ctx_t *ctx, int num_children, int timeout)static void preempt (int fd,const intel_ctx_t *ctx,unsigned ring, -int num_children,int timeout) +int num_children,int timeout,uint32_t region) {struct intel_engine_data ied;const intel_ctx_t *tmp_ctx[2 ];@@ -1144,7 +1140,6 @@ preempt(int fd, const intel_ctx_t *ctx, unsigned ring,intel_detect_and_clear_missed_interrupts (fd); igt_fork(child, num_children) { -const uint32_t bbe =MI_BATCH_BUFFER_END ;struct drm_i915_gem_exec_object2 object;struct drm_i915_gem_execbuffer2 execbuf;double start, elapsed;@@ -1153,11 +1148,10 @@ preempt(int fd, const intel_ctx_t *ctx, unsigned ring, ahnd =get_reloc_ahnd (fd,0 );memset (&object,0 ,sizeof (object)); - object.handle =gem_create (fd,4096 ); + object.handle =batch_create (fd,4096 , region); object.offset =get_offset (ahnd, object.handle,4096 ,0 );if (ahnd) object.flags =EXEC_OBJECT_PINNED ; -gem_write (fd, object.handle,0 , &bbe,sizeof (bbe));memset (&execbuf,0 ,sizeof (execbuf)); execbuf.buffers_ptr =to_user_pointer (&object);@@ -1205,7 +1199,7 @@ igt_mainconst struct {const char *name;void (*func)(int fd,const intel_ctx_t *ctx,unsigned int engine, -int num_children,int timeout); +int num_children,int timeout,uint32_t memregion);int num_children;int timeout; } all[] = {@@ -1236,11 +1230,40 @@ igt_main { "forked-store", store_ring, ncpus, 20 }, {} }; + const struct test { + const char *name;
tests/i915/gem_sync.c igt_main · line 1244
Quoted 10 lines
tests/i915/gem_sync.c +10
-0+void (*func) (int ,const intel_ctx_t *,int ,int ,uint32_t ); +int num_children; +int timeout; + } *test, tests[] = { + { "basic-all", sync_all, 1, 2}, + { "basic-store-all", store_all, 1, 2}, + { "all", sync_all, 1, 20}, + { "store-all", store_all, 1, 20}, + { "forked-all", sync_all, ncpus, 20}, + { "forked-store-all", store_all, ncpus, 20},
Adding space before last bracket would be welcome.
Consider to add two macros around for_each_combination (similar to gem_exec_suspend). If I good see the pattern one of that macro will need to for_each_ctx_engine() whereas second will not.
--
Zbigniew
Quoted 151 lines
tests/i915/gem_sync.c +73
-29+ {} + }; +#define subtest_for_each_combination (__name, __ctx, __num_children, __timeout, __func) \ + igt_subtest_with_dynamic(__name) { \ + 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) \ + (__func)(fd, (__ctx), (__num_children), (__timeout), region); \ + free(sub_name); \ + } \ + } +#define for_each_test (t,T ) for(typeof(*T) *t = T; t->name; t++)const struct intel_execution_engine2 *e;const intel_ctx_t *ctx;int fd =-1 ; +struct drm_i915_query_memory_regions *query_info; +struct igt_collection *regions, *set; +char *sub_name; +uint32_t region; igt_fixture { fd =drm_open_driver (DRIVER_INTEL );@@ -1250,6 +1273,11 @@ igt_main ctx =intel_ctx_create_all_physical (fd);igt_fork_hang_detector (fd); + query_info =gem_get_query_memory_regions (fd); +igt_assert (query_info); + set =get_memory_region_set (query_info, +I915_SYSTEM_MEMORY , +I915_DEVICE_MEMORY );intel_allocator_multiprocess_start (); }@@ -1257,41 +1285,48 @@ igt_mainfor_each_test (t, individual) { igt_subtest_with_dynamic_f("legacy-%s", t->name) {for (const struct intel_execution_ring *l = intel_execution_rings; l->name; l++) { - igt_dynamic_f("%s", l->name) { - t->func (fd,intel_ctx_0 (fd),eb_ring (l), - t->num_children, t->timeout); +for_each_combination (regions,1 , set) { + sub_name =memregion_dynamic_subtest_name (regions); + region =igt_collection_get_value (regions,0 ); + igt_dynamic_f("%s-%s", l->name, sub_name) { + t->func (fd,intel_ctx_0 (fd),eb_ring (l), + t->num_children, + t->timeout, + region); + } +free (sub_name); } } } } - - igt_subtest("basic-all") -sync_all (fd, ctx,1 ,2 ); - igt_subtest("basic-store-all") -store_all (fd, ctx,1 ,2 ); - - igt_subtest("all") -sync_all (fd, ctx,1 ,20 ); - igt_subtest("store-all") -store_all (fd, ctx,1 ,20 ); - igt_subtest("forked-all") -sync_all (fd, ctx, ncpus,20 ); - igt_subtest("forked-store-all") -store_all (fd, ctx, ncpus,20 ); +for (test= tests; test->name; test++) +subtest_for_each_combination (test->name, ctx, test->num_children, test->timeout, test->func);for_each_test (t, all) { -igt_subtest_f ("%s" , t->name) - t->func(fd, ctx, ALL_ENGINES, t->num_children, t->timeout); + igt_subtest_with_dynamic_f("%s", t->name) { +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) + t->func(fd, ctx, ALL_ENGINES, t->num_children, + t->timeout, region); +free (sub_name); + } + } }/* New way of selecting engines. */ for_each_test (t, individual) { igt_subtest_with_dynamic_f("%s", t->name) { -for_each_ctx_engine (fd, ctx, e) { - igt_dynamic_f("%s", e->name) { - t->func (fd, ctx, e->flags, - t->num_children, t->timeout); - } +for_each_combination (regions,1 , set) { + sub_name =memregion_dynamic_subtest_name (regions); + region =igt_collection_get_value (regions,0 ); +for_each_ctx_engine (fd, ctx, e) +igt_dynamic_f ("%s-%s" , e->name, sub_name) + t->func(fd, ctx, e->flags, + t->num_children, + t->timeout, region); +free (sub_name); } } }@@ -1303,17 +1338,32 @@ igt_mainigt_require (gem_scheduler_has_preemption (fd)); } - igt_subtest("preempt-all") -preempt (fd, ctx,ALL_ENGINES ,1 ,20 ); + igt_subtest_with_dynamic("preempt-all") { +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) +preempt (fd, ctx,ALL_ENGINES ,1 ,20 , region); +free (sub_name); + } + } + igt_subtest_with_dynamic("preempt") { -for_each_ctx_engine (fd, ctx, e) { - igt_dynamic_f("%s", e->name) -preempt (fd, ctx, e->flags, ncpus,20 ); +for_each_combination (regions,1 , set) { + sub_name =memregion_dynamic_subtest_name (regions); + region =igt_collection_get_value (regions,0 ); +for_each_ctx_engine (fd, ctx, e) { + igt_dynamic_f("%s-%s", e->name, sub_name) +preempt (fd, ctx, e->flags, ncpus,20 , region); +free (sub_name); + } } } } igt_fixture { +free (query_info); +igt_collection_destroy (set);intel_allocator_multiprocess_stop ();igt_stop_hang_detector ();intel_ctx_destroy (fd, ctx);Signature · 1 line
2.32.0