From cfefbc06aa067dbc003b6189f08cdcfeac77dd16 Mon Sep 17 00:00:00 2001
From: Megamouse <studienricky89@googlemail.com>
Date: Tue, 4 Mar 2025 22:05:35 +0100
Subject: [PATCH] Update llvm to 22.1.0

---
 .github/workflows/rpcs3.yml         |  2 +-
 3rdparty/llvm/CMakeLists.txt        |  2 +-
 3rdparty/llvm/llvm                  |  2 +-
 BUILDING.md                         |  2 +-
 buildfiles/msvc/rpcs3_default.props | 12 +++++++++++-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml
index 740e844d04..32db38acf4 100644
--- a/.github/workflows/rpcs3.yml
+++ b/.github/workflows/rpcs3.yml
@@ -216,7 +216,7 @@ jobs:
       QT_VER: '6.10.2'
       QT_VER_MSVC: 'msvc2022'
       QT_DATE: '202601261212'
-      LLVM_VER: '19.1.7'
+      LLVM_VER: '22.1.0'
       VULKAN_VER: '1.3.268.0'
       VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5'
       CCACHE_SHA: '859141059ac950e1e8cd042c66f842f26b9e3a62a1669a69fe6ba180cb58bbdf'
diff --git a/3rdparty/llvm/CMakeLists.txt b/3rdparty/llvm/CMakeLists.txt
index a4af3b3ef5..a733c79fe2 100644
--- a/3rdparty/llvm/CMakeLists.txt
+++ b/3rdparty/llvm/CMakeLists.txt
@@ -51,7 +51,7 @@ if(WITH_LLVM)
 
 		set(STATIC_LINK_LLVM ON CACHE BOOL "Link against LLVM statically. This will get set to ON if you build LLVM from the submodule." FORCE)
 
-		find_package(LLVM 19.1 CONFIG)
+		find_package(LLVM 22.1 CONFIG)
 		if(NOT LLVM_FOUND)
 			message(FATAL_ERROR "Couldn't build LLVM from the submodule. You might need to run `git submodule update --init`")
 		endif()
diff --git a/3rdparty/llvm/llvm b/3rdparty/llvm/llvm
index cd708029e0..4434dabb69 160000
--- a/3rdparty/llvm/llvm
+++ b/3rdparty/llvm/llvm
@@ -1 +1 @@
-Subproject commit cd708029e0b2869e80abe31ddb175f7c35361f90
+Subproject commit 4434dabb69916856b824f68a64b029c67175e532
diff --git a/BUILDING.md b/BUILDING.md
index 597621e810..1f7563af82 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -132,7 +132,7 @@ Start **Visual Studio**, click on `Open a project or solution` and select the `r
 **NOTE:** The recommended build configuration is `Release`. (On older revisions: `Release - LLVM`)
 
 To speed up the compilation time, you may want to download and extract to `<rpcs3_root>\build\lib_ext\<$(Configuration)>-x64` (e.g. `c:\rpcs3\build\lib_ext\Release-x64`; the path needs to be created) the following precompiled lib:
-- [LLVM libs](https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-19.1.7/llvmlibs_mt.7z)
+- [LLVM libs](https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-22.1.0/llvmlibs_mt.7z)
 
 **NOTES:**
 - `<$(Configuration)>` can assume values `Release` or `Debug`.
diff --git a/buildfiles/msvc/rpcs3_default.props b/buildfiles/msvc/rpcs3_default.props
index b612560a8e..e4c930be33 100644
--- a/buildfiles/msvc/rpcs3_default.props
+++ b/buildfiles/msvc/rpcs3_default.props
@@ -34,6 +34,7 @@
         avutil.lib;
         swresample.lib;
         swscale.lib;
+        LLVMABI.lib;
         LLVMAggressiveInstCombine.lib;
         LLVMAnalysis.lib;
         LLVMAsmParser.lib;
@@ -42,9 +43,10 @@
         LLVMBitReader.lib;
         LLVMBitstreamReader.lib;
         LLVMBitWriter.lib;
+        LLVMCAS.lib;
         LLVMCFGuard.lib;
+        LLVMCGData.lib;
         LLVMCodeGen.lib;
-        LLVMCodeGenData.lib;
         LLVMCodeGenTypes.lib;
         LLVMCore.lib;
         LLVMCoroutines.lib;
@@ -53,12 +55,15 @@
         LLVMDebugInfoCodeView.lib;
         LLVMDebuginfod.lib;
         LLVMDebugInfoDWARF.lib;
+        LLVMDebugInfoDWARFLowLevel.lib;
         LLVMDebugInfoGSYM.lib;
         LLVMDebugInfoLogicalView.lib;
         LLVMDebugInfoMSF.lib;
         LLVMDebugInfoPDB.lib;
         LLVMDemangle.lib;
         LLVMDlltoolDriver.lib;
+        LLVMDTLTO.lib;
+        LLVMDWARFCFIChecker.lib;
         LLVMDWARFLinker.lib;
         LLVMDWARFLinkerClassic.lib;
         LLVMDWARFLinkerParallel.lib;
@@ -66,6 +71,8 @@
         LLVMExecutionEngine.lib;
         LLVMExtensions.lib;
         LLVMFileCheck.lib;
+        LLVMFrontendAtomic.lib;
+        LLVMFrontendDirective.lib;
         LLVMFrontendDriver.lib;
         LLVMFrontendHLSL.lib;
         LLVMFrontendOffloading.lib;
@@ -105,6 +112,7 @@
         LLVMOrcShared.lib;
         LLVMOrcTargetProcess.lib;
         LLVMPasses.lib;
+        LLVMPlugins.lib;
         LLVMProfileData.lib;
         LLVMRemarks.lib;
         LLVMRuntimeDyld.lib;
@@ -112,12 +120,14 @@
         LLVMScalarOpts.lib;
         LLVMSelectionDAG.lib;
         LLVMSupport.lib;
+        LLVMSupportLSP.lib;
         LLVMSymbolize.lib;
         LLVMTableGen.lib;
         LLVMTableGenBasic.lib;
         LLVMTableGenCommon.lib;
         LLVMTarget.lib;
         LLVMTargetParser.lib;
+        LLVMTelemetry.lib;
         LLVMTextAPI.lib;
         LLVMTextAPIBinaryReader.lib;
         LLVMTransformUtils.lib;