diff options
| author | Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> | 2021-01-14 13:22:29 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2021-01-14 15:36:07 +0000 |
| commit | c5cf0734c4f6c1fa17a6a15b5aa721c3a0b8c494 (patch) | |
| tree | dd679bf2e51b6c17f51ae119ffaa3e8e6fdc16aa /tests | |
| parent | cb5bc26db33ed77cfabfc6a9e4777b9167596a67 (diff) | |
i915/gem_ppgtt: Migrate memory check out of render blits
Running memory cache flush when bcs is doing blits leads to serializing
bcs and rcs part. So we move memory check before blitting giving chance
to parallel the execution.
Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
Cc: Dominik Grzegorzek <dominik.grzegorzek@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/i915/gem_ppgtt.c | 44 |
1 files changed, 29 insertions, 15 deletions
diff --git a/tests/i915/gem_ppgtt.c b/tests/i915/gem_ppgtt.c index 73d13fe7..5f8b3422 100644 --- a/tests/i915/gem_ppgtt.c +++ b/tests/i915/gem_ppgtt.c @@ -81,14 +81,8 @@ static void fork_rcs_copy(int timeout, uint32_t final, #define CREATE_CONTEXT 0x1 { igt_render_copyfunc_t render_copy; - uint64_t mem_per_child; int devid; - mem_per_child = SIZE; - if (flags & CREATE_CONTEXT) - mem_per_child += 2 * 128 * 1024; /* rough context sizes */ - intel_require_memory(count, mem_per_child, CHECK_RAM); - for (int child = 0; child < count; child++) { int fd = drm_open_driver(DRIVER_INTEL); struct buf_ops *bops; @@ -267,9 +261,10 @@ static bool has_contexts(void) return result; } -#define N_CHILD 8 igt_main { + const int ncpus = sysconf(_SC_NPROCESSORS_ONLN); + igt_fixture { int fd = drm_open_driver(DRIVER_INTEL); igt_require_gem(fd); @@ -278,35 +273,54 @@ igt_main } igt_subtest("blt-vs-render-ctx0") { - struct intel_buf *bcs[1], *rcs[N_CHILD]; + struct intel_buf *bcs[1], **rcs; + int nchild = ncpus + 1; + uint64_t mem_per_test; + + mem_per_test = SIZE; + intel_require_memory(nchild + 1, mem_per_test, CHECK_RAM); + + rcs = calloc(sizeof(*rcs), nchild); + igt_assert(rcs); fork_bcs_copy(30, 0x4000, bcs, 1); - fork_rcs_copy(30, 0x8000 / N_CHILD, rcs, N_CHILD, 0); + fork_rcs_copy(30, 0x8000 / nchild, rcs, nchild, 0); igt_waitchildren(); surfaces_check(bcs, 1, 0x4000); - surfaces_check(rcs, N_CHILD, 0x8000 / N_CHILD); + surfaces_check(rcs, nchild, 0x8000 / nchild); cleanup_bufs(bcs, 1); - cleanup_bufs(rcs, N_CHILD); + cleanup_bufs(rcs, nchild); + free(rcs); } igt_subtest("blt-vs-render-ctxN") { - struct intel_buf *bcs[1], *rcs[N_CHILD]; + struct intel_buf *bcs[1], **rcs; + uint64_t mem_per_ctx = 2 * 128 * 1024; /* rough context sizes */ + uint64_t mem_per_test; + int nchild = ncpus + 1; igt_require(has_contexts()); - fork_rcs_copy(30, 0x8000 / N_CHILD, rcs, N_CHILD, CREATE_CONTEXT); + mem_per_test = SIZE + mem_per_ctx; + intel_require_memory(1 + nchild, mem_per_test, CHECK_RAM); + + rcs = calloc(sizeof(*rcs), nchild); + igt_assert(rcs); + + fork_rcs_copy(30, 0x8000 / nchild, rcs, nchild, CREATE_CONTEXT); fork_bcs_copy(30, 0x4000, bcs, 1); igt_waitchildren(); surfaces_check(bcs, 1, 0x4000); - surfaces_check(rcs, N_CHILD, 0x8000 / N_CHILD); + surfaces_check(rcs, nchild, 0x8000 / nchild); cleanup_bufs(bcs, 1); - cleanup_bufs(rcs, N_CHILD); + cleanup_bufs(rcs, nchild); + free(rcs); } igt_subtest("flink-and-close-vma-leak") |