diff --git a/src/amd/common/ac_nir_lower_subdword_loads.c b/src/amd/common/ac_nir_lower_subdword_loads.c
index 50cd145568c..1c74c5bab4b 100644
--- a/src/amd/common/ac_nir_lower_subdword_loads.c
+++ b/src/amd/common/ac_nir_lower_subdword_loads.c
@@ -114,8 +114,7 @@ lower_subdword_loads(nir_builder *b, nir_instr *instr, void *data)
        * align_offset. Subtracting align_offset should eliminate it.
        */
       b->cursor = nir_before_instr(instr);
-      nir_instr_rewrite_src_ssa(instr, src_offset,
-                                nir_iadd_imm(b, offset, -align_offset));
+      nir_src_rewrite(src_offset, nir_iadd_imm(b, offset, -align_offset));
 
       b->cursor = nir_after_instr(instr);
       result = nir_extract_bits(b, &result, 1, comp_offset * bit_size,
@@ -133,8 +132,7 @@ lower_subdword_loads(nir_builder *b, nir_instr *instr, void *data)
 
    /* Round down by masking out the bits. */
    b->cursor = nir_before_instr(instr);
-   nir_instr_rewrite_src_ssa(instr, src_offset,
-                             nir_iand_imm(b, offset, ~0x3));
+   nir_src_rewrite(src_offset, nir_iand_imm(b, offset, ~0x3));
 
    /* We need to shift bits in the loaded vector by this number. */
    b->cursor = nir_after_instr(instr);
diff --git a/src/amd/common/ac_nir_lower_tex.c b/src/amd/common/ac_nir_lower_tex.c
index 524fd38d2c7..c1d91669610 100644
--- a/src/amd/common/ac_nir_lower_tex.c
+++ b/src/amd/common/ac_nir_lower_tex.c
@@ -140,7 +140,7 @@ prepare_cube_coords(nir_builder *b, nir_tex_instr *tex, nir_def **coord, nir_src
          nir_def *x = nir_fsub(b, nir_fmul(b, deriv_sc, invma), nir_fmul(b, deriv_ma, sc));
          nir_def *y = nir_fsub(b, nir_fmul(b, deriv_tc, invma), nir_fmul(b, deriv_ma, tc));
 
-         nir_instr_rewrite_src_ssa(&tex->instr, i ? ddy : ddx, nir_vec2(b, x, y));
+         nir_src_rewrite(i ? ddy : ddx, nir_vec2(b, x, y));
       }
 
       sc = nir_fadd_imm(b, sc, 1.5);
@@ -204,14 +204,14 @@ lower_tex_coords(nir_builder *b, nir_tex_instr *tex, nir_def **coords,
       if (offset_src >= 0) {
          nir_src *offset = &tex->src[offset_src].src;
          nir_def *zero = nir_imm_intN_t(b, 0, offset->ssa->bit_size);
-         nir_instr_rewrite_src_ssa(&tex->instr, offset, nir_vec2(b, offset->ssa, zero));
+         nir_src_rewrite(offset, nir_vec2(b, offset->ssa, zero));
       }
 
       if (ddx || ddy) {
          nir_def *def = nir_vec2(b, ddx->ssa, nir_imm_floatN_t(b, 0.0, ddx->ssa->bit_size));
-         nir_instr_rewrite_src_ssa(&tex->instr, ddx, def);
+         nir_src_rewrite(ddx, def);
          def = nir_vec2(b, ddy->ssa, nir_imm_floatN_t(b, 0.0, ddy->ssa->bit_size));
-         nir_instr_rewrite_src_ssa(&tex->instr, ddy, def);
+         nir_src_rewrite(ddy, def);
       }
    } else if (tex->sampler_dim == GLSL_SAMPLER_DIM_CUBE) {
       prepare_cube_coords(b, tex, coords, ddx, ddy, options);
@@ -236,7 +236,7 @@ lower_tex(nir_builder *b, nir_instr *instr, void *options_)
    nir_def *coords = tex->src[coord_idx].src.ssa;
    if (lower_tex_coords(b, tex, &coords, options)) {
       tex->coord_components = coords->num_components;
-      nir_instr_rewrite_src_ssa(&tex->instr, &tex->src[coord_idx].src, coords);
+      nir_src_rewrite(&tex->src[coord_idx].src, coords);
       return true;
    }
 
diff --git a/src/amd/vulkan/nir/radv_nir_apply_pipeline_layout.c b/src/amd/vulkan/nir/radv_nir_apply_pipeline_layout.c
index 535ccafe4fd..a5d91119b8d 100644
--- a/src/amd/vulkan/nir/radv_nir_apply_pipeline_layout.c
+++ b/src/amd/vulkan/nir/radv_nir_apply_pipeline_layout.c
@@ -386,11 +386,11 @@ apply_layout_to_intrin(nir_builder *b, apply_layout_state *state, nir_intrinsic_
    case nir_intrinsic_ssbo_atomic:
    case nir_intrinsic_ssbo_atomic_swap:
       rsrc = load_buffer_descriptor(b, state, intrin->src[0].ssa, nir_intrinsic_access(intrin));
-      nir_instr_rewrite_src_ssa(&intrin->instr, &intrin->src[0], rsrc);
+      nir_src_rewrite(&intrin->src[0], rsrc);
       break;
    case nir_intrinsic_store_ssbo:
       rsrc = load_buffer_descriptor(b, state, intrin->src[1].ssa, nir_intrinsic_access(intrin));
-      nir_instr_rewrite_src_ssa(&intrin->instr, &intrin->src[1], rsrc);
+      nir_src_rewrite(&intrin->src[1], rsrc);
       break;
    case nir_intrinsic_get_ssbo_size:
       visit_get_ssbo_size(b, state, intrin);
@@ -486,11 +486,11 @@ apply_layout_to_tex(nir_builder *b, apply_layout_state *state, nir_tex_instr *te
       switch (tex->src[i].src_type) {
       case nir_tex_src_texture_deref:
          tex->src[i].src_type = nir_tex_src_texture_handle;
-         nir_instr_rewrite_src_ssa(&tex->instr, &tex->src[i].src, image);
+         nir_src_rewrite(&tex->src[i].src, image);
          break;
       case nir_tex_src_sampler_deref:
          tex->src[i].src_type = nir_tex_src_sampler_handle;
-         nir_instr_rewrite_src_ssa(&tex->instr, &tex->src[i].src, sampler);
+         nir_src_rewrite(&tex->src[i].src, sampler);
          break;
       default:
          break;
diff --git a/src/amd/vulkan/radv_rt_shader.c b/src/amd/vulkan/radv_rt_shader.c
index 0ee0b5a9d36..8c4c6f8602a 100644
--- a/src/amd/vulkan/radv_rt_shader.c
+++ b/src/amd/vulkan/radv_rt_shader.c
@@ -350,15 +350,13 @@ lower_rt_instructions(nir_shader *shader, struct rt_variables *vars, unsigned ca
                break;
             }
             case nir_intrinsic_load_scratch: {
-               nir_instr_rewrite_src_ssa(
-                  instr, &intr->src[0],
-                  nir_iadd_nuw(&b_shader, nir_load_var(&b_shader, vars->stack_ptr), intr->src[0].ssa));
+               nir_src_rewrite(&intr->src[0],
+                               nir_iadd_nuw(&b_shader, nir_load_var(&b_shader, vars->stack_ptr), intr->src[0].ssa));
                continue;
             }
             case nir_intrinsic_store_scratch: {
-               nir_instr_rewrite_src_ssa(
-                  instr, &intr->src[1],
-                  nir_iadd_nuw(&b_shader, nir_load_var(&b_shader, vars->stack_ptr), intr->src[1].ssa));
+               nir_src_rewrite(&intr->src[1],
+                               nir_iadd_nuw(&b_shader, nir_load_var(&b_shader, vars->stack_ptr), intr->src[1].ssa));
                continue;
             }
             case nir_intrinsic_load_rt_arg_scratch_offset_amd: {
@@ -932,11 +930,11 @@ lower_any_hit_for_intersection(nir_shader *any_hit)
              */
             case nir_intrinsic_load_scratch:
                b->cursor = nir_before_instr(instr);
-               nir_instr_rewrite_src_ssa(instr, &intrin->src[0], nir_iadd_nuw(b, scratch_offset, intrin->src[0].ssa));
+               nir_src_rewrite(&intrin->src[0], nir_iadd_nuw(b, scratch_offset, intrin->src[0].ssa));
                break;
             case nir_intrinsic_store_scratch:
                b->cursor = nir_before_instr(instr);
-               nir_instr_rewrite_src_ssa(instr, &intrin->src[1], nir_iadd_nuw(b, scratch_offset, intrin->src[1].ssa));
+               nir_src_rewrite(&intrin->src[1], nir_iadd_nuw(b, scratch_offset, intrin->src[1].ssa));
                break;
             case nir_intrinsic_load_rt_arg_scratch_offset_amd:
                b->cursor = nir_after_instr(instr);
diff --git a/src/asahi/compiler/agx_nir_lower_discard_zs_emit.c b/src/asahi/compiler/agx_nir_lower_discard_zs_emit.c
index 71742ec5dd6..e4c2911b022 100644
--- a/src/asahi/compiler/agx_nir_lower_discard_zs_emit.c
+++ b/src/asahi/compiler/agx_nir_lower_discard_zs_emit.c
@@ -60,7 +60,7 @@ lower_zs_emit(nir_block *block)
       assert((nir_intrinsic_base(zs_emit) & base) == 0 &&
              "each of depth/stencil may only be written once");
 
-      nir_instr_rewrite_src_ssa(&zs_emit->instr, &zs_emit->src[src_idx], value);
+      nir_src_rewrite(&zs_emit->src[src_idx], value);
       nir_intrinsic_set_base(zs_emit, nir_intrinsic_base(zs_emit) | base);
 
       nir_instr_remove(instr);
diff --git a/src/asahi/compiler/agx_nir_lower_sample_mask.c b/src/asahi/compiler/agx_nir_lower_sample_mask.c
index 6b6ff35e085..cf084e33e14 100644
--- a/src/asahi/compiler/agx_nir_lower_sample_mask.c
+++ b/src/asahi/compiler/agx_nir_lower_sample_mask.c
@@ -88,7 +88,7 @@ lower_sample_mask_to_zs(nir_builder *b, nir_instr *instr, UNUSED void *data)
 
       /* Write it out from this store_zs */
       nir_intrinsic_set_base(intr, nir_intrinsic_base(intr) | BASE_Z);
-      nir_instr_rewrite_src_ssa(instr, &intr->src[1], z);
+      nir_src_rewrite(&intr->src[1], z);
 
       /* We'll set outputs_written after the pass in case there are multiple
        * store_zs_agx instructions needing fixup.
diff --git a/src/asahi/compiler/agx_nir_lower_shared_bitsize.c b/src/asahi/compiler/agx_nir_lower_shared_bitsize.c
index 4e3f885acad..1991374d608 100644
--- a/src/asahi/compiler/agx_nir_lower_shared_bitsize.c
+++ b/src/asahi/compiler/agx_nir_lower_shared_bitsize.c
@@ -29,8 +29,7 @@ pass(struct nir_builder *b, nir_instr *instr, UNUSED void *data)
       return false;
 
    b->cursor = nir_before_instr(instr);
-   nir_instr_rewrite_src_ssa(instr, offset,
-                             nir_u2u16(b, nir_ssa_for_src(b, *offset, 1)));
+   nir_src_rewrite(offset, nir_u2u16(b, nir_ssa_for_src(b, *offset, 1)));
    return true;
 }
 
diff --git a/src/asahi/compiler/agx_nir_lower_texture.c b/src/asahi/compiler/agx_nir_lower_texture.c
index f62551e9b18..e533e271da4 100644
--- a/src/asahi/compiler/agx_nir_lower_texture.c
+++ b/src/asahi/compiler/agx_nir_lower_texture.c
@@ -281,7 +281,7 @@ lower_buffer_texture(nir_builder *b, nir_tex_instr *tex)
    nir_def_rewrite_uses(&tex->def, phi);
    nir_phi_instr *phi_instr = nir_instr_as_phi(phi->parent_instr);
    nir_phi_src *else_src = nir_phi_get_src_from_block(phi_instr, else_block);
-   nir_instr_rewrite_src_ssa(phi->parent_instr, &else_src->src, &tex->def);
+   nir_src_rewrite(&else_src->src, &tex->def);
    return true;
 }
 
diff --git a/src/asahi/lib/agx_nir_lower_alpha.c b/src/asahi/lib/agx_nir_lower_alpha.c
index 8dfd4402280..fbb669e9538 100644
--- a/src/asahi/lib/agx_nir_lower_alpha.c
+++ b/src/asahi/lib/agx_nir_lower_alpha.c
@@ -108,6 +108,6 @@ agx_nir_lower_alpha_to_one(nir_shader *shader)
       nir_def *rgb1 = nir_vector_insert_imm(
          &b, rgba, nir_imm_floatN_t(&b, 1.0, rgba->bit_size), 3);
 
-      nir_instr_rewrite_src_ssa(instr, &intr->src[0], rgb1);
+      nir_src_rewrite(&intr->src[0], rgb1);
    }
 }
diff --git a/src/compiler/nir/nir_deref.c b/src/compiler/nir/nir_deref.c
index 66601dc27fe..be3fcbcc003 100644
--- a/src/compiler/nir/nir_deref.c
+++ b/src/compiler/nir/nir_deref.c
@@ -932,8 +932,7 @@ opt_alu_of_cast(nir_alu_instr *alu)
       if (src_deref->deref_type != nir_deref_type_cast)
          continue;
 
-      nir_instr_rewrite_src_ssa(&alu->instr, &alu->src[i].src,
-                                src_deref->parent.ssa);
+      nir_src_rewrite(&alu->src[i].src, src_deref->parent.ssa);
       progress = true;
    }
 
diff --git a/src/compiler/nir/nir_lower_blend.c b/src/compiler/nir/nir_lower_blend.c
index b1b2f37d869..a93041d3974 100644
--- a/src/compiler/nir/nir_lower_blend.c
+++ b/src/compiler/nir/nir_lower_blend.c
@@ -597,7 +597,7 @@ nir_lower_blend_instr(nir_builder *b, nir_instr *instr, void *data)
                                           nir_component_mask(num_components));
 
    /* Write out the final color instead of the input */
-   nir_instr_rewrite_src_ssa(instr, &store->src[0], blended);
+   nir_src_rewrite(&store->src[0], blended);
 
    /* Sink to bottom */
    nir_instr_remove(instr);
diff --git a/src/compiler/nir/nir_lower_helper_writes.c b/src/compiler/nir/nir_lower_helper_writes.c
index 15208f253c4..3920ce8c4c8 100644
--- a/src/compiler/nir/nir_lower_helper_writes.c
+++ b/src/compiler/nir/nir_lower_helper_writes.c
@@ -94,8 +94,7 @@ lower(nir_builder *b, nir_instr *instr, void *data)
       nir_phi_instr *phi_as_phi = nir_instr_as_phi(phi_instr);
       nir_phi_src *phi_src = nir_phi_get_src_from_block(phi_as_phi,
                                                         instr->block);
-      nir_instr_rewrite_src_ssa(phi->parent_instr, &phi_src->src,
-                                &intr->def);
+      nir_src_rewrite(&phi_src->src, &intr->def);
    }
 
    return true;
diff --git a/src/compiler/nir/nir_lower_image.c b/src/compiler/nir/nir_lower_image.c
index 1d6803085d0..a4c6be53d3f 100644
--- a/src/compiler/nir/nir_lower_image.c
+++ b/src/compiler/nir/nir_lower_image.c
@@ -119,7 +119,7 @@ lower_image_to_fragment_mask_load(nir_builder *b, nir_intrinsic_instr *intrin)
    nir_def *sample_index_new = nir_ubfe(b, fmask, fmask_offset, fmask_width);
 
    /* fix color buffer load */
-   nir_instr_rewrite_src_ssa(&intrin->instr, &intrin->src[2], sample_index_new);
+   nir_src_rewrite(&intrin->src[2], sample_index_new);
 
    /* Mark uses fmask to prevent lower this intrinsic again. */
    enum gl_access_qualifier access = nir_intrinsic_access(intrin);
diff --git a/src/compiler/nir/nir_lower_mediump.c b/src/compiler/nir/nir_lower_mediump.c
index ca88ae8d9eb..269566c3aed 100644
--- a/src/compiler/nir/nir_lower_mediump.c
+++ b/src/compiler/nir/nir_lower_mediump.c
@@ -214,8 +214,7 @@ nir_lower_mediump_io(nir_shader *nir, nir_variable_mode modes,
 
             /* Convert the 32-bit store into a 16-bit store. */
             b.cursor = nir_before_instr(&intr->instr);
-            nir_instr_rewrite_src_ssa(&intr->instr, &intr->src[0],
-                                      convert(&b, intr->src[0].ssa));
+            nir_src_rewrite(&intr->src[0], convert(&b, intr->src[0].ssa));
             nir_intrinsic_set_src_type(intr, (type & ~32) | 16);
          } else {
             if (!sem.medium_precision)
@@ -716,7 +715,7 @@ nir_legalize_16bit_sampler_srcs(nir_shader *nir,
             nir_def *conv =
                convert(&b, nir_ssa_for_src(&b, tex->src[i].src,
                                            tex->src[i].src.ssa->num_components));
-            nir_instr_rewrite_src_ssa(&tex->instr, &tex->src[i].src, conv);
+            nir_src_rewrite(&tex->src[i].src, conv);
             changed = true;
          }
       }
@@ -819,7 +818,7 @@ fold_16bit_src(nir_builder *b, nir_instr *instr, nir_src *src, nir_alu_type src_
 
    nir_def *new_vec = nir_vec_scalars(b, new_comps, src->ssa->num_components);
 
-   nir_instr_rewrite_src_ssa(instr, src, new_vec);
+   nir_src_rewrite(src, new_vec);
 }
 
 static bool
diff --git a/src/compiler/nir/nir_lower_robust_access.c b/src/compiler/nir/nir_lower_robust_access.c
index d8087117f5d..b4a9e976731 100644
--- a/src/compiler/nir/nir_lower_robust_access.c
+++ b/src/compiler/nir/nir_lower_robust_access.c
@@ -23,7 +23,7 @@ rewrite_offset(nir_builder *b, nir_intrinsic_instr *instr,
                 instr->src[offset_src].ssa);
 
    /* Rewrite offset */
-   nir_instr_rewrite_src_ssa(&instr->instr, &instr->src[offset_src], offset);
+   nir_src_rewrite(&instr->src[offset_src], offset);
 }
 
 /*
diff --git a/src/compiler/nir/nir_lower_shader_calls.c b/src/compiler/nir/nir_lower_shader_calls.c
index e8d99d97f3b..cd231c2d52a 100644
--- a/src/compiler/nir/nir_lower_shader_calls.c
+++ b/src/compiler/nir/nir_lower_shader_calls.c
@@ -1523,7 +1523,7 @@ nir_opt_trim_stack_values(nir_shader *shader)
          nir_builder b = nir_builder_at(nir_before_instr(instr));
 
          nir_def *value = nir_channels(&b, intrin->src[0].ssa, read_mask);
-         nir_instr_rewrite_src_ssa(instr, &intrin->src[0], value);
+         nir_src_rewrite(&intrin->src[0], value);
 
          intrin->num_components = util_bitcount(read_mask);
          nir_intrinsic_set_write_mask(intrin, (1u << intrin->num_components) - 1);
diff --git a/src/compiler/nir/nir_lower_tex.c b/src/compiler/nir/nir_lower_tex.c
index dc9e5e441f2..44a486eabd1 100644
--- a/src/compiler/nir/nir_lower_tex.c
+++ b/src/compiler/nir/nir_lower_tex.c
@@ -1363,7 +1363,7 @@ nir_lower_ms_txf_to_fragment_fetch(nir_builder *b, nir_tex_instr *tex)
 
    /* Update instruction. */
    tex->op = nir_texop_fragment_fetch_amd;
-   nir_instr_rewrite_src_ssa(&tex->instr, &tex->src[ms_index].src, new_sample);
+   nir_src_rewrite(&tex->src[ms_index].src, new_sample);
 }
 
 static void
diff --git a/src/compiler/nir/nir_lower_texcoord_replace_late.c b/src/compiler/nir/nir_lower_texcoord_replace_late.c
index b8730a08887..f232f8e0c92 100644
--- a/src/compiler/nir/nir_lower_texcoord_replace_late.c
+++ b/src/compiler/nir/nir_lower_texcoord_replace_late.c
@@ -63,7 +63,7 @@ pass(nir_builder *b, nir_instr *instr, void *data)
       channels[1] = nir_channel(b, pntc, 1);
    } else {
       sem.location = VARYING_SLOT_PNTC;
-      nir_instr_rewrite_src_ssa(instr, offset, nir_imm_int(b, 0));
+      nir_src_rewrite(offset, nir_imm_int(b, 0));
       nir_intrinsic_set_io_semantics(intr, sem);
       nir_def *raw = &intr->def;
 
diff --git a/src/compiler/nir/nir_normalize_cubemap_coords.c b/src/compiler/nir/nir_normalize_cubemap_coords.c
index 2a675d228ea..5abf8119734 100644
--- a/src/compiler/nir/nir_normalize_cubemap_coords.c
+++ b/src/compiler/nir/nir_normalize_cubemap_coords.c
@@ -60,7 +60,7 @@ normalize_cubemap_coords(nir_builder *b, nir_instr *instr, void *data)
                                          nir_channel(b, orig_coord, 3), 3);
    }
 
-   nir_instr_rewrite_src_ssa(instr, &tex->src[idx].src, normalized);
+   nir_src_rewrite(&tex->src[idx].src, normalized);
    return true;
 }
 
