Mesa (master): nir: extract out convert_to_bitsize() helper
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Jun 3 21:45:18 UTC 2020
Module: Mesa
Branch: master
Commit: 866618c5c86fbbb59036845c1d6e38d8e526b525
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=866618c5c86fbbb59036845c1d6e38d8e526b525
Author: Rob Clark <robdclark at chromium.org>
Date: Wed Jun 3 12:09:59 2020 -0700
nir: extract out convert_to_bitsize() helper
Signed-off-by: Rob Clark <robdclark at chromium.org>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Kristian H. Kristensen <hoegsberg at google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5318>
---
src/compiler/nir/nir_builder.h | 15 +++++++++++++++
src/compiler/nir/nir_lower_bit_size.c | 18 ++----------------
2 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/src/compiler/nir/nir_builder.h b/src/compiler/nir/nir_builder.h
index 6c4b2da6f5c..de84bc85784 100644
--- a/src/compiler/nir/nir_builder.h
+++ b/src/compiler/nir/nir_builder.h
@@ -1384,4 +1384,19 @@ nir_scoped_memory_barrier(nir_builder *b,
nir_scoped_barrier(b, NIR_SCOPE_NONE, scope, semantics, modes);
}
+static inline nir_ssa_def *
+nir_convert_to_bit_size(nir_builder *b,
+ nir_ssa_def *src,
+ nir_alu_type type,
+ unsigned bit_size)
+{
+ nir_alu_type base_type = nir_alu_type_get_base_type(type);
+ nir_alu_type dst_type = (nir_alu_type)(bit_size | base_type);
+
+ nir_op opcode =
+ nir_type_conversion_op(type, dst_type, nir_rounding_mode_undef);
+
+ return nir_build_alu(b, opcode, src, NULL, NULL, NULL);
+}
+
#endif /* NIR_BUILDER_H */
diff --git a/src/compiler/nir/nir_lower_bit_size.c b/src/compiler/nir/nir_lower_bit_size.c
index 100ac4864a5..fbab2677756 100644
--- a/src/compiler/nir/nir_lower_bit_size.c
+++ b/src/compiler/nir/nir_lower_bit_size.c
@@ -29,20 +29,6 @@
* a bit-size that is supported natively and then converts the result back to
* the original bit-size.
*/
-static nir_ssa_def *
-convert_to_bit_size(nir_builder *bld,
- nir_ssa_def *src,
- nir_alu_type type,
- unsigned bit_size)
-{
- nir_alu_type base_type = nir_alu_type_get_base_type(type);
- nir_alu_type lowered_type = bit_size | base_type;
-
- nir_op opcode =
- nir_type_conversion_op(type, lowered_type, nir_rounding_mode_undef);
-
- return nir_build_alu(bld, opcode, src, NULL, NULL, NULL);
-}
static void
lower_instr(nir_builder *bld, nir_alu_instr *alu, unsigned bit_size)
@@ -59,7 +45,7 @@ lower_instr(nir_builder *bld, nir_alu_instr *alu, unsigned bit_size)
nir_alu_type type = nir_op_infos[op].input_types[i];
if (nir_alu_type_get_type_size(type) == 0)
- src = convert_to_bit_size(bld, src, type, bit_size);
+ src = nir_convert_to_bit_size(bld, src, type, bit_size);
if (i == 1 && (op == nir_op_ishl || op == nir_op_ishr || op == nir_op_ushr)) {
assert(util_is_power_of_two_nonzero(dst_bit_size));
@@ -85,7 +71,7 @@ lower_instr(nir_builder *bld, nir_alu_instr *alu, unsigned bit_size)
/* Convert result back to the original bit-size */
nir_alu_type type = nir_op_infos[op].output_type;
- nir_ssa_def *dst = convert_to_bit_size(bld, lowered_dst, type, dst_bit_size);
+ nir_ssa_def *dst = nir_convert_to_bit_size(bld, lowered_dst, type, dst_bit_size);
nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, nir_src_for_ssa(dst));
}
More information about the mesa-commit
mailing list