summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolai Hähnle <nicolai.haehnle@amd.com>2017-06-28 17:37:53 +0200
committerNicolai Hähnle <nicolai.haehnle@amd.com>2017-07-31 15:56:57 +0200
commit0478a7c4222b466b38000ad4905a46e4cfc002f6 (patch)
tree5322be1bd484fbecc5f42f4f43dd90e6e5dba579
parenta4aec6b2c3bd9a96079b2abb6e7d5d3c5f4364bb (diff)
radeonsi: add enable_sisched driconf optiondriconf
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
-rw-r--r--src/gallium/drivers/radeonsi/driinfo_radeonsi.h3
-rw-r--r--src/gallium/drivers/radeonsi/si_pipe.c4
-rw-r--r--src/util/xmlpool/t_options.h9
3 files changed, 16 insertions, 0 deletions
diff --git a/src/gallium/drivers/radeonsi/driinfo_radeonsi.h b/src/gallium/drivers/radeonsi/driinfo_radeonsi.h
index a358f0263e..af6284a778 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 47992cd8dd..a915ea708e 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"
@@ -991,6 +992,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 e308839aa7..d3f31fc94b 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