diff --git a/src/compiler/nir/nir_opt_copy_propagate.c b/src/compiler/nir/nir_opt_copy_propagate.c
index da9e5bc4f46..e10f83bd629 100644
--- a/src/compiler/nir/nir_opt_copy_propagate.c
+++ b/src/compiler/nir/nir_opt_copy_propagate.c
@@ -104,7 +104,7 @@ copy_propagate_alu(nir_alu_src *src, nir_alu_instr *copy)
          src->swizzle[i] = copy->src[src->swizzle[i]].swizzle[0];
    }
 
-   nir_instr_rewrite_src_ssa(src->src.parent_instr, &src->src, def);
+   nir_src_rewrite(&src->src, def);
 
    return true;
 }
diff --git a/src/compiler/nir/nir_opt_if.c b/src/compiler/nir/nir_opt_if.c
index 5def4c4015d..c73f57f33ed 100644
--- a/src/compiler/nir/nir_opt_if.c
+++ b/src/compiler/nir/nir_opt_if.c
@@ -1364,7 +1364,7 @@ rewrite_comp_uses_within_if(nir_builder *b, nir_if *nif, bool invert,
          }
       }
 
-      nir_instr_rewrite_src_ssa(use->parent_instr, use, new_ssa);
+      nir_src_rewrite(use, new_ssa);
       progress = true;
    }
 
