nir: Remove 2nd argument from nir_before_src

We can now determine whether a nir_src is for an if without a sideband, so
simplify the function signature.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Suggested-by: Faith Ekstrand <faith@gfxstrand.net>
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22343>

diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index 62c7227..7064b42 100644 (file)
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -4136,9 +4136,9 @@ nir_after_block_before_jump(nir_block *block)
 }
 
 static inline nir_cursor
-nir_before_src(nir_src *src, bool is_if_condition)
+nir_before_src(nir_src *src)
 {
-   if (is_if_condition) {
+   if (src->is_if) {
       nir_block *prev_block =
          nir_cf_node_as_block(nir_cf_node_prev(&src->parent_if->cf_node));
       assert(!nir_block_ends_in_jump(prev_block));

diff --git a/src/compiler/nir/nir_lower_bit_size.c b/src/compiler/nir/nir_lower_bit_size.c
index b54656b..bd70e91 100644 (file)
--- a/src/compiler/nir/nir_lower_bit_size.c
+++ b/src/compiler/nir/nir_lower_bit_size.c
@@ -313,7 +313,7 @@ split_phi(nir_builder *b, nir_phi_instr *phi)
    nir_foreach_phi_src(src, phi) {
       assert(num_components == src->src.ssa->num_components);
 
-      b->cursor = nir_before_src(&src->src, false);
+      b->cursor = nir_before_src(&src->src);
 
       nir_ssa_def *x = nir_unpack_64_2x32_split_x(b, src->src.ssa);
       nir_ssa_def *y = nir_unpack_64_2x32_split_y(b, src->src.ssa);

diff --git a/src/compiler/nir/nir_lower_bool_to_bitsize.c b/src/compiler/nir/nir_lower_bool_to_bitsize.c
index 47ae5d9..ebc1fb0 100644 (file)
--- a/src/compiler/nir/nir_lower_bool_to_bitsize.c
+++ b/src/compiler/nir/nir_lower_bool_to_bitsize.c
@@ -365,7 +365,7 @@ lower_phi_instr(nir_builder *b, nir_phi_instr *phi)
          dst_bit_size = src_bit_size;
       } else if (src_bit_size != dst_bit_size) {
          assert(phi_src->src.is_ssa);
-         b->cursor = nir_before_src(&phi_src->src, false);
+         b->cursor = nir_before_src(&phi_src->src);
          nir_op convert_op = get_bool_convert_opcode(dst_bit_size);
          nir_ssa_def *new_src =
             nir_build_alu(b, convert_op, phi_src->src.ssa, NULL, NULL, NULL);

diff --git a/src/compiler/nir/nir_opt_if.c b/src/compiler/nir/nir_opt_if.c
index 4a54ae4..2ac6248 100644 (file)
--- a/src/compiler/nir/nir_opt_if.c
+++ b/src/compiler/nir/nir_opt_if.c
@@ -1288,7 +1288,7 @@ propagate_condition_eval(nir_builder *b, nir_if *nif, nir_src *use_src,
                          nir_src *alu_use, nir_alu_instr *alu)
 {
    bool bool_value;
-   b->cursor = nir_before_src(alu_use, alu_use->is_if);
+   b->cursor = nir_before_src(alu_use);
    if (!evaluate_if_condition(nif, b->cursor, &bool_value))
       return false;
 
@@ -1339,7 +1339,7 @@ evaluate_condition_use(nir_builder *b, nir_if *nif, nir_src *use_src)
 {
    bool progress = false;
 
-   b->cursor = nir_before_src(use_src, use_src->is_if);
+   b->cursor = nir_before_src(use_src);
 
    bool bool_value;
    if (evaluate_if_condition(nif, b->cursor, &bool_value)) {

diff --git a/src/gallium/drivers/lima/ir/lima_nir_split_loads.c b/src/gallium/drivers/lima/ir/lima_nir_split_loads.c
index 7570728..2d9f7de 100644 (file)
--- a/src/gallium/drivers/lima/ir/lima_nir_split_loads.c
+++ b/src/gallium/drivers/lima/ir/lima_nir_split_loads.c
@@ -80,13 +80,13 @@ replace_intrinsic(nir_builder *b, nir_intrinsic_instr *intrin)
          nir_instr_rewrite_src(src->parent_instr, src, nir_src_for_ssa(def));
          continue;
       }
-      b->cursor = nir_before_src(src, false);
+      b->cursor = nir_before_src(src);
       nir_ssa_def *new = clone_intrinsic(b, intrin);
       nir_instr_rewrite_src(src->parent_instr, src, nir_src_for_ssa(new));
       _mesa_hash_table_insert(visited_instrs, src->parent_instr, new);
    }
    nir_foreach_if_use_safe(src, &intrin->dest.ssa) {
-      b->cursor = nir_before_src(src, true);
+      b->cursor = nir_before_src(src);
       nir_if_rewrite_condition(src->parent_if,
                                nir_src_for_ssa(clone_intrinsic(b, intrin)));
    }
@@ -109,7 +109,7 @@ replace_load_const(nir_builder *b, nir_load_const_instr *load_const)
          nir_instr_rewrite_src(src->parent_instr, src, nir_src_for_ssa(def));
          continue;
       }
-      b->cursor = nir_before_src(src, false);
+      b->cursor = nir_before_src(src);
       nir_ssa_def *new = nir_build_imm(b, load_const->def.num_components,
                                        load_const->def.bit_size,
                                        load_const->value);

diff --git a/src/microsoft/compiler/dxil_nir_tess.c b/src/microsoft/compiler/dxil_nir_tess.c
index daff2a1..addfccc 100644 (file)
--- a/src/microsoft/compiler/dxil_nir_tess.c
+++ b/src/microsoft/compiler/dxil_nir_tess.c
@@ -233,7 +233,7 @@ dxil_nir_split_tess_ctrl(nir_shader *nir, nir_function **patch_const_func)
              list_length(&intr->dest.ssa.uses) <= 1)
             continue;
          nir_foreach_use_including_if_safe(src, &intr->dest.ssa) {
-            b.cursor = nir_before_src(src, src->is_if);
+            b.cursor = nir_before_src(src);
             nir_ssa_def *id = nir_load_invocation_id(&b);
 
             if (src->is_if)