From 20409b6baec1639d9c7b0d6f6c6c309f7b3daccf Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Date: Thu, 22 Feb 2024 08:42:56 -0400
Subject: [PATCH] agx: validate phi sources for consistency

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28483>
---
 src/asahi/compiler/agx_validate.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/asahi/compiler/agx_validate.c b/src/asahi/compiler/agx_validate.c
index a0897b6ad54..defa090e40c 100644
--- a/src/asahi/compiler/agx_validate.c
+++ b/src/asahi/compiler/agx_validate.c
@@ -101,6 +101,9 @@ agx_validate_sources(agx_instr *I)
          agx_validate_assert(src.value < (1 << (ldst ? 16 : 8)));
       } else if (I->op == AGX_OPCODE_COLLECT && !agx_is_null(src)) {
          agx_validate_assert(src.size == I->src[0].size);
+      } else if (I->op == AGX_OPCODE_PHI) {
+         agx_validate_assert(src.size == I->dest[0].size);
+         agx_validate_assert(!agx_is_null(src));
       }
 
       agx_validate_assert(!src.memory || is_stack_valid(I));