From ef9d97ec1f9d9834db3066b5a7ec67ce6d4ecd86 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 20 Apr 2022 11:37:19 -0500 Subject: [PATCH] spirv: Handle Op*MulExtended for non-32-bit types Fixes: 58bcebd987b7 ("spirv: Allow [i/u]mulExtended to use new nir opcode") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6306 Reviewed-by: Bas Nieuwenhuizen Part-of: --- src/compiler/spirv/vtn_alu.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/compiler/spirv/vtn_alu.c b/src/compiler/spirv/vtn_alu.c index a9bdb4c3cf1..6fd7a05afc2 100644 --- a/src/compiler/spirv/vtn_alu.c +++ b/src/compiler/spirv/vtn_alu.c @@ -530,17 +530,27 @@ vtn_handle_alu(struct vtn_builder *b, SpvOp opcode, case SpvOpUMulExtended: { vtn_assert(glsl_type_is_struct_or_ifc(dest_type)); - nir_ssa_def *umul = nir_umul_2x32_64(&b->nb, src[0], src[1]); - dest->elems[0]->def = nir_unpack_64_2x32_split_x(&b->nb, umul); - dest->elems[1]->def = nir_unpack_64_2x32_split_y(&b->nb, umul); + if (src[0]->bit_size == 32) { + nir_ssa_def *umul = nir_umul_2x32_64(&b->nb, src[0], src[1]); + dest->elems[0]->def = nir_unpack_64_2x32_split_x(&b->nb, umul); + dest->elems[1]->def = nir_unpack_64_2x32_split_y(&b->nb, umul); + } else { + dest->elems[0]->def = nir_imul(&b->nb, src[0], src[1]); + dest->elems[1]->def = nir_umul_high(&b->nb, src[0], src[1]); + } break; } case SpvOpSMulExtended: { vtn_assert(glsl_type_is_struct_or_ifc(dest_type)); - nir_ssa_def *smul = nir_imul_2x32_64(&b->nb, src[0], src[1]); - dest->elems[0]->def = nir_unpack_64_2x32_split_x(&b->nb, smul); - dest->elems[1]->def = nir_unpack_64_2x32_split_y(&b->nb, smul); + if (src[0]->bit_size == 32) { + nir_ssa_def *umul = nir_imul_2x32_64(&b->nb, src[0], src[1]); + dest->elems[0]->def = nir_unpack_64_2x32_split_x(&b->nb, umul); + dest->elems[1]->def = nir_unpack_64_2x32_split_y(&b->nb, umul); + } else { + dest->elems[0]->def = nir_imul(&b->nb, src[0], src[1]); + dest->elems[1]->def = nir_imul_high(&b->nb, src[0], src[1]); + } break; }