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

nir/lower_goto_ifs: Use rzalloc

Browse Source 
In particular, SSA forks weren't always getting properly initialized
which was causing asserts to fail.

Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6750>
This commit is contained in:
Jason Ekstrand
2020-09-23 21:54:05 -05:00
committed by Marge Bot
parent fa3c38ceb3
commit dc010cb74e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/compiler/nir/nir_lower_goto_ifs.c
View File

@@ -312,7 +312,7 @@ loop_routing_start(struct routes *routing, nir_builder *b,
printf("\n"); printf("\n");
} }
struct routes *routing_backup = ralloc(mem_ctx, struct routes); struct routes *routing_backup = rzalloc(mem_ctx, struct routes);
*routing_backup = *routing; *routing_backup = *routing;
bool break_needed = false; bool break_needed = false;
bool continue_needed = false; bool continue_needed = false;
@@ -342,7 +342,7 @@ loop_routing_start(struct routes *routing, nir_builder *b,
routing->loop_backup = routing_backup; routing->loop_backup = routing_backup;
if (break_needed) { if (break_needed) {
struct path_fork *fork = ralloc(mem_ctx, struct path_fork); struct path_fork *fork = rzalloc(mem_ctx, struct path_fork);
fork->is_var = true; fork->is_var = true;
fork->path_var = nir_local_variable_create(b->impl, glsl_bool_type(), fork->path_var = nir_local_variable_create(b->impl, glsl_bool_type(),
"path_break"); "path_break");
@@ -352,7 +352,7 @@ loop_routing_start(struct routes *routing, nir_builder *b,
routing->brk.reachable = fork_reachable(fork); routing->brk.reachable = fork_reachable(fork);
} }
if (continue_needed) { if (continue_needed) {
struct path_fork *fork = ralloc(mem_ctx, struct path_fork); struct path_fork *fork = rzalloc(mem_ctx, struct path_fork);
fork->is_var = true; fork->is_var = true;
fork->path_var = nir_local_variable_create(b->impl, glsl_bool_type(), fork->path_var = nir_local_variable_create(b->impl, glsl_bool_type(),
"path_continue"); "path_continue");
@@ -522,7 +522,7 @@ select_fork_recur(struct nir_block **blocks, unsigned start, unsigned end,
if (start == end - 1) if (start == end - 1)
return NULL; return NULL;
struct path_fork *fork = ralloc(mem_ctx, struct path_fork); struct path_fork *fork = rzalloc(mem_ctx, struct path_fork);
fork->is_var = need_var; fork->is_var = need_var;
if (need_var) if (need_var)
fork->path_var = nir_local_variable_create(impl, glsl_bool_type(), fork->path_var = nir_local_variable_create(impl, glsl_bool_type(),
@@ -801,7 +801,7 @@ organize_levels(struct list_head *levels, struct set *children,
routing->regular.fork = select_fork(routing->regular.reachable, impl, routing->regular.fork = select_fork(routing->regular.reachable, impl,
need_var, mem_ctx); need_var, mem_ctx);
if (level->skip_start) { if (level->skip_start) {
struct path_fork *fork = ralloc(mem_ctx, struct path_fork); struct path_fork *fork = rzalloc(mem_ctx, struct path_fork);
fork->is_var = need_var; fork->is_var = need_var;
if (need_var) if (need_var)
fork->path_var = nir_local_variable_create(impl, glsl_bool_type(), fork->path_var = nir_local_variable_create(impl, glsl_bool_type(),
@@ -984,7 +984,7 @@ nir_lower_goto_ifs_impl(nir_function_impl *impl)
exec_node_data(nir_cf_node, exec_list_get_head(&cf_list.list), node); exec_node_data(nir_cf_node, exec_list_get_head(&cf_list.list), node);
nir_block *start_block = nir_cf_node_as_block(start_node); nir_block *start_block = nir_cf_node_as_block(start_node);
struct routes *routing = ralloc(mem_ctx, struct routes); struct routes *routing = rzalloc(mem_ctx, struct routes);
*routing = (struct routes) { *routing = (struct routes) {
.outside = empty_set, .outside = empty_set,
.regular.reachable = end_set, .regular.reachable = end_set,