Mesa (master): radv: remove the shader ballot workaround for Youngblood with LLVM

[GitLab Mirror]

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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Fri Jun 26 09:23:40 2020 +0200

radv: remove the shader ballot workaround for Youngblood with LLVM

Now that ACO is default, this is now pointless.

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

---

 docs/envvars.rst             |  2 --
 src/amd/vulkan/radv_debug.h  | 11 +++++------
 src/amd/vulkan/radv_device.c | 10 ----------
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/docs/envvars.rst b/docs/envvars.rst
index bc431ccf1f1..4ad5e72d79d 100644
--- a/docs/envvars.rst
+++ b/docs/envvars.rst
@@ -548,8 +548,6 @@ RADV driver environment variables
       disable NGG for GFX10+
    ``nooutoforder``
       disable out-of-order rasterization
-   ``noshaderballot``
-      disable shader ballot
    ``nothreadllvm``
       disable LLVM threaded compilation
    ``preoptir``
diff --git a/src/amd/vulkan/radv_debug.h b/src/amd/vulkan/radv_debug.h
index c7559875de9..557e402105f 100644
--- a/src/amd/vulkan/radv_debug.h
+++ b/src/amd/vulkan/radv_debug.h
@@ -52,12 +52,11 @@ enum {
 	RADV_DEBUG_NOBINNING         = 0x200000,
 	RADV_DEBUG_NO_LOAD_STORE_OPT = 0x400000,
 	RADV_DEBUG_NO_NGG            = 0x800000,
-	RADV_DEBUG_NO_SHADER_BALLOT  = 0x1000000,
-	RADV_DEBUG_ALL_ENTRYPOINTS   = 0x2000000,
-	RADV_DEBUG_DUMP_META_SHADERS = 0x4000000,
-	RADV_DEBUG_NO_MEMORY_CACHE   = 0x8000000,
-	RADV_DEBUG_DISCARD_TO_DEMOTE = 0x10000000,
-	RADV_DEBUG_LLVM              = 0x20000000,
+	RADV_DEBUG_ALL_ENTRYPOINTS   = 0x1000000,
+	RADV_DEBUG_DUMP_META_SHADERS = 0x2000000,
+	RADV_DEBUG_NO_MEMORY_CACHE   = 0x4000000,
+	RADV_DEBUG_DISCARD_TO_DEMOTE = 0x8000000,
+	RADV_DEBUG_LLVM              = 0x10000000,
 };
 
 enum {
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 0a0443e3f0e..84f7707def9 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -503,7 +503,6 @@ static const struct debug_control radv_debug_options[] = {
 	{"nobinning", RADV_DEBUG_NOBINNING},
 	{"noloadstoreopt", RADV_DEBUG_NO_LOAD_STORE_OPT},
 	{"nongg", RADV_DEBUG_NO_NGG},
-	{"noshaderballot", RADV_DEBUG_NO_SHADER_BALLOT},
 	{"allentrypoints", RADV_DEBUG_ALL_ENTRYPOINTS},
 	{"metashaders", RADV_DEBUG_DUMP_META_SHADERS},
 	{"nomemorycache", RADV_DEBUG_NO_MEMORY_CACHE},
@@ -556,15 +555,6 @@ radv_handle_per_app_options(struct radv_instance *instance,
 			 */
 			if (LLVM_VERSION_MAJOR < 9)
 				instance->debug_flags |= RADV_DEBUG_NO_LOAD_STORE_OPT;
-		} else if (!strcmp(name, "Wolfenstein: Youngblood")) {
-			if (!(instance->debug_flags & RADV_DEBUG_NO_SHADER_BALLOT) &&
-			    (instance->debug_flags & RADV_DEBUG_LLVM)) {
-				/* Force enable VK_AMD_shader_ballot because it looks
-				 * safe and it gives a nice boost (+20% on Vega 56 at
-				 * this time). It also prevents corruption on LLVM.
-				 */
-				instance->perftest_flags |= RADV_PERFTEST_SHADER_BALLOT;
-			}
 		} else if (!strcmp(name, "Fledge")) {
 			/*
 			 * Zero VRAM for "The Surge 2"