diff --git a/src/compiler/nir/nir_opt_shrink_vectors.c b/src/compiler/nir/nir_opt_shrink_vectors.c
index adb1282511e..40289505fd7 100644
--- a/src/compiler/nir/nir_opt_shrink_vectors.c
+++ b/src/compiler/nir/nir_opt_shrink_vectors.c
@@ -486,7 +486,7 @@ opt_shrink_vectors_phi(nir_builder *b, nir_phi_instr *instr)
          alu_src.swizzle[i] = src_reswizzle[i];
       nir_def *mov = nir_mov_alu(b, alu_src, num_components);
 
-      nir_instr_rewrite_src_ssa(&instr->instr, &phi_src->src, mov);
+      nir_src_rewrite(&phi_src->src, mov);
    }
    b->cursor = nir_before_instr(&instr->instr);
 
diff --git a/src/compiler/nir/nir_trivialize_registers.c b/src/compiler/nir/nir_trivialize_registers.c
index 00d2bf69bf2..147be5754b7 100644
--- a/src/compiler/nir/nir_trivialize_registers.c
+++ b/src/compiler/nir/nir_trivialize_registers.c
@@ -195,7 +195,7 @@ isolate_store(nir_intrinsic_instr *store)
    nir_builder b = nir_builder_at(nir_before_instr(&store->instr));
    nir_def *copy = nir_mov(&b, store->src[0].ssa);
    copy->divergent = store->src[0].ssa->divergent;
