fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 00:38:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

nir/validate: Don't treat if-uses specially

Browse source 
We don't use the tag anywhere, so don't bother with it.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Suggested-by: Faith Ekstrand <faith@gfxstrand.net>
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22343>
This commit is contained in:
Alyssa Rosenzweig 2023-04-06 15:37:54 -04:00 • committed by Marge Bot
parent f3b420692b
commit c4a91c12dc
1 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/compiler/nir/nir_validate.c
View file

@ -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 static void
validate_ssa_src(nir_src *src, validate_state *state, validate_ssa_src(nir_src *src, validate_state *state,
unsigned bit_sizes, unsigned num_components) 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 /* 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. * our use is seen in a use list.
*/ */
struct set_entry *entry; struct set_entry *entry = _mesa_set_search(state->ssa_srcs, src);
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));
}
validate_assert(state, entry); validate_assert(state, entry);
/* This will let us prove that we've seen all the sources */ /* 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) { nir_foreach_use_including_if(src, def) {
validate_assert(state, src->is_ssa); validate_assert(state, src->is_ssa);
validate_assert(state, src->ssa == def); validate_assert(state, src->ssa == def);
bool already_seen = false; bool already_seen = false;
_mesa_set_search_and_add(state->ssa_srcs, src, &already_seen);
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);
/* A nir_src should only appear once and only in one SSA def use list */ /* A nir_src should only appear once and only in one SSA def use list */
validate_assert(state, !already_seen); validate_assert(state, !already_seen);
} }