Module: Mesa Branch: main Commit: 0f0f6c622713dd9b93a055530b320db13239ad87 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0f0f6c622713dd9b93a055530b320db13239ad87
Author: Alyssa Rosenzweig <aly...@rosenzweig.io> Date: Mon Nov 6 17:44:08 2023 -0400 nir/validate: Specialize if source validation Yet another bit of branchiness we should tame. 99% of the time, sources are not for if's, so we shouldn't need to do the extra checking to handle that 1%. Signed-off-by: Alyssa Rosenzweig <aly...@rosenzweig.io> Reviewed-by: Rhys Perry <pendingchao...@gmail.com> Reviewed-by: Faith Ekstrand <faith.ekstr...@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26084> --- src/compiler/nir/nir_validate.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/compiler/nir/nir_validate.c b/src/compiler/nir/nir_validate.c index 31379e36f2d..8021fd3abbb 100644 --- a/src/compiler/nir/nir_validate.c +++ b/src/compiler/nir/nir_validate.c @@ -171,16 +171,23 @@ validate_src_tag(nir_src *src, validate_state *state) } } +static void +validate_if_src(nir_src *src, validate_state *state) +{ + validate_src_tag(src, state); + validate_assert(state, nir_src_parent_if(src) == state->if_stmt); + validate_assert(state, src->ssa != NULL); + validate_assert(state, src->ssa->num_components == 1); +} + static void validate_src(nir_src *src, validate_state *state) { /* Validate the tag first, so that nir_src_parent_instr is valid */ validate_src_tag(src, state); - if (state->instr) - validate_assert(state, nir_src_parent_instr(src) == state->instr); - else - validate_assert(state, nir_src_parent_if(src) == state->if_stmt); + /* Source assumed to be instruction, use validate_if_src for if */ + validate_assert(state, nir_src_parent_instr(src) == state->instr); validate_assert(state, src->ssa != NULL); } @@ -1290,7 +1297,7 @@ validate_if(nir_if *if_stmt, validate_state *state) validate_assert(state, next_node->type == nir_cf_node_block); validate_assert(state, nir_src_is_if(&if_stmt->condition)); - validate_sized_src(&if_stmt->condition, state, 0, 1); + validate_if_src(&if_stmt->condition, state); validate_assert(state, !exec_list_is_empty(&if_stmt->then_list)); validate_assert(state, !exec_list_is_empty(&if_stmt->else_list));