-   nir_instr_rewrite_src_ssa(&store->instr, &store->src[0], copy);
+   nir_src_rewrite(&store->src[0], copy);
 }
 
 static void
diff --git a/src/freedreno/vulkan/tu_shader.cc b/src/freedreno/vulkan/tu_shader.cc
index e4f8c47691a..b9ed69c0b78 100644
--- a/src/freedreno/vulkan/tu_shader.cc
+++ b/src/freedreno/vulkan/tu_shader.cc
@@ -291,7 +291,7 @@ lower_ssbo_ubo_intrinsic(struct tu_device *dev,
    if (nir_scalar_is_const(scalar_idx)) {
       nir_def *bindless =
          nir_bindless_resource_ir3(b, 32, descriptor_idx, .desc_set = nir_scalar_as_uint(scalar_idx));
-      nir_instr_rewrite_src_ssa(&intrin->instr, &intrin->src[buffer_src], bindless);
+      nir_src_rewrite(&intrin->src[buffer_src], bindless);
       return;
    }
 
diff --git a/src/gallium/drivers/d3d12/d3d12_lower_image_casts.c b/src/gallium/drivers/d3d12/d3d12_lower_image_casts.c
index 35b82a9a467..4dc1c86bbb6 100644
--- a/src/gallium/drivers/d3d12/d3d12_lower_image_casts.c
+++ b/src/gallium/drivers/d3d12/d3d12_lower_image_casts.c
@@ -237,7 +237,7 @@ lower_image_cast_instr(nir_builder *b, nir_instr *instr, void *_data)
       nir_def_rewrite_uses_after(value, new_value, new_value->parent_instr);
       nir_intrinsic_set_dest_type(intr, alu_type);
    } else {
-      nir_instr_rewrite_src_ssa(instr, &intr->src[3], new_value);
+      nir_src_rewrite(&intr->src[3], new_value);
       nir_intrinsic_set_src_type(intr, alu_type);
    }
    nir_intrinsic_set_format(intr, emulation_format);
