Mesa (master): radv: print warnings for famous RADV_PERFTEST options that no longer exist

[GitLab Mirror]

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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Fri Jun 26 12:12:18 2020 +0200

radv: print warnings for famous RADV_PERFTEST options that no longer exist

RADV_PERFTEST=aco no longer exists, ACO is the default compiler.
RADV_PERFTEST=llvm is deprecated, use RADV_DEBUG=llvm instead.

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/5662>

---

 src/amd/vulkan/radv_device.c | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index a237a1a19bb..c52fbad8f68 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -667,8 +667,26 @@ VkResult radv_CreateInstance(
 	instance->debug_flags = parse_debug_string(getenv("RADV_DEBUG"),
 						   radv_debug_options);
 
-	instance->perftest_flags = parse_debug_string(getenv("RADV_PERFTEST"),
-						   radv_perftest_options);
+	const char *radv_perftest_str = getenv("RADV_PERFTEST");
+	instance->perftest_flags = parse_debug_string(radv_perftest_str,
+						      radv_perftest_options);
+
+	if (radv_perftest_str) {
+		/* Output warnings for famous RADV_PERFTEST options that no
+		 * longer exist or are deprecated.
+		 */
+		if (strstr(radv_perftest_str, "aco")) {
+			fprintf(stderr, "*******************************************************************************\n");
+			fprintf(stderr, "* WARNING: Unknown option RADV_PERFTEST='aco'. ACO is enabled by default now. *\n");
+			fprintf(stderr, "*******************************************************************************\n");
+		}
+		if (strstr(radv_perftest_str, "llvm")) {
+			fprintf(stderr, "*********************************************************************************\n");
+			fprintf(stderr, "* WARNING: Unknown option 'RADV_PERFTEST=llvm'. Did you mean 'RADV_DEBUG=llvm'? *\n");
+			fprintf(stderr, "*********************************************************************************\n");
+			abort();
+		}
+	}
 
 	if (instance->debug_flags & RADV_DEBUG_STARTUP)
 		radv_logi("Created an instance");