vc4: Don't call nir_lower_flrp in vc4_optimize_nir
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
macOS-CI / macOS-CI (xlib) (push) Waiting to run

It's already called by st_nir_opts, so it shouldn't be necessary to do
it again here.

This is only compile tested.  I have not collected any shader-db or
fossil-db data.

Acked-by: Juan A. Suarez Romero <jasuarez@igalia.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12526>
This commit is contained in:
Ian Romanick 2021-08-24 10:43:08 -07:00 committed by Marge Bot
parent 956a09b990
commit b16c169b6d

View file

@ -1486,10 +1486,6 @@ static void
vc4_optimize_nir(struct nir_shader *s) vc4_optimize_nir(struct nir_shader *s)
{ {
bool progress; bool progress;
unsigned lower_flrp =
(s->options->lower_flrp16 ? 16 : 0) |
(s->options->lower_flrp32 ? 32 : 0) |
(s->options->lower_flrp64 ? 64 : 0);
do { do {
progress = false; progress = false;
@ -1511,16 +1507,6 @@ vc4_optimize_nir(struct nir_shader *s)
NIR_PASS(progress, s, nir_opt_peephole_select, &peephole_select_options); NIR_PASS(progress, s, nir_opt_peephole_select, &peephole_select_options);
NIR_PASS(progress, s, nir_opt_algebraic); NIR_PASS(progress, s, nir_opt_algebraic);
NIR_PASS(progress, s, nir_opt_constant_folding); NIR_PASS(progress, s, nir_opt_constant_folding);
if (lower_flrp != 0) {
NIR_PASS(progress, s, nir_lower_flrp,
lower_flrp, false /* always_precise */);
/* Nothing should rematerialize any flrps, so we only
* need to do this lowering once.
*/
lower_flrp = 0;
}
NIR_PASS(progress, s, nir_opt_undef); NIR_PASS(progress, s, nir_opt_undef);
NIR_PASS(progress, s, nir_opt_loop_unroll); NIR_PASS(progress, s, nir_opt_loop_unroll);
} while (progress); } while (progress);