From adb157ddfd52ab495878a8b2b1bf70586d773aa2 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Fri, 24 Feb 2017 15:29:24 -0800 Subject: [PATCH] nir: Return progress from nir_lower_64bit_pack(). Reviewed-by: Jason Ekstrand --- src/compiler/nir/nir.h | 2 +- src/compiler/nir/nir_lower_64bit_packing.c | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h index 1b9e17fe89d..a3235739192 100644 --- a/src/compiler/nir/nir.h +++ b/src/compiler/nir/nir.h @@ -2568,7 +2568,7 @@ typedef enum { } nir_lower_doubles_options; bool nir_lower_doubles(nir_shader *shader, nir_lower_doubles_options options); -void nir_lower_64bit_pack(nir_shader *shader); +bool nir_lower_64bit_pack(nir_shader *shader); bool nir_normalize_cubemap_coords(nir_shader *shader); diff --git a/src/compiler/nir/nir_lower_64bit_packing.c b/src/compiler/nir/nir_lower_64bit_packing.c index f523cebf474..abae173ce3b 100644 --- a/src/compiler/nir/nir_lower_64bit_packing.c +++ b/src/compiler/nir/nir_lower_64bit_packing.c @@ -48,11 +48,12 @@ lower_unpack_64(nir_builder *b, nir_ssa_def *src) nir_unpack_64_2x32_split_y(b, src)); } -static void +static bool lower_64bit_pack_impl(nir_function_impl *impl) { nir_builder b; nir_builder_init(&b, impl); + bool progress = false; nir_foreach_block(block, impl) { nir_foreach_instr_safe(instr, block) { @@ -83,15 +84,24 @@ lower_64bit_pack_impl(nir_function_impl *impl) nir_ssa_def_rewrite_uses(&alu_instr->dest.dest.ssa, nir_src_for_ssa(dest)); nir_instr_remove(&alu_instr->instr); + nir_metadata_preserve(impl, nir_metadata_block_index | + nir_metadata_dominance); + progress = true; } } + + return progress; } -void +bool nir_lower_64bit_pack(nir_shader *shader) { + bool progress = false; + nir_foreach_function(function, shader) { if (function->impl) - lower_64bit_pack_impl(function->impl); + progress |= lower_64bit_pack_impl(function->impl); } + + return false; } -- 2.30.2