OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel/cs: Drop max_dispatch_width checks from compile_cs

Browse Source 
The only things that adjust fs_visitor::max_dispatch_width are render
target writes which don't happen in compute shaders so they're
pointless.

Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
This commit is contained in:
Jason Ekstrand
2017-08-21 19:30:24 -07:00
parent 1077981eb5
commit b1a9cdede4
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/intel/compiler/brw_fs.cpp
View File

@@ -6860,6 +6860,9 @@ brw_compile_cs(const struct brw_compiler *compiler, void *log_data,
if (!v8.run_cs(min_dispatch_width)) { if (!v8.run_cs(min_dispatch_width)) {
fail_msg = v8.fail_msg; fail_msg = v8.fail_msg;
} else { } else {
/* We should always be able to do SIMD32 for compute shaders */
assert(v8.max_dispatch_width >= 32);
cfg = v8.cfg; cfg = v8.cfg;
cs_set_simd_size(prog_data, 8); cs_set_simd_size(prog_data, 8);
cs_fill_push_const_info(compiler->devinfo, prog_data); cs_fill_push_const_info(compiler->devinfo, prog_data);
@@ -6871,8 +6874,7 @@ brw_compile_cs(const struct brw_compiler *compiler, void *log_data,
NULL, /* Never used in core profile */ NULL, /* Never used in core profile */
shader, 16, shader_time_index); shader, 16, shader_time_index);
if (likely(!(INTEL_DEBUG & DEBUG_NO16)) && if (likely(!(INTEL_DEBUG & DEBUG_NO16)) &&
!fail_msg && v8.max_dispatch_width >= 16 && !fail_msg && min_dispatch_width <= 16) {
min_dispatch_width <= 16) {
/* Try a SIMD16 compile */ /* Try a SIMD16 compile */
if (min_dispatch_width <= 8) if (min_dispatch_width <= 8)
v16.import_uniforms(&v8); v16.import_uniforms(&v8);
@@ -6886,6 +6888,9 @@ brw_compile_cs(const struct brw_compiler *compiler, void *log_data,
"enough threads for SIMD8"; "enough threads for SIMD8";
} }
} else { } else {
/* We should always be able to do SIMD32 for compute shaders */
assert(v16.max_dispatch_width >= 32);
cfg = v16.cfg; cfg = v16.cfg;
cs_set_simd_size(prog_data, 16); cs_set_simd_size(prog_data, 16);
cs_fill_push_const_info(compiler->devinfo, prog_data); cs_fill_push_const_info(compiler->devinfo, prog_data);
@@ -6896,8 +6901,7 @@ brw_compile_cs(const struct brw_compiler *compiler, void *log_data,
fs_visitor v32(compiler, log_data, mem_ctx, key, &prog_data->base, fs_visitor v32(compiler, log_data, mem_ctx, key, &prog_data->base,
NULL, /* Never used in core profile */ NULL, /* Never used in core profile */
shader, 32, shader_time_index); shader, 32, shader_time_index);
if (!fail_msg && v8.max_dispatch_width >= 32 && if (!fail_msg && (min_dispatch_width > 16 || (INTEL_DEBUG & DEBUG_DO32))) {
(min_dispatch_width > 16 || (INTEL_DEBUG & DEBUG_DO32))) {
/* Try a SIMD32 compile */ /* Try a SIMD32 compile */
if (min_dispatch_width <= 8) if (min_dispatch_width <= 8)
v32.import_uniforms(&v8); v32.import_uniforms(&v8);