nir: Drop nir_ssa_dest_init_for_type()

Replace it with a new nir_def_init_for_type()

Acked-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24658>

diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index 3b07964..92ffa3b 100644 (file)
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -4445,11 +4445,11 @@ void nir_if_rewrite_condition(nir_if *if_stmt, nir_src new_src);
 void nir_def_init(nir_instr *instr, nir_def *def,
                   unsigned num_components, unsigned bit_size);
 static inline void
-nir_ssa_dest_init_for_type(nir_instr *instr, nir_dest *dest,
-                           const struct glsl_type *type)
+nir_def_init_for_type(nir_instr *instr, nir_def *def,
+                      const struct glsl_type *type)
 {
    assert(glsl_type_is_vector_or_scalar(type));
-   nir_def_init(instr, &dest->ssa, glsl_get_components(type),
+   nir_def_init(instr, def, glsl_get_components(type),
                 glsl_get_bit_size(type));
 }
 void nir_def_rewrite_uses(nir_def *def, nir_def *new_ssa);

diff --git a/src/compiler/nir/nir_lower_system_values.c b/src/compiler/nir/nir_lower_system_values.c
index 2186e52..c018be2 100644 (file)
--- a/src/compiler/nir/nir_lower_system_values.c
+++ b/src/compiler/nir/nir_lower_system_values.c
@@ -201,7 +201,7 @@ lower_system_value_instr(nir_builder *b, nir_instr *instr, void *_state)
          nir_intrinsic_op op =
             nir_intrinsic_from_system_value(var->data.location);
          nir_intrinsic_instr *load = nir_intrinsic_instr_create(b->shader, op);
-         nir_ssa_dest_init_for_type(&load->instr, &load->dest, var->type);
+         nir_def_init_for_type(&load->instr, &load->dest.ssa, var->type);
          load->num_components = load->dest.ssa.num_components;
          nir_builder_instr_insert(b, &load->instr);
          return &load->dest.ssa;

diff --git a/src/compiler/spirv/vtn_amd.c b/src/compiler/spirv/vtn_amd.c
index 0418d08..c1bba1b 100644 (file)
--- a/src/compiler/spirv/vtn_amd.c
+++ b/src/compiler/spirv/vtn_amd.c
@@ -84,7 +84,7 @@ vtn_handle_amd_shader_ballot_instruction(struct vtn_builder *b, SpvOp ext_opcode
 
    const struct glsl_type *dest_type = vtn_get_type(b, w[1])->type;
    nir_intrinsic_instr *intrin = nir_intrinsic_instr_create(b->nb.shader, op);
-   nir_ssa_dest_init_for_type(&intrin->instr, &intrin->dest, dest_type);
+   nir_def_init_for_type(&intrin->instr, &intrin->dest.ssa, dest_type);
    if (nir_intrinsic_infos[op].src_components[0] == 0)
       intrin->num_components = intrin->dest.ssa.num_components;
 

diff --git a/src/compiler/spirv/vtn_subgroup.c b/src/compiler/spirv/vtn_subgroup.c
index 90c4778..b3a7eb4 100644 (file)
--- a/src/compiler/spirv/vtn_subgroup.c
+++ b/src/compiler/spirv/vtn_subgroup.c
@@ -52,7 +52,7 @@ vtn_build_subgroup_instr(struct vtn_builder *b,
 
    nir_intrinsic_instr *intrin =
       nir_intrinsic_instr_create(b->nb.shader, nir_op);
-   nir_ssa_dest_init_for_type(&intrin->instr, &intrin->dest, dst->type);
+   nir_def_init_for_type(&intrin->instr, &intrin->dest.ssa, dst->type);
    intrin->num_components = intrin->dest.ssa.num_components;
 
    intrin->src[0] = nir_src_for_ssa(src0->def);
@@ -81,7 +81,7 @@ vtn_handle_subgroup(struct vtn_builder *b, SpvOp opcode,
                   "OpGroupNonUniformElect must return a Bool");
       nir_intrinsic_instr *elect =
          nir_intrinsic_instr_create(b->nb.shader, nir_intrinsic_elect);
-      nir_ssa_dest_init_for_type(&elect->instr, &elect->dest, dest_type->type);
+      nir_def_init_for_type(&elect->instr, &elect->dest.ssa, dest_type->type);
       nir_builder_instr_insert(&b->nb, &elect->instr);
       vtn_push_nir_ssa(b, w[2], &elect->dest.ssa);
       break;
@@ -114,8 +114,8 @@ vtn_handle_subgroup(struct vtn_builder *b, SpvOp opcode,
       intrin->src[0] = nir_src_for_ssa(vtn_get_nir_ssa(b, w[4]));
       intrin->src[1] = nir_src_for_ssa(nir_load_subgroup_invocation(&b->nb));
 
-      nir_ssa_dest_init_for_type(&intrin->instr, &intrin->dest,
-                                 dest_type->type);
+      nir_def_init_for_type(&intrin->instr, &intrin->dest.ssa,
+                            dest_type->type);
       nir_builder_instr_insert(&b->nb, &intrin->instr);
 
       vtn_push_nir_ssa(b, w[2], &intrin->dest.ssa);
@@ -169,8 +169,8 @@ vtn_handle_subgroup(struct vtn_builder *b, SpvOp opcode,
       if (src1)
          intrin->src[1] = nir_src_for_ssa(src1);
 
-      nir_ssa_dest_init_for_type(&intrin->instr, &intrin->dest,
-                                 dest_type->type);
+      nir_def_init_for_type(&intrin->instr, &intrin->dest.ssa,
+                            dest_type->type);
       nir_builder_instr_insert(&b->nb, &intrin->instr);
 
       vtn_push_nir_ssa(b, w[2], &intrin->dest.ssa);
@@ -262,8 +262,8 @@ vtn_handle_subgroup(struct vtn_builder *b, SpvOp opcode,
       if (nir_intrinsic_infos[op].src_components[0] == 0)
          intrin->num_components = src0->num_components;
       intrin->src[0] = nir_src_for_ssa(src0);
-      nir_ssa_dest_init_for_type(&intrin->instr, &intrin->dest,
-                                 dest_type->type);
+      nir_def_init_for_type(&intrin->instr, &intrin->dest.ssa,
+                            dest_type->type);
       nir_builder_instr_insert(&b->nb, &intrin->instr);
 
       vtn_push_nir_ssa(b, w[2], &intrin->dest.ssa);

diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c
index 172d3a7..414b1b5 100644 (file)
--- a/src/compiler/spirv/vtn_variables.c
+++ b/src/compiler/spirv/vtn_variables.c
@@ -2820,7 +2820,7 @@ vtn_handle_variables(struct vtn_builder *b, SpvOp opcode,
          nir_intrinsic_instr_create(b->nb.shader,
                                     nir_intrinsic_load_deref_block_intel);
       load->src[0] = nir_src_for_ssa(&src->dest.ssa);
-      nir_ssa_dest_init_for_type(&load->instr, &load->dest, res_type->type);
+      nir_def_init_for_type(&load->instr, &load->dest.ssa, res_type->type);
       load->num_components = load->dest.ssa.num_components;
       nir_builder_instr_insert(&b->nb, &load->instr);
 

diff --git a/src/intel/compiler/brw_kernel.c b/src/intel/compiler/brw_kernel.c
index d795142..721dbb8 100644 (file)
--- a/src/intel/compiler/brw_kernel.c
+++ b/src/intel/compiler/brw_kernel.c
@@ -91,7 +91,7 @@ implement_atomic_builtin(nir_function *func, nir_atomic_op atomic_op,
       atomic->src[i] = nir_src_for_ssa(src);
    }
 
-   nir_ssa_dest_init_for_type(&atomic->instr, &atomic->dest, data_type);
+   nir_def_init_for_type(&atomic->instr, &atomic->dest.ssa, data_type);
 
    nir_builder_instr_insert(&b, &atomic->instr);
    nir_store_deref(&b, ret, &atomic->dest.ssa, ~0);