summaryrefslogtreecommitdiff
path: root/src/compiler/nir/nir_validate.c
diff options
context:
space:
mode:
authorFaith Ekstrand <faith.ekstrand@collabora.com>2023-08-14 11:08:07 -0500
committerMarge Bot <emma+marge@anholt.net>2023-08-14 21:22:53 +0000
commit80a1836d8bb68ef156254d72de0b3deb2dad17d1 (patch)
tree45dd4bb7fb035206abe051adb66a0a3891003ab3 /src/compiler/nir/nir_validate.c
parent0dd76b1abb952476a0d8723c7b0414406ce17f28 (diff)
nir: Get rid of nir_dest_bit_size()
We could add a nir_def_bit_size() helper but we use ->bit_size about 3x as often as nir_dest_bit_size() today so that's a major Coccinelle refactor anyway and this doesn't make it much worse. Most of this commit was generated byt the following semantic patch: @@ expression D; @@ <... -nir_dest_bit_size(D) +D.ssa.bit_size ... Some manual fixup was needed, especially in cpp files where Coccinelle tends to give up the moment it sees any interesting C++. Acked-by: Alyssa Rosenzweig <alyssa@rosenzweig.io> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24674>
Diffstat (limited to 'src/compiler/nir/nir_validate.c')
-rw-r--r--src/compiler/nir/nir_validate.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/compiler/nir/nir_validate.c b/src/compiler/nir/nir_validate.c
index 0e51d0366de..bb996122d88 100644
--- a/src/compiler/nir/nir_validate.c
+++ b/src/compiler/nir/nir_validate.c
@@ -248,7 +248,7 @@ validate_alu_instr(nir_alu_instr *instr, validate_state *state)
}
nir_alu_type dest_type = nir_op_infos[instr->op].output_type;
- unsigned dest_bit_size = nir_dest_bit_size(instr->dest.dest);
+ unsigned dest_bit_size = instr->dest.dest.ssa.bit_size;
if (nir_alu_type_get_type_size(dest_type)) {
validate_assert(state, dest_bit_size == nir_alu_type_get_type_size(dest_type));
} else if (instr_bit_size) {
@@ -316,7 +316,7 @@ validate_deref_instr(nir_deref_instr *instr, validate_state *state)
/* The parent pointer value must have the same number of components
* as the destination.
*/
- validate_src(&instr->parent, state, nir_dest_bit_size(instr->dest),
+ validate_src(&instr->parent, state, instr->dest.ssa.bit_size,
nir_dest_num_components(instr->dest));
nir_instr *parent_instr = instr->parent.ssa->parent_instr;
@@ -357,7 +357,7 @@ validate_deref_instr(nir_deref_instr *instr, validate_state *state)
if (instr->deref_type == nir_deref_type_array) {
validate_src(&instr->arr.index, state,
- nir_dest_bit_size(instr->dest), 1);
+ instr->dest.ssa.bit_size, 1);
}
break;
@@ -371,7 +371,7 @@ validate_deref_instr(nir_deref_instr *instr, validate_state *state)
parent->deref_type == nir_deref_type_ptr_as_array ||
parent->deref_type == nir_deref_type_cast);
validate_src(&instr->arr.index, state,
- nir_dest_bit_size(instr->dest), 1);
+ instr->dest.ssa.bit_size, 1);
break;
default:
@@ -478,7 +478,7 @@ validate_intrinsic_instr(nir_intrinsic_instr *instr, validate_state *state)
case nir_intrinsic_load_reg_indirect:
validate_register_handle(instr->src[0],
nir_dest_num_components(instr->dest),
- nir_dest_bit_size(instr->dest), state);
+ instr->dest.ssa.bit_size, state);
break;
case nir_intrinsic_store_reg:
@@ -552,7 +552,7 @@ validate_intrinsic_instr(nir_intrinsic_instr *instr, validate_state *state)
}
case nir_intrinsic_load_ubo_vec4: {
- int bit_size = nir_dest_bit_size(instr->dest);
+ int bit_size = instr->dest.ssa.bit_size;
validate_assert(state, bit_size >= 8);
validate_assert(state, (nir_intrinsic_component(instr) +
instr->num_components) *
@@ -587,7 +587,7 @@ validate_intrinsic_instr(nir_intrinsic_instr *instr, validate_state *state)
case nir_intrinsic_load_per_primitive_output:
case nir_intrinsic_load_push_constant:
/* All memory load operations must load at least a byte */
- validate_assert(state, nir_dest_bit_size(instr->dest) >= 8);
+ validate_assert(state, instr->dest.ssa.bit_size >= 8);
break;
case nir_intrinsic_store_ssbo:
@@ -645,7 +645,7 @@ validate_intrinsic_instr(nir_intrinsic_instr *instr, validate_state *state)
}
validate_assert(state, allowed);
- validate_assert(state, nir_dest_bit_size(instr->dest) ==
+ validate_assert(state, instr->dest.ssa.bit_size ==
util_format_get_blocksizebits(format));
}
break;
@@ -852,7 +852,7 @@ validate_tex_instr(nir_tex_instr *instr, validate_state *state)
unsigned bit_size = nir_alu_type_get_type_size(instr->dest_type);
validate_assert(state,
(bit_size ? bit_size : 32) ==
- nir_dest_bit_size(instr->dest));
+ instr->dest.ssa.bit_size);
}
static void