OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: remove the shader ballot workaround for Youngblood with LLVM

Browse Source 
Now that ACO is default, this is now pointless.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5658>
This commit is contained in:
Samuel Pitoiset
2020-06-26 09:23:40 +02:00
parent 099916384a
commit a30ad8cb23
3 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/envvars.rst
View File

@@ -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``

11
src/amd/vulkan/radv_debug.h
View File

@@ -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 {

10
src/amd/vulkan/radv_device.c
View File

@@ -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"