From 2028df87577f40ab12d9b9a9ae9db7dac165eeec Mon Sep 17 00:00:00 2001
From: Georg Lehmann <dadschoorse@gmail.com>
Date: Mon, 12 Jun 2023 16:03:58 +0200
Subject: [PATCH] aco: don't validate p_constaddr_addlo/p_resumeaddr_addlo
 operands
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These can have two literals so validation would fail.

Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23507>
---
 src/amd/compiler/aco_validate.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/amd/compiler/aco_validate.cpp b/src/amd/compiler/aco_validate.cpp
index 142c42a9158..afb9896a23f 100644
--- a/src/amd/compiler/aco_validate.cpp
+++ b/src/amd/compiler/aco_validate.cpp
@@ -289,7 +289,9 @@ validate_ir(Program* program)
                      instr.get());
          }
 
-         if (instr->isSALU() || instr->isVALU()) {
+         if ((instr->isSALU() && instr->opcode != aco_opcode::p_constaddr_addlo &&
+              instr->opcode != aco_opcode::p_resumeaddr_addlo) ||
+             instr->isVALU()) {
             /* check literals */
             Operand literal(s1);
             for (unsigned i = 0; i < instr->operands.size(); i++) {