From 53485c2d0efd0410831924dbf01f30043c466df6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolai=20H=C3=A4hnle?= Date: Wed, 28 Jun 2017 17:37:53 +0200 Subject: [PATCH] radeonsi: add enable_sisched driconf option MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák --- src/gallium/drivers/radeonsi/driinfo_radeonsi.h | 3 +++ src/gallium/drivers/radeonsi/si_pipe.c | 4 ++++ src/util/xmlpool/t_options.h | 9 +++++++++ 3 files changed, 16 insertions(+) diff --git a/src/gallium/drivers/radeonsi/driinfo_radeonsi.h b/src/gallium/drivers/radeonsi/driinfo_radeonsi.h index a358f0263e4..af6284a7787 100644 --- a/src/gallium/drivers/radeonsi/driinfo_radeonsi.h +++ b/src/gallium/drivers/radeonsi/driinfo_radeonsi.h @@ -1 +1,4 @@ // DriConf options specific to radeonsi +DRI_CONF_SECTION_PERFORMANCE + DRI_CONF_RADEONSI_ENABLE_SISCHED("false") +DRI_CONF_SECTION_END diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index d276b885c11..ae87d7feeca 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -31,6 +31,7 @@ #include "util/u_memory.h" #include "util/u_suballoc.h" #include "util/u_tests.h" +#include "util/xmlconfig.h" #include "vl/vl_decoder.h" #include "../ddebug/dd_util.h" @@ -992,6 +993,9 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws, return NULL; } + if (driQueryOptionb(config->options, "radeonsi_enable_sisched")) + sscreen->b.debug_flags |= DBG_SI_SCHED; + /* Only enable as many threads as we have target machines, but at most * the number of CPUs - 1 if there is more than one. */ diff --git a/src/util/xmlpool/t_options.h b/src/util/xmlpool/t_options.h index e308839aa78..d3f31fc94b1 100644 --- a/src/util/xmlpool/t_options.h +++ b/src/util/xmlpool/t_options.h @@ -429,3 +429,12 @@ DRI_CONF_OPT_END DRI_CONF_OPT_BEGIN(csmt_force, int, def) \ DRI_CONF_DESC(en,gettext("If set to 1, force gallium nine CSMT. If set to 0, disable it. By default (-1) CSMT is enabled on known thread-safe drivers.")) \ DRI_CONF_OPT_END + +/** + * \brief radeonsi specific configuration options + */ + +#define DRI_CONF_RADEONSI_ENABLE_SISCHED(def) \ +DRI_CONF_OPT_BEGIN_B(radeonsi_enable_sisched, def) \ + DRI_CONF_DESC(en,gettext("Use the LLVM sisched option for shader compiles")) \ +DRI_CONF_OPT_END -- 2.30.2