Mesa (main): intel/compiler: use nir_shader_instructions_pass in brw_nir_demote_sample_qualifiers
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Oct 5 10:29:39 UTC 2021
Module: Mesa
Branch: main
Commit: 9e22e0838adf6e05330c544d4cdd7db1e3ac4494
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9e22e0838adf6e05330c544d4cdd7db1e3ac4494
Author: Marcin Ślusarz <marcin.slusarz at intel.com>
Date: Fri Aug 6 12:56:31 2021 +0200
intel/compiler: use nir_shader_instructions_pass in brw_nir_demote_sample_qualifiers
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
- pass returns true ONLY when it makes progress ("progress" was initialized incorrectly)
Signed-off-by: Marcin Ślusarz <marcin.slusarz at intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13189>
---
src/intel/compiler/brw_fs.cpp | 62 +++++++++++++++++++------------------------
1 file changed, 27 insertions(+), 35 deletions(-)
diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp
index 7b6f65a8e1e..6c0dd3125dd 100644
--- a/src/intel/compiler/brw_fs.cpp
+++ b/src/intel/compiler/brw_fs.cpp
@@ -9585,6 +9585,28 @@ brw_nir_move_interpolation_to_top(nir_shader *nir)
return progress;
}
+static bool
+brw_nir_demote_sample_qualifiers_instr(nir_builder *b,
+ nir_instr *instr,
+ UNUSED void *cb_data)
+{
+ if (instr->type != nir_instr_type_intrinsic)
+ return false;
+
+ nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
+ if (intrin->intrinsic != nir_intrinsic_load_barycentric_sample &&
+ intrin->intrinsic != nir_intrinsic_load_barycentric_at_sample)
+ return false;
+
+ b->cursor = nir_before_instr(instr);
+ nir_ssa_def *centroid =
+ nir_load_barycentric(b, nir_intrinsic_load_barycentric_centroid,
+ nir_intrinsic_interp_mode(intrin));
+ nir_ssa_def_rewrite_uses(&intrin->dest.ssa, centroid);
+ nir_instr_remove(instr);
+ return true;
+}
+
/**
* Demote per-sample barycentric intrinsics to centroid.
*
@@ -9593,41 +9615,11 @@ brw_nir_move_interpolation_to_top(nir_shader *nir)
bool
brw_nir_demote_sample_qualifiers(nir_shader *nir)
{
- bool progress = true;
-
- nir_foreach_function(f, nir) {
- if (!f->impl)
- continue;
-
- nir_builder b;
- nir_builder_init(&b, f->impl);
-
- nir_foreach_block(block, f->impl) {
- nir_foreach_instr_safe(instr, block) {
- if (instr->type != nir_instr_type_intrinsic)
- continue;
-
- nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
- if (intrin->intrinsic != nir_intrinsic_load_barycentric_sample &&
- intrin->intrinsic != nir_intrinsic_load_barycentric_at_sample)
- continue;
-
- b.cursor = nir_before_instr(instr);
- nir_ssa_def *centroid =
- nir_load_barycentric(&b, nir_intrinsic_load_barycentric_centroid,
- nir_intrinsic_interp_mode(intrin));
- nir_ssa_def_rewrite_uses(&intrin->dest.ssa,
- centroid);
- nir_instr_remove(instr);
- progress = true;
- }
- }
-
- nir_metadata_preserve(f->impl, nir_metadata_block_index |
- nir_metadata_dominance);
- }
-
- return progress;
+ return nir_shader_instructions_pass(nir,
+ brw_nir_demote_sample_qualifiers_instr,
+ nir_metadata_block_index |
+ nir_metadata_dominance,
+ NULL);
}
void
More information about the mesa-commit
mailing list