From 70328a0a8aefea5afa29659dd659482eae33f676 Mon Sep 17 00:00:00 2001
From: Rhys Perry <pendingchaos02@gmail.com>
Date: Thu, 13 Jul 2023 14:25:04 +0100
Subject: [PATCH] ac/llvm: fix AC_TM_CHECK_IR
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This was using the wrong pass.

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Fixes: 3f272fd15e9 ("ac/llvm: fix build with LLVM 17")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24140>
(cherry picked from commit 85d1159a2a7b09dd285376cbb62921126ba0fda2)
---
 .pick_status.json               | 2 +-
 src/amd/llvm/ac_llvm_helper.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 49189629e90..8a8ad920541 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -5908,7 +5908,7 @@
         "description": "ac/llvm: fix AC_TM_CHECK_IR",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "3f272fd15e9f0776056699e90ce021f4766d3384"
     },
diff --git a/src/amd/llvm/ac_llvm_helper.cpp b/src/amd/llvm/ac_llvm_helper.cpp
index 9d831f37a65..c86cca0d009 100644
--- a/src/amd/llvm/ac_llvm_helper.cpp
+++ b/src/amd/llvm/ac_llvm_helper.cpp
@@ -27,6 +27,7 @@
 #include <llvm/Analysis/TargetLibraryInfo.h>
 #include <llvm/IR/IRBuilder.h>
 #include <llvm/IR/LegacyPassManager.h>
+#include <llvm/IR/Verifier.h>
 #include <llvm/Target/TargetMachine.h>
 #include <llvm/MC/MCSubtargetInfo.h>
 #include <llvm/Support/CommandLine.h>
@@ -307,7 +308,7 @@ LLVMPassManagerRef ac_create_passmgr(LLVMTargetLibraryInfoRef target_library_inf
       LLVMAddTargetLibraryInfo(target_library_info, passmgr);
 
    if (check_ir)
-      unwrap(passmgr)->add(createMachineVerifierPass("mesa ir"));
+      unwrap(passmgr)->add(createVerifierPass());
 
    unwrap(passmgr)->add(createAlwaysInlinerLegacyPass());