From 0e0cc12de6d74d9ba99d558b9a48e62b193f2899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sat, 9 Aug 2025 17:39:47 -0400 Subject: [PATCH] nir/opt_vectorize: don't ralloc the set Reviewed-by: Gert Wollny Acked-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/compiler/nir/nir_opt_vectorize.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/compiler/nir/nir_opt_vectorize.c b/src/compiler/nir/nir_opt_vectorize.c index edf153b7699..69fb720f77a 100644 --- a/src/compiler/nir/nir_opt_vectorize.c +++ b/src/compiler/nir/nir_opt_vectorize.c @@ -530,16 +530,16 @@ instr_try_combine(struct set *instr_set, nir_instr *instr1, nir_instr *instr2) } } -static struct set * -vec_instr_set_create(void) +static void +vec_instr_set_init(struct set *instr_set) { - return _mesa_set_create(NULL, hash_instr, instrs_equal); + _mesa_set_init(instr_set, NULL, hash_instr, instrs_equal); } static void -vec_instr_set_destroy(struct set *instr_set) +vec_instr_set_fini(struct set *instr_set) { - _mesa_set_destroy(instr_set, NULL); + _mesa_set_fini(instr_set, NULL); } static bool @@ -584,7 +584,8 @@ static bool nir_opt_vectorize_impl(nir_function_impl *impl, nir_vectorize_cb filter, void *data) { - struct set *instr_set = vec_instr_set_create(); + struct set instr_set; + vec_instr_set_init(&instr_set); nir_metadata_require(impl, nir_metadata_control_flow); @@ -592,13 +593,13 @@ nir_opt_vectorize_impl(nir_function_impl *impl, nir_foreach_block(block, impl) { nir_foreach_instr_safe(instr, block) { - progress |= vec_instr_set_add_or_rewrite(instr_set, instr, filter, data); + progress |= vec_instr_set_add_or_rewrite(&instr_set, instr, filter, data); } } nir_progress(progress, impl, nir_metadata_control_flow); - vec_instr_set_destroy(instr_set); + vec_instr_set_fini(&instr_set); return progress; }