diff --git a/src/gallium/drivers/freedreno/ir3/ir3_descriptor.c b/src/gallium/drivers/freedreno/ir3/ir3_descriptor.c
index ae845e23598..2cef3ea75fa 100644
--- a/src/gallium/drivers/freedreno/ir3/ir3_descriptor.c
+++ b/src/gallium/drivers/freedreno/ir3/ir3_descriptor.c
@@ -72,7 +72,7 @@ lower_intrinsic(nir_builder *b, nir_intrinsic_instr *intr)
     */
    src = nir_umod_imm(b, src, IR3_BINDLESS_DESC_COUNT);
    nir_def *bindless = nir_bindless_resource_ir3(b, 32, src, set);
-   nir_instr_rewrite_src_ssa(&intr->instr, &intr->src[buffer_src], bindless);
+   nir_src_rewrite(&intr->src[buffer_src], bindless);
 
    return true;
 }
diff --git a/src/gallium/drivers/r600/sfn/sfn_nir_legalize_image_load_store.cpp b/src/gallium/drivers/r600/sfn/sfn_nir_legalize_image_load_store.cpp
index 904aaf3daa0..47dd4785ecd 100644
--- a/src/gallium/drivers/r600/sfn/sfn_nir_legalize_image_load_store.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_nir_legalize_image_load_store.cpp
@@ -62,7 +62,7 @@ r600_legalize_image_load_store_impl(nir_builder *b,
          nir_umin(b,
                   ir->src[0].ssa,
                   nir_imm_int(b, b->shader->info.num_images - 1));
-      nir_instr_rewrite_src_ssa(instr, &ir->src[0], new_index);
+      nir_src_rewrite(&ir->src[0], new_index);
 
       enum glsl_sampler_dim dim = nir_intrinsic_image_dim(ir);
 
diff --git a/src/gallium/drivers/radeonsi/si_nir_lower_abi.c b/src/gallium/drivers/radeonsi/si_nir_lower_abi.c
index 010df9efc09..844e0455428 100644
--- a/src/gallium/drivers/radeonsi/si_nir_lower_abi.c
+++ b/src/gallium/drivers/radeonsi/si_nir_lower_abi.c
@@ -755,7 +755,7 @@ static bool lower_tex(nir_builder *b, nir_instr *instr, struct lower_abi_state *
       nir_def *clamped = nir_fsat(b, compare);
       compare = nir_bcsel(b, upgraded, clamped, compare);
 
-      nir_instr_rewrite_src_ssa(instr, &tex->src[comp_index].src, compare);
+      nir_src_rewrite(&tex->src[comp_index].src, compare);
       return true;
    }
 
diff --git a/src/gallium/drivers/radeonsi/si_nir_lower_resource.c b/src/gallium/drivers/radeonsi/si_nir_lower_resource.c
index b63839eb4ec..74c7a78a38c 100644
--- a/src/gallium/drivers/radeonsi/si_nir_lower_resource.c
+++ b/src/gallium/drivers/radeonsi/si_nir_lower_resource.c
@@ -267,7 +267,7 @@ static bool lower_resource_intrinsic(nir_builder *b, nir_intrinsic_instr *intrin
       assert(!(nir_intrinsic_access(intrin) & ACCESS_NON_UNIFORM));
 
       nir_def *desc = load_ubo_desc(b, intrin->src[0].ssa, s);
-      nir_instr_rewrite_src_ssa(&intrin->instr, &intrin->src[0], desc);
+      nir_src_rewrite(&intrin->src[0], desc);
       break;
    }
    case nir_intrinsic_load_ssbo:
@@ -276,14 +276,14 @@ static bool lower_resource_intrinsic(nir_builder *b, nir_intrinsic_instr *intrin
       assert(!(nir_intrinsic_access(intrin) & ACCESS_NON_UNIFORM));
 
       nir_def *desc = load_ssbo_desc(b, &intrin->src[0], s);
-      nir_instr_rewrite_src_ssa(&intrin->instr, &intrin->src[0], desc);
+      nir_src_rewrite(&intrin->src[0], desc);
       break;
    }
    case nir_intrinsic_store_ssbo: {
       assert(!(nir_intrinsic_access(intrin) & ACCESS_NON_UNIFORM));
 
       nir_def *desc = load_ssbo_desc(b, &intrin->src[1], s);
-      nir_instr_rewrite_src_ssa(&intrin->instr, &intrin->src[1], desc);
+      nir_src_rewrite(&intrin->src[1], desc);
       break;
    }
    case nir_intrinsic_get_ssbo_size: {
@@ -533,13 +533,13 @@ static bool lower_resource_tex(nir_builder *b, nir_tex_instr *tex,
          tex->src[i].src_type = nir_tex_src_texture_handle;
          FALLTHROUGH;
       case nir_tex_src_texture_handle:
-         nir_instr_rewrite_src_ssa(&tex->instr, &tex->src[i].src, image);
+         nir_src_rewrite(&tex->src[i].src, image);
          break;
       case nir_tex_src_sampler_deref:
          tex->src[i].src_type = nir_tex_src_sampler_handle;
          FALLTHROUGH;
       case nir_tex_src_sampler_handle:
-         nir_instr_rewrite_src_ssa(&tex->instr, &tex->src[i].src, sampler);
+         nir_src_rewrite(&tex->src[i].src, sampler);
          break;
       default:
          break;
diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 720ac7dd718..d0bf933d9cc 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -1678,7 +1678,7 @@ static bool clamp_vertex_color_instr(nir_builder *b, nir_instr *instr, void *sta
    nir_def *color = intrin->src[0].ssa;
    nir_def *clamp = nir_load_clamp_vertex_color_amd(b);
    nir_def *new_color = nir_bcsel(b, clamp, nir_fsat(b, color), color);
-   nir_instr_rewrite_src_ssa(instr, &intrin->src[0], new_color);
+   nir_src_rewrite(&intrin->src[0], new_color);
 
    return true;
 }
diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c
index 17b46c8696c..e7d4fe12e6b 100644
--- a/src/gallium/drivers/zink/zink_compiler.c
+++ b/src/gallium/drivers/zink/zink_compiler.c
@@ -4122,7 +4122,7 @@ lower_bindless_instr(nir_builder *b, nir_instr *in, void *data)
       nir_deref_instr *deref = nir_build_deref_var(b, var);
       if (glsl_type_is_array(var->type))
          deref = nir_build_deref_array(b, deref, nir_u2uN(b, tex->src[idx].src.ssa, 32));
-      nir_instr_rewrite_src_ssa(in, &tex->src[idx].src, &deref->def);
+      nir_src_rewrite(&tex->src[idx].src, &deref->def);
 
       /* bindless sampling uses the variable type directly, which means the tex instr has to exactly
        * match up with it in contrast to normal sampler ops where things are a bit more flexible;
@@ -4137,7 +4137,7 @@ lower_bindless_instr(nir_builder *b, nir_instr *in, void *data)
       unsigned coord_components = nir_src_num_components(tex->src[c].src);
       if (coord_components < needed_components) {
          nir_def *def = nir_pad_vector(b, tex->src[c].src.ssa, needed_components);
-         nir_instr_rewrite_src_ssa(in, &tex->src[c].src, def);
+         nir_src_rewrite(&tex->src[c].src, def);
          tex->coord_components = needed_components;
       }
       return true;
@@ -4176,7 +4176,7 @@ lower_bindless_instr(nir_builder *b, nir_instr *in, void *data)
    nir_deref_instr *deref = nir_build_deref_var(b, var);
    if (glsl_type_is_array(var->type))
       deref = nir_build_deref_array(b, deref, nir_u2uN(b, instr->src[0].ssa, 32));
-   nir_instr_rewrite_src_ssa(in, &instr->src[0], &deref->def);
+   nir_src_rewrite(&instr->src[0], &deref->def);
    return true;
 }
 
@@ -4355,7 +4355,7 @@ convert_1d_shadow_tex(nir_builder *b, nir_instr *instr, void *data)
          def = nir_vec2(b, tex->src[c].src.ssa, zero);
       else
          def = nir_vec3(b, nir_channel(b, tex->src[c].src.ssa, 0), zero, nir_channel(b, tex->src[c].src.ssa, 1));
-      nir_instr_rewrite_src_ssa(instr, &tex->src[c].src, def);
+      nir_src_rewrite(&tex->src[c].src, def);
    }
    b->cursor = nir_after_instr(instr);
    unsigned needed_components = nir_tex_instr_dest_size(tex);
diff --git a/src/gallium/frontends/lavapipe/lvp_lower_vulkan_resource.c b/src/gallium/frontends/lavapipe/lvp_lower_vulkan_resource.c
index 23b1c1b2a7c..c635cc9f541 100644
--- a/src/gallium/frontends/lavapipe/lvp_lower_vulkan_resource.c
+++ b/src/gallium/frontends/lavapipe/lvp_lower_vulkan_resource.c
@@ -130,7 +130,7 @@ static void lower_vri_instr_tex(struct nir_builder *b,
       }
 
       nir_def *resource = vulkan_resource_from_deref(b, deref, layout);
-      nir_instr_rewrite_src_ssa(&tex->instr, &tex->src[i].src, resource);
+      nir_src_rewrite(&tex->src[i].src, resource);
    }
 }
 
diff --git a/src/intel/compiler/brw_nir_clamp_per_vertex_loads.c b/src/intel/compiler/brw_nir_clamp_per_vertex_loads.c
index ba02129f268..c497101e6e4 100644
--- a/src/intel/compiler/brw_nir_clamp_per_vertex_loads.c
+++ b/src/intel/compiler/brw_nir_clamp_per_vertex_loads.c
@@ -58,11 +58,8 @@ clamp_per_vertex_loads_instr(nir_builder *b, nir_instr *instr, void *cb_data)
 
       b->cursor = nir_before_instr(&path.path[i]->instr);
 
-      nir_instr_rewrite_src_ssa(&path.path[i]->instr,
-                                &path.path[i]->arr.index,
-                                nir_umin(b,
-                                         path.path[i]->arr.index.ssa,
-                                         nir_iadd_imm(b, nir_load_patch_vertices_in(b), -1)));
+      nir_src_rewrite(&path.path[i]->arr.index,
+                      nir_umin(b, path.path[i]->arr.index.ssa, nir_iadd_imm(b, nir_load_patch_vertices_in(b), -1)));
 
       progress = true;
       break;
diff --git a/src/intel/vulkan/anv_nir_lower_resource_intel.c b/src/intel/vulkan/anv_nir_lower_resource_intel.c
index b219031ac18..ba213f7f165 100644
--- a/src/intel/vulkan/anv_nir_lower_resource_intel.c
+++ b/src/intel/vulkan/anv_nir_lower_resource_intel.c
@@ -148,13 +148,13 @@ lower_resource_intel(nir_builder *b, nir_instr *instr, void *data)
             binding_offset = nir_ishl_imm(b, binding_offset, 6);
       }
 
-      nir_instr_rewrite_src_ssa(instr, &intrin->src[1],
-                                nir_iadd(b, set_offset, binding_offset));
+      nir_src_rewrite(&intrin->src[1],
+                      nir_iadd(b, set_offset, binding_offset));
    }
 
    /* Now unused values : set offset, array index */
-   nir_instr_rewrite_src_ssa(instr, &intrin->src[0], nir_imm_int(b, 0xdeaddeed));
-   nir_instr_rewrite_src_ssa(instr, &intrin->src[2], nir_imm_int(b, 0xdeaddeed));
+   nir_src_rewrite(&intrin->src[0], nir_imm_int(b, 0xdeaddeed));
+   nir_src_rewrite(&intrin->src[2], nir_imm_int(b, 0xdeaddeed));
 
    return true;
 }
diff --git a/src/mesa/state_tracker/st_atifs_to_nir.c b/src/mesa/state_tracker/st_atifs_to_nir.c
index 42eaf7a0ea6..0ad01d8408d 100644
--- a/src/mesa/state_tracker/st_atifs_to_nir.c
+++ b/src/mesa/state_tracker/st_atifs_to_nir.c
@@ -517,8 +517,8 @@ st_nir_lower_atifs_samplers_instr(nir_builder *b, nir_instr *instr, void *data)
     */
    if (coord_components != tex->coord_components) {
       nir_def *coords = nir_ssa_for_src(b, tex->src[coords_idx].src, tex->coord_components);
-      nir_instr_rewrite_src_ssa(instr, &tex->src[coords_idx].src,
-                                nir_resize_vector(b, coords, coord_components));
+      nir_src_rewrite(&tex->src[coords_idx].src,
+                      nir_resize_vector(b, coords, coord_components));
       tex->coord_components = coord_components;
    }
 
diff --git a/src/mesa/state_tracker/st_nir_lower_fog.c b/src/mesa/state_tracker/st_nir_lower_fog.c
index 76aea99f83e..2b016dcfa9f 100644
--- a/src/mesa/state_tracker/st_nir_lower_fog.c
+++ b/src/mesa/state_tracker/st_nir_lower_fog.c
@@ -102,7 +102,8 @@ st_nir_lower_fog_instr(nir_builder *b, nir_instr *instr, void *_state)
    /* retain the non-fog-blended alpha value for color */
    color = nir_vector_insert_imm(b, fog, nir_channel(b, color, 3), 3);
 
-   nir_instr_rewrite_src_ssa(instr, &intr->src[0], nir_resize_vector(b, color, intr->num_components));
+   nir_src_rewrite(&intr->src[0],
+                   nir_resize_vector(b, color, intr->num_components));
 
    return true;
 }
diff --git a/src/microsoft/compiler/dxil_nir.c b/src/microsoft/compiler/dxil_nir.c
index 5712c7293be..7f600640eae 100644
--- a/src/microsoft/compiler/dxil_nir.c
+++ b/src/microsoft/compiler/dxil_nir.c
@@ -1055,7 +1055,8 @@ dxil_nir_lower_double_math_instr(nir_builder *b,
             components[c] = nir_pack_double_2x32_dxil(b, unpacked_double);
             alu->src[i].swizzle[c] = c;
          }
-         nir_instr_rewrite_src_ssa(instr, &alu->src[i].src, nir_vec(b, components, num_components));
+         nir_src_rewrite(&alu->src[i].src,
+                         nir_vec(b, components, num_components));
          progress = true;
       }
    }
