iris: validation dumping improvements

backported from i965.  don't bother with (pinned) because everything is.

diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c
index 4db52897adf4b15422b46e26e3cffb428e092bfa..51c48476f864b95a3a26e9f86b76d2e1f6f84d0e 100644 (file)
--- 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 da55a1775be8c96c5ccdcb31cde67fd81d22fe56..3934f82350498997184f95b82e45f9340be25a0d 100644 (file)
--- 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";