Mesa (master): radv: dump application info in the GPU hang report

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: a61a398f7eb4f2dd50722e152895a1e54b599e14
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a61a398f7eb4f2dd50722e152895a1e54b599e14

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Fri Nov 20 09:48:13 2020 +0100

radv: dump application info in the GPU hang report

Like the name, version, as well as the engine and the API version.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7706>

---

 src/amd/vulkan/radv_debug.c | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/amd/vulkan/radv_debug.c b/src/amd/vulkan/radv_debug.c
index ee8dc036362..00af287dcc1 100644
--- a/src/amd/vulkan/radv_debug.c
+++ b/src/amd/vulkan/radv_debug.c
@@ -528,6 +528,23 @@ radv_dump_enabled_options(struct radv_device *device, FILE *f)
 	}
 }
 
+static void
+radv_dump_app_info(struct radv_device *device, FILE *f)
+{
+	struct radv_instance *instance = device->instance;
+
+	fprintf(f, "Application name: %s\n", instance->applicationName);
+	fprintf(f, "Application version: %d\n", instance->applicationVersion);
+	fprintf(f, "Engine name: %s\n", instance->engineName);
+	fprintf(f, "Engine version: %d\n", instance->engineVersion);
+	fprintf(f, "API version: %d.%d.%d\n",
+		VK_VERSION_MAJOR(instance->apiVersion),
+		VK_VERSION_MINOR(instance->apiVersion),
+		VK_VERSION_PATCH(instance->apiVersion));
+
+	radv_dump_enabled_options(device, f);
+}
+
 static void
 radv_dump_device_name(struct radv_device *device, FILE *f)
 {
@@ -692,11 +709,11 @@ radv_check_gpu_hangs(struct radv_queue *queue, struct radeon_cmdbuf *cs)
 		}
 	}
 
-	/* Dump enabled debug/perftest options. */
-	snprintf(dump_path, sizeof(dump_path), "%s/%s", dump_dir, "options.log");
+	/* Dump app info. */
+	snprintf(dump_path, sizeof(dump_path), "%s/%s", dump_dir, "app_info.log");
 	f = fopen(dump_path, "w+");
 	if (f) {
-		radv_dump_enabled_options(device, f);
+		radv_dump_app_info(device, f);
 		fclose(f);
 	}