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

intel/fs: Early return when can't satisfy explicit group size

Browse Source 
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5213>
This commit is contained in:
Caio Marcelo de Oliveira Filho
2020-05-19 09:44:55 -07:00
committed by Marge Bot
parent 2a308ee4c7
commit 462bc408fe
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9053,10 +9053,6 @@ brw_compile_cs(const struct brw_compiler *compiler, void *log_data,
assert(min_dispatch_width <= 32); assert(min_dispatch_width <= 32);
unsigned max_dispatch_width = 32; unsigned max_dispatch_width = 32;
fs_visitor *v8 = NULL, *v16 = NULL, *v32 = NULL;
fs_visitor *v = NULL;
const char *fail_msg = NULL;
if ((int)key->base.subgroup_size_type >= (int)BRW_SUBGROUP_SIZE_REQUIRE_8) { if ((int)key->base.subgroup_size_type >= (int)BRW_SUBGROUP_SIZE_REQUIRE_8) {
/* These enum values are expressly chosen to be equal to the subgroup /* These enum values are expressly chosen to be equal to the subgroup
* size that they require. * size that they require.
@@ -9068,15 +9064,22 @@ brw_compile_cs(const struct brw_compiler *compiler, void *log_data,
required_dispatch_width == 32); required_dispatch_width == 32);
if (required_dispatch_width < min_dispatch_width || if (required_dispatch_width < min_dispatch_width ||
required_dispatch_width > max_dispatch_width) { required_dispatch_width > max_dispatch_width) {
fail_msg = "Cannot satisfy explicit subgroup size"; if (error_str) {
} else { *error_str = ralloc_strdup(mem_ctx,
min_dispatch_width = max_dispatch_width = required_dispatch_width; "Cannot satisfy explicit subgroup size");
}
return NULL;
} }
min_dispatch_width = max_dispatch_width = required_dispatch_width;
} }
fs_visitor *v8 = NULL, *v16 = NULL, *v32 = NULL;
fs_visitor *v = NULL;
const char *fail_msg = NULL;
/* Now the main event: Visit the shader IR and generate our CS IR for it. /* Now the main event: Visit the shader IR and generate our CS IR for it.
*/ */
if (!fail_msg && min_dispatch_width <= 8 && max_dispatch_width >= 8) { if (min_dispatch_width <= 8 && max_dispatch_width >= 8) {
nir_shader *nir8 = compile_cs_to_nir(compiler, mem_ctx, key, nir_shader *nir8 = compile_cs_to_nir(compiler, mem_ctx, key,
src_shader, 8); src_shader, 8);
v8 = new fs_visitor(compiler, log_data, mem_ctx, &key->base, v8 = new fs_visitor(compiler, log_data, mem_ctx, &key->base,