From ac581b30ec8188e36cf9d77fc5bdfc6196ba0ec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=9Alusarz?= Date: Thu, 8 Sep 2022 15:01:10 +0200 Subject: [PATCH] intel/compiler: refactor brw_nir_lower_mem_access_bit_sizes Change dup_mem_intrinsic return type. Reviewed-by: Caio Oliveira Part-of: --- .../brw_nir_lower_mem_access_bit_sizes.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) 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 bfdfa732049..20a92b0e2bb 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 @@ -26,7 +26,7 @@ #include "util/u_math.h" #include "util/bitscan.h" -static nir_ssa_def * +static nir_intrinsic_instr * dup_mem_intrinsic(nir_builder *b, nir_intrinsic_instr *intrin, nir_ssa_def *store_src, int offset, unsigned num_components, unsigned bit_size, @@ -75,7 +75,7 @@ dup_mem_intrinsic(nir_builder *b, nir_intrinsic_instr *intrin, nir_builder_instr_insert(b, &dup->instr); - return info->has_dest ? &dup->dest.ssa : NULL; + return dup; } static bool @@ -109,8 +109,9 @@ lower_mem_load_bit_size(nir_builder *b, nir_intrinsic_instr *intrin, */ assert(load_comps32 <= 3); - nir_ssa_def *load = dup_mem_intrinsic(b, intrin, NULL, -load_offset, - load_comps32, 32, 4); + nir_intrinsic_instr *load_instr = + dup_mem_intrinsic(b, intrin, NULL, -load_offset, load_comps32, 32, 4); + nir_ssa_def *load = &load_instr->dest.ssa; result = nir_extract_bits(b, &load, 1, load_offset * 8, num_components, bit_size); } else { @@ -134,9 +135,10 @@ lower_mem_load_bit_size(nir_builder *b, nir_intrinsic_instr *intrin, DIV_ROUND_UP(MIN2(bytes_left, 16), 4); } - loads[num_loads++] = dup_mem_intrinsic(b, intrin, NULL, load_offset, - load_comps, load_bit_size, - align); + nir_intrinsic_instr *load_instr = + dup_mem_intrinsic(b, intrin, NULL, load_offset, load_comps, + load_bit_size, align); + loads[num_loads++] = &load_instr->dest.ssa; load_offset += load_comps * (load_bit_size / 8); }