Mesa (master): radv: enable primitive binning by default

[GitLab Mirror]

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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Thu Nov 15 09:58:52 2018 +0100

radv: enable primitive binning by default

After doing a bunch of benchmarks, primitive binning helps
some games like The Talos Principle (+5%) or Serious Sam 2017
(+3%). For other titles, either it doesn't change anything or
it hurts very few (less than 1%).

This only affects GFX9.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>

---

 src/amd/vulkan/radv_debug.h  | 5 ++---
 src/amd/vulkan/radv_device.c | 5 +----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/amd/vulkan/radv_debug.h b/src/amd/vulkan/radv_debug.h
index 397d567961..01712bd22c 100644
--- a/src/amd/vulkan/radv_debug.h
+++ b/src/amd/vulkan/radv_debug.h
@@ -57,9 +57,8 @@ enum {
 	RADV_PERFTEST_NO_BATCHCHAIN  =   0x1,
 	RADV_PERFTEST_SISCHED        =   0x2,
 	RADV_PERFTEST_LOCAL_BOS      =   0x4,
-	RADV_PERFTEST_BINNING     =   0x8,
-	RADV_PERFTEST_OUT_OF_ORDER   =  0x10,
-	RADV_PERFTEST_DCC_MSAA       =  0x20,
+	RADV_PERFTEST_OUT_OF_ORDER   =   0x8,
+	RADV_PERFTEST_DCC_MSAA       =  0x10,
 };
 
 bool
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 33ef6867fd..70084a2b60 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -466,7 +466,6 @@ static const struct debug_control radv_perftest_options[] = {
 	{"nobatchchain", RADV_PERFTEST_NO_BATCHCHAIN},
 	{"sisched", RADV_PERFTEST_SISCHED},
 	{"localbos", RADV_PERFTEST_LOCAL_BOS},
-	{"binning", RADV_PERFTEST_BINNING},
 	{"dccmsaa", RADV_PERFTEST_DCC_MSAA},
 	{NULL, 0}
 };
@@ -1633,9 +1632,7 @@ VkResult radv_CreateDevice(
 	}
 
 	device->pbb_allowed = device->physical_device->rad_info.chip_class >= GFX9 &&
-			((device->instance->perftest_flags & RADV_PERFTEST_BINNING) ||
-			 device->physical_device->rad_info.family == CHIP_RAVEN ||
-			 device->physical_device->rad_info.family == CHIP_RAVEN2);
+			      !(device->instance->debug_flags & RADV_DEBUG_NOBINNING);
 
 	/* Disabled and not implemented for now. */
 	device->dfsm_allowed = device->pbb_allowed &&