From a110a4a6d6979ffbcaf3d277b76b1cb7ff9634b8 Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa.rosenzweig@intel.com>
Date: Tue, 2 Jun 2026 10:30:30 -0400
Subject: [PATCH] jay/validate: add validation for bogus uflag cases

this would've caught the previous bug

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41872>
---
 src/intel/compiler/jay/jay_validate.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/intel/compiler/jay/jay_validate.c b/src/intel/compiler/jay/jay_validate.c
index 68ecb4bfd4b..8e8e1837ff3 100644
--- a/src/intel/compiler/jay/jay_validate.c
+++ b/src/intel/compiler/jay/jay_validate.c
@@ -215,6 +215,10 @@ validate_inst(struct validate_state *validate, jay_inst *I)
           I->cond_flag.file == UFLAG &&
           (I->op == JAY_OPCODE_CMP || I->op == JAY_OPCODE_MOV)));
 
+   /* We cannot mix uniformness */
+   CHECK(I->cond_flag.file != UFLAG || I->dst.file != GPR);
+   CHECK(I->cond_flag.file != FLAG || I->dst.file != UGPR);
+
    /* Standard modifiers only allowed on some instructions */
    CHECK(!I->conditional_mod || opinfo->cmod || I->op == JAY_OPCODE_CSEL);
    CHECK(!I->saturate || opinfo->sat);