nir: Drop "SSA" from NIR language

Everything is SSA now.

   sed -e 's/nir_ssa_def/nir_def/g' \
       -e 's/nir_ssa_undef/nir_undef/g' \
       -e 's/nir_ssa_scalar/nir_scalar/g' \
       -e 's/nir_src_rewrite_ssa/nir_src_rewrite/g' \
       -e 's/nir_gather_ssa_types/nir_gather_types/g' \
       -i $(git grep -l nir | grep -v relnotes)

   git mv src/compiler/nir/nir_gather_ssa_types.c \
          src/compiler/nir/nir_gather_types.c

   ninja -C build/ clang-format
   cd src/compiler/nir && find *.c *.h -type f -exec clang-format -i \{} \;

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

1 files changed, 37 insertions, 37 deletions

diff --git a/src/panfrost/midgard/midgard_address.c b/src/panfrost/midgard/midgard_address.c
index 6a24d57b8a8..fc36cb7f3c1 100644
--- a/src/panfrost/midgard/midgard_address.c
+++ b/src/panfrost/midgard/midgard_address.c
@@ -38,8 +38,8 @@
  */
 
 struct mir_address {
-   nir_ssa_scalar A;
-   nir_ssa_scalar B;
+   nir_scalar A;
+   nir_scalar B;
 
    midgard_index_address_format type;
    unsigned shift;
@@ -47,7 +47,7 @@ struct mir_address {
 };
 
 static bool
-mir_args_ssa(nir_ssa_scalar s, unsigned count)
+mir_args_ssa(nir_scalar s, unsigned count)
 {
    nir_alu_instr *alu = nir_instr_as_alu(s.def->parent_instr);
 
@@ -62,13 +62,13 @@ mir_args_ssa(nir_ssa_scalar s, unsigned count)
 static void
 mir_match_constant(struct mir_address *address)
 {
-   if (address->A.def && nir_ssa_scalar_is_const(address->A)) {
-      address->bias += nir_ssa_scalar_as_uint(address->A);
+   if (address->A.def && nir_scalar_is_const(address->A)) {
+      address->bias += nir_scalar_as_uint(address->A);
       address->A.def = NULL;
    }
 
-   if (address->B.def && nir_ssa_scalar_is_const(address->B)) {
-      address->bias += nir_ssa_scalar_as_uint(address->B);
+   if (address->B.def && nir_scalar_is_const(address->B)) {
+      address->bias += nir_scalar_as_uint(address->B);
       address->B.def = NULL;
    }
 }
@@ -81,29 +81,29 @@ mir_match_constant(struct mir_address *address)
 static void
 mir_match_iadd(struct mir_address *address, bool first_free)
 {
-   if (!address->B.def || !nir_ssa_scalar_is_alu(address->B))
+   if (!address->B.def || !nir_scalar_is_alu(address->B))
       return;
 
    if (!mir_args_ssa(address->B, 2))
       return;
 
-   nir_op op = nir_ssa_scalar_alu_op(address->B);
+   nir_op op = nir_scalar_alu_op(address->B);
 
    if (op != nir_op_iadd)
       return;
 
-   nir_ssa_scalar op1 = nir_ssa_scalar_chase_alu_src(address->B, 0);
-   nir_ssa_scalar op2 = nir_ssa_scalar_chase_alu_src(address->B, 1);
+   nir_scalar op1 = nir_scalar_chase_alu_src(address->B, 0);
+   nir_scalar op2 = nir_scalar_chase_alu_src(address->B, 1);
 
-   if (nir_ssa_scalar_is_const(op1) &&
-       nir_ssa_scalar_as_uint(op1) <= MAX_POSITIVE_OFFSET) {
-      address->bias += nir_ssa_scalar_as_uint(op1);
+   if (nir_scalar_is_const(op1) &&
+       nir_scalar_as_uint(op1) <= MAX_POSITIVE_OFFSET) {
+      address->bias += nir_scalar_as_uint(op1);
       address->B = op2;
-   } else if (nir_ssa_scalar_is_const(op2) &&
-              nir_ssa_scalar_as_uint(op2) <= MAX_POSITIVE_OFFSET) {
-      address->bias += nir_ssa_scalar_as_uint(op2);
+   } else if (nir_scalar_is_const(op2) &&
+              nir_scalar_as_uint(op2) <= MAX_POSITIVE_OFFSET) {
+      address->bias += nir_scalar_as_uint(op2);
       address->B = op1;
-   } else if (!nir_ssa_scalar_is_const(op1) && !nir_ssa_scalar_is_const(op2) &&
+   } else if (!nir_scalar_is_const(op1) && !nir_scalar_is_const(op2) &&
               first_free && !address->A.def) {
       address->A = op1;
       address->B = op2;
@@ -115,16 +115,16 @@ mir_match_iadd(struct mir_address *address, bool first_free)
 static void
 mir_match_u2u64(struct mir_address *address)
 {
-   if (!address->B.def || !nir_ssa_scalar_is_alu(address->B))
+   if (!address->B.def || !nir_scalar_is_alu(address->B))
       return;
 
    if (!mir_args_ssa(address->B, 1))
       return;
 
-   nir_op op = nir_ssa_scalar_alu_op(address->B);
+   nir_op op = nir_scalar_alu_op(address->B);
    if (op != nir_op_u2u64)
       return;
-   nir_ssa_scalar arg = nir_ssa_scalar_chase_alu_src(address->B, 0);
+   nir_scalar arg = nir_scalar_chase_alu_src(address->B, 0);
 
    address->B = arg;
    address->type = midgard_index_address_u32;
@@ -135,16 +135,16 @@ mir_match_u2u64(struct mir_address *address)
 static void
 mir_match_i2i64(struct mir_address *address)
 {
-   if (!address->B.def || !nir_ssa_scalar_is_alu(address->B))
+   if (!address->B.def || !nir_scalar_is_alu(address->B))
       return;
 
    if (!mir_args_ssa(address->B, 1))
       return;
 
-   nir_op op = nir_ssa_scalar_alu_op(address->B);
+   nir_op op = nir_scalar_alu_op(address->B);
    if (op != nir_op_i2i64)
       return;
-   nir_ssa_scalar arg = nir_ssa_scalar_chase_alu_src(address->B, 0);
+   nir_scalar arg = nir_scalar_chase_alu_src(address->B, 0);
 
    address->B = arg;
    address->type = midgard_index_address_s32;
@@ -155,22 +155,22 @@ mir_match_i2i64(struct mir_address *address)
 static void
 mir_match_ishl(struct mir_address *address)
 {
-   if (!address->B.def || !nir_ssa_scalar_is_alu(address->B))
+   if (!address->B.def || !nir_scalar_is_alu(address->B))
       return;
 
    if (!mir_args_ssa(address->B, 2))
       return;
 
-   nir_op op = nir_ssa_scalar_alu_op(address->B);
+   nir_op op = nir_scalar_alu_op(address->B);
    if (op != nir_op_ishl)
       return;
-   nir_ssa_scalar op1 = nir_ssa_scalar_chase_alu_src(address->B, 0);
-   nir_ssa_scalar op2 = nir_ssa_scalar_chase_alu_src(address->B, 1);
+   nir_scalar op1 = nir_scalar_chase_alu_src(address->B, 0);
+   nir_scalar op2 = nir_scalar_chase_alu_src(address->B, 1);
 
-   if (!nir_ssa_scalar_is_const(op2))
+   if (!nir_scalar_is_const(op2))
       return;
 
-   unsigned shift = nir_ssa_scalar_as_uint(op2);
+   unsigned shift = nir_scalar_as_uint(op2);
    if (shift > 0x7)
       return;
 
@@ -183,25 +183,25 @@ mir_match_ishl(struct mir_address *address)
 static void
 mir_match_mov(struct mir_address *address)
 {
-   if (address->A.def && nir_ssa_scalar_is_alu(address->A)) {
-      nir_op op = nir_ssa_scalar_alu_op(address->A);
+   if (address->A.def && nir_scalar_is_alu(address->A)) {
+      nir_op op = nir_scalar_alu_op(address->A);
 
       if (op == nir_op_mov && mir_args_ssa(address->A, 1))
-         address->A = nir_ssa_scalar_chase_alu_src(address->A, 0);
+         address->A = nir_scalar_chase_alu_src(address->A, 0);
    }
 
-   if (address->B.def && nir_ssa_scalar_is_alu(address->B)) {
-      nir_op op = nir_ssa_scalar_alu_op(address->B);
+   if (address->B.def && nir_scalar_is_alu(address->B)) {
+      nir_op op = nir_scalar_alu_op(address->B);
 
       if (op == nir_op_mov && mir_args_ssa(address->B, 1))
-         address->B = nir_ssa_scalar_chase_alu_src(address->B, 0);
+         address->B = nir_scalar_chase_alu_src(address->B, 0);
    }
 }
 
 /* Tries to pattern match into mir_address */
 
 static struct mir_address
-mir_match_offset(nir_ssa_def *offset, bool first_free, bool extend)
+mir_match_offset(nir_def *offset, bool first_free, bool extend)
 {
    struct mir_address address = {
       .B = {.def = offset},