@@ -1289,7 +1290,7 @@ redirect_sampler_derefs(struct nir_builder *b, nir_instr *instr, void *data)
    }
 
    nir_deref_path_finish(&path);
-   nir_instr_rewrite_src_ssa(&tex->instr, &tex->src[sampler_idx].src, &new_tail->def);
+   nir_src_rewrite(&tex->src[sampler_idx].src, &new_tail->def);
    return true;
 }
 
@@ -1368,7 +1369,7 @@ redirect_texture_derefs(struct nir_builder *b, nir_instr *instr, void *data)
    }
 
    nir_deref_path_finish(&path);
-   nir_instr_rewrite_src_ssa(&tex->instr, &tex->src[texture_idx].src, &new_tail->def);
+   nir_src_rewrite(&tex->src[texture_idx].src, &new_tail->def);
 
    return true;
 }
@@ -1864,7 +1865,7 @@ update_writes(struct nir_builder *b, nir_instr *instr, void *_state)
          channels[i] = nir_imm_intN_t(b, 0, src->bit_size);
 
    intr->num_components = 4;
-   nir_instr_rewrite_src_ssa(instr, &intr->src[0], nir_vec(b, channels, 4));
+   nir_src_rewrite(&intr->src[0], nir_vec(b, channels, 4));
    nir_intrinsic_set_component(intr, 0);
    nir_intrinsic_set_write_mask(intr, 0xf);
    return true;
