agx: Remove agx_nir_ssa_index

Deduplicated from agx_def_index.

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

diff --git a/src/asahi/compiler/agx_compile.c b/src/asahi/compiler/agx_compile.c
index ead73b4..8995e71 100644 (file)
--- a/src/asahi/compiler/agx_compile.c
+++ b/src/asahi/compiler/agx_compile.c
@@ -308,7 +308,7 @@ agx_emit_load_const(agx_builder *b, nir_load_const_instr *instr)
    assert(instr->def.num_components == 1);
 
    /* Emit move, later passes can inline/push if useful */
-   agx_mov_imm_to(b, agx_nir_ssa_index(&instr->def),
+   agx_mov_imm_to(b, agx_def_index(&instr->def),
                   nir_const_value_as_uint(instr->value[0], bit_size));
 }
 
@@ -1804,7 +1804,7 @@ agx_emit_undef(agx_builder *b, nir_undef_instr *instr)
     * the lowering happens in NIR and this just allows for late lowering passes
     * to result in undefs.
     */
-   agx_mov_imm_to(b, agx_nir_ssa_index(&instr->def), 0);
+   agx_mov_imm_to(b, agx_def_index(&instr->def), 0);
 }
 
 static void

diff --git a/src/asahi/compiler/agx_compiler.h b/src/asahi/compiler/agx_compiler.h
index bdece9d..65bc35e 100644 (file)
--- a/src/asahi/compiler/agx_compiler.h
+++ b/src/asahi/compiler/agx_compiler.h
@@ -454,7 +454,7 @@ agx_size_for_bits(unsigned bits)
 }
 
 static inline agx_index
-agx_nir_ssa_index(nir_def *ssa)
+agx_def_index(nir_def *ssa)
 {
    return agx_get_index(ssa->index, agx_size_for_bits(ssa->bit_size));
 }
@@ -462,13 +462,7 @@ agx_nir_ssa_index(nir_def *ssa)
 static inline agx_index
 agx_src_index(nir_src *src)
 {
-   return agx_nir_ssa_index(src->ssa);
-}
-
-static inline agx_index
-agx_def_index(nir_def *def)
-{
-   return agx_nir_ssa_index(def);
+   return agx_def_index(src->ssa);
 }
 
 static inline agx_index