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-13 13:27:47 +0200
commit977d8e40bd31c87906d3e2d5eb73f79885455297 (patch)
tree08f9d6d82c99e925a338c891c3c5adf8aeb51acc
parent4333ed138ec19c989f23907aa2c13c9ea5b4fb81 (diff)
radeonsi: add enable_sisched driconf option
-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 b32a950e8e..7846d9d10d 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"
@@ -984,6 +985,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 9aa1798b9d..fcf65cdd08 100644
--- a/src/util/xmlpool/t_options.h
+++ b/src/util/xmlpool/t_options.h
@@ -424,3 +424,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