From 69cdcd1c411ce315d20f3975a14177dff3aa7204 Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@collabora.com>
Date: Thu, 19 May 2022 12:49:48 -0400
Subject: [PATCH] pan/bi: Add phi nodes

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17794>
---
 src/panfrost/bifrost/ISA.xml         | 2 ++
 src/panfrost/bifrost/bi_printer.c.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/panfrost/bifrost/ISA.xml b/src/panfrost/bifrost/ISA.xml
index e5c600c874d..f1e908331c2 100644
--- a/src/panfrost/bifrost/ISA.xml
+++ b/src/panfrost/bifrost/ISA.xml
@@ -8854,6 +8854,8 @@
     </mod>
   </ins>
 
+  <ins name="+PHI" pseudo="true" variable_srcs="true"/>
+
   <ins name="+COLLECT.i32" pseudo="true" variable_srcs="true"/>
 
   <ins name="+SPLIT.i32" pseudo="true" variable_dests="true">
diff --git a/src/panfrost/bifrost/bi_printer.c.py b/src/panfrost/bifrost/bi_printer.c.py
index b4cc3d8965e..391223593ea 100644
--- a/src/panfrost/bifrost/bi_printer.c.py
+++ b/src/panfrost/bifrost/bi_printer.c.py
@@ -179,7 +179,7 @@ bi_print_instr(const bi_instr *I, FILE *fp)
     if (I->flow)
         fprintf(fp, ".flow%u", I->flow);
 
-    if (I->op == BI_OPCODE_COLLECT_I32) {
+    if (I->op == BI_OPCODE_COLLECT_I32 || I->op == BI_OPCODE_PHI) {
         for (unsigned i = 0; i < I->nr_srcs; ++i) {
             if (i > 0)
                 fputs(", ", fp);