From c4a91c12dc29cba7b2e1c1908b29b1ca6cce49dc Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Thu, 6 Apr 2023 15:37:54 -0400 Subject: [PATCH] nir/validate: Don't treat if-uses specially We don't use the tag anywhere, so don't bother with it. Signed-off-by: Alyssa Rosenzweig Suggested-by: Faith Ekstrand Reviewed-by: Faith Ekstrand Part-of: --- src/compiler/nir/nir_validate.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/src/compiler/nir/nir_validate.c b/src/compiler/nir/nir_validate.c index 06259c3..f051b23 100644 --- a/src/compiler/nir/nir_validate.c +++ b/src/compiler/nir/nir_validate.c @@ -188,9 +188,6 @@ validate_reg_src(nir_src *src, validate_state *state, } } -#define SET_PTR_BIT(ptr, bit) \ - (void *)(((uintptr_t)(ptr)) | (((uintptr_t)1) << bit)) - static void validate_ssa_src(nir_src *src, validate_state *state, unsigned bit_sizes, unsigned num_components) @@ -200,12 +197,7 @@ validate_ssa_src(nir_src *src, validate_state *state, /* As we walk SSA defs, we add every use to this set. We need to make sure * our use is seen in a use list. */ - struct set_entry *entry; - if (!src->is_if && state->instr) { - entry = _mesa_set_search(state->ssa_srcs, src); - } else { - entry = _mesa_set_search(state->ssa_srcs, SET_PTR_BIT(src, 0)); - } + struct set_entry *entry = _mesa_set_search(state->ssa_srcs, src); validate_assert(state, entry); /* This will let us prove that we've seen all the sources */ @@ -304,13 +296,9 @@ validate_ssa_def(nir_ssa_def *def, validate_state *state) nir_foreach_use_including_if(src, def) { validate_assert(state, src->is_ssa); validate_assert(state, src->ssa == def); - bool already_seen = false; - - nir_src *ssa_src_ptr = src; - if (src->is_if) - ssa_src_ptr = SET_PTR_BIT(ssa_src_ptr, 0); - _mesa_set_search_and_add(state->ssa_srcs, ssa_src_ptr, &already_seen); + bool already_seen = false; + _mesa_set_search_and_add(state->ssa_srcs, src, &already_seen); /* A nir_src should only appear once and only in one SSA def use list */ validate_assert(state, !already_seen); } -- 2.7.4