nir: Rename lower_locals_to_reg_intrinsics back

The short name is freed up.

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

diff --git a/src/compiler/nir/meson.build b/src/compiler/nir/meson.build
index 5301c06..b6421e4 100644 (file)
--- a/src/compiler/nir/meson.build
+++ b/src/compiler/nir/meson.build
@@ -166,7 +166,7 @@ files_libnir = files(
   'nir_lower_gs_intrinsics.c',
   'nir_lower_helper_writes.c',
   'nir_lower_load_const_to_scalar.c',
-  'nir_lower_locals_to_reg_intrinsics.c',
+  'nir_lower_locals_to_regs.c',
   'nir_lower_idiv.c',
   'nir_lower_image.c',
   'nir_lower_image_atomics_to_global.c',

diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index 15cbdc0..2ace569 100644 (file)
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -4954,7 +4954,7 @@ bool nir_lower_indirect_derefs(nir_shader *shader, nir_variable_mode modes,
 bool nir_lower_indirect_var_derefs(nir_shader *shader,
                                    const struct set *vars);
 
-bool nir_lower_locals_to_reg_intrinsics(nir_shader *shader, uint8_t bool_bitsize);
+bool nir_lower_locals_to_regs(nir_shader *shader, uint8_t bool_bitsize);
 
 void nir_lower_io_to_temporaries(nir_shader *shader,
                                  nir_function_impl *entrypoint,

diff --git a/src/compiler/nir/nir_lower_locals_to_reg_intrinsics.c b/src/compiler/nir/nir_lower_locals_to_regs.c
similarity index 99%
rename from src/compiler/nir/nir_lower_locals_to_reg_intrinsics.c
rename to src/compiler/nir/nir_lower_locals_to_regs.c
index b25e4b6..3648d8b 100644 (file)
--- a/src/compiler/nir/nir_lower_locals_to_reg_intrinsics.c
+++ b/src/compiler/nir/nir_lower_locals_to_regs.c
@@ -309,7 +309,7 @@ impl(nir_function_impl *impl, uint8_t bool_bitsize)
 }
 
 bool
-nir_lower_locals_to_reg_intrinsics(nir_shader *shader, uint8_t bool_bitsize)
+nir_lower_locals_to_regs(nir_shader *shader, uint8_t bool_bitsize)
 {
    bool progress = false;
 

diff --git a/src/freedreno/ir3/ir3_context.c b/src/freedreno/ir3/ir3_context.c
index 3e995a1..ddb7bf0 100644 (file)
--- a/src/freedreno/ir3/ir3_context.c
+++ b/src/freedreno/ir3/ir3_context.c
@@ -89,9 +89,9 @@ ir3_context_init(struct ir3_compiler *compiler, struct ir3_shader *shader,
     */
    bool progress = false;
    bool needs_late_alg = false;
-   NIR_PASS(progress, ctx->s, nir_lower_locals_to_reg_intrinsics, 1);
+   NIR_PASS(progress, ctx->s, nir_lower_locals_to_regs, 1);
 
-   /* we could need cleanup after lower_locals_to_reg_intrinsics */
+   /* we could need cleanup after lower_locals_to_regs */
    while (progress) {
       progress = false;
       NIR_PASS(progress, ctx->s, nir_opt_algebraic);
@@ -101,7 +101,7 @@ ir3_context_init(struct ir3_compiler *compiler, struct ir3_shader *shader,
 
    /* We want to lower nir_op_imul as late as possible, to catch also
     * those generated by earlier passes (e.g,
-    * nir_lower_locals_to_reg_intrinsics).  However, we want a final swing of a
+    * nir_lower_locals_to_regs).  However, we want a final swing of a
     * few passes to have a chance at optimizing the result.
     */
    progress = false;

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_nir.c b/src/gallium/auxiliary/gallivm/lp_bld_nir.c
index 33311bf..52bc9e3 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_nir.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_nir.c
@@ -2894,7 +2894,7 @@ bool lp_build_nir_llvm(struct lp_build_nir_context *bld_base,
    struct nir_function *func;
 
    NIR_PASS_V(nir, nir_convert_from_ssa, true, true);
-   NIR_PASS_V(nir, nir_lower_locals_to_reg_intrinsics, 32);
+   NIR_PASS_V(nir, nir_lower_locals_to_regs, 32);
    NIR_PASS_V(nir, nir_remove_dead_derefs);
    NIR_PASS_V(nir, nir_remove_dead_variables, nir_var_function_temp, NULL);
 

diff --git a/src/gallium/auxiliary/nir/nir_to_tgsi.c b/src/gallium/auxiliary/nir/nir_to_tgsi.c
index 40514d9..913e263 100644 (file)
--- a/src/gallium/auxiliary/nir/nir_to_tgsi.c
+++ b/src/gallium/auxiliary/nir/nir_to_tgsi.c
@@ -3977,7 +3977,7 @@ const void *nir_to_tgsi_options(struct nir_shader *s,
 
    /* locals_to_reg_intrinsics will leave dead derefs that are good to clean up.
     */
-   NIR_PASS_V(s, nir_lower_locals_to_reg_intrinsics, 32);
+   NIR_PASS_V(s, nir_lower_locals_to_regs, 32);
    NIR_PASS_V(s, nir_opt_dce);
 
    /* See comment in ntt_get_alu_src for supported modifiers */

diff --git a/src/gallium/drivers/r600/sfn/sfn_nir.cpp b/src/gallium/drivers/r600/sfn/sfn_nir.cpp
index 8c34900..81de655 100644 (file)
--- a/src/gallium/drivers/r600/sfn/sfn_nir.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_nir.cpp
@@ -934,7 +934,7 @@ r600_shader_from_nir(struct r600_context *rctx,
 
    NIR_PASS_V(sh, nir_lower_bool_to_int32);
 
-   NIR_PASS_V(sh, nir_lower_locals_to_reg_intrinsics, 32);
+   NIR_PASS_V(sh, nir_lower_locals_to_regs, 32);
    NIR_PASS_V(sh, nir_convert_from_ssa, true, true);
    NIR_PASS_V(sh, nir_opt_dce);
 

diff --git a/src/intel/compiler/brw_nir.c b/src/intel/compiler/brw_nir.c
index 0bca69a..11c2c12 100644 (file)
--- a/src/intel/compiler/brw_nir.c
+++ b/src/intel/compiler/brw_nir.c
@@ -1706,7 +1706,7 @@ brw_postprocess_nir(nir_shader *nir, const struct brw_compiler *compiler,
    OPT(nir_copy_prop);
    OPT(nir_opt_dce);
 
-   OPT(nir_lower_locals_to_reg_intrinsics, 32);
+   OPT(nir_lower_locals_to_regs, 32);
 
    if (unlikely(debug_enabled)) {
       /* Re-index SSA defs so we print more sensible numbers. */