diff --git a/src/amd/vulkan/radv_nir_lower_ycbcr_textures.c b/src/amd/vulkan/radv_nir_lower_ycbcr_textures.c index 0cfe3ef957e..ced1a83c082 100644 --- a/src/amd/vulkan/radv_nir_lower_ycbcr_textures.c +++ b/src/amd/vulkan/radv_nir_lower_ycbcr_textures.c @@ -298,7 +298,7 @@ try_lower_tex_ycbcr(const struct radv_pipeline_layout *layout, bpcs); } - nir_ssa_def_rewrite_uses(&tex->dest.ssa, nir_src_for_ssa(result)); + nir_ssa_def_rewrite_uses(&tex->dest.ssa, result); nir_instr_remove(&tex->instr); return true; diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index dd5ee93bbb6..d62df297152 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -363,7 +363,7 @@ lower_intrinsics(nir_shader *nir) } nir_ssa_def_rewrite_uses(&intrin->dest.ssa, - nir_src_for_ssa(def)); + def); nir_instr_remove(instr); progress = true; @@ -770,7 +770,7 @@ lower_view_index(nir_shader *nir) b.cursor = nir_before_instr(instr); nir_ssa_def *def = nir_load_var(&b, layer); nir_ssa_def_rewrite_uses(&load->dest.ssa, - nir_src_for_ssa(def)); + def); nir_instr_remove(instr); progress = true; diff --git a/src/broadcom/compiler/v3d_nir_lower_scratch.c b/src/broadcom/compiler/v3d_nir_lower_scratch.c index d23b8be838f..893b6f6ae28 100644 --- a/src/broadcom/compiler/v3d_nir_lower_scratch.c +++ b/src/broadcom/compiler/v3d_nir_lower_scratch.c @@ -78,7 +78,7 @@ v3d_nir_lower_load_scratch(nir_builder *b, nir_intrinsic_instr *instr) } nir_ssa_def *result = nir_vec(b, chans, instr->num_components); - nir_ssa_def_rewrite_uses(&instr->dest.ssa, nir_src_for_ssa(result)); + nir_ssa_def_rewrite_uses(&instr->dest.ssa, result); nir_instr_remove(&instr->instr); } diff --git a/src/broadcom/vulkan/v3dv_pipeline.c b/src/broadcom/vulkan/v3dv_pipeline.c index 2d623625f1e..66dc139a2bb 100644 --- a/src/broadcom/vulkan/v3dv_pipeline.c +++ b/src/broadcom/vulkan/v3dv_pipeline.c @@ -641,7 +641,7 @@ lower_vulkan_resource_index(nir_builder *b, * second component (unused right now) to zero. */ nir_ssa_def_rewrite_uses(&instr->dest.ssa, - nir_src_for_ssa(nir_imm_int(b, index))); + nir_imm_int(b, index)); nir_instr_remove(&instr->instr); } @@ -860,7 +860,7 @@ lower_intrinsic(nir_builder *b, nir_intrinsic_instr *instr, * lowering */ nir_ssa_def_rewrite_uses(&instr->dest.ssa, - nir_src_for_ssa(nir_imm_int(b, 0))); + nir_imm_int(b, 0)); nir_instr_remove(&instr->instr); return true; @@ -879,7 +879,7 @@ lower_intrinsic(nir_builder *b, nir_intrinsic_instr *instr, * lower the desc back to a vec2, as it is what load_ssbo/ubo expects. */ nir_ssa_def *desc = nir_vec2(b, instr->src[0].ssa, nir_imm_int(b, 0)); - nir_ssa_def_rewrite_uses(&instr->dest.ssa, nir_src_for_ssa(desc)); + nir_ssa_def_rewrite_uses(&instr->dest.ssa, desc); nir_instr_remove(&instr->instr); return true; } diff --git a/src/compiler/glsl/gl_nir_lower_buffers.c b/src/compiler/glsl/gl_nir_lower_buffers.c index a9a74ffce0a..8e678e5789c 100644 --- a/src/compiler/glsl/gl_nir_lower_buffers.c +++ b/src/compiler/glsl/gl_nir_lower_buffers.c @@ -220,7 +220,7 @@ lower_buffer_interface_derefs_impl(nir_function_impl *impl, cast->cast.align_offset = offset % NIR_ALIGN_MUL_MAX; nir_ssa_def_rewrite_uses(&deref->dest.ssa, - nir_src_for_ssa(&cast->dest.ssa)); + &cast->dest.ssa); nir_deref_instr_remove_if_unused(deref); break; } diff --git a/src/compiler/nir/nir.c b/src/compiler/nir/nir.c index 91538adc781..ab211b602b4 100644 --- a/src/compiler/nir/nir.c +++ b/src/compiler/nir/nir.c @@ -1352,7 +1352,7 @@ nir_ssa_dest_init(nir_instr *instr, nir_dest *dest, } void -nir_ssa_def_rewrite_uses_ssa(nir_ssa_def *def, nir_ssa_def *new_ssa) +nir_ssa_def_rewrite_uses(nir_ssa_def *def, nir_ssa_def *new_ssa) { assert(def != new_ssa); nir_foreach_use_safe(use_src, def) @@ -1362,17 +1362,11 @@ nir_ssa_def_rewrite_uses_ssa(nir_ssa_def *def, nir_ssa_def *new_ssa) nir_if_rewrite_condition_ssa(use_src->parent_if, use_src, new_ssa); } -void -nir_ssa_def_rewrite_uses(nir_ssa_def *def, nir_src new_src) -{ - nir_ssa_def_rewrite_uses_src(def, new_src); -} - void nir_ssa_def_rewrite_uses_src(nir_ssa_def *def, nir_src new_src) { if (new_src.is_ssa) { - nir_ssa_def_rewrite_uses_ssa(def, new_src.ssa); + nir_ssa_def_rewrite_uses(def, new_src.ssa); } else { nir_foreach_use_safe(use_src, def) nir_instr_rewrite_src(use_src->parent_instr, use_src, new_src); diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h index e49480085a9..752dafcfd07 100644 --- a/src/compiler/nir/nir.h +++ b/src/compiler/nir/nir.h @@ -3945,8 +3945,7 @@ nir_ssa_dest_init_for_type(nir_instr *instr, nir_dest *dest, nir_ssa_dest_init(instr, dest, glsl_get_components(type), glsl_get_bit_size(type), name); } -void nir_ssa_def_rewrite_uses(nir_ssa_def *def, nir_src new_src); -void nir_ssa_def_rewrite_uses_ssa(nir_ssa_def *def, nir_ssa_def *new_ssa); +void nir_ssa_def_rewrite_uses(nir_ssa_def *def, nir_ssa_def *new_ssa); void nir_ssa_def_rewrite_uses_src(nir_ssa_def *def, nir_src new_src); void nir_ssa_def_rewrite_uses_after(nir_ssa_def *def, nir_src new_src, nir_instr *after_me); diff --git a/src/compiler/nir/nir_control_flow.c b/src/compiler/nir/nir_control_flow.c index d48292f4bdf..59a7524b974 100644 --- a/src/compiler/nir/nir_control_flow.c +++ b/src/compiler/nir/nir_control_flow.c @@ -620,7 +620,7 @@ replace_ssa_def_uses(nir_ssa_def *def, void *void_impl) nir_ssa_undef_instr_create(mem_ctx, def->num_components, def->bit_size); nir_instr_insert_before_cf_list(&impl->body, &undef->instr); - nir_ssa_def_rewrite_uses(def, nir_src_for_ssa(&undef->def)); + nir_ssa_def_rewrite_uses(def, &undef->def); return true; } diff --git a/src/compiler/nir/nir_deref.c b/src/compiler/nir/nir_deref.c index 540603c32de..6e6c10a7cc6 100644 --- a/src/compiler/nir/nir_deref.c +++ b/src/compiler/nir/nir_deref.c @@ -1021,7 +1021,7 @@ opt_remove_sampler_cast(nir_deref_instr *cast) /* We're a cast from a more detailed sampler type to a bare sampler */ nir_ssa_def_rewrite_uses(&cast->dest.ssa, - nir_src_for_ssa(&parent->dest.ssa)); + &parent->dest.ssa); nir_instr_remove(&cast->instr); /* Recursively crawl the deref tree and clean up types */ @@ -1059,7 +1059,7 @@ opt_replace_struct_wrapper_cast(nir_builder *b, nir_deref_instr *cast) return false; nir_deref_instr *replace = nir_build_deref_struct(b, parent, 0); - nir_ssa_def_rewrite_uses(&cast->dest.ssa, nir_src_for_ssa(&replace->dest.ssa)); + nir_ssa_def_rewrite_uses(&cast->dest.ssa, &replace->dest.ssa); nir_deref_instr_remove_if_unused(cast); return true; } @@ -1135,7 +1135,7 @@ opt_deref_ptr_as_array(nir_builder *b, nir_deref_instr *deref) is_trivial_deref_cast(parent)) parent = nir_deref_instr_parent(parent); nir_ssa_def_rewrite_uses(&deref->dest.ssa, - nir_src_for_ssa(&parent->dest.ssa)); + &parent->dest.ssa); nir_instr_remove(&deref->instr); return true; } @@ -1320,7 +1320,7 @@ opt_known_deref_mode_is(nir_builder *b, nir_intrinsic_instr *intrin) if (deref_is == NULL) return false; - nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_src_for_ssa(deref_is)); + nir_ssa_def_rewrite_uses(&intrin->dest.ssa, deref_is); nir_instr_remove(&intrin->instr); return true; } diff --git a/src/compiler/nir/nir_from_ssa.c b/src/compiler/nir/nir_from_ssa.c index ad8df587eaf..e3b2d16a8fb 100644 --- a/src/compiler/nir/nir_from_ssa.c +++ b/src/compiler/nir/nir_from_ssa.c @@ -404,7 +404,7 @@ isolate_phi_nodes_block(nir_block *block, void *dead_ctx) exec_list_push_tail(&block_pcopy->entries, &entry->node); nir_ssa_def_rewrite_uses(&phi->dest.ssa, - nir_src_for_ssa(&entry->dest.ssa)); + &entry->dest.ssa); nir_instr_rewrite_src(&block_pcopy->instr, &entry->src, nir_src_for_ssa(&phi->dest.ssa)); @@ -970,7 +970,7 @@ nir_lower_phis_to_regs_block(nir_block *block) b.cursor = nir_after_instr(&phi->instr); nir_ssa_def *def = nir_load_reg(&b, reg); - nir_ssa_def_rewrite_uses(&phi->dest.ssa, nir_src_for_ssa(def)); + nir_ssa_def_rewrite_uses(&phi->dest.ssa, def); nir_foreach_phi_src(src, phi) { assert(src->src.is_ssa); diff --git a/src/compiler/nir/nir_inline_functions.c b/src/compiler/nir/nir_inline_functions.c index c81c6c4e9a8..b1399897be5 100644 --- a/src/compiler/nir/nir_inline_functions.c +++ b/src/compiler/nir/nir_inline_functions.c @@ -84,7 +84,7 @@ void nir_inline_function_impl(struct nir_builder *b, assert(param_idx < impl->function->num_params); assert(load->dest.is_ssa); nir_ssa_def_rewrite_uses(&load->dest.ssa, - nir_src_for_ssa(params[param_idx])); + params[param_idx]); /* Remove any left-over load_param intrinsics because they're soon * to be in another function and therefore no longer valid. diff --git a/src/compiler/nir/nir_inline_uniforms.c b/src/compiler/nir/nir_inline_uniforms.c index 8fdcd2dfeb2..3e0030bbda2 100644 --- a/src/compiler/nir/nir_inline_uniforms.c +++ b/src/compiler/nir/nir_inline_uniforms.c @@ -186,7 +186,7 @@ nir_inline_uniforms(nir_shader *shader, unsigned num_uniforms, if (offset == uniform_dw_offsets[i] * 4) { b.cursor = nir_before_instr(&intr->instr); nir_ssa_def *def = nir_imm_int(&b, uniform_values[i]); - nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(def)); + nir_ssa_def_rewrite_uses(&intr->dest.ssa, def); nir_instr_remove(&intr->instr); break; } diff --git a/src/compiler/nir/nir_instr_set.c b/src/compiler/nir/nir_instr_set.c index 9220ed49bf5..5a3a0f0cada 100644 --- a/src/compiler/nir/nir_instr_set.c +++ b/src/compiler/nir/nir_instr_set.c @@ -821,7 +821,7 @@ nir_instr_set_add_or_rewrite(struct set *instr_set, nir_instr *instr) if (instr->type == nir_instr_type_alu && nir_instr_as_alu(instr)->exact) nir_instr_as_alu(match)->exact = true; - nir_ssa_def_rewrite_uses_ssa(def, new_def); + nir_ssa_def_rewrite_uses(def, new_def); return true; } diff --git a/src/compiler/nir/nir_linking_helpers.c b/src/compiler/nir/nir_linking_helpers.c index af34fbc213f..2b3b16f4558 100644 --- a/src/compiler/nir/nir_linking_helpers.c +++ b/src/compiler/nir/nir_linking_helpers.c @@ -945,7 +945,7 @@ replace_constant_input(nir_shader *shader, nir_intrinsic_instr *store_intr) intr->dest.ssa.bit_size, out_const->value); - nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(nconst)); + nir_ssa_def_rewrite_uses(&intr->dest.ssa, nconst); progress = true; } @@ -992,7 +992,7 @@ replace_duplicate_input(nir_shader *shader, nir_variable *input_var, b.cursor = nir_before_instr(instr); nir_ssa_def *load = nir_load_var(&b, input_var); - nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(load)); + nir_ssa_def_rewrite_uses(&intr->dest.ssa, load); progress = true; } diff --git a/src/compiler/nir/nir_lower_alu.c b/src/compiler/nir/nir_lower_alu.c index 19c3e4f199d..c11a88d7496 100644 --- a/src/compiler/nir/nir_lower_alu.c +++ b/src/compiler/nir/nir_lower_alu.c @@ -216,7 +216,7 @@ lower_alu_instr(nir_alu_instr *instr, nir_builder *b) } if (lowered) { - nir_ssa_def_rewrite_uses(&instr->dest.dest.ssa, nir_src_for_ssa(lowered)); + nir_ssa_def_rewrite_uses(&instr->dest.dest.ssa, lowered); nir_instr_remove(&instr->instr); return true; } else { diff --git a/src/compiler/nir/nir_lower_array_deref_of_vec.c b/src/compiler/nir/nir_lower_array_deref_of_vec.c index 12a376dd654..2459bbe046e 100644 --- a/src/compiler/nir/nir_lower_array_deref_of_vec.c +++ b/src/compiler/nir/nir_lower_array_deref_of_vec.c @@ -151,7 +151,7 @@ nir_lower_array_deref_of_vec_impl(nir_function_impl *impl, nir_vector_extract(&b, &intrin->dest.ssa, index); if (scalar->parent_instr->type == nir_instr_type_ssa_undef) { nir_ssa_def_rewrite_uses(&intrin->dest.ssa, - nir_src_for_ssa(scalar)); + scalar); nir_instr_remove(&intrin->instr); } else { nir_ssa_def_rewrite_uses_after(&intrin->dest.ssa, diff --git a/src/compiler/nir/nir_lower_atomics_to_ssbo.c b/src/compiler/nir/nir_lower_atomics_to_ssbo.c index f9df9b1027f..99b6612e00a 100644 --- a/src/compiler/nir/nir_lower_atomics_to_ssbo.c +++ b/src/compiler/nir/nir_lower_atomics_to_ssbo.c @@ -146,9 +146,9 @@ lower_instr(nir_intrinsic_instr *instr, unsigned ssbo_offset, nir_builder *b) if (instr->intrinsic == nir_intrinsic_atomic_counter_pre_dec) { b->cursor = nir_after_instr(&new_instr->instr); nir_ssa_def *result = nir_iadd(b, &new_instr->dest.ssa, temp); - nir_ssa_def_rewrite_uses(&instr->dest.ssa, nir_src_for_ssa(result)); + nir_ssa_def_rewrite_uses(&instr->dest.ssa, result); } else { - nir_ssa_def_rewrite_uses(&instr->dest.ssa, nir_src_for_ssa(&new_instr->dest.ssa)); + nir_ssa_def_rewrite_uses(&instr->dest.ssa, &new_instr->dest.ssa); } return true; diff --git a/src/compiler/nir/nir_lower_bit_size.c b/src/compiler/nir/nir_lower_bit_size.c index 81bc4489d97..2527efc369c 100644 --- a/src/compiler/nir/nir_lower_bit_size.c +++ b/src/compiler/nir/nir_lower_bit_size.c @@ -89,9 +89,9 @@ lower_alu_instr(nir_builder *bld, nir_alu_instr *alu, unsigned bit_size) dst_bit_size != bit_size) { nir_alu_type type = nir_op_infos[op].output_type; nir_ssa_def *dst = nir_convert_to_bit_size(bld, lowered_dst, type, dst_bit_size); - nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, nir_src_for_ssa(dst)); + nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, dst); } else { - nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, nir_src_for_ssa(lowered_dst)); + nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, lowered_dst); } } @@ -175,7 +175,7 @@ lower_intrinsic_instr(nir_builder *b, nir_intrinsic_instr *intrin, intrin->intrinsic != nir_intrinsic_vote_ieq) res = nir_u2u(b, res, old_bit_size); - nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_src_for_ssa(res)); + nir_ssa_def_rewrite_uses(&intrin->dest.ssa, res); break; } @@ -314,7 +314,7 @@ split_phi(nir_builder *b, nir_phi_instr *phi) b->cursor = nir_after_phis(nir_cursor_current_block(b->cursor)); nir_ssa_def *merged = nir_pack_64_2x32_split(b, &lowered[0]->dest.ssa, &lowered[1]->dest.ssa); - nir_ssa_def_rewrite_uses(&phi->dest.ssa, nir_src_for_ssa(merged)); + nir_ssa_def_rewrite_uses(&phi->dest.ssa, merged); nir_instr_remove(&phi->instr); } diff --git a/src/compiler/nir/nir_lower_bool_to_float.c b/src/compiler/nir/nir_lower_bool_to_float.c index edd8b04dc80..8247430d7d9 100644 --- a/src/compiler/nir/nir_lower_bool_to_float.c +++ b/src/compiler/nir/nir_lower_bool_to_float.c @@ -117,7 +117,7 @@ lower_alu_instr(nir_builder *b, nir_alu_instr *alu) if (rep) { /* We've emitted a replacement instruction */ - nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, nir_src_for_ssa(rep)); + nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, rep); nir_instr_remove(&alu->instr); } else { if (alu->dest.dest.ssa.bit_size == 1) diff --git a/src/compiler/nir/nir_lower_cl_images_to_tex.c b/src/compiler/nir/nir_lower_cl_images_to_tex.c index 71cbadad5f2..3cd224bcf91 100644 --- a/src/compiler/nir/nir_lower_cl_images_to_tex.c +++ b/src/compiler/nir/nir_lower_cl_images_to_tex.c @@ -132,7 +132,7 @@ lower_cl_images_to_tex_impl(nir_function_impl *impl) res = nir_channels(&b, res, (1 << num_components) - 1); } - nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_src_for_ssa(res)); + nir_ssa_def_rewrite_uses(&intrin->dest.ssa, res); progress = true; } } diff --git a/src/compiler/nir/nir_lower_convert_alu_types.c b/src/compiler/nir/nir_lower_convert_alu_types.c index dcf2d1adfdb..1a5f0d614a3 100644 --- a/src/compiler/nir/nir_lower_convert_alu_types.c +++ b/src/compiler/nir/nir_lower_convert_alu_types.c @@ -63,7 +63,7 @@ lower_convert_alu_types_instr(nir_builder *b, nir_intrinsic_instr *conv) nir_intrinsic_dest_type(conv), nir_intrinsic_rounding_mode(conv), nir_intrinsic_saturate(conv)); - nir_ssa_def_rewrite_uses(&conv->dest.ssa, nir_src_for_ssa(val)); + nir_ssa_def_rewrite_uses(&conv->dest.ssa, val); } static bool diff --git a/src/compiler/nir/nir_lower_discard_or_demote.c b/src/compiler/nir/nir_lower_discard_or_demote.c index 037022503e8..5857dcaa76d 100644 --- a/src/compiler/nir/nir_lower_discard_or_demote.c +++ b/src/compiler/nir/nir_lower_discard_or_demote.c @@ -67,7 +67,7 @@ nir_lower_demote_to_discard_instr(nir_builder *b, nir_instr *instr, void *data) * we can assume there are none */ b->cursor = nir_before_instr(instr); nir_ssa_def *zero = nir_imm_false(b); - nir_ssa_def_rewrite_uses_ssa(&intrin->dest.ssa, zero); + nir_ssa_def_rewrite_uses(&intrin->dest.ssa, zero); nir_instr_remove_v(instr); return true; } @@ -118,7 +118,7 @@ nir_lower_load_helper_to_is_helper(nir_builder *b, nir_instr *instr, void *data) * top-level blocks to ensure correct behavior w.r.t. loops */ if (is_helper == NULL) is_helper = insert_is_helper(b, instr); - nir_ssa_def_rewrite_uses_ssa(&intrin->dest.ssa, is_helper); + nir_ssa_def_rewrite_uses(&intrin->dest.ssa, is_helper); nir_instr_remove_v(instr); return true; default: diff --git a/src/compiler/nir/nir_lower_drawpixels.c b/src/compiler/nir/nir_lower_drawpixels.c index 6bf34fad1e1..f35b5a647a2 100644 --- a/src/compiler/nir/nir_lower_drawpixels.c +++ b/src/compiler/nir/nir_lower_drawpixels.c @@ -222,7 +222,7 @@ lower_color(lower_drawpixels_state *state, nir_intrinsic_instr *intr) nir_channel(b, def_zw, 1)); } - nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(def)); + nir_ssa_def_rewrite_uses(&intr->dest.ssa, def); } static void @@ -231,7 +231,7 @@ lower_texcoord(lower_drawpixels_state *state, nir_intrinsic_instr *intr) state->b.cursor = nir_before_instr(&intr->instr); nir_ssa_def *texcoord_const = get_texcoord_const(state); - nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(texcoord_const)); + nir_ssa_def_rewrite_uses(&intr->dest.ssa, texcoord_const); } static bool diff --git a/src/compiler/nir/nir_lower_fb_read.c b/src/compiler/nir/nir_lower_fb_read.c index 90924690266..52e8cc5b7e7 100644 --- a/src/compiler/nir/nir_lower_fb_read.c +++ b/src/compiler/nir/nir_lower_fb_read.c @@ -69,7 +69,7 @@ lower_fb_read(nir_builder *b, nir_intrinsic_instr *intr) nir_ssa_dest_init(&tex->instr, &tex->dest, 4, 32, NULL); nir_builder_instr_insert(b, &tex->instr); - nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(&tex->dest.ssa)); + nir_ssa_def_rewrite_uses(&intr->dest.ssa, &tex->dest.ssa); } bool diff --git a/src/compiler/nir/nir_lower_flrp.c b/src/compiler/nir/nir_lower_flrp.c index d9c45877dd0..e23c3c189a5 100644 --- a/src/compiler/nir/nir_lower_flrp.c +++ b/src/compiler/nir/nir_lower_flrp.c @@ -60,7 +60,7 @@ replace_with_strict_ffma(struct nir_builder *bld, struct u_vector *dead_flrp, nir_ssa_def *const outer_ffma = nir_ffma(bld, b, c, inner_ffma); nir_instr_as_alu(outer_ffma->parent_instr)->exact = alu->exact; - nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, nir_src_for_ssa(outer_ffma)); + nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, outer_ffma); /* DO NOT REMOVE the original flrp yet. Many of the lowering choices are * based on other uses of the sources. Removing the flrp may cause the @@ -93,7 +93,7 @@ replace_with_single_ffma(struct nir_builder *bld, struct u_vector *dead_flrp, nir_ssa_def *const final_ffma = nir_ffma(bld, a, one_minus_c, b_times_c); nir_instr_as_alu(final_ffma->parent_instr)->exact = alu->exact; - nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, nir_src_for_ssa(final_ffma)); + nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, final_ffma); /* DO NOT REMOVE the original flrp yet. Many of the lowering choices are * based on other uses of the sources. Removing the flrp may cause the @@ -129,7 +129,7 @@ replace_with_strict(struct nir_builder *bld, struct u_vector *dead_flrp, nir_ssa_def *const sum = nir_fadd(bld, first_product, second_product); nir_instr_as_alu(sum->parent_instr)->exact = alu->exact; - nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, nir_src_for_ssa(sum)); + nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, sum); /* DO NOT REMOVE the original flrp yet. Many of the lowering choices are * based on other uses of the sources. Removing the flrp may cause the @@ -161,7 +161,7 @@ replace_with_fast(struct nir_builder *bld, struct u_vector *dead_flrp, nir_ssa_def *const sum = nir_fadd(bld, a, product); nir_instr_as_alu(sum->parent_instr)->exact = alu->exact; - nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, nir_src_for_ssa(sum)); + nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, sum); /* DO NOT REMOVE the original flrp yet. Many of the lowering choices are * based on other uses of the sources. Removing the flrp may cause the @@ -203,7 +203,7 @@ replace_with_expanded_ffma_and_add(struct nir_builder *bld, nir_ssa_def *const outer_sum = nir_fadd(bld, inner_sum, b_times_c); nir_instr_as_alu(outer_sum->parent_instr)->exact = alu->exact; - nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, nir_src_for_ssa(outer_sum)); + nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, outer_sum); /* DO NOT REMOVE the original flrp yet. Many of the lowering choices are * based on other uses of the sources. Removing the flrp may cause the diff --git a/src/compiler/nir/nir_lower_frexp.c b/src/compiler/nir/nir_lower_frexp.c index ce6c811a965..d4be828afdd 100644 --- a/src/compiler/nir/nir_lower_frexp.c +++ b/src/compiler/nir/nir_lower_frexp.c @@ -180,7 +180,7 @@ lower_frexp_impl(nir_function_impl *impl) } nir_ssa_def_rewrite_uses(&alu_instr->dest.dest.ssa, - nir_src_for_ssa(lower)); + lower); nir_instr_remove(instr); progress = true; } diff --git a/src/compiler/nir/nir_lower_idiv.c b/src/compiler/nir/nir_lower_idiv.c index 06f6b5a435f..1ac511d7cb3 100644 --- a/src/compiler/nir/nir_lower_idiv.c +++ b/src/compiler/nir/nir_lower_idiv.c @@ -129,7 +129,7 @@ convert_instr(nir_builder *bld, nir_alu_instr *alu) } assert(alu->dest.dest.is_ssa); - nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, nir_src_for_ssa(q)); + nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, q); return true; } @@ -231,7 +231,7 @@ convert_instr_precise(nir_builder *bld, nir_alu_instr *alu) res = emit_idiv(bld, numer, denom, op); assert(alu->dest.dest.is_ssa); - nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, nir_src_for_ssa(res)); + nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, res); return true; } diff --git a/src/compiler/nir/nir_lower_indirect_derefs.c b/src/compiler/nir/nir_lower_indirect_derefs.c index 08dbcb1f0d0..a9784355625 100644 --- a/src/compiler/nir/nir_lower_indirect_derefs.c +++ b/src/compiler/nir/nir_lower_indirect_derefs.c @@ -172,7 +172,7 @@ lower_indirect_derefs_block(nir_block *block, nir_builder *b, nir_ssa_def *result; emit_load_store_deref(b, intrin, base, &path.path[1], &result, NULL); - nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_src_for_ssa(result)); + nir_ssa_def_rewrite_uses(&intrin->dest.ssa, result); } nir_deref_path_finish(&path); diff --git a/src/compiler/nir/nir_lower_input_attachments.c b/src/compiler/nir/nir_lower_input_attachments.c index c35c53ad0e0..057a716b874 100644 --- a/src/compiler/nir/nir_lower_input_attachments.c +++ b/src/compiler/nir/nir_lower_input_attachments.c @@ -144,10 +144,10 @@ try_lower_input_load(nir_function_impl *impl, nir_intrinsic_instr *load, nir_ssa_def *res = nir_channels( &b, &tex->dest.ssa, load_result_mask | 0x10); - nir_ssa_def_rewrite_uses(&load->dest.ssa, nir_src_for_ssa(res)); + nir_ssa_def_rewrite_uses(&load->dest.ssa, res); } else { nir_ssa_def_rewrite_uses(&load->dest.ssa, - nir_src_for_ssa(&tex->dest.ssa)); + &tex->dest.ssa); } return true; diff --git a/src/compiler/nir/nir_lower_int_to_float.c b/src/compiler/nir/nir_lower_int_to_float.c index 0b35dc4f3f7..2a9b6803493 100644 --- a/src/compiler/nir/nir_lower_int_to_float.c +++ b/src/compiler/nir/nir_lower_int_to_float.c @@ -108,7 +108,7 @@ lower_alu_instr(nir_builder *b, nir_alu_instr *alu) if (rep) { /* We've emitted a replacement instruction */ - nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, nir_src_for_ssa(rep)); + nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, rep); nir_instr_remove(&alu->instr); } diff --git a/src/compiler/nir/nir_lower_interpolation.c b/src/compiler/nir/nir_lower_interpolation.c index 985764fcd62..84abd9e9ef1 100644 --- a/src/compiler/nir/nir_lower_interpolation.c +++ b/src/compiler/nir/nir_lower_interpolation.c @@ -121,7 +121,7 @@ nir_lower_interpolation_block(nir_block *block, nir_builder *b, comps[i] = val; } nir_ssa_def *vec = nir_vec(b, comps, intr->num_components); - nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(vec)); + nir_ssa_def_rewrite_uses(&intr->dest.ssa, vec); progress = true; } diff --git a/src/compiler/nir/nir_lower_io.c b/src/compiler/nir/nir_lower_io.c index ea060807af6..554c0d26d5d 100644 --- a/src/compiler/nir/nir_lower_io.c +++ b/src/compiler/nir/nir_lower_io.c @@ -652,7 +652,7 @@ nir_lower_io_block(nir_block *block, nir_imm_zero(b, intrin->dest.ssa.num_components, intrin->dest.ssa.bit_size); nir_ssa_def_rewrite_uses(&intrin->dest.ssa, - nir_src_for_ssa(zero)); + zero); } nir_instr_remove(&intrin->instr); @@ -692,7 +692,7 @@ nir_lower_io_block(nir_block *block, if (replacement) { nir_ssa_def_rewrite_uses(&intrin->dest.ssa, - nir_src_for_ssa(replacement)); + replacement); } nir_instr_remove(&intrin->instr); progress = true; @@ -1771,7 +1771,7 @@ nir_lower_explicit_io_instr(nir_builder *b, deref->modes, align_mul, align_offset, intrin->num_components); } - nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_src_for_ssa(value)); + nir_ssa_def_rewrite_uses(&intrin->dest.ssa, value); break; } @@ -1806,7 +1806,7 @@ nir_lower_explicit_io_instr(nir_builder *b, deref->modes, align_mul, align_offset, intrin->num_components); - nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_src_for_ssa(value)); + nir_ssa_def_rewrite_uses(&intrin->dest.ssa, value); break; } @@ -1823,7 +1823,7 @@ nir_lower_explicit_io_instr(nir_builder *b, default: { nir_ssa_def *value = build_explicit_io_atomic(b, intrin, addr, addr_format, deref->modes); - nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_src_for_ssa(value)); + nir_ssa_def_rewrite_uses(&intrin->dest.ssa, value); break; } } @@ -1957,7 +1957,7 @@ lower_explicit_io_deref(nir_builder *b, nir_deref_instr *deref, assert(addr->num_components == deref->dest.ssa.num_components); nir_instr_remove(&deref->instr); - nir_ssa_def_rewrite_uses(&deref->dest.ssa, nir_src_for_ssa(addr)); + nir_ssa_def_rewrite_uses(&deref->dest.ssa, addr); } static void @@ -1991,7 +1991,7 @@ lower_explicit_io_array_length(nir_builder *b, nir_intrinsic_instr *intrin, arr_size = nir_imax(b, nir_isub(b, arr_size, offset), nir_imm_int(b, 0u)); arr_size = nir_idiv(b, arr_size, nir_imm_int(b, stride)); - nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_src_for_ssa(arr_size)); + nir_ssa_def_rewrite_uses(&intrin->dest.ssa, arr_size); nir_instr_remove(&intrin->instr); } @@ -2018,7 +2018,7 @@ lower_explicit_io_mode_check(nir_builder *b, nir_intrinsic_instr *intrin, build_runtime_addr_mode_check(b, addr, addr_format, nir_intrinsic_memory_modes(intrin)); - nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_src_for_ssa(is_mode)); + nir_ssa_def_rewrite_uses(&intrin->dest.ssa, is_mode); } static bool diff --git a/src/compiler/nir/nir_lower_io_arrays_to_elements.c b/src/compiler/nir/nir_lower_io_arrays_to_elements.c index 737bfa2dc41..de35b6d0ea8 100644 --- a/src/compiler/nir/nir_lower_io_arrays_to_elements.c +++ b/src/compiler/nir/nir_lower_io_arrays_to_elements.c @@ -121,7 +121,7 @@ lower_array(nir_builder *b, nir_intrinsic_instr *intr, nir_variable *var, nir_ssa_def *zero = nir_imm_zero(b, intr->dest.ssa.num_components, intr->dest.ssa.bit_size); nir_ssa_def_rewrite_uses(&intr->dest.ssa, - nir_src_for_ssa(zero)); + zero); } nir_instr_remove(&intr->instr); return; @@ -186,7 +186,7 @@ lower_array(nir_builder *b, nir_intrinsic_instr *intr, nir_variable *var, } nir_ssa_def_rewrite_uses(&intr->dest.ssa, - nir_src_for_ssa(&element_intr->dest.ssa)); + &element_intr->dest.ssa); } else { nir_intrinsic_set_write_mask(element_intr, nir_intrinsic_write_mask(intr)); diff --git a/src/compiler/nir/nir_lower_io_to_scalar.c b/src/compiler/nir/nir_lower_io_to_scalar.c index e8aca858546..f07733aa731 100644 --- a/src/compiler/nir/nir_lower_io_to_scalar.c +++ b/src/compiler/nir/nir_lower_io_to_scalar.c @@ -60,8 +60,7 @@ lower_load_input_to_scalar(nir_builder *b, nir_intrinsic_instr *intr) } nir_ssa_def_rewrite_uses(&intr->dest.ssa, - nir_src_for_ssa(nir_vec(b, loads, - intr->num_components))); + nir_vec(b, loads, intr->num_components)); nir_instr_remove(&intr->instr); } @@ -231,8 +230,7 @@ lower_load_to_scalar_early(nir_builder *b, nir_intrinsic_instr *intr, } nir_ssa_def_rewrite_uses(&intr->dest.ssa, - nir_src_for_ssa(nir_vec(b, loads, - intr->num_components))); + nir_vec(b, loads, intr->num_components)); /* Remove the old load intrinsic */ nir_instr_remove(&intr->instr); diff --git a/src/compiler/nir/nir_lower_io_to_temporaries.c b/src/compiler/nir/nir_lower_io_to_temporaries.c index eaeea21f499..2cb82353594 100644 --- a/src/compiler/nir/nir_lower_io_to_temporaries.c +++ b/src/compiler/nir/nir_lower_io_to_temporaries.c @@ -246,7 +246,7 @@ fixup_interpolation_instr(struct lower_io_state *state, * correct part of the temporary. */ nir_ssa_def *load = nir_load_deref(b, nir_src_as_deref(interp->src[0])); - nir_ssa_def_rewrite_uses(&interp->dest.ssa, nir_src_for_ssa(load)); + nir_ssa_def_rewrite_uses(&interp->dest.ssa, load); nir_instr_remove(&interp->instr); nir_deref_path_finish(&interp_path); diff --git a/src/compiler/nir/nir_lower_load_const_to_scalar.c b/src/compiler/nir/nir_lower_load_const_to_scalar.c index 197cebd695d..4331b8058cf 100644 --- a/src/compiler/nir/nir_lower_load_const_to_scalar.c +++ b/src/compiler/nir/nir_lower_load_const_to_scalar.c @@ -59,7 +59,7 @@ lower_load_const_instr_scalar(nir_load_const_instr *lower) nir_ssa_def *vec = nir_vec(&b, loads, lower->def.num_components); /* Replace the old load with a reference to our reconstructed vector. */ - nir_ssa_def_rewrite_uses(&lower->def, nir_src_for_ssa(vec)); + nir_ssa_def_rewrite_uses(&lower->def, vec); nir_instr_remove(&lower->instr); return true; } diff --git a/src/compiler/nir/nir_lower_locals_to_regs.c b/src/compiler/nir/nir_lower_locals_to_regs.c index 02f23a6f979..cddc49bc37d 100644 --- a/src/compiler/nir/nir_lower_locals_to_regs.c +++ b/src/compiler/nir/nir_lower_locals_to_regs.c @@ -206,7 +206,7 @@ lower_locals_to_regs_block(nir_block *block, intrin->num_components, intrin->dest.ssa.bit_size, NULL); nir_ssa_def_rewrite_uses(&intrin->dest.ssa, - nir_src_for_ssa(&mov->dest.dest.ssa)); + &mov->dest.dest.ssa); } else { nir_dest_copy(&mov->dest.dest, &intrin->dest, &mov->instr); } diff --git a/src/compiler/nir/nir_lower_multiview.c b/src/compiler/nir/nir_lower_multiview.c index ce273dc8c5e..eea5031a86a 100644 --- a/src/compiler/nir/nir_lower_multiview.c +++ b/src/compiler/nir/nir_lower_multiview.c @@ -306,7 +306,7 @@ nir_lower_multiview(nir_shader *shader, uint32_t view_mask) switch (intrin->intrinsic) { case nir_intrinsic_load_view_index: { assert(intrin->dest.is_ssa); - nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_src_for_ssa(view_index)); + nir_ssa_def_rewrite_uses(&intrin->dest.ssa, view_index); break; } diff --git a/src/compiler/nir/nir_lower_packing.c b/src/compiler/nir/nir_lower_packing.c index ed95d46dd1e..23e22d35f79 100644 --- a/src/compiler/nir/nir_lower_packing.c +++ b/src/compiler/nir/nir_lower_packing.c @@ -136,7 +136,7 @@ lower_pack_impl(nir_function_impl *impl) unreachable("Impossible opcode"); } - nir_ssa_def_rewrite_uses(&alu_instr->dest.dest.ssa, nir_src_for_ssa(dest)); + nir_ssa_def_rewrite_uses(&alu_instr->dest.dest.ssa, dest); nir_instr_remove(&alu_instr->instr); progress = true; } diff --git a/src/compiler/nir/nir_lower_patch_vertices.c b/src/compiler/nir/nir_lower_patch_vertices.c index 8e89268ca41..3f6ccfbfbf4 100644 --- a/src/compiler/nir/nir_lower_patch_vertices.c +++ b/src/compiler/nir/nir_lower_patch_vertices.c @@ -92,7 +92,7 @@ nir_lower_patch_vertices(nir_shader *nir, progress = true; nir_ssa_def_rewrite_uses(&intr->dest.ssa, - nir_src_for_ssa(val)); + val); nir_instr_remove(instr); } } diff --git a/src/compiler/nir/nir_lower_phis_to_scalar.c b/src/compiler/nir/nir_lower_phis_to_scalar.c index f107900e832..c964ad04467 100644 --- a/src/compiler/nir/nir_lower_phis_to_scalar.c +++ b/src/compiler/nir/nir_lower_phis_to_scalar.c @@ -256,7 +256,7 @@ lower_phis_to_scalar_block(nir_block *block, nir_instr_insert_after(&last_phi->instr, &vec->instr); nir_ssa_def_rewrite_uses(&phi->dest.ssa, - nir_src_for_ssa(&vec->dest.dest.ssa)); + &vec->dest.dest.ssa); ralloc_steal(state->dead_ctx, phi); nir_instr_remove(&phi->instr); diff --git a/src/compiler/nir/nir_lower_printf.c b/src/compiler/nir/nir_lower_printf.c index 1dabe6778a1..dec69085ca2 100644 --- a/src/compiler/nir/nir_lower_printf.c +++ b/src/compiler/nir/nir_lower_printf.c @@ -128,7 +128,7 @@ lower_printf_instr(nir_builder *b, nir_instr *instr, void *_options) nir_pop_if(b, NULL); nir_ssa_def *ret_val = nir_if_phi(b, printf_succ_val, printf_fail_val); - nir_ssa_def_rewrite_uses(&prntf->dest.ssa, nir_src_for_ssa(ret_val)); + nir_ssa_def_rewrite_uses(&prntf->dest.ssa, ret_val); nir_instr_remove(&prntf->instr); return true; diff --git a/src/compiler/nir/nir_lower_scratch.c b/src/compiler/nir/nir_lower_scratch.c index 1a82a07b996..b23d7f60f9d 100644 --- a/src/compiler/nir/nir_lower_scratch.c +++ b/src/compiler/nir/nir_lower_scratch.c @@ -58,8 +58,7 @@ lower_load_store(nir_builder *b, if (bit_size == 1) value = nir_b2b1(b, value); - nir_ssa_def_rewrite_uses(&intrin->dest.ssa, - nir_src_for_ssa(value)); + nir_ssa_def_rewrite_uses(&intrin->dest.ssa, value); } else { assert(intrin->intrinsic == nir_intrinsic_store_deref); diff --git a/src/compiler/nir/nir_lower_ssbo.c b/src/compiler/nir/nir_lower_ssbo.c index 1c861755619..19a040a68d8 100644 --- a/src/compiler/nir/nir_lower_ssbo.c +++ b/src/compiler/nir/nir_lower_ssbo.c @@ -206,7 +206,7 @@ nir_lower_ssbo(nir_shader *shader) if (replace) { nir_ssa_def_rewrite_uses(&intr->dest.ssa, - nir_src_for_ssa(replace)); + replace); } nir_instr_remove(instr); diff --git a/src/compiler/nir/nir_lower_tex.c b/src/compiler/nir/nir_lower_tex.c index ccce138a9cc..b0224fa3bc4 100644 --- a/src/compiler/nir/nir_lower_tex.c +++ b/src/compiler/nir/nir_lower_tex.c @@ -337,7 +337,7 @@ convert_yuv_to_rgb(nir_builder *b, nir_tex_instr *tex, nir_ssa_def *result = nir_ffma(b, y, m0, nir_ffma(b, u, m1, nir_ffma(b, v, m2, offset))); - nir_ssa_def_rewrite_uses(&tex->dest.ssa, nir_src_for_ssa(result)); + nir_ssa_def_rewrite_uses(&tex->dest.ssa, result); } static void @@ -717,7 +717,7 @@ lower_tex_to_txd(nir_builder *b, nir_tex_instr *tex) nir_ssa_dest_init(&txd->instr, &txd->dest, nir_dest_num_components(tex->dest), nir_dest_bit_size(tex->dest), NULL); nir_builder_instr_insert(b, &txd->instr); - nir_ssa_def_rewrite_uses(&tex->dest.ssa, nir_src_for_ssa(&txd->dest.ssa)); + nir_ssa_def_rewrite_uses(&tex->dest.ssa, &txd->dest.ssa); nir_instr_remove(&tex->instr); return txd; } @@ -754,7 +754,7 @@ lower_txb_to_txl(nir_builder *b, nir_tex_instr *tex) nir_ssa_dest_init(&txl->instr, &txl->dest, nir_dest_num_components(tex->dest), nir_dest_bit_size(tex->dest), NULL); nir_builder_instr_insert(b, &txl->instr); - nir_ssa_def_rewrite_uses(&tex->dest.ssa, nir_src_for_ssa(&txl->dest.ssa)); + nir_ssa_def_rewrite_uses(&tex->dest.ssa, &txl->dest.ssa); nir_instr_remove(&tex->instr); return txl; } @@ -1052,7 +1052,7 @@ lower_tg4_offsets(nir_builder *b, nir_tex_instr *tex) } nir_ssa_def *res = nir_vec(b, dest, tex->dest.ssa.num_components); - nir_ssa_def_rewrite_uses(&tex->dest.ssa, nir_src_for_ssa(res)); + nir_ssa_def_rewrite_uses(&tex->dest.ssa, res); nir_instr_remove(&tex->instr); return true; diff --git a/src/compiler/nir/nir_lower_two_sided_color.c b/src/compiler/nir/nir_lower_two_sided_color.c index 902900e7a67..aa3afc2347c 100644 --- a/src/compiler/nir/nir_lower_two_sided_color.c +++ b/src/compiler/nir/nir_lower_two_sided_color.c @@ -191,7 +191,7 @@ nir_lower_two_sided_color_block(nir_block *block, nir_ssa_def *color = nir_bcsel(b, face, front, back); assert(intr->dest.is_ssa); - nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(color)); + nir_ssa_def_rewrite_uses(&intr->dest.ssa, color); } return true; diff --git a/src/compiler/nir/nir_lower_undef_to_zero.c b/src/compiler/nir/nir_lower_undef_to_zero.c index 9727d626ed8..c3c519367c6 100644 --- a/src/compiler/nir/nir_lower_undef_to_zero.c +++ b/src/compiler/nir/nir_lower_undef_to_zero.c @@ -50,7 +50,7 @@ lower_undef_instr_to_zero(nir_builder *b, nir_instr *instr, UNUSED void *_state) b->cursor = nir_instr_remove(&und->instr); nir_ssa_def *zero = nir_imm_zero(b, und->def.num_components, und->def.bit_size); - nir_ssa_def_rewrite_uses(&und->def, nir_src_for_ssa(zero)); + nir_ssa_def_rewrite_uses(&und->def, zero); return true; } diff --git a/src/compiler/nir/nir_lower_uniforms_to_ubo.c b/src/compiler/nir/nir_lower_uniforms_to_ubo.c index 06ddb0a9a9d..65107c01046 100644 --- a/src/compiler/nir/nir_lower_uniforms_to_ubo.c +++ b/src/compiler/nir/nir_lower_uniforms_to_ubo.c @@ -91,7 +91,7 @@ lower_instr(nir_intrinsic_instr *instr, nir_builder *b, int multiplier) load->num_components, instr->dest.ssa.bit_size, instr->dest.ssa.name); nir_builder_instr_insert(b, &load->instr); - nir_ssa_def_rewrite_uses(&instr->dest.ssa, nir_src_for_ssa(&load->dest.ssa)); + nir_ssa_def_rewrite_uses(&instr->dest.ssa, &load->dest.ssa); nir_intrinsic_set_range_base(load, nir_intrinsic_base(instr) * multiplier); nir_intrinsic_set_range(load, nir_intrinsic_range(instr) * multiplier); diff --git a/src/compiler/nir/nir_lower_vars_to_ssa.c b/src/compiler/nir/nir_lower_vars_to_ssa.c index 3f03f3c6f20..4ee561e2a91 100644 --- a/src/compiler/nir/nir_lower_vars_to_ssa.c +++ b/src/compiler/nir/nir_lower_vars_to_ssa.c @@ -577,7 +577,7 @@ rename_variables(struct lower_variables_state *state) nir_instr_remove(&intrin->instr); nir_ssa_def_rewrite_uses(&intrin->dest.ssa, - nir_src_for_ssa(&undef->def)); + &undef->def); continue; } @@ -602,7 +602,7 @@ rename_variables(struct lower_variables_state *state) nir_instr_remove(&intrin->instr); nir_ssa_def_rewrite_uses(&intrin->dest.ssa, - nir_src_for_ssa(&mov->dest.dest.ssa)); + &mov->dest.dest.ssa); break; } diff --git a/src/compiler/nir/nir_opt_comparison_pre.c b/src/compiler/nir/nir_opt_comparison_pre.c index bc8656fd115..ae35e2c8d09 100644 --- a/src/compiler/nir/nir_opt_comparison_pre.c +++ b/src/compiler/nir/nir_opt_comparison_pre.c @@ -193,9 +193,9 @@ rewrite_compare_instruction(nir_builder *bld, nir_alu_instr *orig_cmp, nir_builder_instr_insert(bld, &mov_cmp->instr); nir_ssa_def_rewrite_uses(&orig_cmp->dest.dest.ssa, - nir_src_for_ssa(&mov_cmp->dest.dest.ssa)); + &mov_cmp->dest.dest.ssa); nir_ssa_def_rewrite_uses(&orig_add->dest.dest.ssa, - nir_src_for_ssa(&mov_add->dest.dest.ssa)); + &mov_add->dest.dest.ssa); /* We know these have no more uses because we just rewrote them all, so we * can remove them. diff --git a/src/compiler/nir/nir_opt_constant_folding.c b/src/compiler/nir/nir_opt_constant_folding.c index bb1cb6ec3b4..5695a09e2e4 100644 --- a/src/compiler/nir/nir_opt_constant_folding.c +++ b/src/compiler/nir/nir_opt_constant_folding.c @@ -103,7 +103,7 @@ try_fold_alu(nir_builder *b, nir_alu_instr *alu) nir_ssa_def *imm = nir_build_imm(b, alu->dest.dest.ssa.num_components, alu->dest.dest.ssa.bit_size, dest); - nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, nir_src_for_ssa(imm)); + nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, imm); nir_instr_remove(&alu->instr); ralloc_free(alu); @@ -220,7 +220,7 @@ try_fold_intrinsic(nir_builder *b, nir_intrinsic_instr *intrin, b->cursor = nir_before_instr(&intrin->instr); nir_ssa_def *val = nir_build_imm(b, intrin->dest.ssa.num_components, intrin->dest.ssa.bit_size, v); - nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_src_for_ssa(val)); + nir_ssa_def_rewrite_uses(&intrin->dest.ssa, val); nir_instr_remove(&intrin->instr); return true; } @@ -259,7 +259,7 @@ try_fold_intrinsic(nir_builder *b, nir_intrinsic_instr *intrin, val = nir_build_imm(b, intrin->dest.ssa.num_components, intrin->dest.ssa.bit_size, imm); } - nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_src_for_ssa(val)); + nir_ssa_def_rewrite_uses(&intrin->dest.ssa, val); nir_instr_remove(&intrin->instr); return true; } @@ -284,7 +284,7 @@ try_fold_intrinsic(nir_builder *b, nir_intrinsic_instr *intrin, */ if (nir_src_is_const(intrin->src[0])) { nir_ssa_def_rewrite_uses(&intrin->dest.ssa, - nir_src_for_ssa(intrin->src[0].ssa)); + intrin->src[0].ssa); nir_instr_remove(&intrin->instr); return true; } @@ -295,7 +295,7 @@ try_fold_intrinsic(nir_builder *b, nir_intrinsic_instr *intrin, if (nir_src_is_const(intrin->src[0])) { b->cursor = nir_before_instr(&intrin->instr); nir_ssa_def_rewrite_uses(&intrin->dest.ssa, - nir_src_for_ssa(nir_imm_true(b))); + nir_imm_true(b)); nir_instr_remove(&intrin->instr); return true; } diff --git a/src/compiler/nir/nir_opt_copy_prop_vars.c b/src/compiler/nir/nir_opt_copy_prop_vars.c index f496b5de2e7..b0f2727f8b6 100644 --- a/src/compiler/nir/nir_opt_copy_prop_vars.c +++ b/src/compiler/nir/nir_opt_copy_prop_vars.c @@ -939,7 +939,7 @@ copy_prop_vars_block(struct copy_prop_var_state *state, if (vec_index >= vec_comps) { b->cursor = nir_instr_remove(instr); nir_ssa_def *u = nir_ssa_undef(b, 1, intrin->dest.ssa.bit_size); - nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_src_for_ssa(u)); + nir_ssa_def_rewrite_uses(&intrin->dest.ssa, u); state->progress = true; break; } @@ -968,7 +968,7 @@ copy_prop_vars_block(struct copy_prop_var_state *state, value.ssa.def[0]->parent_instr); } else { nir_ssa_def_rewrite_uses(&intrin->dest.ssa, - nir_src_for_ssa(value.ssa.def[0])); + value.ssa.def[0]); } } else { /* We're turning it into a load of a different variable */ diff --git a/src/compiler/nir/nir_opt_copy_propagate.c b/src/compiler/nir/nir_opt_copy_propagate.c index 757facccb9c..5e5c5fd31bc 100644 --- a/src/compiler/nir/nir_opt_copy_propagate.c +++ b/src/compiler/nir/nir_opt_copy_propagate.c @@ -93,7 +93,7 @@ rewrite_to_vec(nir_function_impl *impl, nir_alu_instr *mov, nir_alu_instr *vec) new_vec->src[i] = vec->src[mov->src[0].swizzle[i]]; nir_ssa_def *new = nir_builder_alu_instr_finish_and_insert(&b, new_vec); - nir_ssa_def_rewrite_uses_ssa(&mov->dest.dest.ssa, new); + nir_ssa_def_rewrite_uses(&mov->dest.dest.ssa, new); /* If we remove "mov" and it's the next instruction in the * nir_foreach_instr_safe() loop, then we would end copy-propagation early. */ diff --git a/src/compiler/nir/nir_opt_dead_cf.c b/src/compiler/nir/nir_opt_dead_cf.c index cdb6138f1b7..e925c6d7877 100644 --- a/src/compiler/nir/nir_opt_dead_cf.c +++ b/src/compiler/nir/nir_opt_dead_cf.c @@ -106,7 +106,7 @@ opt_constant_if(nir_if *if_stmt, bool condition) assert(def); assert(phi->dest.is_ssa); - nir_ssa_def_rewrite_uses(&phi->dest.ssa, nir_src_for_ssa(def)); + nir_ssa_def_rewrite_uses(&phi->dest.ssa, def); nir_instr_remove(instr); } diff --git a/src/compiler/nir/nir_opt_gcm.c b/src/compiler/nir/nir_opt_gcm.c index cbffdcc5ea8..7317ded09ca 100644 --- a/src/compiler/nir/nir_opt_gcm.c +++ b/src/compiler/nir/nir_opt_gcm.c @@ -516,7 +516,7 @@ gcm_replace_def_with_undef(nir_ssa_def *def, void *void_state) nir_ssa_undef_instr_create(state->impl->function->shader, def->num_components, def->bit_size); nir_instr_insert(nir_before_cf_list(&state->impl->body), &undef->instr); - nir_ssa_def_rewrite_uses(def, nir_src_for_ssa(&undef->def)); + nir_ssa_def_rewrite_uses(def, &undef->def); return true; } diff --git a/src/compiler/nir/nir_opt_idiv_const.c b/src/compiler/nir/nir_opt_idiv_const.c index 3d940cee1c9..44daa793435 100644 --- a/src/compiler/nir/nir_opt_idiv_const.c +++ b/src/compiler/nir/nir_opt_idiv_const.c @@ -145,7 +145,7 @@ nir_opt_idiv_const_instr(nir_builder *b, nir_alu_instr *alu) } nir_ssa_def *qvec = nir_vec(b, q, alu->dest.dest.ssa.num_components); - nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, nir_src_for_ssa(qvec)); + nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, qvec); nir_instr_remove(&alu->instr); return true; diff --git a/src/compiler/nir/nir_opt_if.c b/src/compiler/nir/nir_opt_if.c index edda17979fd..2882ed4287a 100644 --- a/src/compiler/nir/nir_opt_if.c +++ b/src/compiler/nir/nir_opt_if.c @@ -541,7 +541,7 @@ opt_split_alu_of_phi(nir_builder *b, nir_loop *loop) * result of the phi. */ nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, - nir_src_for_ssa(&phi->dest.ssa)); + &phi->dest.ssa); /* Since the original ALU instruction no longer has any readers, just * remove it. @@ -714,7 +714,7 @@ opt_simplify_bcsel_of_phi(nir_builder *b, nir_loop *loop) * the phi. */ nir_ssa_def_rewrite_uses(&bcsel->dest.dest.ssa, - nir_src_for_ssa(&phi->dest.ssa)); + &phi->dest.ssa); /* Since the original bcsel instruction no longer has any readers, * just remove it. diff --git a/src/compiler/nir/nir_opt_intrinsics.c b/src/compiler/nir/nir_opt_intrinsics.c index 6742fe91988..11c26b54828 100644 --- a/src/compiler/nir/nir_opt_intrinsics.c +++ b/src/compiler/nir/nir_opt_intrinsics.c @@ -107,7 +107,7 @@ opt_intrinsics_alu(nir_builder *b, nir_alu_instr *alu, if (replacement) { nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, - nir_src_for_ssa(replacement)); + replacement); nir_instr_remove(&alu->instr); return true; } else { @@ -149,7 +149,7 @@ opt_intrinsics_intrin(nir_builder *b, nir_intrinsic_instr *intrin, new_expr = nir_inot(b, new_expr); nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, - nir_src_for_ssa(new_expr)); + new_expr); nir_instr_remove(&alu->instr); progress = true; } diff --git a/src/compiler/nir/nir_opt_large_constants.c b/src/compiler/nir/nir_opt_large_constants.c index 60f2b5837d6..1e032f199c2 100644 --- a/src/compiler/nir/nir_opt_large_constants.c +++ b/src/compiler/nir/nir_opt_large_constants.c @@ -363,7 +363,7 @@ nir_opt_large_constants(nir_shader *shader, b.cursor = nir_after_instr(&intrin->instr); nir_ssa_def *val = build_constant_load(&b, deref, size_align); nir_ssa_def_rewrite_uses(&intrin->dest.ssa, - nir_src_for_ssa(val)); + val); nir_instr_remove(&intrin->instr); nir_deref_instr_remove_if_unused(deref); } diff --git a/src/compiler/nir/nir_opt_load_store_vectorize.c b/src/compiler/nir/nir_opt_load_store_vectorize.c index fc06336408c..b1d5c42d07f 100644 --- a/src/compiler/nir/nir_opt_load_store_vectorize.c +++ b/src/compiler/nir/nir_opt_load_store_vectorize.c @@ -734,9 +734,9 @@ vectorize_loads(nir_builder *b, struct vectorize_ctx *ctx, if (first == low) { nir_ssa_def_rewrite_uses_after(&low->intrin->dest.ssa, nir_src_for_ssa(low_def), high_def->parent_instr); - nir_ssa_def_rewrite_uses(&high->intrin->dest.ssa, nir_src_for_ssa(high_def)); + nir_ssa_def_rewrite_uses(&high->intrin->dest.ssa, high_def); } else { - nir_ssa_def_rewrite_uses(&low->intrin->dest.ssa, nir_src_for_ssa(low_def)); + nir_ssa_def_rewrite_uses(&low->intrin->dest.ssa, low_def); nir_ssa_def_rewrite_uses_after(&high->intrin->dest.ssa, nir_src_for_ssa(high_def), high_def->parent_instr); } diff --git a/src/compiler/nir/nir_opt_loop_unroll.c b/src/compiler/nir/nir_opt_loop_unroll.c index 86095e45e03..b3ec353097c 100644 --- a/src/compiler/nir/nir_opt_loop_unroll.c +++ b/src/compiler/nir/nir_opt_loop_unroll.c @@ -654,7 +654,7 @@ remove_out_of_bounds_induction_use(nir_shader *shader, nir_loop *loop, nir_ssa_undef(&b, intrin->dest.ssa.num_components, intrin->dest.ssa.bit_size); nir_ssa_def_rewrite_uses(&intrin->dest.ssa, - nir_src_for_ssa(undef)); + undef); } else { nir_instr_remove(instr); continue; diff --git a/src/compiler/nir/nir_opt_peephole_select.c b/src/compiler/nir/nir_opt_peephole_select.c index 5e155c7d458..e3cb21be2d5 100644 --- a/src/compiler/nir/nir_opt_peephole_select.c +++ b/src/compiler/nir/nir_opt_peephole_select.c @@ -437,7 +437,7 @@ nir_opt_peephole_select_block(nir_block *block, nir_shader *shader, sel->dest.write_mask = (1 << phi->dest.ssa.num_components) - 1; nir_ssa_def_rewrite_uses(&phi->dest.ssa, - nir_src_for_ssa(&sel->dest.dest.ssa)); + &sel->dest.dest.ssa); nir_instr_insert_before(&phi->instr, &sel->instr); nir_instr_remove(&phi->instr); diff --git a/src/compiler/nir/nir_opt_remove_phis.c b/src/compiler/nir/nir_opt_remove_phis.c index 97cdcfecf38..20efa41a601 100644 --- a/src/compiler/nir/nir_opt_remove_phis.c +++ b/src/compiler/nir/nir_opt_remove_phis.c @@ -132,7 +132,7 @@ remove_phis_block(nir_block *block, nir_builder *b) } assert(phi->dest.is_ssa); - nir_ssa_def_rewrite_uses(&phi->dest.ssa, nir_src_for_ssa(def)); + nir_ssa_def_rewrite_uses(&phi->dest.ssa, def); nir_instr_remove(instr); progress = true; diff --git a/src/compiler/nir/nir_opt_shrink_vectors.c b/src/compiler/nir/nir_opt_shrink_vectors.c index 6192dbadeb1..c7e1e8e307c 100644 --- a/src/compiler/nir/nir_opt_shrink_vectors.c +++ b/src/compiler/nir/nir_opt_shrink_vectors.c @@ -95,7 +95,7 @@ opt_shrink_vectors_alu(nir_builder *b, nir_alu_instr *instr) srcs[i] = nir_ssa_for_alu_src(b, instr, i); nir_ssa_def *new_vec = nir_vec(b, srcs, last_bit); - nir_ssa_def_rewrite_uses(def, nir_src_for_ssa(new_vec)); + nir_ssa_def_rewrite_uses(def, new_vec); return true; } break; diff --git a/src/compiler/nir/nir_opt_undef.c b/src/compiler/nir/nir_opt_undef.c index c5f8ead0234..20b31a4adad 100644 --- a/src/compiler/nir/nir_opt_undef.c +++ b/src/compiler/nir/nir_opt_undef.c @@ -91,7 +91,7 @@ opt_undef_vecN(nir_builder *b, nir_alu_instr *alu) b->cursor = nir_before_instr(&alu->instr); nir_ssa_def *undef = nir_ssa_undef(b, alu->dest.dest.ssa.num_components, nir_dest_bit_size(alu->dest.dest)); - nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, nir_src_for_ssa(undef)); + nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, undef); return true; } diff --git a/src/compiler/nir/nir_opt_uniform_atomics.c b/src/compiler/nir/nir_opt_uniform_atomics.c index 8ffee69f2d3..83113284cc2 100644 --- a/src/compiler/nir/nir_opt_uniform_atomics.c +++ b/src/compiler/nir/nir_opt_uniform_atomics.c @@ -261,7 +261,7 @@ optimize_and_rewrite_atomic(nir_builder *b, nir_intrinsic_instr *intrin) if (result) { assert(result->divergent == original_result_divergent); - nir_ssa_def_rewrite_uses(&old_result, nir_src_for_ssa(result)); + nir_ssa_def_rewrite_uses(&old_result, result); } } diff --git a/src/compiler/nir/nir_search.c b/src/compiler/nir/nir_search.c index 1408917fde4..272a3f6444a 100644 --- a/src/compiler/nir/nir_search.c +++ b/src/compiler/nir/nir_search.c @@ -793,7 +793,7 @@ nir_replace_instr(nir_builder *build, nir_alu_instr *instr, /* Rewrite the uses of the old SSA value to the new one, and recurse * through the uses updating the automaton's state. */ - nir_ssa_def_rewrite_uses_ssa(&instr->dest.dest.ssa, ssa_val); + nir_ssa_def_rewrite_uses(&instr->dest.dest.ssa, ssa_val); nir_algebraic_update_automaton(ssa_val->parent_instr, algebraic_worklist, states, pass_op_table); diff --git a/src/compiler/nir/nir_split_per_member_structs.c b/src/compiler/nir/nir_split_per_member_structs.c index 6c9b314002e..b5cf32bc3d4 100644 --- a/src/compiler/nir/nir_split_per_member_structs.c +++ b/src/compiler/nir/nir_split_per_member_structs.c @@ -145,7 +145,7 @@ rewrite_deref_instr(nir_builder *b, nir_deref_instr *deref, nir_deref_instr *member_deref = build_member_deref(b, nir_deref_instr_parent(deref), member); nir_ssa_def_rewrite_uses(&deref->dest.ssa, - nir_src_for_ssa(&member_deref->dest.ssa)); + &member_deref->dest.ssa); /* The referenced variable is no longer valid, clean up the deref */ nir_deref_instr_remove_if_unused(deref); diff --git a/src/compiler/nir/nir_split_vars.c b/src/compiler/nir/nir_split_vars.c index f42b462d159..a4bf4a754ae 100644 --- a/src/compiler/nir/nir_split_vars.c +++ b/src/compiler/nir/nir_split_vars.c @@ -291,7 +291,7 @@ split_struct_derefs_impl(nir_function_impl *impl, assert(new_deref->type == deref->type); nir_ssa_def_rewrite_uses(&deref->dest.ssa, - nir_src_for_ssa(&new_deref->dest.ssa)); + &new_deref->dest.ssa); nir_deref_instr_remove_if_unused(deref); } } @@ -820,7 +820,7 @@ split_array_access_impl(nir_function_impl *impl, nir_ssa_undef(&b, intrin->dest.ssa.num_components, intrin->dest.ssa.bit_size); nir_ssa_def_rewrite_uses(&intrin->dest.ssa, - nir_src_for_ssa(u)); + u); } nir_instr_remove(&intrin->instr); for (unsigned i = 0; i < num_derefs; i++) @@ -1549,7 +1549,7 @@ shrink_vec_var_access_impl(nir_function_impl *impl, nir_ssa_undef(&b, intrin->dest.ssa.num_components, intrin->dest.ssa.bit_size); nir_ssa_def_rewrite_uses(&intrin->dest.ssa, - nir_src_for_ssa(u)); + u); } nir_instr_remove(&intrin->instr); nir_deref_instr_remove_if_unused(deref); diff --git a/src/freedreno/ir3/ir3_nir.c b/src/freedreno/ir3/ir3_nir.c index 24d3902f541..e26ef579173 100644 --- a/src/freedreno/ir3/ir3_nir.c +++ b/src/freedreno/ir3/ir3_nir.c @@ -411,7 +411,7 @@ ir3_nir_lower_view_layer_id(nir_shader *nir, bool layer_zero, bool view_zero) b.cursor = nir_before_instr(&intrin->instr); nir_ssa_def *zero = nir_imm_int(&b, 0); nir_ssa_def_rewrite_uses(&intrin->dest.ssa, - nir_src_for_ssa(zero)); + zero); nir_instr_remove(&intrin->instr); progress = true; } diff --git a/src/freedreno/ir3/ir3_nir_analyze_ubo_ranges.c b/src/freedreno/ir3/ir3_nir_analyze_ubo_ranges.c index 8c910f6bacc..5e63d3b870b 100644 --- a/src/freedreno/ir3/ir3_nir_analyze_ubo_ranges.c +++ b/src/freedreno/ir3/ir3_nir_analyze_ubo_ranges.c @@ -333,7 +333,7 @@ lower_ubo_load_to_uniform(nir_intrinsic_instr *instr, nir_builder *b, nir_load_uniform(b, instr->num_components, instr->dest.ssa.bit_size, uniform_offset, .base = const_offset); nir_ssa_def_rewrite_uses(&instr->dest.ssa, - nir_src_for_ssa(uniform)); + uniform); nir_instr_remove(&instr->instr); diff --git a/src/freedreno/ir3/ir3_nir_lower_io_offsets.c b/src/freedreno/ir3/ir3_nir_lower_io_offsets.c index 110197d93b9..596b7e16d8e 100644 --- a/src/freedreno/ir3/ir3_nir_lower_io_offsets.c +++ b/src/freedreno/ir3/ir3_nir_lower_io_offsets.c @@ -244,7 +244,7 @@ lower_offset_for_ssbo(nir_intrinsic_instr *intrinsic, nir_builder *b, * of the new intrinsic. */ nir_ssa_def_rewrite_uses(&intrinsic->dest.ssa, - nir_src_for_ssa(new_dest)); + new_dest); } /* Finally remove the original intrinsic. */ diff --git a/src/freedreno/ir3/ir3_nir_lower_tess.c b/src/freedreno/ir3/ir3_nir_lower_tess.c index 27bbef9f788..99a633b1d4e 100644 --- a/src/freedreno/ir3/ir3_nir_lower_tess.c +++ b/src/freedreno/ir3/ir3_nir_lower_tess.c @@ -164,7 +164,7 @@ replace_intrinsic(nir_builder *b, nir_intrinsic_instr *intr, nir_builder_instr_insert(b, &new_intr->instr); if (nir_intrinsic_infos[op].has_dest) - nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(&new_intr->dest.ssa)); + nir_ssa_def_rewrite_uses(&intr->dest.ssa, &new_intr->dest.ssa); nir_instr_remove(&intr->instr); @@ -330,7 +330,7 @@ lower_block_to_explicit_input(nir_block *block, nir_builder *b, struct state *st b->cursor = nir_before_instr(&intr->instr); nir_ssa_def *iid = build_invocation_id(b, state); - nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(iid)); + nir_ssa_def_rewrite_uses(&intr->dest.ssa, iid); nir_instr_remove(&intr->instr); break; } diff --git a/src/freedreno/vulkan/tu_shader.c b/src/freedreno/vulkan/tu_shader.c index 8640f0107dd..5c2a91a5d4e 100644 --- a/src/freedreno/vulkan/tu_shader.c +++ b/src/freedreno/vulkan/tu_shader.c @@ -198,7 +198,7 @@ lower_load_push_constant(nir_builder *b, nir_intrinsic_instr *instr, nir_ushr(b, instr->src[0].ssa, nir_imm_int(b, 2)), .base = base / 4); - nir_ssa_def_rewrite_uses(&instr->dest.ssa, nir_src_for_ssa(load)); + nir_ssa_def_rewrite_uses(&instr->dest.ssa, load); nir_instr_remove(&instr->instr); } @@ -235,7 +235,7 @@ lower_vulkan_resource_index(nir_builder *b, nir_intrinsic_instr *instr, nir_iadd(b, nir_imm_int(b, base), vulkan_idx), nir_imm_int(b, 0)); - nir_ssa_def_rewrite_uses(&instr->dest.ssa, nir_src_for_ssa(def)); + nir_ssa_def_rewrite_uses(&instr->dest.ssa, def); nir_instr_remove(&instr->instr); } @@ -319,7 +319,7 @@ lower_ssbo_ubo_intrinsic(nir_builder *b, nir_intrinsic_instr *intrin) } if (info->has_dest) - nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_src_for_ssa(result)); + nir_ssa_def_rewrite_uses(&intrin->dest.ssa, result); nir_instr_remove(&intrin->instr); } diff --git a/src/gallium/auxiliary/nir/nir_to_tgsi.c b/src/gallium/auxiliary/nir/nir_to_tgsi.c index b77d7d53dc0..eb386103f2a 100644 --- a/src/gallium/auxiliary/nir/nir_to_tgsi.c +++ b/src/gallium/auxiliary/nir/nir_to_tgsi.c @@ -2522,7 +2522,7 @@ nir_to_tgsi_lower_64bit_intrinsic(nir_builder *b, nir_intrinsic_instr *instr) second->num_components > 1 ? nir_channel(b, &second->dest.ssa, 1) : NULL, }; nir_ssa_def *new = nir_vec(b, channels, instr->num_components); - nir_ssa_def_rewrite_uses(&instr->dest.ssa, nir_src_for_ssa(new)); + nir_ssa_def_rewrite_uses(&instr->dest.ssa, new); } else { /* Split the src value across the two stores. */ b->cursor = nir_before_instr(&instr->instr); @@ -2614,7 +2614,7 @@ nir_to_tgsi_lower_64bit_load_const(nir_builder *b, nir_load_const_instr *instr) num_components == 4 ? nir_channel(b, &second->def, 1) : NULL, }; nir_ssa_def *new = nir_vec(b, channels, num_components); - nir_ssa_def_rewrite_uses(&instr->def, nir_src_for_ssa(new)); + nir_ssa_def_rewrite_uses(&instr->def, new); nir_instr_remove(&instr->instr); return true; diff --git a/src/gallium/drivers/d3d12/d3d12_nir_passes.c b/src/gallium/drivers/d3d12/d3d12_nir_passes.c index 4866e0eaaab..52489a9d41e 100644 --- a/src/gallium/drivers/d3d12/d3d12_nir_passes.c +++ b/src/gallium/drivers/d3d12/d3d12_nir_passes.c @@ -129,7 +129,7 @@ lower_load_face(nir_builder *b, struct nir_instr *instr, nir_variable *var) nir_ssa_def *load = nir_load_var(b, var); - nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(load)); + nir_ssa_def_rewrite_uses(&intr->dest.ssa, load); nir_instr_remove(instr); } @@ -295,7 +295,7 @@ lower_load_first_vertex(nir_builder *b, nir_instr *instr, nir_variable **first_v nir_ssa_def *load = get_state_var(b, D3D12_STATE_VAR_FIRST_VERTEX, "d3d12_FirstVertex", glsl_uint_type(), first_vertex); - nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(load)); + nir_ssa_def_rewrite_uses(&intr->dest.ssa, load); nir_instr_remove(instr); return true; @@ -447,7 +447,7 @@ lower_instr(nir_intrinsic_instr *instr, nir_builder *b, .range = ~0, ); - nir_ssa_def_rewrite_uses(&instr->dest.ssa, nir_src_for_ssa(load)); + nir_ssa_def_rewrite_uses(&instr->dest.ssa, load); /* Remove the old load_* instruction and any parent derefs */ nir_instr_remove(&instr->instr); diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c index 9e5d6c6dcc9..4a875908138 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c +++ b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c @@ -824,7 +824,7 @@ lower_alu(struct etna_compile *c, nir_alu_instr *alu) nir_ssa_def *def = nir_build_imm(&b, num_components, 32, value); if (num_components == info->num_inputs) { - nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, nir_src_for_ssa(def)); + nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, def); nir_instr_remove(&alu->instr); return; } @@ -927,7 +927,7 @@ emit_shader(struct etna_compile *c, unsigned *num_temps, unsigned *num_consts) b.cursor = nir_after_instr(instr); nir_ssa_def *def = nir_build_imm(&b, intr->dest.ssa.num_components, 32, value); - nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(def)); + nir_ssa_def_rewrite_uses(&intr->dest.ssa, def); nir_instr_remove(instr); } break; default: diff --git a/src/gallium/drivers/etnaviv/etnaviv_nir_lower_ubo_to_uniform.c b/src/gallium/drivers/etnaviv/etnaviv_nir_lower_ubo_to_uniform.c index 8f3485ec87e..2b66dc0873e 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_nir_lower_ubo_to_uniform.c +++ b/src/gallium/drivers/etnaviv/etnaviv_nir_lower_ubo_to_uniform.c @@ -69,7 +69,7 @@ lower_ubo_to_uniform(nir_builder *b, nir_instr *instr, void *_data) .range = nir_intrinsic_range(intr) / 16, .dest_type = nir_type_float32); - nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(uniform)); + nir_ssa_def_rewrite_uses(&intr->dest.ssa, uniform); return uniform; } diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c index ba3d9c11384..10fb67b8d5a 100644 --- a/src/gallium/drivers/iris/iris_program.c +++ b/src/gallium/drivers/iris/iris_program.c @@ -451,7 +451,7 @@ iris_setup_uniforms(const struct brw_compiler *compiler, intrin->dest.ssa.bit_size); nir_ssa_def_rewrite_uses(&intrin->dest.ssa, - nir_src_for_ssa(data)); + data); continue; } case nir_intrinsic_load_user_clip_plane: { @@ -574,7 +574,7 @@ iris_setup_uniforms(const struct brw_compiler *compiler, .range = ~0); nir_ssa_def_rewrite_uses(&intrin->dest.ssa, - nir_src_for_ssa(load)); + load); nir_instr_remove(instr); } } diff --git a/src/gallium/drivers/lima/ir/lima_nir_lower_uniform_to_scalar.c b/src/gallium/drivers/lima/ir/lima_nir_lower_uniform_to_scalar.c index 67bef3f341b..f9d593f0417 100644 --- a/src/gallium/drivers/lima/ir/lima_nir_lower_uniform_to_scalar.c +++ b/src/gallium/drivers/lima/ir/lima_nir_lower_uniform_to_scalar.c @@ -52,8 +52,7 @@ lower_load_uniform_to_scalar(nir_builder *b, nir_intrinsic_instr *intr) } nir_ssa_def_rewrite_uses(&intr->dest.ssa, - nir_src_for_ssa(nir_vec(b, loads, - intr->num_components))); + nir_vec(b, loads, intr->num_components)); nir_instr_remove(&intr->instr); } diff --git a/src/gallium/drivers/lima/ir/lima_nir_split_load_input.c b/src/gallium/drivers/lima/ir/lima_nir_split_load_input.c index 9686633a812..b1ec9aef39e 100644 --- a/src/gallium/drivers/lima/ir/lima_nir_split_load_input.c +++ b/src/gallium/drivers/lima/ir/lima_nir_split_load_input.c @@ -85,7 +85,7 @@ lima_nir_split_load_input_block(nir_block *block, nir_builder *b) nir_builder_instr_insert(b, &new_intrin->instr); nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, - nir_src_for_ssa(&new_intrin->dest.ssa)); + &new_intrin->dest.ssa); nir_instr_remove(&alu->instr); progress = true; } diff --git a/src/gallium/drivers/r600/sfn/sfn_nir.cpp b/src/gallium/drivers/r600/sfn/sfn_nir.cpp index f05c62e5690..7b2c604a0ad 100644 --- a/src/gallium/drivers/r600/sfn/sfn_nir.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_nir.cpp @@ -695,7 +695,7 @@ r600_lower_shared_io_impl(nir_function *func) load->src[0] = nir_src_for_ssa(addr); nir_ssa_dest_init(&load->instr, &load->dest, load->num_components, 32, NULL); - nir_ssa_def_rewrite_uses(&op->dest.ssa, nir_src_for_ssa(&load->dest.ssa)); + nir_ssa_def_rewrite_uses(&op->dest.ssa, &load->dest.ssa); nir_builder_instr_insert(&b, &load->instr); } else { nir_ssa_def *addr = op->src[1].ssa; diff --git a/src/gallium/drivers/r600/sfn/sfn_nir_lower_tess_io.cpp b/src/gallium/drivers/r600/sfn/sfn_nir_lower_tess_io.cpp index b1b86ffaaa7..ee1e0c0b4de 100644 --- a/src/gallium/drivers/r600/sfn/sfn_nir_lower_tess_io.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_nir_lower_tess_io.cpp @@ -221,7 +221,7 @@ static void replace_load_instr(nir_builder *b, nir_intrinsic_instr *op, nir_ssa_ } } auto new_load_remixed = nir_vec(b, remix, comps); - nir_ssa_def_rewrite_uses(&op->dest.ssa, nir_src_for_ssa(new_load_remixed)); + nir_ssa_def_rewrite_uses(&op->dest.ssa, new_load_remixed); } nir_instr_remove(&op->instr); } @@ -317,7 +317,7 @@ r600_lower_tess_io_impl(nir_builder *b, nir_instr *instr, enum pipe_prim_type pr auto base = emit_load_param_base(b, nir_intrinsic_load_tcs_in_param_base_r600); vertices_in = nir_channel(b, base, 2); } - nir_ssa_def_rewrite_uses(&op->dest.ssa, nir_src_for_ssa(vertices_in)); + nir_ssa_def_rewrite_uses(&op->dest.ssa, vertices_in); nir_instr_remove(&op->instr); return true; } @@ -384,7 +384,7 @@ r600_lower_tess_io_impl(nir_builder *b, nir_instr *instr, enum pipe_prim_type pr tf->num_components, 32, NULL); nir_builder_instr_insert(b, &tf->instr); - nir_ssa_def_rewrite_uses(&op->dest.ssa, nir_src_for_ssa(&tf->dest.ssa)); + nir_ssa_def_rewrite_uses(&op->dest.ssa, &tf->dest.ssa); nir_instr_remove(instr); return true; } diff --git a/src/gallium/drivers/r600/sfn/sfn_nir_vectorize_vs_inputs.c b/src/gallium/drivers/r600/sfn/sfn_nir_vectorize_vs_inputs.c index 6f01d3ccfd2..2ff60cf6a77 100644 --- a/src/gallium/drivers/r600/sfn/sfn_nir_vectorize_vs_inputs.c +++ b/src/gallium/drivers/r600/sfn/sfn_nir_vectorize_vs_inputs.c @@ -166,7 +166,7 @@ r600_create_new_load(nir_builder *b, nir_intrinsic_instr *intr, nir_variable *va for (unsigned i = 0; i < old_num_comps; ++i) channels[i] = comp - var->data.location_frac + i; nir_ssa_def *load = nir_swizzle(b, &new_intr->dest.ssa, channels, old_num_comps); - nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(load)); + nir_ssa_def_rewrite_uses(&intr->dest.ssa, load); /* Remove the old load intrinsic */ nir_instr_remove(&intr->instr); diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c b/src/gallium/drivers/radeonsi/si_shader_nir.c index 673b8ffae90..f5a61de3c3c 100644 --- a/src/gallium/drivers/radeonsi/si_shader_nir.c +++ b/src/gallium/drivers/radeonsi/si_shader_nir.c @@ -650,7 +650,7 @@ static void si_nir_lower_color(nir_shader *nir) continue; } - nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_src_for_ssa(def)); + nir_ssa_def_rewrite_uses(&intrin->dest.ssa, def); nir_instr_remove(instr); } } diff --git a/src/gallium/drivers/vc4/vc4_nir_lower_io.c b/src/gallium/drivers/vc4/vc4_nir_lower_io.c index b072c409165..5e34db39e22 100644 --- a/src/gallium/drivers/vc4/vc4_nir_lower_io.c +++ b/src/gallium/drivers/vc4/vc4_nir_lower_io.c @@ -49,7 +49,7 @@ replace_intrinsic_with_vec(nir_builder *b, nir_intrinsic_instr *intr, /* Replace the old intrinsic with a reference to our reconstructed * vector. */ - nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(vec)); + nir_ssa_def_rewrite_uses(&intr->dest.ssa, vec); nir_instr_remove(&intr->instr); } diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c index 322ad32ae2f..58588e94250 100644 --- a/src/gallium/drivers/zink/zink_compiler.c +++ b/src/gallium/drivers/zink/zink_compiler.c @@ -275,7 +275,7 @@ lower_drawid_instr(nir_builder *b, nir_instr *in, void *data) nir_ssa_dest_init(&load->instr, &load->dest, 1, 32, "draw_id"); nir_builder_instr_insert(b, &load->instr); - nir_ssa_def_rewrite_uses(&instr->dest.ssa, nir_src_for_ssa(&load->dest.ssa)); + nir_ssa_def_rewrite_uses(&instr->dest.ssa, &load->dest.ssa); return true; } diff --git a/src/gallium/frontends/clover/nir/invocation.cpp b/src/gallium/frontends/clover/nir/invocation.cpp index a590076eec2..b7f520b4f90 100644 --- a/src/gallium/frontends/clover/nir/invocation.cpp +++ b/src/gallium/frontends/clover/nir/invocation.cpp @@ -134,7 +134,7 @@ clover_nir_lower_images(nir_shader *shader) nir_ssa_def *loc = nir_imm_intN_t(&b, deref->var->data.driver_location, deref->dest.ssa.bit_size); - nir_ssa_def_rewrite_uses(&deref->dest.ssa, nir_src_for_ssa(loc)); + nir_ssa_def_rewrite_uses(&deref->dest.ssa, loc); progress = true; break; } diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp index 41b638616cd..c87304867be 100644 --- a/src/intel/compiler/brw_fs.cpp +++ b/src/intel/compiler/brw_fs.cpp @@ -8953,7 +8953,7 @@ brw_nir_demote_sample_qualifiers(nir_shader *nir) nir_load_barycentric(&b, nir_intrinsic_load_barycentric_centroid, nir_intrinsic_interp_mode(intrin)); nir_ssa_def_rewrite_uses(&intrin->dest.ssa, - nir_src_for_ssa(centroid)); + centroid); nir_instr_remove(instr); progress = true; } diff --git a/src/intel/compiler/brw_nir.c b/src/intel/compiler/brw_nir.c index a67ac6dc461..dea4eadb484 100644 --- a/src/intel/compiler/brw_nir.c +++ b/src/intel/compiler/brw_nir.c @@ -75,7 +75,7 @@ remap_tess_levels(nir_builder *b, nir_intrinsic_instr *intr, if (nir_intrinsic_infos[intr->intrinsic].has_dest) { b->cursor = nir_before_instr(&intr->instr); nir_ssa_def *undef = nir_ssa_undef(b, 1, 32); - nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(undef)); + nir_ssa_def_rewrite_uses(&intr->dest.ssa, undef); } nir_instr_remove(&intr->instr); } @@ -258,7 +258,7 @@ brw_nir_lower_vs_inputs(nir_shader *nir, nir_builder_instr_insert(&b, &load->instr); nir_ssa_def_rewrite_uses(&intrin->dest.ssa, - nir_src_for_ssa(&load->dest.ssa)); + &load->dest.ssa); nir_instr_remove(&intrin->instr); break; } diff --git a/src/intel/compiler/brw_nir_lower_conversions.c b/src/intel/compiler/brw_nir_lower_conversions.c index 0febb1f913e..6890d8cdcc2 100644 --- a/src/intel/compiler/brw_nir_lower_conversions.c +++ b/src/intel/compiler/brw_nir_lower_conversions.c @@ -58,7 +58,7 @@ split_conversion(nir_builder *b, nir_alu_instr *alu, nir_op op1, nir_op op2) nir_ssa_def *src = nir_ssa_for_alu_src(b, alu, 0); nir_ssa_def *tmp = nir_build_alu(b, op1, src, NULL, NULL, NULL); nir_ssa_def *res = nir_build_alu(b, op2, tmp, NULL, NULL, NULL); - nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, nir_src_for_ssa(res)); + nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, res); nir_instr_remove(&alu->instr); } diff --git a/src/intel/compiler/brw_nir_lower_cs_intrinsics.c b/src/intel/compiler/brw_nir_lower_cs_intrinsics.c index 2fc160aff13..c6852ecec41 100644 --- a/src/intel/compiler/brw_nir_lower_cs_intrinsics.c +++ b/src/intel/compiler/brw_nir_lower_cs_intrinsics.c @@ -187,7 +187,7 @@ lower_cs_intrinsics_convert_block(struct lower_intrinsics_state *state, if (intrinsic->dest.ssa.bit_size == 64) sysval = nir_u2u64(b, sysval); - nir_ssa_def_rewrite_uses(&intrinsic->dest.ssa, nir_src_for_ssa(sysval)); + nir_ssa_def_rewrite_uses(&intrinsic->dest.ssa, sysval); nir_instr_remove(&intrinsic->instr); state->progress = true; diff --git a/src/intel/compiler/brw_nir_lower_image_load_store.c b/src/intel/compiler/brw_nir_lower_image_load_store.c index 11abd046bae..b7d82835f2f 100644 --- a/src/intel/compiler/brw_nir_lower_image_load_store.c +++ b/src/intel/compiler/brw_nir_lower_image_load_store.c @@ -379,7 +379,7 @@ lower_image_load_instr(nir_builder *b, * conversion. */ nir_ssa_def *placeholder = nir_ssa_undef(b, 4, 32); - nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_src_for_ssa(placeholder)); + nir_ssa_def_rewrite_uses(&intrin->dest.ssa, placeholder); intrin->num_components = isl_format_get_num_channels(lower_fmt); intrin->dest.ssa.num_components = intrin->num_components; @@ -391,7 +391,7 @@ lower_image_load_instr(nir_builder *b, image_fmt, lower_fmt, dest_components); - nir_ssa_def_rewrite_uses(placeholder, nir_src_for_ssa(color)); + nir_ssa_def_rewrite_uses(placeholder, color); nir_instr_remove(placeholder->parent_instr); } else { const struct isl_format_layout *image_fmtl = @@ -439,7 +439,7 @@ lower_image_load_instr(nir_builder *b, image_fmt, raw_fmt, dest_components); - nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_src_for_ssa(color)); + nir_ssa_def_rewrite_uses(&intrin->dest.ssa, color); } return true; @@ -604,7 +604,7 @@ lower_image_atomic_instr(nir_builder *b, /* Use an undef to hold the uses of the load conversion. */ nir_ssa_def *placeholder = nir_ssa_undef(b, 4, 32); - nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_src_for_ssa(placeholder)); + nir_ssa_def_rewrite_uses(&intrin->dest.ssa, placeholder); /* Check the first component of the size field to find out if the * image is bound. Necessary on IVB for typed atomics because @@ -620,7 +620,7 @@ lower_image_atomic_instr(nir_builder *b, nir_pop_if(b, NULL); nir_ssa_def *result = nir_if_phi(b, &intrin->dest.ssa, zero); - nir_ssa_def_rewrite_uses(placeholder, nir_src_for_ssa(result)); + nir_ssa_def_rewrite_uses(placeholder, result); return true; } @@ -669,7 +669,7 @@ lower_image_size_instr(nir_builder *b, comps[c] = nir_imm_int(b, 1); nir_ssa_def *vec = nir_vec(b, comps, intrin->dest.ssa.num_components); - nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_src_for_ssa(vec)); + nir_ssa_def_rewrite_uses(&intrin->dest.ssa, vec); return true; } diff --git a/src/intel/compiler/brw_nir_lower_intersection_shader.c b/src/intel/compiler/brw_nir_lower_intersection_shader.c index 93f906aedbc..8bd42171758 100644 --- a/src/intel/compiler/brw_nir_lower_intersection_shader.c +++ b/src/intel/compiler/brw_nir_lower_intersection_shader.c @@ -96,13 +96,13 @@ lower_any_hit_for_intersection(nir_shader *any_hit) case nir_intrinsic_load_ray_t_max: nir_ssa_def_rewrite_uses(&intrin->dest.ssa, - nir_src_for_ssa(hit_t)); + hit_t); nir_instr_remove(&intrin->instr); break; case nir_intrinsic_load_ray_hit_kind: nir_ssa_def_rewrite_uses(&intrin->dest.ssa, - nir_src_for_ssa(hit_kind)); + hit_kind); nir_instr_remove(&intrin->instr); break; @@ -231,7 +231,7 @@ brw_nir_lower_intersection_shader(nir_shader *intersection, nir_ssa_def *accepted = nir_load_var(b, commit_tmp); nir_ssa_def_rewrite_uses(&intrin->dest.ssa, - nir_src_for_ssa(accepted)); + accepted); break; } diff --git a/src/intel/compiler/brw_nir_lower_mem_access_bit_sizes.c b/src/intel/compiler/brw_nir_lower_mem_access_bit_sizes.c index bbb210b4103..ea79f3b1879 100644 --- a/src/intel/compiler/brw_nir_lower_mem_access_bit_sizes.c +++ b/src/intel/compiler/brw_nir_lower_mem_access_bit_sizes.c @@ -144,7 +144,7 @@ lower_mem_load_bit_size(nir_builder *b, nir_intrinsic_instr *intrin, } nir_ssa_def_rewrite_uses(&intrin->dest.ssa, - nir_src_for_ssa(result)); + result); nir_instr_remove(&intrin->instr); return true; diff --git a/src/intel/compiler/brw_nir_lower_rt_intrinsics.c b/src/intel/compiler/brw_nir_lower_rt_intrinsics.c index efd5e24a891..205604f6563 100644 --- a/src/intel/compiler/brw_nir_lower_rt_intrinsics.c +++ b/src/intel/compiler/brw_nir_lower_rt_intrinsics.c @@ -365,7 +365,7 @@ lower_rt_intrinsics_impl(nir_function_impl *impl, if (sysval) { nir_ssa_def_rewrite_uses(&intrin->dest.ssa, - nir_src_for_ssa(sysval)); + sysval); nir_instr_remove(&intrin->instr); } } diff --git a/src/intel/compiler/brw_nir_lower_shader_calls.c b/src/intel/compiler/brw_nir_lower_shader_calls.c index b7c74356c06..9880f4f8396 100644 --- a/src/intel/compiler/brw_nir_lower_shader_calls.c +++ b/src/intel/compiler/brw_nir_lower_shader_calls.c @@ -847,7 +847,7 @@ rewrite_phis_to_pred(nir_block *block, nir_block *pred) if (phi_src->pred == pred) { found = true; assert(phi_src->src.is_ssa); - nir_ssa_def_rewrite_uses(&phi->dest.ssa, phi_src->src); + nir_ssa_def_rewrite_uses(&phi->dest.ssa, phi_src->src.ssa); break; } } diff --git a/src/intel/compiler/brw_nir_opt_peephole_ffma.c b/src/intel/compiler/brw_nir_opt_peephole_ffma.c index 813ede4c1cb..eba3e8f3090 100644 --- a/src/intel/compiler/brw_nir_opt_peephole_ffma.c +++ b/src/intel/compiler/brw_nir_opt_peephole_ffma.c @@ -253,7 +253,7 @@ brw_nir_opt_peephole_ffma_block(nir_builder *b, nir_block *block) bit_size, add->dest.dest.ssa.name); nir_ssa_def_rewrite_uses(&add->dest.dest.ssa, - nir_src_for_ssa(&ffma->dest.dest.ssa)); + &ffma->dest.dest.ssa); nir_builder_instr_insert(b, &ffma->instr); assert(list_is_empty(&add->dest.dest.ssa.uses)); diff --git a/src/intel/compiler/brw_nir_rt.c b/src/intel/compiler/brw_nir_rt.c index 30cd59d7292..62323e33e81 100644 --- a/src/intel/compiler/brw_nir_rt.c +++ b/src/intel/compiler/brw_nir_rt.c @@ -122,7 +122,7 @@ lower_rt_io_derefs(nir_shader *shader) nir_var_function_temp, deref->var->type, 0); nir_ssa_def_rewrite_uses(&deref->dest.ssa, - nir_src_for_ssa(&cast->dest.ssa)); + &cast->dest.ssa); nir_instr_remove(&deref->instr); progress = true; } @@ -135,7 +135,7 @@ lower_rt_io_derefs(nir_shader *shader) nir_var_function_temp, deref->type, 0); nir_ssa_def_rewrite_uses(&deref->dest.ssa, - nir_src_for_ssa(&cast->dest.ssa)); + &cast->dest.ssa); nir_instr_remove(&deref->instr); progress = true; } @@ -502,7 +502,7 @@ brw_nir_create_raygen_trampoline(const struct brw_compiler *compiler, load_trampoline_param(&b, rt_disp_globals_addr, 1, 64); assert(intrin->dest.is_ssa); nir_ssa_def_rewrite_uses(&intrin->dest.ssa, - nir_src_for_ssa(global_arg_addr)); + global_arg_addr); nir_instr_remove(instr); } } diff --git a/src/intel/vulkan/anv_nir_apply_pipeline_layout.c b/src/intel/vulkan/anv_nir_apply_pipeline_layout.c index 4b9fccdd874..6d0dd8085c0 100644 --- a/src/intel/vulkan/anv_nir_apply_pipeline_layout.c +++ b/src/intel/vulkan/anv_nir_apply_pipeline_layout.c @@ -431,7 +431,7 @@ lower_res_index_intrinsic(nir_intrinsic_instr *intrin, } assert(intrin->dest.is_ssa); - nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_src_for_ssa(index)); + nir_ssa_def_rewrite_uses(&intrin->dest.ssa, index); nir_instr_remove(&intrin->instr); } @@ -488,7 +488,7 @@ lower_res_reindex_intrinsic(nir_intrinsic_instr *intrin, } assert(intrin->dest.is_ssa); - nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_src_for_ssa(new_index)); + nir_ssa_def_rewrite_uses(&intrin->dest.ssa, new_index); nir_instr_remove(&intrin->instr); } @@ -659,7 +659,7 @@ lower_load_vulkan_descriptor(nir_intrinsic_instr *intrin, } assert(intrin->dest.is_ssa); - nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_src_for_ssa(desc)); + nir_ssa_def_rewrite_uses(&intrin->dest.ssa, desc); nir_instr_remove(&intrin->instr); } @@ -682,7 +682,7 @@ lower_get_ssbo_size(nir_intrinsic_instr *intrin, if (state->pdevice->has_a64_buffer_access) { nir_ssa_def *desc = build_ssbo_descriptor_load(desc_type, index, state); nir_ssa_def *size = nir_channel(b, desc, 2); - nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_src_for_ssa(size)); + nir_ssa_def_rewrite_uses(&intrin->dest.ssa, size); nir_instr_remove(&intrin->instr); } else { /* We're following the nir_address_format_32bit_index_offset model so @@ -765,7 +765,7 @@ lower_image_intrinsic(nir_intrinsic_instr *intrin, intrin->dest.ssa.num_components, intrin->dest.ssa.bit_size, state); - nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_src_for_ssa(desc)); + nir_ssa_def_rewrite_uses(&intrin->dest.ssa, desc); } else if (binding_offset > MAX_BINDING_TABLE_SIZE) { const bool write_only = (var->data.access & ACCESS_NON_READABLE) != 0; @@ -837,7 +837,7 @@ lower_load_constant(nir_intrinsic_instr *intrin, .range = nir_intrinsic_range(intrin)); } - nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_src_for_ssa(data)); + nir_ssa_def_rewrite_uses(&intrin->dest.ssa, data); } static void diff --git a/src/intel/vulkan/anv_nir_lower_multiview.c b/src/intel/vulkan/anv_nir_lower_multiview.c index d3d6dc63a9d..7c0abac0cad 100644 --- a/src/intel/vulkan/anv_nir_lower_multiview.c +++ b/src/intel/vulkan/anv_nir_lower_multiview.c @@ -221,7 +221,7 @@ anv_nir_lower_multiview(nir_shader *shader, value = build_view_index(&state); } - nir_ssa_def_rewrite_uses(&load->dest.ssa, nir_src_for_ssa(value)); + nir_ssa_def_rewrite_uses(&load->dest.ssa, value); nir_instr_remove(&load->instr); progress = true; diff --git a/src/intel/vulkan/anv_nir_lower_ycbcr_textures.c b/src/intel/vulkan/anv_nir_lower_ycbcr_textures.c index 454fb05f3c7..f8fb67ba646 100644 --- a/src/intel/vulkan/anv_nir_lower_ycbcr_textures.c +++ b/src/intel/vulkan/anv_nir_lower_ycbcr_textures.c @@ -324,7 +324,7 @@ try_lower_tex_ycbcr(const struct anv_pipeline_layout *layout, swizzled_bpcs); } - nir_ssa_def_rewrite_uses(&tex->dest.ssa, nir_src_for_ssa(result)); + nir_ssa_def_rewrite_uses(&tex->dest.ssa, result); nir_instr_remove(&tex->instr); return true; diff --git a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp index 25df2cf5b27..e58269651bb 100644 --- a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp +++ b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp @@ -387,7 +387,7 @@ brw_nir_lower_gl_images(nir_shader *shader, nir_builder_instr_insert(&b, &load->instr); nir_ssa_def_rewrite_uses(&intrin->dest.ssa, - nir_src_for_ssa(&load->dest.ssa)); + &load->dest.ssa); break; } @@ -449,7 +449,7 @@ brw_nir_lower_legacy_clipping(nir_shader *nir, int nr_userclip_plane_consts, nir_builder_instr_insert(&b, &load->instr); nir_ssa_def_rewrite_uses(&intrin->dest.ssa, - nir_src_for_ssa(&load->dest.ssa)); + &load->dest.ssa); nir_instr_remove(instr); } } diff --git a/src/mesa/state_tracker/st_nir_lower_builtin.c b/src/mesa/state_tracker/st_nir_lower_builtin.c index 339e25446b8..fbf672c7b00 100644 --- a/src/mesa/state_tracker/st_nir_lower_builtin.c +++ b/src/mesa/state_tracker/st_nir_lower_builtin.c @@ -228,7 +228,7 @@ lower_builtin_block(lower_builtin_state *state, nir_block *block) /* and rewrite uses of original instruction: */ assert(intrin->dest.is_ssa); - nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_src_for_ssa(def)); + nir_ssa_def_rewrite_uses(&intrin->dest.ssa, def); /* at this point intrin should be unused. We need to remove it * (rather than waiting for DCE pass) to avoid dangling reference diff --git a/src/microsoft/clc/clc_compiler.c b/src/microsoft/clc/clc_compiler.c index 6896506b469..46fcda3200b 100644 --- a/src/microsoft/clc/clc_compiler.c +++ b/src/microsoft/clc/clc_compiler.c @@ -272,7 +272,7 @@ clc_lower_input_image_deref(nir_builder *b, struct clc_image_lower_context *cont } /* No actual intrinsic needed here, just reference the loaded variable */ - nir_ssa_def_rewrite_uses(&intrinsic->dest.ssa, nir_src_for_ssa(*cached_deref)); + nir_ssa_def_rewrite_uses(&intrinsic->dest.ssa, *cached_deref); nir_instr_remove(&intrinsic->instr); break; } @@ -826,7 +826,7 @@ split_unaligned_load(nir_builder *b, nir_intrinsic_instr *intrin, unsigned align } nir_ssa_def *new_dest = nir_extract_bits(b, srcs, num_loads, 0, num_comps, intrin->dest.ssa.bit_size); - nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_src_for_ssa(new_dest)); + nir_ssa_def_rewrite_uses(&intrin->dest.ssa, new_dest); nir_instr_remove(&intrin->instr); } diff --git a/src/microsoft/clc/clc_nir.c b/src/microsoft/clc/clc_nir.c index 206365ab896..5ca437a38ae 100644 --- a/src/microsoft/clc/clc_nir.c +++ b/src/microsoft/clc/clc_nir.c @@ -44,7 +44,7 @@ lower_load_base_global_invocation_id(nir_builder *b, nir_intrinsic_instr *intr, global_offset_x)), nir_dest_num_components(intr->dest), nir_dest_bit_size(intr->dest)); - nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(offset)); + nir_ssa_def_rewrite_uses(&intr->dest.ssa, offset); nir_instr_remove(&intr->instr); return true; } @@ -62,7 +62,7 @@ lower_load_work_dim(nir_builder *b, nir_intrinsic_instr *intr, work_dim)), nir_dest_num_components(intr->dest), nir_dest_bit_size(intr->dest)); - nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(dim)); + nir_ssa_def_rewrite_uses(&intr->dest.ssa, dim); nir_instr_remove(&intr->instr); return true; } @@ -78,7 +78,7 @@ lower_load_local_group_size(nir_builder *b, nir_intrinsic_instr *intr) nir_const_value_for_int(b->shader->info.cs.local_size[2], 32) }; nir_ssa_def *size = nir_build_imm(b, 3, 32, v); - nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(size)); + nir_ssa_def_rewrite_uses(&intr->dest.ssa, size); nir_instr_remove(&intr->instr); return true; } @@ -96,7 +96,7 @@ lower_load_num_work_groups(nir_builder *b, nir_intrinsic_instr *intr, group_count_total_x)), nir_dest_num_components(intr->dest), nir_dest_bit_size(intr->dest)); - nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(count)); + nir_ssa_def_rewrite_uses(&intr->dest.ssa, count); nir_instr_remove(&intr->instr); return true; } @@ -114,7 +114,7 @@ lower_load_base_work_group_id(nir_builder *b, nir_intrinsic_instr *intr, group_id_offset_x)), nir_dest_num_components(intr->dest), nir_dest_bit_size(intr->dest)); - nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(offset)); + nir_ssa_def_rewrite_uses(&intr->dest.ssa, offset); nir_instr_remove(&intr->instr); return true; } @@ -201,7 +201,7 @@ lower_load_kernel_input(nir_builder *b, nir_intrinsic_instr *intr, nir_ssa_def *result = nir_load_deref(b, deref); - nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(result)); + nir_ssa_def_rewrite_uses(&intr->dest.ssa, result); nir_instr_remove(&intr->instr); return true; } @@ -274,7 +274,7 @@ clc_lower_printf_base(nir_shader *nir, unsigned uav_id) nir_deref_instr *deref = nir_build_deref_var(&b, printf_var); printf_deref = &deref->dest.ssa; } - nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_src_for_ssa(printf_deref)); + nir_ssa_def_rewrite_uses(&intrin->dest.ssa, printf_deref); } } diff --git a/src/microsoft/compiler/dxil_nir.c b/src/microsoft/compiler/dxil_nir.c index 2b1bcb001cb..c1cafffd613 100644 --- a/src/microsoft/compiler/dxil_nir.c +++ b/src/microsoft/compiler/dxil_nir.c @@ -166,7 +166,7 @@ lower_load_deref(nir_builder *b, nir_intrinsic_instr *intr) nir_deref_path_finish(&path); assert(comp_idx == num_components); nir_ssa_def *result = nir_vec(b, comps, num_components); - nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(result)); + nir_ssa_def_rewrite_uses(&intr->dest.ssa, result); nir_instr_remove(&intr->instr); return true; } @@ -308,7 +308,7 @@ lower_load_ssbo(nir_builder *b, nir_intrinsic_instr *intr) assert(comp_idx == num_components); nir_ssa_def *result = nir_vec(b, comps, num_components); - nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(result)); + nir_ssa_def_rewrite_uses(&intr->dest.ssa, result); nir_instr_remove(&intr->instr); return true; } @@ -458,7 +458,7 @@ lower_32b_offset_load(nir_builder *b, nir_intrinsic_instr *intr) } nir_ssa_def *result = nir_vec(b, comps, num_components); - nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(result)); + nir_ssa_def_rewrite_uses(&intr->dest.ssa, result); nir_instr_remove(&intr->instr); return true; @@ -696,7 +696,7 @@ lower_load_ubo(nir_builder *b, nir_intrinsic_instr *intr) nir_dest_num_components(intr->dest), nir_dest_bit_size(intr->dest)); - nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(result)); + nir_ssa_def_rewrite_uses(&intr->dest.ssa, result); nir_instr_remove(&intr->instr); return true; } @@ -774,7 +774,7 @@ lower_shared_atomic(nir_builder *b, nir_intrinsic_instr *intr, nir_ssa_dest_init(&atomic->instr, &atomic->dest, 1, 32, intr->dest.ssa.name); nir_builder_instr_insert(b, &atomic->instr); - nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(&atomic->dest.ssa)); + nir_ssa_def_rewrite_uses(&intr->dest.ssa, &atomic->dest.ssa); nir_instr_remove(&intr->instr); return true; } @@ -847,7 +847,7 @@ lower_deref_ssbo(nir_builder *b, nir_deref_instr *deref) nir_build_deref_cast(b, ptr, nir_var_mem_ssbo, deref->type, glsl_get_explicit_stride(var->type)); nir_ssa_def_rewrite_uses(&deref->dest.ssa, - nir_src_for_ssa(&deref_cast->dest.ssa)); + &deref_cast->dest.ssa); nir_instr_remove(&deref->instr); deref = deref_cast; @@ -1082,7 +1082,7 @@ cast_phi(nir_builder *b, nir_phi_instr *phi, unsigned new_bit_size) b->cursor = nir_after_phis(nir_cursor_current_block(b->cursor)); nir_ssa_def *result = nir_build_alu(b, downcast_op, &lowered->dest.ssa, NULL, NULL, NULL); - nir_ssa_def_rewrite_uses(&phi->dest.ssa, nir_src_for_ssa(result)); + nir_ssa_def_rewrite_uses(&phi->dest.ssa, result); nir_instr_remove(&phi->instr); } diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c index 38efe98bd25..0a901f7dd1f 100644 --- a/src/panfrost/midgard/midgard_compile.c +++ b/src/panfrost/midgard/midgard_compile.c @@ -226,7 +226,7 @@ midgard_nir_lower_fdot2_instr(nir_builder *b, nir_instr *instr, void *data) nir_channel(b, product, 1)); /* Replace the fdot2 with this sum */ - nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, nir_src_for_ssa(sum)); + nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, sum); return true; } diff --git a/src/panfrost/util/pan_lower_helper_invocation.c b/src/panfrost/util/pan_lower_helper_invocation.c index 13b7fb987a4..23a37a15dd3 100644 --- a/src/panfrost/util/pan_lower_helper_invocation.c +++ b/src/panfrost/util/pan_lower_helper_invocation.c @@ -43,7 +43,7 @@ pan_lower_helper_invocation_instr(nir_builder *b, nir_instr *instr, void *data) nir_ssa_def *mask = nir_load_sample_mask_in(b); nir_ssa_def *eq = nir_ieq(b, mask, nir_imm_int(b, 0)); - nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(eq)); + nir_ssa_def_rewrite_uses(&intr->dest.ssa, eq); return true; } diff --git a/src/panfrost/util/pan_lower_sample_position.c b/src/panfrost/util/pan_lower_sample_position.c index 55c70521a5d..12a0c47bbff 100644 --- a/src/panfrost/util/pan_lower_sample_position.c +++ b/src/panfrost/util/pan_lower_sample_position.c @@ -58,7 +58,7 @@ pan_lower_sample_pos_impl(struct nir_builder *b, if (decoded->bit_size != nir_dest_bit_size(intr->dest)) decoded = nir_f2fN(b, decoded, nir_dest_bit_size(intr->dest)); - nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(decoded)); + nir_ssa_def_rewrite_uses(&intr->dest.ssa, decoded); return true; }