diff --git a/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c b/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c
index d3658bb5340..0740ab6a41e 100644
--- a/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c
+++ b/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c
@@ -844,7 +844,7 @@ lower_view_index_to_rt_layer_instr(nir_builder *b, nir_instr *instr, void *data)
    nir_def *layer = intr->src[1].ssa;
    nir_def *new_layer = nir_iadd(b, layer,
                                      nir_load_view_index(b));
-   nir_instr_rewrite_src_ssa(instr, &intr->src[1], new_layer);
+   nir_src_rewrite(&intr->src[1], new_layer);
    return true;
 }
 
diff --git a/src/microsoft/spirv_to_dxil/dxil_spirv_nir_lower_bindless.c b/src/microsoft/spirv_to_dxil/dxil_spirv_nir_lower_bindless.c
index eea5aaea98d..aa2c92a8a6c 100644
--- a/src/microsoft/spirv_to_dxil/dxil_spirv_nir_lower_bindless.c
+++ b/src/microsoft/spirv_to_dxil/dxil_spirv_nir_lower_bindless.c
@@ -130,7 +130,7 @@ lower_bindless_tex_src(nir_builder *b, nir_tex_instr *tex,
    if (!handle)
       return false;
 
-   nir_instr_rewrite_src_ssa(&tex->instr, &tex->src[index].src, handle);
+   nir_src_rewrite(&tex->src[index].src, handle);
    tex->src[index].src_type = new;
    return true;
 }
