With intel_measure_ring_size and igt_cork added as common utilities we can use them instead of the local copy of those utilities
Signed-off-by: Daniele Ceraolo Spurio <[email protected]> Cc: Chris Wilson <[email protected]> --- tests/gem_exec_latency.c | 97 ++++++------------------------------------------ 1 file changed, 11 insertions(+), 86 deletions(-) diff --git a/tests/gem_exec_latency.c b/tests/gem_exec_latency.c index e9d9344..c6c4bb2 100644 --- a/tests/gem_exec_latency.c +++ b/tests/gem_exec_latency.c @@ -54,83 +54,6 @@ static unsigned int ring_size; -struct cork { - int device; - uint32_t handle; - uint32_t fence; -}; - -static void plug(int fd, struct cork *c) -{ - struct vgem_bo bo; - int dmabuf; - - c->device = drm_open_driver(DRIVER_VGEM); - - bo.width = bo.height = 1; - bo.bpp = 4; - vgem_create(c->device, &bo); - c->fence = vgem_fence_attach(c->device, &bo, VGEM_FENCE_WRITE); - - dmabuf = prime_handle_to_fd(c->device, bo.handle); - c->handle = prime_fd_to_handle(fd, dmabuf); - close(dmabuf); -} - -static void unplug(struct cork *c) -{ - vgem_fence_signal(c->device, c->fence); - close(c->device); -} - -static void alarm_handler(int sig) -{ -} - -static void set_timeout(int seconds) -{ - struct sigaction sa = { .sa_handler = alarm_handler }; - - sigaction(SIGALRM, seconds ? &sa : NULL, NULL); - alarm(seconds); -} - -static int __execbuf(int fd, struct drm_i915_gem_execbuffer2 *execbuf) -{ - return ioctl(fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, execbuf); -} - -static unsigned int measure_ring_size(int fd) -{ - struct drm_i915_gem_exec_object2 obj[2]; - struct drm_i915_gem_execbuffer2 execbuf; - const uint32_t bbe = MI_BATCH_BUFFER_END; - unsigned int count; - struct cork c; - - memset(obj, 0, sizeof(obj)); - obj[1].handle = gem_create(fd, 4096); - gem_write(fd, obj[1].handle, 0, &bbe, sizeof(bbe)); - - plug(fd, &c); - obj[0].handle = c.handle; - - memset(&execbuf, 0, sizeof(execbuf)); - execbuf.buffers_ptr = to_user_pointer(obj); - execbuf.buffer_count = 2; - - count = 0; - set_timeout(1); - while (__execbuf(fd, &execbuf) == 0) - count++; - set_timeout(0); - - unplug(&c); - gem_close(fd, obj[1].handle); - - return count; -} - #define RCS_TIMESTAMP (0x2000 + 0x358) static void latency_on_ring(int fd, unsigned ring, const char *name, @@ -141,7 +64,7 @@ static void latency_on_ring(int fd, struct drm_i915_gem_exec_object2 obj[3]; struct drm_i915_gem_relocation_entry reloc; struct drm_i915_gem_execbuffer2 execbuf; - struct cork c; + struct igt_cork c; volatile uint32_t *reg; unsigned repeats = ring_size; uint32_t start, end, *map, *results; @@ -205,8 +128,7 @@ static void latency_on_ring(int fd, } if (flags & CORK) { - plug(fd, &c); - obj[0].handle = c.handle; + obj[0].handle = igt_cork_plug(fd, &c); execbuf.buffers_ptr = to_user_pointer(&obj[0]); execbuf.buffer_count = 3; } @@ -227,7 +149,7 @@ static void latency_on_ring(int fd, igt_assert(reloc.presumed_offset == obj[1].offset); if (flags & CORK) - unplug(&c); + igt_cork_unplug(&c); gem_set_domain(fd, obj[1].handle, I915_GEM_DOMAIN_GTT, 0); gpu_latency = (results[repeats-1] - results[0]) / (double)(repeats-1); @@ -268,6 +190,8 @@ static void latency_on_ring(int fd, munmap(map, 64*1024); munmap(results, 4096); + if (flags & CORK) + gem_close(fd, obj[0].handle); gem_close(fd, obj[1].handle); gem_close(fd, obj[2].handle); } @@ -319,7 +243,7 @@ static void latency_from_ring(int fd, reloc.target_handle = flags & CORK ? 1 : 0; for (e = intel_execution_engines; e->name; e++) { - struct cork c; + struct igt_cork c; if (e->exec_id == 0) continue; @@ -332,8 +256,7 @@ static void latency_from_ring(int fd, I915_GEM_DOMAIN_GTT); if (flags & CORK) { - plug(fd, &c); - obj[0].handle = c.handle; + obj[0].handle = igt_cork_plug(fd, &c); execbuf.buffers_ptr = to_user_pointer(&obj[0]); execbuf.buffer_count = 3; } @@ -391,7 +314,7 @@ static void latency_from_ring(int fd, } if (flags & CORK) - unplug(&c); + igt_cork_unplug(&c); gem_set_domain(fd, obj[1].handle, I915_GEM_DOMAIN_GTT, @@ -403,6 +326,8 @@ static void latency_from_ring(int fd, munmap(map, 64*1024); munmap(results, 4096); + if (flags & CORK) + gem_close(fd, obj[0].handle); gem_close(fd, obj[1].handle); gem_close(fd, obj[2].handle); } @@ -419,7 +344,7 @@ igt_main gem_submission_print_method(device); - ring_size = measure_ring_size(device); + ring_size = intel_measure_ring_size(device, 0, false); igt_info("Ring size: %d batches\n", ring_size); igt_require(ring_size > 8); ring_size -= 8; /* leave some spare */ -- 1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
