nir: use nir_shader_instructions_pass in nir_lower_interpolation

Changes:
- nir_metadata_preserve(..., nir_metadata_block_index | nir_metadata_dominance)
  is called only when pass makes progress
- nir_metadata_preserve(..., nir_metadata_all) is called when pass doesn't
  make progress

Reviewed-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12282>

diff --git a/src/compiler/nir/nir_lower_interpolation.c b/src/compiler/nir/nir_lower_interpolation.c
index 84abd9e..4e4d96a 100644 (file)
--- a/src/compiler/nir/nir_lower_interpolation.c
+++ b/src/compiler/nir/nir_lower_interpolation.c
@@ -35,126 +35,101 @@
 #include "nir_builder.h"
 
 static bool
-nir_lower_interpolation_block(nir_block *block, nir_builder *b,
-                              nir_lower_interpolation_options options)
+nir_lower_interpolation_instr(nir_builder *b, nir_instr *instr, void *cb_data)
 {
-   bool progress = false;
-
-   nir_foreach_instr_safe(instr, block) {
-      if (instr->type != nir_instr_type_intrinsic)
-         continue;
-
-      nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
-
-      if (intr->intrinsic != nir_intrinsic_load_interpolated_input)
-         continue;
-
-      assert(intr->dest.is_ssa);
-      assert(intr->src[0].is_ssa);
-      assert(intr->src[1].is_ssa);
-
-      nir_intrinsic_instr *bary_intrinsic =
-         nir_instr_as_intrinsic(intr->src[0].ssa->parent_instr);
-
-      /* Leave VARYING_SLOT_POS alone */
-      if (nir_intrinsic_base(intr) == VARYING_SLOT_POS)
-         continue;
-
-      const enum glsl_interp_mode interp_mode =
-         nir_intrinsic_interp_mode(bary_intrinsic);
-
-      /* We need actual interpolation modes by the time we get here */
-      assert(interp_mode != INTERP_MODE_NONE);
-
-      /* Only lower for inputs that need interpolation */
-      if (interp_mode != INTERP_MODE_SMOOTH &&
-          interp_mode != INTERP_MODE_NOPERSPECTIVE)
-         continue;
-
-      nir_intrinsic_op op = bary_intrinsic->intrinsic;
-
-      switch (op) {
-      case nir_intrinsic_load_barycentric_at_sample:
-         if (options & nir_lower_interpolation_at_sample)
-            break;
-         continue;
-      case nir_intrinsic_load_barycentric_at_offset:
-         if (options & nir_lower_interpolation_at_offset)
-            break;
-         continue;
-      case nir_intrinsic_load_barycentric_centroid:
-         if (options & nir_lower_interpolation_centroid)
-            break;
-         continue;
-      case nir_intrinsic_load_barycentric_pixel:
-         if (options & nir_lower_interpolation_pixel)
-            break;
-         continue;
-      case nir_intrinsic_load_barycentric_sample:
-         if (options & nir_lower_interpolation_sample)
-            break;
-         continue;
-      default:
-         continue;
-      }
-
-      b->cursor = nir_before_instr(instr);
-
-      nir_ssa_def *comps[NIR_MAX_VEC_COMPONENTS];
-      for (int i = 0; i < intr->num_components; i++) {
-         nir_ssa_def *iid =
-            nir_load_fs_input_interp_deltas(b, 32, intr->src[1].ssa,
-                                            .base = nir_intrinsic_base(intr),
-                                            .component = (nir_intrinsic_component(intr) + i),
-                                            .io_semantics = nir_intrinsic_io_semantics(intr));
-
-         nir_ssa_def *bary = intr->src[0].ssa;
-         nir_ssa_def *val;
-
-         val = nir_ffma(b, nir_channel(b, bary, 1),
-                           nir_channel(b, iid, 1),
-                           nir_channel(b, iid, 0));
-         val = nir_ffma(b, nir_channel(b, bary, 0),
-                           nir_channel(b, iid, 2),
-                           val);
-
-         comps[i] = val;
-      }
-      nir_ssa_def *vec = nir_vec(b, comps, intr->num_components);
-      nir_ssa_def_rewrite_uses(&intr->dest.ssa, vec);
-
-      progress = true;
+   nir_lower_interpolation_options options =
+         *(nir_lower_interpolation_options *)cb_data;
+
+   if (instr->type != nir_instr_type_intrinsic)
+      return false;
+
+   nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
+
+   if (intr->intrinsic != nir_intrinsic_load_interpolated_input)
+      return false;
+
+   assert(intr->dest.is_ssa);
+   assert(intr->src[0].is_ssa);
+   assert(intr->src[1].is_ssa);
+
+   nir_intrinsic_instr *bary_intrinsic =
+      nir_instr_as_intrinsic(intr->src[0].ssa->parent_instr);
+
+   /* Leave VARYING_SLOT_POS alone */
+   if (nir_intrinsic_base(intr) == VARYING_SLOT_POS)
+      return false;
+
+   const enum glsl_interp_mode interp_mode =
+      nir_intrinsic_interp_mode(bary_intrinsic);
+
+   /* We need actual interpolation modes by the time we get here */
+   assert(interp_mode != INTERP_MODE_NONE);
+
+   /* Only lower for inputs that need interpolation */
+   if (interp_mode != INTERP_MODE_SMOOTH &&
+       interp_mode != INTERP_MODE_NOPERSPECTIVE)
+      return false;
+
+   nir_intrinsic_op op = bary_intrinsic->intrinsic;
+
+   switch (op) {
+   case nir_intrinsic_load_barycentric_at_sample:
+      if (options & nir_lower_interpolation_at_sample)
+         break;
+      return false;
+   case nir_intrinsic_load_barycentric_at_offset:
+      if (options & nir_lower_interpolation_at_offset)
+         break;
+      return false;
+   case nir_intrinsic_load_barycentric_centroid:
+      if (options & nir_lower_interpolation_centroid)
+         break;
+      return false;
+   case nir_intrinsic_load_barycentric_pixel:
+      if (options & nir_lower_interpolation_pixel)
+         break;
+      return false;
+   case nir_intrinsic_load_barycentric_sample:
+      if (options & nir_lower_interpolation_sample)
+         break;
+      return false;
+   default:
+      return false;
    }
 
-   return progress;
-}
+   b->cursor = nir_before_instr(instr);
 
-static bool
-nir_lower_interpolation_impl(nir_function_impl *impl,
-                             nir_lower_interpolation_options options)
-{
-   bool progress = false;
-   nir_builder builder;
-   nir_builder_init(&builder, impl);
+   nir_ssa_def *comps[NIR_MAX_VEC_COMPONENTS];
+   for (int i = 0; i < intr->num_components; i++) {
+      nir_ssa_def *iid =
+         nir_load_fs_input_interp_deltas(b, 32, intr->src[1].ssa,
+                                         .base = nir_intrinsic_base(intr),
+                                         .component = (nir_intrinsic_component(intr) + i),
+                                         .io_semantics = nir_intrinsic_io_semantics(intr));
+
+      nir_ssa_def *bary = intr->src[0].ssa;
+      nir_ssa_def *val;
 
-   nir_foreach_block(block, impl) {
-      progress |= nir_lower_interpolation_block(block, &builder, options);
+      val = nir_ffma(b, nir_channel(b, bary, 1),
+                        nir_channel(b, iid, 1),
+                        nir_channel(b, iid, 0));
+      val = nir_ffma(b, nir_channel(b, bary, 0),
+                        nir_channel(b, iid, 2),
+                        val);
+
+      comps[i] = val;
    }
+   nir_ssa_def *vec = nir_vec(b, comps, intr->num_components);
+   nir_ssa_def_rewrite_uses(&intr->dest.ssa, vec);
 
-   nir_metadata_preserve(impl, nir_metadata_block_index |
-                               nir_metadata_dominance);
-   return progress;
+   return true;
 }
 
 bool
 nir_lower_interpolation(nir_shader *shader, nir_lower_interpolation_options options)
 {
-   bool progress = false;
-
-   nir_foreach_function(function, shader) {
-      if (function->impl)
-         progress |= nir_lower_interpolation_impl(function->impl, options);
-   }
-
-   return progress;
+   return nir_shader_instructions_pass(shader, nir_lower_interpolation_instr,
+                                       nir_metadata_block_index |
+                                       nir_metadata_dominance,
+                                       &options);
 }