Mesa (master): intel/tools: Support multiple contexts in intel_dump_gpu.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Oct 10 14:47:51 UTC 2019
Module: Mesa
Branch: master
Commit: 01122a78b33489d9fdb5f41d04617e3130989c4a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=01122a78b33489d9fdb5f41d04617e3130989c4a
Author: Rafael Antognolli <rafael.antognolli at intel.com>
Date: Mon Sep 16 09:07:26 2019 -0700
intel/tools: Support multiple contexts in intel_dump_gpu.
Create basic aub_context on GEM_CONTEXT_CREATE.
Set it up and submit a context + ring + pphwsp during execbuf
submission, if it has not been initialized yet.
v2: Write the HWSP only once per engine (Lionel).
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
---
src/intel/tools/aub_write.c | 75 +++++++++++++++++++++++++++-------------
src/intel/tools/aub_write.h | 6 ++--
src/intel/tools/error2aub.c | 8 +++--
src/intel/tools/intel_dump_gpu.c | 4 ++-
4 files changed, 62 insertions(+), 31 deletions(-)
diff --git a/src/intel/tools/aub_write.c b/src/intel/tools/aub_write.c
index f9fe8db24cb..b6d96fc88a3 100644
--- a/src/intel/tools/aub_write.c
+++ b/src/intel/tools/aub_write.c
@@ -510,8 +510,26 @@ alloc_ggtt_address(struct aub_file *aub, uint64_t size)
return addr;
}
+static void
+write_hwsp(struct aub_file *aub,
+ enum drm_i915_gem_engine_class engine_class)
+{
+ uint32_t reg = 0;
+ switch (engine_class) {
+ case I915_ENGINE_CLASS_RENDER: reg = HWS_PGA_RCSUNIT; break;
+ case I915_ENGINE_CLASS_COPY: reg = HWS_PGA_BCSUNIT; break;
+ case I915_ENGINE_CLASS_VIDEO: reg = HWS_PGA_VCSUNIT0; break;
+ default:
+ unreachable("unknown ring");
+ }
+
+ register_write_out(aub, reg, aub->engine_setup[engine_class].hwsp_addr);
+}
+
static uint32_t
write_engine_execlist_setup(struct aub_file *aub,
+ uint32_t ctx_id,
+ struct aub_hw_context *hw_ctx,
enum drm_i915_gem_engine_class engine_class)
{
const struct engine *cs = engine_from_engine_class(engine_class);
@@ -524,10 +542,10 @@ write_engine_execlist_setup(struct aub_file *aub,
char name[80];
uint64_t ggtt_addr = alloc_ggtt_address(aub, total_size);
- snprintf(name, sizeof(name), "%s GGTT PT", cs->name);
+ snprintf(name, sizeof(name), "%s (ctx id: %d) GGTT PT", cs->name, ctx_id);
/* RING */
- aub->engine_setup[engine_class].ring_addr = ggtt_addr;
+ hw_ctx->ring_addr = ggtt_addr;
snprintf(name, sizeof(name), "%s RING", cs->name);
mem_trace_memory_write_header_out(aub, ggtt_addr, RING_SIZE,
AUB_MEM_TRACE_MEMORY_ADDRESS_SPACE_GGTT,
@@ -537,8 +555,7 @@ write_engine_execlist_setup(struct aub_file *aub,
ggtt_addr += RING_SIZE;
/* PPHWSP */
- aub->engine_setup[engine_class].pphwsp_addr = ggtt_addr;
- aub->engine_setup[engine_class].descriptor = cs->hw_class | ggtt_addr | CONTEXT_FLAGS;
+ hw_ctx->pphwsp_addr = ggtt_addr;
snprintf(name, sizeof(name), "%s PPHWSP", cs->name);
mem_trace_memory_write_header_out(aub, ggtt_addr,
PPHWSP_SIZE + context_size,
@@ -549,7 +566,7 @@ write_engine_execlist_setup(struct aub_file *aub,
/* CONTEXT */
struct gen_context_parameters params = {
- .ring_addr = aub->engine_setup[engine_class].ring_addr,
+ .ring_addr = hw_ctx->ring_addr,
.ring_size = RING_SIZE,
.pml4_addr = aub->pml4.phys_addr,
};
@@ -558,20 +575,14 @@ write_engine_execlist_setup(struct aub_file *aub,
data_out(aub, context_data, context_size);
free(context_data);
+ hw_ctx->initialized = true;
+
return total_size;
}
static void
write_execlists_default_setup(struct aub_file *aub)
{
- write_engine_execlist_setup(aub, I915_ENGINE_CLASS_RENDER);
- write_engine_execlist_setup(aub, I915_ENGINE_CLASS_COPY);
- write_engine_execlist_setup(aub, I915_ENGINE_CLASS_VIDEO);
-
- register_write_out(aub, HWS_PGA_RCSUNIT, aub->engine_setup[I915_ENGINE_CLASS_RENDER].pphwsp_addr);
- register_write_out(aub, HWS_PGA_VCSUNIT0, aub->engine_setup[I915_ENGINE_CLASS_VIDEO].pphwsp_addr);
- register_write_out(aub, HWS_PGA_BCSUNIT, aub->engine_setup[I915_ENGINE_CLASS_COPY].pphwsp_addr);
-
register_write_out(aub, GFX_MODE_RCSUNIT, 0x80008000 /* execlist enable */);
register_write_out(aub, GFX_MODE_VCSUNIT0, 0x80008000 /* execlist enable */);
register_write_out(aub, GFX_MODE_BCSUNIT, 0x80008000 /* execlist enable */);
@@ -619,9 +630,8 @@ aub_context_new(struct aub_file *aub, uint32_t new_id)
assert(aub->num_contexts < MAX_CONTEXT_COUNT);
struct aub_context *ctx = &aub->contexts[aub->num_contexts++];
-
- ctx->id = new_id;
memset(ctx, 0, sizeof(*ctx));
+ ctx->id = new_id;
return ctx;
}
@@ -658,9 +668,8 @@ aub_write_ensure_context(struct aub_file *aub, uint32_t ctx_id,
assert(ctx != NULL);
struct aub_hw_context *hw_ctx = &ctx->hw_contexts[engine_class];
- if (!hw_ctx->initialized) {
- /* TODO: initialize context here */
- }
+ if (!hw_ctx->initialized)
+ write_engine_execlist_setup(aub, ctx->id, hw_ctx, engine_class);
return hw_ctx;
}
@@ -721,10 +730,11 @@ aub_write_trace_block(struct aub_file *aub,
static void
aub_dump_ring_buffer_execlist(struct aub_file *aub,
+ struct aub_hw_context *hw_ctx,
const struct engine *cs,
uint64_t batch_offset)
{
- mem_trace_memory_write_header_out(aub, aub->engine_setup[cs->engine_class].ring_addr, 16,
+ mem_trace_memory_write_header_out(aub, hw_ctx->ring_addr, 16,
AUB_MEM_TRACE_MEMORY_ADDRESS_SPACE_GGTT,
"RING MI_BATCH_BUFFER_START user");
dword_out(aub, AUB_MI_BATCH_BUFFER_START | MI_BATCH_NON_SECURE_I965 | (3 - 2));
@@ -732,11 +742,11 @@ aub_dump_ring_buffer_execlist(struct aub_file *aub,
dword_out(aub, batch_offset >> 32);
dword_out(aub, 0 /* MI_NOOP */);
- mem_trace_memory_write_header_out(aub, aub->engine_setup[cs->engine_class].ring_addr + 8192 + 20, 4,
+ mem_trace_memory_write_header_out(aub, hw_ctx->ring_addr + 8192 + 20, 4,
AUB_MEM_TRACE_MEMORY_ADDRESS_SPACE_GGTT,
"RING BUFFER HEAD");
dword_out(aub, 0); /* RING_BUFFER_HEAD */
- mem_trace_memory_write_header_out(aub, aub->engine_setup[cs->engine_class].ring_addr + 8192 + 28, 4,
+ mem_trace_memory_write_header_out(aub, hw_ctx->ring_addr + 8192 + 28, 4,
AUB_MEM_TRACE_MEMORY_ADDRESS_SPACE_GGTT,
"RING BUFFER TAIL");
dword_out(aub, 16); /* RING_BUFFER_TAIL */
@@ -810,15 +820,32 @@ aub_dump_ring_buffer_legacy(struct aub_file *aub,
data_out(aub, ringbuffer, ring_count * 4);
}
+static void
+aub_write_ensure_hwsp(struct aub_file *aub,
+ enum drm_i915_gem_engine_class engine_class)
+{
+ uint64_t *hwsp_addr = &aub->engine_setup[engine_class].hwsp_addr;
+
+ if (*hwsp_addr != 0)
+ return;
+
+ *hwsp_addr = alloc_ggtt_address(aub, 4096);
+ write_hwsp(aub, engine_class);
+}
+
void
-aub_write_exec(struct aub_file *aub, uint64_t batch_addr,
+aub_write_exec(struct aub_file *aub, uint32_t ctx_id, uint64_t batch_addr,
uint64_t offset, enum drm_i915_gem_engine_class engine_class)
{
const struct engine *cs = engine_from_engine_class(engine_class);
if (aub_use_execlists(aub)) {
- aub_dump_ring_buffer_execlist(aub, cs, batch_addr);
- aub_dump_execlist(aub, cs, aub->engine_setup[engine_class].descriptor);
+ struct aub_hw_context *hw_ctx =
+ aub_write_ensure_context(aub, ctx_id, engine_class);
+ uint64_t descriptor = get_context_descriptor(aub, cs, hw_ctx);
+ aub_write_ensure_hwsp(aub, engine_class);
+ aub_dump_ring_buffer_execlist(aub, hw_ctx, cs, batch_addr);
+ aub_dump_execlist(aub, cs, descriptor);
} else {
/* Dump ring buffer */
aub_dump_ring_buffer_legacy(aub, batch_addr, offset, engine_class);
diff --git a/src/intel/tools/aub_write.h b/src/intel/tools/aub_write.h
index 1b0524c38ce..b4f8649b384 100644
--- a/src/intel/tools/aub_write.h
+++ b/src/intel/tools/aub_write.h
@@ -74,9 +74,7 @@ struct aub_file {
uint64_t ggtt_addrs_allocator;
struct {
- uint64_t ring_addr;
- uint64_t pphwsp_addr;
- uint64_t descriptor;
+ uint64_t hwsp_addr;
} engine_setup[I915_ENGINE_CLASS_VIDEO_ENHANCE + 1];
struct aub_context contexts[MAX_CONTEXT_COUNT];
@@ -111,7 +109,7 @@ void aub_write_ggtt(struct aub_file *aub, uint64_t virt_addr, uint64_t size, con
void aub_write_trace_block(struct aub_file *aub,
uint32_t type, void *virtual,
uint32_t size, uint64_t gtt_offset);
-void aub_write_exec(struct aub_file *aub, uint64_t batch_addr,
+void aub_write_exec(struct aub_file *aub, uint32_t ctx_id, uint64_t batch_addr,
uint64_t offset, enum drm_i915_gem_engine_class engine_class);
void aub_write_context_execlists(struct aub_file *aub, uint64_t context_addr,
enum drm_i915_gem_engine_class engine_class);
diff --git a/src/intel/tools/error2aub.c b/src/intel/tools/error2aub.c
index 62c3fdd0f7e..48cd8a0666f 100644
--- a/src/intel/tools/error2aub.c
+++ b/src/intel/tools/error2aub.c
@@ -540,8 +540,12 @@ main(int argc, char *argv[])
if (aub_use_execlists(&aub)) {
fail_if(!hwsp_bo, "Failed to find Context buffer.\n");
aub_write_context_execlists(&aub, hwsp_bo->addr + 4096 /* skip GuC page */, hwsp_bo->engine_class);
- } else
- aub_write_exec(&aub, batch_bo->addr, 0, I915_ENGINE_CLASS_RENDER);
+ } else {
+ /* Use context id 0 -- if we are not using execlists it doesn't matter
+ * anyway
+ */
+ aub_write_exec(&aub, 0, batch_bo->addr, 0, I915_ENGINE_CLASS_RENDER);
+ }
/* Cleanup */
list_for_each_entry_safe(struct bo, bo_entry, &bo_list, link) {
diff --git a/src/intel/tools/intel_dump_gpu.c b/src/intel/tools/intel_dump_gpu.c
index cb2bf8b1351..db80fd4ada7 100644
--- a/src/intel/tools/intel_dump_gpu.c
+++ b/src/intel/tools/intel_dump_gpu.c
@@ -291,7 +291,9 @@ dump_execbuffer2(int fd, struct drm_i915_gem_execbuffer2 *execbuffer2)
free(data);
}
- aub_write_exec(&aub_file,
+ uint32_t ctx_id = execbuffer2->rsvd1;
+
+ aub_write_exec(&aub_file, ctx_id,
batch_bo->offset + execbuffer2->batch_start_offset,
offset, engine_class_from_ring_flag(ring_flag));
More information about the mesa-commit
mailing list