From: Kristian H. Kristensen <hoegsberg@google.com>
Date: Thu, 10 Oct 2019 20:21:25 +0000 (-0700)
Subject: freedreno/ir3: Add support for CHSH and CHMASK instructions
X-Git-Tag: android-x86-9.0-r1~1002
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3a93e60e7bba1bbb6ecac170c25623c08d6ff55f;p=android-x86%2Fexternal-mesa.git

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 <hoegsberg@google.com>
---

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) {