From 4dc0c3ce942b21c241e79eaa157b65a12a03a09c Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Tue, 17 Mar 2026 11:07:49 -0400 Subject: [PATCH] nak: Report progress from nak_nir_rematerialize_load_const() Fixes: 8fffcdb18b4d ("nak/nir: Re-materialize load_const instructions in use blocks") Reviewed-by: Karol Herbst Acked-by: Mel Henning (cherry picked from commit 381bc06c4a86e356817d12d4020334308838e516) Part-of: --- .pick_status.json | 2 +- src/nouveau/compiler/nak_nir_rematerialize_load_const.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 974402cfd03..8fe494124ca 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -6624,7 +6624,7 @@ "description": "nak: Report progress from nak_nir_rematerialize_load_const()", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "8fffcdb18b4d24f66a76d7c4de8006bd67eec728", "notes": null diff --git a/src/nouveau/compiler/nak_nir_rematerialize_load_const.c b/src/nouveau/compiler/nak_nir_rematerialize_load_const.c index 8b885c5cd48..c4ba9529e62 100644 --- a/src/nouveau/compiler/nak_nir_rematerialize_load_const.c +++ b/src/nouveau/compiler/nak_nir_rematerialize_load_const.c @@ -43,13 +43,12 @@ rematerialize_load_const(nir_src *src, void *_ctx) static bool rematerialize_load_const_impl(nir_function_impl *impl) { - bool progress = false; - struct remat_ctx ctx = { .remap = _mesa_pointer_hash_table_create(NULL), .b = nir_builder_create(impl), }; + bool progress = false; nir_foreach_block(block, impl) { _mesa_hash_table_clear(ctx.remap, NULL); ctx.block = block; @@ -82,12 +81,14 @@ rematerialize_load_const_impl(nir_function_impl *impl) } } } + + if (ctx.remap->entries > 0) + progress = true; } _mesa_hash_table_destroy(ctx.remap, NULL); - return nir_progress(progress, impl, nir_metadata_control_flow | - nir_metadata_divergence); + return nir_progress(progress, impl, nir_metadata_control_flow); } bool