From 5cdc31abd63302e3da82a1bfee625019e818fc3f Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Sat, 21 Mar 2020 21:19:14 -0400 Subject: [PATCH] pan/bi: Default csel to "!= 0" mode This way we always have regular csel conditions instead of a weird .always special case for 3-src CSEL mode. Signed-off-by: Alyssa Rosenzweig Part-of: --- src/panfrost/bifrost/bifrost_compile.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/panfrost/bifrost/bifrost_compile.c b/src/panfrost/bifrost/bifrost_compile.c index cdf25d5a81d..a00dabe71fb 100644 --- a/src/panfrost/bifrost/bifrost_compile.c +++ b/src/panfrost/bifrost/bifrost_compile.c @@ -595,6 +595,11 @@ emit_alu(bi_context *ctx, nir_alu_instr *instr) } if (alu.type == BI_CSEL) { + /* Default to csel3 */ + alu.csel_cond = BI_COND_NE; + alu.src[3] = BIR_INDEX_ZERO; + alu.src_types[3] = alu.src_types[0]; + bi_fuse_csel_cond(&alu, instr->src[0], &constants_left, &constant_shift); } -- 2.30.2