From b69a85bc4dc2af7667b37301a84d5eaa6ee0b1d4 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Fri, 6 Apr 2018 22:39:01 -0700 Subject: [PATCH] iris: validation dumping improvements backported from i965. don't bother with (pinned) because everything is. --- src/gallium/drivers/iris/iris_batch.c | 9 +++++++-- src/gallium/drivers/iris/iris_resource.c | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c index 4db52897adf..51c48476f86 100644 --- a/src/gallium/drivers/iris/iris_batch.c +++ b/src/gallium/drivers/iris/iris_batch.c @@ -59,13 +59,18 @@ dump_validation_list(struct iris_batch *batch) fprintf(stderr, "Validation list (length %d):\n", batch->exec_count); for (int i = 0; i < batch->exec_count; i++) { + uint64_t flags = batch->validation_list[i].flags; assert(batch->validation_list[i].handle == batch->exec_bos[i]->gem_handle); - fprintf(stderr, "[%d] = %d %s %p @ %"PRIx64"\n", i, + fprintf(stderr, "[%2d]: %2d %-14s %p %s%-7s @ 0x%016llx (%"PRIu64"B)\n", + i, batch->validation_list[i].handle, batch->exec_bos[i]->name, batch->exec_bos[i], - batch->exec_bos[i]->gtt_offset); + (flags & EXEC_OBJECT_SUPPORTS_48B_ADDRESS) ? "(48b" : "(32b", + (flags & EXEC_OBJECT_WRITE) ? " write)" : ")", + batch->validation_list[i].offset, + batch->exec_bos[i]->size); } } diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c index da55a1775be..3934f823504 100644 --- a/src/gallium/drivers/iris/iris_resource.c +++ b/src/gallium/drivers/iris/iris_resource.c @@ -257,7 +257,7 @@ iris_resource_create_with_modifiers(struct pipe_screen *pscreen, .tiling_flags = 1 << mod_info->tiling); enum iris_memory_zone memzone = IRIS_MEMZONE_OTHER; - const char *name = "resource"; + const char *name = templ->target == PIPE_BUFFER ? "buffer" : "miptree"; if (templ->flags & IRIS_RESOURCE_FLAG_SHADER_MEMZONE) { memzone = IRIS_MEMZONE_SHADER; name = "shader kernels"; -- 2.30.2