From 3a93e60e7bba1bbb6ecac170c25623c08d6ff55f Mon Sep 17 00:00:00 2001 From: "Kristian H. Kristensen" Date: Thu, 10 Oct 2019 13:21:25 -0700 Subject: [PATCH] freedreno/ir3: Add support for CHSH and CHMASK instructions Just add the constructors for now and special case similar to END so we don't remove them. Signed-off-by: Kristian H. Kristensen --- src/freedreno/ir3/ir3.h | 2 ++ src/freedreno/ir3/ir3_depth.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/freedreno/ir3/ir3.h b/src/freedreno/ir3/ir3.h index 50c9b70ae14..9d2a8d73528 100644 --- a/src/freedreno/ir3/ir3.h +++ b/src/freedreno/ir3/ir3.h @@ -1293,6 +1293,8 @@ INSTR0(BR) INSTR0(JUMP) INSTR1(KILL) INSTR0(END) +INSTR0(CHSH) +INSTR0(CHMASK) /* cat2 instructions, most 2 src but some 1 src: */ INSTR2(ADD_F) diff --git a/src/freedreno/ir3/ir3_depth.c b/src/freedreno/ir3/ir3_depth.c index 071b5e3c528..bc42bfdeb3b 100644 --- a/src/freedreno/ir3/ir3_depth.c +++ b/src/freedreno/ir3/ir3_depth.c @@ -171,7 +171,7 @@ remove_unused_by_block(struct ir3_block *block) { bool progress = false; list_for_each_entry_safe (struct ir3_instruction, instr, &block->instr_list, node) { - if (instr->opc == OPC_END) + if (instr->opc == OPC_END || instr->opc == OPC_CHSH || instr->opc == OPC_CHMASK) continue; if (instr->flags & IR3_INSTR_UNUSED) { if (instr->opc == OPC_META_FO) { -- 2.11.0