From ebf4eff7eb67eb20e7db624622ab60377cbd34fc Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Fri, 26 May 2023 11:15:36 -0400 Subject: [PATCH] treewide: Use nir_replicate Via coccinelle. Signed-off-by: Alyssa Rosenzweig Acked-by: Jesse Natalie Part-of: --- src/amd/vulkan/meta/radv_meta_bufimage.c | 8 ++++---- src/amd/vulkan/radv_query.c | 2 +- src/gallium/auxiliary/nir/nir_draw_helpers.c | 2 +- src/intel/compiler/brw_nir_lower_cs_intrinsics.c | 2 +- src/mesa/main/ff_fragment_shader.c | 2 +- src/mesa/main/ffvertex_prog.c | 2 +- src/microsoft/spirv_to_dxil/dxil_spirv_nir.c | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/amd/vulkan/meta/radv_meta_bufimage.c b/src/amd/vulkan/meta/radv_meta_bufimage.c index 65e781be6b4..1867eaf3fa6 100644 --- a/src/amd/vulkan/meta/radv_meta_bufimage.c +++ b/src/amd/vulkan/meta/radv_meta_bufimage.c @@ -63,7 +63,7 @@ build_nir_itob_compute_shader(struct radv_device *dev, bool is_3d) nir_ssa_def *tmp = nir_imul(&b, pos_y, stride); tmp = nir_iadd(&b, tmp, pos_x); - nir_ssa_def *coord = nir_vec4(&b, tmp, tmp, tmp, tmp); + nir_ssa_def *coord = nir_replicate(&b, tmp, 4); nir_image_deref_store(&b, &nir_build_deref_var(&b, output_img)->dest.ssa, coord, nir_ssa_undef(&b, 1, 32), outval, nir_imm_int(&b, 0), @@ -384,7 +384,7 @@ build_nir_btoi_r32g32b32_compute_shader(struct radv_device *dev) for (int chan = 0; chan < 3; chan++) { nir_ssa_def *local_pos = nir_iadd_imm(&b, global_pos, chan); - nir_ssa_def *coord = nir_vec4(&b, local_pos, local_pos, local_pos, local_pos); + nir_ssa_def *coord = nir_replicate(&b, local_pos, 4); nir_image_deref_store(&b, &nir_build_deref_var(&b, output_img)->dest.ssa, coord, nir_ssa_undef(&b, 1, 32), nir_channel(&b, outval, chan), @@ -706,7 +706,7 @@ build_nir_itoi_r32g32b32_compute_shader(struct radv_device *dev) nir_ssa_def *dst_local_pos = nir_iadd_imm(&b, dst_global_pos, chan); nir_ssa_def *dst_coord = - nir_vec4(&b, dst_local_pos, dst_local_pos, dst_local_pos, dst_local_pos); + nir_replicate(&b, dst_local_pos, 4); nir_image_deref_store(&b, &nir_build_deref_var(&b, output_img)->dest.ssa, dst_coord, nir_ssa_undef(&b, 1, 32), nir_channel(&b, outval, 0), @@ -983,7 +983,7 @@ build_nir_cleari_r32g32b32_compute_shader(struct radv_device *dev) for (unsigned chan = 0; chan < 3; chan++) { nir_ssa_def *local_pos = nir_iadd_imm(&b, global_pos, chan); - nir_ssa_def *coord = nir_vec4(&b, local_pos, local_pos, local_pos, local_pos); + nir_ssa_def *coord = nir_replicate(&b, local_pos, 4); nir_image_deref_store(&b, &nir_build_deref_var(&b, output_img)->dest.ssa, coord, nir_ssa_undef(&b, 1, 32), nir_channel(&b, clear_val, chan), diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c index 8c77fae5ac9..efd2fd25605 100644 --- a/src/amd/vulkan/radv_query.c +++ b/src/amd/vulkan/radv_query.c @@ -447,7 +447,7 @@ build_tfb_query_shader(struct radv_device *device) nir_local_variable_create(b.impl, glsl_vector_type(GLSL_TYPE_UINT64, 2), "result"); nir_variable *available = nir_local_variable_create(b.impl, glsl_bool_type(), "available"); - nir_store_var(&b, result, nir_vec2(&b, nir_imm_int64(&b, 0), nir_imm_int64(&b, 0)), 0x3); + nir_store_var(&b, result, nir_replicate(&b, nir_imm_int64(&b, 0), 2), 0x3); nir_store_var(&b, available, nir_imm_false(&b), 0x1); nir_ssa_def *flags = nir_load_push_constant(&b, 1, 32, nir_imm_int(&b, 0), .range = 4); diff --git a/src/gallium/auxiliary/nir/nir_draw_helpers.c b/src/gallium/auxiliary/nir/nir_draw_helpers.c index fcf11eb5fa4..606aa6a3bef 100644 --- a/src/gallium/auxiliary/nir/nir_draw_helpers.c +++ b/src/gallium/auxiliary/nir/nir_draw_helpers.c @@ -218,7 +218,7 @@ lower_aaline_instr(nir_builder *b, nir_instr *instr, void *data) // vec2 a = vec2((uvec2(pattern) >> p) & uvec2(1u)); nir_ssa_def *a = nir_i2f32(b, - nir_iand(b, nir_ishr(b, nir_vec2(b, pattern, pattern), p), + nir_iand(b, nir_ishr(b, nir_replicate(b, pattern, 2), p), nir_imm_ivec2(b, 1, 1))); // float cov = mix(a.x, a.y, t); diff --git a/src/intel/compiler/brw_nir_lower_cs_intrinsics.c b/src/intel/compiler/brw_nir_lower_cs_intrinsics.c index 1097ea42a3e..be2f772fbad 100644 --- a/src/intel/compiler/brw_nir_lower_cs_intrinsics.c +++ b/src/intel/compiler/brw_nir_lower_cs_intrinsics.c @@ -209,7 +209,7 @@ lower_cs_intrinsics_convert_block(struct lower_intrinsics_state *state, if (ws[0] * ws[1] * ws[2] == 1) { nir_ssa_def *zero = nir_imm_int(b, 0); local_index = zero; - local_id = nir_vec3(b, zero, zero, zero); + local_id = nir_replicate(b, zero, 3); } } diff --git a/src/mesa/main/ff_fragment_shader.c b/src/mesa/main/ff_fragment_shader.c index 8ea9480b1f0..f16e05885e9 100644 --- a/src/mesa/main/ff_fragment_shader.c +++ b/src/mesa/main/ff_fragment_shader.c @@ -540,7 +540,7 @@ smear(nir_builder *b, nir_ssa_def *val) if (val->num_components != 1) return val; - return nir_vec4(b, val, val, val, val); + return nir_replicate(b, val, 4); } static nir_ssa_def * diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c index 13f2b11dc4d..fa385d29863 100644 --- a/src/mesa/main/ffvertex_prog.c +++ b/src/mesa/main/ffvertex_prog.c @@ -950,7 +950,7 @@ static void build_lighting( struct tnl_program *p ) */ nir_ssa_def *dot = nir_fdot3(p->b, normal, VPpli); if (p->state->material_shininess_is_zero) { - dots = nir_vec4(p->b, dot, dot, dot, dot); + dots = nir_replicate(p->b, dot, 4); } else { dots = nir_vector_insert_imm(p->b, dots, dot, 0); dot = nir_fdot3(p->b, normal, half); diff --git a/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c b/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c index 147ca0e6988..026f9424cf0 100644 --- a/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c +++ b/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c @@ -790,7 +790,7 @@ lower_pntc_read(nir_builder *b, nir_instr *instr, void *data) else pos = nir_interp_deref_at_offset(b, 4, 32, &nir_build_deref_var(b, pos_var)->dest.ssa, - nir_vec2(b, nir_imm_float(b, 0), nir_imm_float(b, 0))); + nir_replicate(b, nir_imm_float(b, 0), 2)); nir_ssa_def *pntc = nir_fadd_imm(b, nir_fsub(b, nir_channels(b, pos, 0x3), nir_channels(b, point_center, 0x3)),