KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nir/validate: validate intr->num_components 

Validate that num_components is only set for vectorized instructions, to
prevent other nir passes or driver backends from mistakenly relying on
num_components for non-vectorized instructions.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5371>
This commit is contained in:
Rob Clark 2020-06-08 09:52:28 -07:00 committed by Marge Bot
parent be16833d96
commit 167fa2887f
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -514,6 +514,21 @@ validate_deref_instr(nir_deref_instr *instr, validate_state *state)
}
}
static bool
vectorized_intrinsic(nir_intrinsic_instr *intr)
{
const nir_intrinsic_info *info = &nir_intrinsic_infos[intr->intrinsic];
if (info->dest_components == 0)
return true;
for (unsigned i = 0; i < info->num_srcs; i++)
if (info->src_components[i] == 0)
return true;
return false;
}
static void
validate_intrinsic_instr(nir_intrinsic_instr *instr, validate_state *state)
{
@ -640,6 +655,9 @@ validate_intrinsic_instr(nir_intrinsic_instr *instr, validate_state *state)
validate_dest(&instr->dest, state, dest_bit_size, components_written);
}
if (!vectorized_intrinsic(instr))
validate_assert(state, instr->num_components == 0);
}
static void