From 4bf3ca8422e2153b208b0cba791b8a45c64ac9d9 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 28 Mar 2017 13:12:24 +0100 Subject: benchmarks/gem_exec_trace: Include client wait points Signed-off-by: Chris Wilson --- benchmarks/gem_exec_trace.c | 14 ++++++++++++++ benchmarks/gem_exec_tracer.c | 25 +++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/benchmarks/gem_exec_trace.c b/benchmarks/gem_exec_trace.c index ddd140f4..83b2a837 100644 --- a/benchmarks/gem_exec_trace.c +++ b/benchmarks/gem_exec_trace.c @@ -50,6 +50,7 @@ enum { ADD_CTX, DEL_CTX, EXEC, + WAIT, }; struct trace_add_bo { @@ -85,6 +86,10 @@ struct trace_exec_object { uint64_t rsvd2; }__attribute__((packed)); +struct trace_wait { + uint32_t handle; +} __attribute__((packed)); + static double elapsed(const struct timespec *start, const struct timespec *end) { return 1e3*(end->tv_sec - start->tv_sec) + 1e-6*(end->tv_nsec - start->tv_nsec); @@ -242,6 +247,15 @@ static double replay(const char *filename) break; } + case WAIT: + { + struct trace_wait *t = (void *)ptr; + ptr = (void *)(t + 1); + + gem_wait(fd, t->handle, NULL); + break; + } + default: fprintf(stderr, "Unknown cmd: %x\n", *ptr); return -1; diff --git a/benchmarks/gem_exec_tracer.c b/benchmarks/gem_exec_tracer.c index 9af61420..4316e218 100644 --- a/benchmarks/gem_exec_tracer.c +++ b/benchmarks/gem_exec_tracer.c @@ -59,6 +59,7 @@ enum { ADD_CTX, DEL_CTX, EXEC, + WAIT, }; static struct trace_verion { @@ -114,6 +115,11 @@ struct trace_exec_relocation { uint32_t write_domain; }__attribute__((packed)); +struct trace_wait { + uint8_t cmd; + uint32_t handle; +} __attribute__((packed)); + static void __attribute__ ((format(__printf__, 2, 3))) fail_if(int cond, const char *format, ...) { @@ -174,6 +180,13 @@ trace_exec(struct trace *trace, #undef to_ptr } +static void +trace_wait(struct trace *trace, uint32_t handle) +{ + struct trace_wait t = { WAIT, handle }; + fwrite(&t, sizeof(t), 1, trace->file); +} + static void trace_add(struct trace *trace, uint32_t handle, uint64_t size) { @@ -314,6 +327,18 @@ ioctl(int fd, unsigned long request, ...) trace_del_context(t, close->ctx_id); break; } + + case DRM_IOCTL_I915_GEM_WAIT: { + struct drm_i915_gem_wait *w = argp; + trace_wait(t, w->bo_handle); + break; + } + + case DRM_IOCTL_I915_GEM_SET_DOMAIN: { + struct drm_i915_gem_set_domain *w = argp; + trace_wait(t, w->handle); + break; + } } ret = libc_ioctl(fd, request, argp); -- cgit v1.2.3