From 5300cff16ce79f168b1c9852525979aadf07b884 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Thu, 22 Jun 2023 12:24:28 -0400 Subject: [PATCH] nir/lower_bool_to_int32: Fix progress reporting If we only lower parameters, that's still progress. Technically. Fixes: 6a29cb2654f ("nir/lower_bool_to_int32: add support for lowering functions.") Signed-off-by: Alyssa Rosenzweig Reviewed-by: Ian Romanick Part-of: (cherry picked from commit 5c8f21412f240c5197ee12293eedfba7307627e1) --- .pick_status.json | 2 +- src/compiler/nir/nir_lower_bool_to_int32.c | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 43f2e7a8dd7..5478927acb5 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -238,7 +238,7 @@ "description": "nir/lower_bool_to_int32: Fix progress reporting", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "6a29cb2654ff059dcb59e3fcaa0bcc982656609d" }, diff --git a/src/compiler/nir/nir_lower_bool_to_int32.c b/src/compiler/nir/nir_lower_bool_to_int32.c index 779520e56bd..3febb73e15f 100644 --- a/src/compiler/nir/nir_lower_bool_to_int32.c +++ b/src/compiler/nir/nir_lower_bool_to_int32.c @@ -169,15 +169,20 @@ nir_lower_bool_to_int32_instr(UNUSED nir_builder *b, bool nir_lower_bool_to_int32(nir_shader *shader) { + bool progress = false; nir_foreach_function(func, shader) { for (unsigned idx = 0; idx < func->num_params; idx++) { nir_parameter *param = &func->params[idx]; - if (param->bit_size == 1) + if (param->bit_size == 1) { param->bit_size = 32; + progress = true; + } } } - return nir_shader_instructions_pass(shader, nir_lower_bool_to_int32_instr, - nir_metadata_block_index | - nir_metadata_dominance, - NULL); + + progress |= + nir_shader_instructions_pass(shader, nir_lower_bool_to_int32_instr, + nir_metadata_block_index | + nir_metadata_dominance, NULL); + return progress; }