diff --git a/src/nouveau/vulkan/nvk_nir_lower_descriptors.c b/src/nouveau/vulkan/nvk_nir_lower_descriptors.c
index b18544363e0..9a8e6ed661c 100644
--- a/src/nouveau/vulkan/nvk_nir_lower_descriptors.c
+++ b/src/nouveau/vulkan/nvk_nir_lower_descriptors.c
@@ -390,17 +390,13 @@ lower_tex(nir_builder *b, nir_tex_instr *tex,
    /* TODO: The nv50 back-end assumes it gets handles both places, even for
     * texelFetch.
     */
-   nir_instr_rewrite_src_ssa(&tex->instr,
-                             &tex->src[texture_src_idx].src,
-                             combined_handle);
+   nir_src_rewrite(&tex->src[texture_src_idx].src, combined_handle);
    tex->src[texture_src_idx].src_type = nir_tex_src_texture_handle;
 
    if (sampler_src_idx < 0) {
       nir_tex_instr_add_src(tex, nir_tex_src_sampler_handle, combined_handle);
    } else {
-      nir_instr_rewrite_src_ssa(&tex->instr,
-                                &tex->src[sampler_src_idx].src,
-                                combined_handle);
+      nir_src_rewrite(&tex->src[sampler_src_idx].src, combined_handle);
       tex->src[sampler_src_idx].src_type = nir_tex_src_sampler_handle;
    }
 
diff --git a/src/panfrost/compiler/bifrost_compile.c b/src/panfrost/compiler/bifrost_compile.c
index 1c8b548428e..0deb60820fe 100644
--- a/src/panfrost/compiler/bifrost_compile.c
+++ b/src/panfrost/compiler/bifrost_compile.c
@@ -4299,7 +4299,7 @@ bifrost_nir_lower_blend_components(struct nir_builder *b, nir_instr *instr,
                bifrost_nir_valid_channel(b, in, 3, first, mask));
 
    /* Rewrite to use our replicated version */
-   nir_instr_rewrite_src_ssa(instr, &intr->src[0], replicated);
+   nir_src_rewrite(&intr->src[0], replicated);
    nir_intrinsic_set_component(intr, 0);
    nir_intrinsic_set_write_mask(intr, 0xF);
    intr->num_components = 4;
@@ -4592,8 +4592,8 @@ bi_lower_sample_mask_writes(nir_builder *b, nir_instr *instr, void *data)
 
    nir_def *orig = nir_load_sample_mask(b);
 
-   nir_instr_rewrite_src_ssa(
-      instr, &intr->src[0],
+   nir_src_rewrite(
+      &intr->src[0],
       nir_b32csel(b, nir_load_multisampled_pan(b),
                   nir_iand(b, orig, nir_ssa_for_src(b, intr->src[0], 1)),
                   orig));
diff --git a/src/panfrost/util/pan_lower_store_component.c b/src/panfrost/util/pan_lower_store_component.c
index 6393fc14750..7ac3e3d5131 100644
--- a/src/panfrost/util/pan_lower_store_component.c
+++ b/src/panfrost/util/pan_lower_store_component.c
@@ -75,8 +75,7 @@ lower_store_component(nir_builder *b, nir_instr *instr, void *data)
    }
 
    intr->num_components = util_last_bit(mask);
-   nir_instr_rewrite_src_ssa(instr, &intr->src[0],
-                             nir_vec(b, channels, intr->num_components));
+   nir_src_rewrite(&intr->src[0], nir_vec(b, channels, intr->num_components));
 
    nir_intrinsic_set_component(intr, 0);
    nir_intrinsic_set_write_mask(intr, mask);