From 49ce749d0e25d957c6a38f1165b63a31baed708d Mon Sep 17 00:00:00 2001 From: Gert Wollny Date: Sun, 12 Apr 2020 16:36:20 +0200 Subject: [PATCH] nir: Add umad24 and umul24 opcodes So far only the singed versions are defined. v2: Make umad24 and umul24 non-driver specific (Eric Anholt) v3: Take care of nir_builder and automatic lowering of the opcodes if they are not supported by the backend. Signed-off-by: Gert Wollny Reviewed-by: Eric Anholt Part-of: --- src/compiler/nir/nir.h | 8 ++++++++ src/compiler/nir/nir_builtin_builder.h | 16 ---------------- src/compiler/nir/nir_opcodes.py | 8 ++++++++ src/compiler/nir/nir_opt_algebraic.py | 7 +++++++ 4 files changed, 23 insertions(+), 16 deletions(-) diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h index fd6086af70b..4f445b1b894 100644 --- a/src/compiler/nir/nir.h +++ b/src/compiler/nir/nir.h @@ -2996,6 +2996,14 @@ typedef struct nir_shader_compiler_options { */ bool has_imul24; + /** Backend supports umul24, if not set umul24 will automatically be lowered + * to imul with masked inputs */ + bool has_umul24; + + /** Backend supports umad24, if not set umad24 will automatically be lowered + * to imul with masked inputs and iadd */ + bool has_umad24; + /* Whether to generate only scoped_memory_barrier intrinsics instead of the * set of memory barrier intrinsics based on GLSL. */ diff --git a/src/compiler/nir/nir_builtin_builder.h b/src/compiler/nir/nir_builtin_builder.h index ad837a51569..e4c836541b7 100644 --- a/src/compiler/nir/nir_builtin_builder.h +++ b/src/compiler/nir/nir_builtin_builder.h @@ -100,22 +100,6 @@ nir_flog(nir_builder *b, nir_ssa_def *x) return nir_fmul_imm(b, nir_flog2(b, x), 1.0 / M_LOG2E); } -static inline nir_ssa_def * -nir_umul24(nir_builder *b, nir_ssa_def *x, nir_ssa_def *y) -{ - nir_ssa_def *mask = nir_imm_int(b, 0xffffff); - nir_ssa_def *x_24 = nir_iand(b, x, mask); - nir_ssa_def *y_24 = nir_iand(b, y, mask); - return nir_imul(b, x_24, y_24); -} - -static inline nir_ssa_def * -nir_umad24(nir_builder *b, nir_ssa_def *x, nir_ssa_def *y, nir_ssa_def *z) -{ - nir_ssa_def *temp = nir_umul24(b, x, y); - return nir_iadd(b, temp, z); -} - static inline nir_ssa_def * nir_imad24(nir_builder *b, nir_ssa_def *x, nir_ssa_def *y, nir_ssa_def *z) { diff --git a/src/compiler/nir/nir_opcodes.py b/src/compiler/nir/nir_opcodes.py index 57778e6cd3e..830fb346a4d 100644 --- a/src/compiler/nir/nir_opcodes.py +++ b/src/compiler/nir/nir_opcodes.py @@ -1137,3 +1137,11 @@ triop("imad24_ir3", tint32, _2src_commutative, # 24b multiply into 32b result (with sign extension) binop("imul24", tint32, _2src_commutative + associative, "(((int32_t)src0 << 8) >> 8) * (((int32_t)src1 << 8) >> 8)") + +# unsigned 24b multiply into 32b result plus 32b int +triop("umad24", tuint32, _2src_commutative, + "(((uint32_t)src0 << 8) >> 8) * (((uint32_t)src1 << 8) >> 8) + src2") + +# unsigned 24b multiply into 32b result uint +binop("umul24", tint32, _2src_commutative + associative, + "(((uint32_t)src0 << 8) >> 8) * (((uint32_t)src1 << 8) >> 8)") diff --git a/src/compiler/nir/nir_opt_algebraic.py b/src/compiler/nir/nir_opt_algebraic.py index 6c0ce923c9d..bcf13bdf399 100644 --- a/src/compiler/nir/nir_opt_algebraic.py +++ b/src/compiler/nir/nir_opt_algebraic.py @@ -1313,6 +1313,13 @@ optimizations.extend([ # rule converts everyone else to imul: (('amul', a, b), ('imul', a, b), '!options->has_imul24'), + (('umul24', a, b), + ('imul', ('iand', a, 0xffffff), ('iand', b, 0xffffff)), + '!options->has_umul24'), + (('umad24', a, b, c), + ('iadd', ('imul', ('iand', a, 0xffffff), ('iand', b, 0xffffff)), c), + '!options->has_umad24'), + (('imad24_ir3', a, b, 0), ('imul24', a, b)), (('imad24_ir3', a, 0, c), (c)), (('imad24_ir3', a, 1, c), ('iadd', a, c)), -- 2.30.2