fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 16:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

v3d/v3dv: use shader_info->var_copies_lowered

Browse source 
Instead of passing allow_copies as a parameter for v3d_optimize_nir
(so manually doing that tracking).

Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19338>
This commit is contained in:
Alejandro Piñeiro 2022-10-26 12:13:26 +02:00 • committed by Marge Bot
parent ba0bc7182d
commit 1a1fa2393e
5 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/broadcom/compiler/nir_to_vir.c
View file

@ -2052,7 +2052,7 @@ mem_vectorize_callback(unsigned align_mul, unsigned align_offset,
}
void
v3d_optimize_nir(struct v3d_compile *c, struct nir_shader *s, bool allow_copies)
v3d_optimize_nir(struct v3d_compile *c, struct nir_shader *s)
{
bool progress;
unsigned lower_flrp =
@ -2068,7 +2068,7 @@ v3d_optimize_nir(struct v3d_compile *c, struct nir_shader *s, bool allow_copies)
NIR_PASS(progress, s, nir_opt_deref);
NIR_PASS(progress, s, nir_lower_vars_to_ssa);
if (allow_copies) {
if (!s->info.var_copies_lowered) {
/* Only run this pass if nir_lower_var_copies was not called
* yet. That would lower away any copy_deref instructions and we
* don't want to introduce any more.

2
src/broadcom/compiler/v3d_compiler.h
View file

@ -1079,7 +1079,7 @@ vir_has_uniform(struct qinst *inst)
const struct v3d_compiler *v3d_compiler_init(const struct v3d_device_info *devinfo,
uint32_t max_inline_uniform_buffers);
void v3d_compiler_free(const struct v3d_compiler *compiler);
void v3d_optimize_nir(struct v3d_compile *c, struct nir_shader *s, bool allow_copies);
void v3d_optimize_nir(struct v3d_compile *c, struct nir_shader *s);
uint64_t *v3d_compile(const struct v3d_compiler *compiler,
struct v3d_key *key,

6
src/broadcom/compiler/vir.c
View file

@ -938,7 +938,7 @@ v3d_nir_lower_vs_early(struct v3d_compile *c)
NIR_PASS(_, c->s, nir_remove_unused_io_vars,
nir_var_shader_out, used_outputs, NULL); /* demotes to globals */
NIR_PASS(_, c->s, nir_lower_global_vars_to_local);
v3d_optimize_nir(c, c->s, false);
v3d_optimize_nir(c, c->s);
NIR_PASS(_, c->s, nir_remove_dead_variables, nir_var_shader_in, NULL);
/* This must go before nir_lower_io */
@ -972,7 +972,7 @@ v3d_nir_lower_gs_early(struct v3d_compile *c)
NIR_PASS(_, c->s, nir_remove_unused_io_vars,
nir_var_shader_out, used_outputs, NULL); /* demotes to globals */
NIR_PASS(_, c->s, nir_lower_global_vars_to_local);
v3d_optimize_nir(c, c->s, false);
v3d_optimize_nir(c, c->s);
NIR_PASS(_, c->s, nir_remove_dead_variables, nir_var_shader_in, NULL);
/* This must go before nir_lower_io */
@ -1615,7 +1615,7 @@ v3d_attempt_compile(struct v3d_compile *c)
NIR_PASS(_, c->s, v3d_nir_lower_subgroup_intrinsics, c);
v3d_optimize_nir(c, c->s, false);
v3d_optimize_nir(c, c->s);
/* Do late algebraic optimization to turn add(a, neg(b)) back into
* subs, then the mandatory cleanup after algebraic. Note that it may

16
src/broadcom/vulkan/v3dv_pipeline.c
View file

@ -312,7 +312,7 @@ preprocess_nir(nir_shader *nir)
NIR_PASS(_, nir, nir_split_var_copies);
NIR_PASS(_, nir, nir_split_struct_vars, nir_var_function_temp);
v3d_optimize_nir(NULL, nir, true);
v3d_optimize_nir(NULL, nir);
NIR_PASS(_, nir, nir_lower_explicit_io,
nir_var_mem_push_const,
@ -343,7 +343,7 @@ preprocess_nir(nir_shader *nir)
NIR_PASS(_, nir, nir_lower_frexp);
/* Get rid of split copies */
v3d_optimize_nir(NULL, nir, false);
v3d_optimize_nir(NULL, nir);
}
static nir_shader *
@ -1682,11 +1682,11 @@ link_shaders(nir_shader *producer, nir_shader *consumer)
nir_lower_io_arrays_to_elements(producer, consumer);
v3d_optimize_nir(NULL, producer, false);
v3d_optimize_nir(NULL, consumer, false);
v3d_optimize_nir(NULL, producer);
v3d_optimize_nir(NULL, consumer);
if (nir_link_opt_varyings(producer, consumer))
v3d_optimize_nir(NULL, consumer, false);
v3d_optimize_nir(NULL, consumer);
NIR_PASS(_, producer, nir_remove_dead_variables, nir_var_shader_out, NULL);
NIR_PASS(_, consumer, nir_remove_dead_variables, nir_var_shader_in, NULL);
@ -1695,8 +1695,8 @@ link_shaders(nir_shader *producer, nir_shader *consumer)
NIR_PASS(_, producer, nir_lower_global_vars_to_local);
NIR_PASS(_, consumer, nir_lower_global_vars_to_local);
v3d_optimize_nir(NULL, producer, false);
v3d_optimize_nir(NULL, consumer, false);
v3d_optimize_nir(NULL, producer);
v3d_optimize_nir(NULL, consumer);
/* Optimizations can cause varyings to become unused.
* nir_compact_varyings() depends on all dead varyings being removed so
@ -3199,7 +3199,7 @@ pipeline_compile_compute(struct v3dv_pipeline *pipeline,
p_stage->nir = pipeline_stage_get_nir(p_stage, pipeline, cache);
assert(p_stage->nir);
v3d_optimize_nir(NULL, p_stage->nir, false);
v3d_optimize_nir(NULL, p_stage->nir);
pipeline_lower_nir(pipeline, p_stage, pipeline->layout);
lower_cs_shared(p_stage->nir);

4
src/gallium/drivers/v3d/v3d_program.c
View file

@ -318,12 +318,12 @@ v3d_uncompiled_shader_create(struct pipe_context *pctx,
NIR_PASS(_, s, nir_lower_load_const_to_scalar);
v3d_optimize_nir(NULL, s, true);
v3d_optimize_nir(NULL, s);
NIR_PASS(_, s, nir_lower_var_copies);
/* Get rid of split copies */
v3d_optimize_nir(NULL, s, false);
v3d_optimize_nir(NULL, s);
NIR_PASS(_, s, nir_remove_dead_variables, nir_var_function_temp, NULL);