Mesa (main): r600: use nir_shader_instructions_pass in r600_nir_lower_atomics
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Aug 19 13:33:25 UTC 2021
Module: Mesa
Branch: main
Commit: 956d6461ef603b744a6095f60ae7baac61defe3d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=956d6461ef603b744a6095f60ae7baac61defe3d
Author: Marcin Ślusarz <marcin.slusarz at intel.com>
Date: Tue Aug 10 14:10:16 2021 +0200
r600: use nir_shader_instructions_pass in r600_nir_lower_atomics
Changes:
- nir_metadata_preserve(..., nir_metadata_all) is called when pass doesn't
make progress
Signed-off-by: Marcin Ślusarz <marcin.slusarz at intel.com>
Reviewed-by: Gert Wollny <gert.wollny at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12467>
---
src/gallium/drivers/r600/sfn/sfn_nir.cpp | 40 ++++++++------------------------
1 file changed, 10 insertions(+), 30 deletions(-)
diff --git a/src/gallium/drivers/r600/sfn/sfn_nir.cpp b/src/gallium/drivers/r600/sfn/sfn_nir.cpp
index b4874441732..78d87247412 100644
--- a/src/gallium/drivers/r600/sfn/sfn_nir.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_nir.cpp
@@ -478,9 +478,13 @@ r600_map_atomic(nir_intrinsic_op op)
}
static bool
-r600_lower_deref_instr(nir_builder *b, nir_intrinsic_instr *instr,
- nir_shader *shader)
+r600_lower_deref_instr(nir_builder *b, nir_instr *instr_, UNUSED void *cb_data)
{
+ if (instr_->type != nir_instr_type_intrinsic)
+ return false;
+
+ nir_intrinsic_instr *instr = nir_instr_as_intrinsic(instr_);
+
nir_intrinsic_op op = r600_map_atomic(instr->intrinsic);
if (nir_num_intrinsics == op)
return false;
@@ -528,8 +532,6 @@ r600_lower_deref_instr(nir_builder *b, nir_intrinsic_instr *instr,
static bool
r600_nir_lower_atomics(nir_shader *shader)
{
- bool progress = false;
-
/* First re-do the offsets, in Hardware we start at zero for each new
* binding, and we use an offset of one per counter */
int current_binding = -1;
@@ -548,32 +550,10 @@ r600_nir_lower_atomics(nir_shader *shader)
}
}
- nir_foreach_function(function, shader) {
- if (!function->impl)
- continue;
-
- bool impl_progress = false;
-
- nir_builder build;
- nir_builder_init(&build, function->impl);
-
- nir_foreach_block(block, function->impl) {
- nir_foreach_instr_safe(instr, block) {
- if (instr->type != nir_instr_type_intrinsic)
- continue;
-
- impl_progress |= r600_lower_deref_instr(&build,
- nir_instr_as_intrinsic(instr), shader);
- }
- }
-
- if (impl_progress) {
- nir_metadata_preserve(function->impl, nir_metadata_block_index | nir_metadata_dominance);
- progress = true;
- }
- }
-
- return progress;
+ return nir_shader_instructions_pass(shader, r600_lower_deref_instr,
+ nir_metadata_block_index |
+ nir_metadata_dominance,
+ NULL);
}
using r600::r600_nir_lower_int_tg4;
using r600::r600_lower_scratch_addresses;
More information about the mesa-commit
mailing list