Mesa (master): i965/cs: Get max_cs_threads from brw_compiler devinfo
Kristian Høgsberg
krh at kemper.freedesktop.org
Thu Oct 8 19:20:18 UTC 2015
Module: Mesa
Branch: master
Commit: 9a2573e5fc63f48cde56efdb191c129e7d7fb7b1
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9a2573e5fc63f48cde56efdb191c129e7d7fb7b1
Author: Kristian Høgsberg Kristensen <krh at bitplanet.net>
Date: Wed Oct 7 05:13:50 2015 -0700
i965/cs: Get max_cs_threads from brw_compiler devinfo
Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>
Signed-off-by: Kristian Høgsberg Kristensen <krh at bitplanet.net>
---
src/mesa/drivers/dri/i965/brw_fs.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index f1282a0..ba62fdd 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -5277,6 +5277,7 @@ brw_cs_emit(struct brw_context *brw,
prog_data->local_size[2] = cp->LocalSize[2];
unsigned local_workgroup_size =
cp->LocalSize[0] * cp->LocalSize[1] * cp->LocalSize[2];
+ unsigned max_cs_threads = brw->intelScreen->compiler->devinfo->max_cs_threads;
cfg_t *cfg = NULL;
const char *fail_msg = NULL;
@@ -5287,7 +5288,7 @@ brw_cs_emit(struct brw_context *brw,
&prog_data->base, &cp->Base, cp->Base.nir, 8, shader_time_index);
if (!v8.run_cs()) {
fail_msg = v8.fail_msg;
- } else if (local_workgroup_size <= 8 * brw->max_cs_threads) {
+ } else if (local_workgroup_size <= 8 * max_cs_threads) {
cfg = v8.cfg;
prog_data->simd_size = 8;
}
@@ -5296,7 +5297,7 @@ brw_cs_emit(struct brw_context *brw,
&prog_data->base, &cp->Base, cp->Base.nir, 16, shader_time_index);
if (likely(!(INTEL_DEBUG & DEBUG_NO16)) &&
!fail_msg && !v8.simd16_unsupported &&
- local_workgroup_size <= 16 * brw->max_cs_threads) {
+ local_workgroup_size <= 16 * max_cs_threads) {
/* Try a SIMD16 compile */
v16.import_uniforms(&v8);
if (!v16.run_cs()) {
More information about the mesa-commit
mailing list