Merge cab419881f into c7a576edce

2026-03-10 23:45:16 +01:00 · 2026-03-10 17:06:23 +03:00 · 2026-03-10 17:06:23 +03:00 · 25c4bd94db
parent c7a576edce cab419881f
commit 25c4bd94db
10 changed files with 228 additions and 15 deletions
--- 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'
--- a/3rdparty/OpenAL/openal-soft.vcxproj
+++ b/3rdparty/OpenAL/openal-soft.vcxproj
@ -49,11 +49,44 @@
  <PropertyGroup Label="UserMacros">
    <CmakeReleaseCLI>call vsdevcmd.bat -arch=amd64
      cd "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)"
-      cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX="./Release" -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DCMAKE_SYSTEM_VERSION=10.0 -DLIBTYPE=STATIC -DFORCE_STATIC_VCRT=true -DALSOFT_UTILS=false -DALSOFT_EXAMPLES=false -DALSOFT_INSTALL=false -DALSOFT_INSTALL_CONFIG=false -DALSOFT_INSTALL_HRTF_DATA=false -DALSOFT_INSTALL_AMBDEC_PRESETS=false -DALSOFT_INSTALL_EXAMPLES=false -DALSOFT_INSTALL_UTILS=false "$(SolutionDir)3rdparty\OpenAL\openal-soft"
+      cmake -G Ninja ^
+        -DCMAKE_CXX_COMPILER="cl.exe" ^
+        -DCMAKE_C_COMPILER="cl.exe" ^
+        -DCMAKE_BUILD_TYPE="Release" ^
+        -DCMAKE_INSTALL_PREFIX="./Release" ^
+        -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded ^
+        -DCMAKE_SYSTEM_VERSION=10.0 ^
+        -DLIBTYPE=STATIC ^
+        -DFORCE_STATIC_VCRT=true ^
+        -DALSOFT_UTILS=false ^
+        -DALSOFT_EXAMPLES=false ^
+        -DALSOFT_INSTALL=false ^
+        -DALSOFT_INSTALL_CONFIG=false ^
+        -DALSOFT_INSTALL_HRTF_DATA=false ^
+        -DALSOFT_INSTALL_AMBDEC_PRESETS=false ^
+        -DALSOFT_INSTALL_EXAMPLES=false ^
+        -DALSOFT_INSTALL_UTILS=false ^
+        "$(SolutionDir)3rdparty\OpenAL\openal-soft"
    </CmakeReleaseCLI>
    <CmakeDebugCLI>call vsdevcmd.bat -arch=amd64
      cd "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)"
-      cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_INSTALL_PREFIX="./Debug" -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebug -DCMAKE_SYSTEM_VERSION=10.0 -DLIBTYPE=STATIC -DALSOFT_UTILS=false -DALSOFT_EXAMPLES=false -DALSOFT_INSTALL=false -DALSOFT_INSTALL_CONFIG=false -DALSOFT_INSTALL_HRTF_DATA=false -DALSOFT_INSTALL_AMBDEC_PRESETS=false -DALSOFT_INSTALL_EXAMPLES=false -DALSOFT_INSTALL_UTILS=false "$(SolutionDir)3rdparty\OpenAL\openal-soft"
+      cmake -G Ninja ^
+        -DCMAKE_CXX_COMPILER="cl.exe" ^
+        -DCMAKE_C_COMPILER="cl.exe" ^
+        -DCMAKE_BUILD_TYPE="Debug" ^
+        -DCMAKE_INSTALL_PREFIX="./Debug" ^
+        -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebug ^
+        -DCMAKE_SYSTEM_VERSION=10.0 ^
+        -DLIBTYPE=STATIC ^
+        -DALSOFT_UTILS=false ^
+        -DALSOFT_EXAMPLES=false ^
+        -DALSOFT_INSTALL=false ^
+        -DALSOFT_INSTALL_CONFIG=false ^
+        -DALSOFT_INSTALL_HRTF_DATA=false ^
+        -DALSOFT_INSTALL_AMBDEC_PRESETS=false ^
+        -DALSOFT_INSTALL_EXAMPLES=false ^
+        -DALSOFT_INSTALL_UTILS=false ^
+        "$(SolutionDir)3rdparty\OpenAL\openal-soft"
    </CmakeDebugCLI>
    <CmakeCopyCLI>
      echo Copying..
--- a/3rdparty/glslang/glslang.vcxproj
+++ b/3rdparty/glslang/glslang.vcxproj
@ -39,10 +39,30 @@
  <PropertyGroup Label="UserMacros">
    <CmakeGenerator>"Visual Studio $(VisualStudioVersion.Substring(0,2))"</CmakeGenerator>
    <CmakeReleaseCLI>call vsdevcmd.bat -arch=amd64
-      cmake -G $(CmakeGenerator) -A x64 -DCMAKE_BUILD_TYPE="Release" -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DGLSLANG_TESTS=OFF -DENABLE_GLSLANG_BINARIES=OFF -DBUILD_EXTERNAL=OFF -DENABLE_SPVREMAPPER=OFF -DENABLE_HLSL=OFF -DENABLE_OPT=OFF -S glslang -B "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)"
+      cmake -G $(CmakeGenerator) -A x64 ^
+        -DCMAKE_BUILD_TYPE="Release" ^
+        -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded ^
+        -DGLSLANG_TESTS=OFF ^
+        -DENABLE_GLSLANG_BINARIES=OFF ^
+        -DBUILD_EXTERNAL=OFF ^
+        -DENABLE_SPVREMAPPER=OFF ^
+        -DENABLE_HLSL=OFF ^
+        -DENABLE_OPT=OFF ^
+        -S glslang ^
+        -B "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)"
    </CmakeReleaseCLI>
    <CmakeDebugCLI>call vsdevcmd.bat -arch=amd64
-      cmake -G $(CmakeGenerator) -A x64 -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebug -DGLSLANG_TESTS=OFF -DENABLE_GLSLANG_BINARIES=OFF -DBUILD_EXTERNAL=OFF -DENABLE_SPVREMAPPER=OFF -DENABLE_HLSL=OFF -DENABLE_OPT=OFF -S glslang -B "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)"
+      cmake -G $(CmakeGenerator) -A x64 ^
+        -DCMAKE_BUILD_TYPE="Debug" ^
+        -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebug ^
+        -DGLSLANG_TESTS=OFF ^
+        -DENABLE_GLSLANG_BINARIES=OFF ^
+        -DBUILD_EXTERNAL=OFF ^
+        -DENABLE_SPVREMAPPER=OFF ^
+        -DENABLE_HLSL=OFF ^
+        -DENABLE_OPT=OFF ^
+        -S glslang ^
+        -B "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)"
    </CmakeDebugCLI>
    <CmakeCopyCLI>
      echo Copying..
--- 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()
--- a/3rdparty/llvm/llvm
+++ b/3rdparty/llvm/llvm
@ -1 +1 @@
-Subproject commit cd708029e0b2869e80abe31ddb175f7c35361f90
+Subproject commit 4434dabb69916856b824f68a64b029c67175e532
--- a/3rdparty/llvm/llvm_build.vcxproj
+++ b/3rdparty/llvm/llvm_build.vcxproj
@ -40,11 +40,65 @@
  <PropertyGroup Label="UserMacros">
    <CmakeReleaseCLI>call vsdevcmd.bat -arch=amd64
      cd "$(SolutionDir)build\tmp\llvm_build-$(Configuration)-$(Platform)"
-      cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX="$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build" -DCMAKE_SYSTEM_VERSION=10.0 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_BUILD_BENCHMARKS=OFF -DLLVM_BUILD_DOCS=OFF -DLLVM_BUILD_EXAMPLES=OFF -DLLVM_BUILD_TESTS=OFF\ -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_UTILS=OFF -DLLVM_INSTALL_UTILS=OFF -DLLVM_ENABLE_DIA_SDK=OFF -DLLVM_ENABLE_PDB=OFF -DLLVM_USE_INTEL_JITEVENTS=ON "$(SolutionDir)3rdparty\llvm\llvm\llvm"
+      cmake -G Ninja ^
+        -DCMAKE_CXX_COMPILER="cl.exe" ^
+        -DCMAKE_C_COMPILER="cl.exe" ^
+        -DCMAKE_BUILD_TYPE="Release" ^
+        -DCMAKE_INSTALL_PREFIX="$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build" ^
+        -DCMAKE_SYSTEM_VERSION=10.0 ^
+        -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) ^
+        -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded ^
+        -DLLVM_TARGETS_TO_BUILD=X86 ^
+        -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc ^
+        -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc ^
+        -DLLVM_BUILD_RUNTIME=OFF ^
+        -DLLVM_BUILD_TOOLS=OFF ^
+        -DLLVM_BUILD_BENCHMARKS=OFF ^
+        -DLLVM_BUILD_DOCS=OFF ^
+        -DLLVM_BUILD_EXAMPLES=OFF ^
+        -DLLVM_BUILD_TESTS=OFF ^
+        -DLLVM_INCLUDE_TOOLS=OFF ^
+        -DLLVM_INCLUDE_DOCS=OFF ^
+        -DLLVM_INCLUDE_EXAMPLES=OFF ^
+        -DLLVM_INCLUDE_TESTS=OFF ^
+        -DLLVM_INCLUDE_BENCHMARKS=OFF ^
+        -DLLVM_INCLUDE_UTILS=OFF ^
+        -DLLVM_INSTALL_UTILS=OFF ^
+        -DLLVM_ENABLE_DIA_SDK=OFF ^
+        -DLLVM_ENABLE_PDB=OFF ^
+        -DLLVM_USE_INTEL_JITEVENTS=ON ^
+        "$(SolutionDir)3rdparty\llvm\llvm\llvm"
    </CmakeReleaseCLI>
    <CmakeDebugCLI>call vsdevcmd.bat -arch=amd64
      cd "$(SolutionDir)build\tmp\llvm_build-$(Configuration)-$(Platform)"
-      cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_INSTALL_PREFIX="$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build" -DCMAKE_SYSTEM_VERSION=10.0 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebugDLL -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_BUILD_BENCHMARKS=OFF -DLLVM_BUILD_DOCS=OFF -DLLVM_BUILD_EXAMPLES=OFF -DLLVM_BUILD_TESTS=OFF\ -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_UTILS=OFF -DLLVM_INSTALL_UTILS=OFF -DLLVM_ENABLE_DIA_SDK=OFF -DLLVM_ENABLE_PDB=OFF -DLLVM_USE_INTEL_JITEVENTS=ON "$(SolutionDir)3rdparty\llvm\llvm\llvm"
+      cmake -G Ninja ^
+        -DCMAKE_CXX_COMPILER="cl.exe" ^
+        -DCMAKE_C_COMPILER="cl.exe" ^
+        -DCMAKE_BUILD_TYPE="Debug" ^
+        -DCMAKE_INSTALL_PREFIX="$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build" ^
+        -DCMAKE_SYSTEM_VERSION=10.0 ^
+        -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) ^
+        -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebugDLL ^
+        -DLLVM_TARGETS_TO_BUILD=X86 ^
+        -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc ^
+        -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc ^
+        -DLLVM_BUILD_RUNTIME=OFF ^
+        -DLLVM_BUILD_TOOLS=OFF ^
+        -DLLVM_BUILD_BENCHMARKS=OFF ^
+        -DLLVM_BUILD_DOCS=OFF ^
+        -DLLVM_BUILD_EXAMPLES=OFF ^
+        -DLLVM_BUILD_TESTS=OFF ^
+        -DLLVM_INCLUDE_TOOLS=OFF ^
+        -DLLVM_INCLUDE_DOCS=OFF ^
+        -DLLVM_INCLUDE_EXAMPLES=OFF ^
+        -DLLVM_INCLUDE_TESTS=OFF ^
+        -DLLVM_INCLUDE_BENCHMARKS=OFF ^
+        -DLLVM_INCLUDE_UTILS=OFF ^
+        -DLLVM_INSTALL_UTILS=OFF ^
+        -DLLVM_ENABLE_DIA_SDK=OFF ^
+        -DLLVM_ENABLE_PDB=OFF ^
+        -DLLVM_USE_INTEL_JITEVENTS=ON ^
+        "$(SolutionDir)3rdparty\llvm\llvm\llvm"
    </CmakeDebugCLI>
    <CmakeCleanCLI>
      echo Cleaning..
--- a/3rdparty/llvm/llvm_build_clang_cl.vcxproj
+++ b/3rdparty/llvm/llvm_build_clang_cl.vcxproj
@ -40,11 +40,65 @@
  <PropertyGroup Label="UserMacros">
    <CmakeReleaseCLI>call vsdevcmd.bat -arch=amd64
      cd "$(SolutionDir)build\tmp\llvm_build-$(Configuration)-$(Platform)"
-      cmake -G Ninja -DCMAKE_CXX_COMPILER="clang-cl.exe" -DCMAKE_C_COMPILER="clang-cl.exe" -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX="$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build" -DCMAKE_SYSTEM_VERSION=10.0 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_BUILD_BENCHMARKS=OFF -DLLVM_BUILD_DOCS=OFF -DLLVM_BUILD_EXAMPLES=OFF -DLLVM_BUILD_TESTS=OFF\ -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_UTILS=OFF -DLLVM_INSTALL_UTILS=OFF -DLLVM_ENABLE_DIA_SDK=OFF -DLLVM_ENABLE_PDB=OFF -DLLVM_USE_INTEL_JITEVENTS=ON "$(SolutionDir)3rdparty\llvm\llvm\llvm"
+      cmake -G Ninja ^
+        -DCMAKE_CXX_COMPILER="clang-cl.exe" ^
+        -DCMAKE_C_COMPILER="clang-cl.exe" ^
+        -DCMAKE_BUILD_TYPE="Release" ^
+        -DCMAKE_INSTALL_PREFIX="$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build" ^
+        -DCMAKE_SYSTEM_VERSION=10.0 ^
+        -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) ^
+        -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded ^
+        -DLLVM_TARGETS_TO_BUILD=X86 ^
+        -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc ^
+        -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc ^
+        -DLLVM_BUILD_RUNTIME=OFF ^
+        -DLLVM_BUILD_TOOLS=OFF ^
+        -DLLVM_BUILD_BENCHMARKS=OFF ^
+        -DLLVM_BUILD_DOCS=OFF ^
+        -DLLVM_BUILD_EXAMPLES=OFF ^
+        -DLLVM_BUILD_TESTS=OFF ^
+        -DLLVM_INCLUDE_TOOLS=OFF ^
+        -DLLVM_INCLUDE_DOCS=OFF ^
+        -DLLVM_INCLUDE_EXAMPLES=OFF ^
+        -DLLVM_INCLUDE_TESTS=OFF ^
+        -DLLVM_INCLUDE_BENCHMARKS=OFF ^
+        -DLLVM_INCLUDE_UTILS=OFF ^
+        -DLLVM_INSTALL_UTILS=OFF ^
+        -DLLVM_ENABLE_DIA_SDK=OFF ^
+        -DLLVM_ENABLE_PDB=OFF ^
+        -DLLVM_USE_INTEL_JITEVENTS=ON ^
+        "$(SolutionDir)3rdparty\llvm\llvm\llvm"
    </CmakeReleaseCLI>
    <CmakeDebugCLI>call vsdevcmd.bat -arch=amd64
      cd "$(SolutionDir)build\tmp\llvm_build-$(Configuration)-$(Platform)"
-      cmake -G Ninja -DCMAKE_CXX_COMPILER="clang-cl.exe" -DCMAKE_C_COMPILER="clang-cl.exe" -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_INSTALL_PREFIX="$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build" -DCMAKE_SYSTEM_VERSION=10.0 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebugDLL -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_BUILD_BENCHMARKS=OFF -DLLVM_BUILD_DOCS=OFF -DLLVM_BUILD_EXAMPLES=OFF -DLLVM_BUILD_TESTS=OFF\ -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_UTILS=OFF -DLLVM_INSTALL_UTILS=OFF -DLLVM_ENABLE_DIA_SDK=OFF -DLLVM_ENABLE_PDB=OFF -DLLVM_USE_INTEL_JITEVENTS=ON "$(SolutionDir)3rdparty\llvm\llvm\llvm"
+      cmake -G Ninja ^
+        -DCMAKE_CXX_COMPILER="clang-cl.exe" ^
+        -DCMAKE_C_COMPILER="clang-cl.exe" ^
+        -DCMAKE_BUILD_TYPE="Debug" ^
+        -DCMAKE_INSTALL_PREFIX="$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build" ^
+        -DCMAKE_SYSTEM_VERSION=10.0 ^
+        -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) ^
+        -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebugDLL ^
+        -DLLVM_TARGETS_TO_BUILD=X86 ^
+        -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc ^
+        -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc ^
+        -DLLVM_BUILD_RUNTIME=OFF ^
+        -DLLVM_BUILD_TOOLS=OFF ^
+        -DLLVM_BUILD_BENCHMARKS=OFF ^
+        -DLLVM_BUILD_DOCS=OFF ^
+        -DLLVM_BUILD_EXAMPLES=OFF ^
+        -DLLVM_BUILD_TESTS=OFF ^
+        -DLLVM_INCLUDE_TOOLS=OFF ^
+        -DLLVM_INCLUDE_DOCS=OFF ^
+        -DLLVM_INCLUDE_EXAMPLES=OFF ^
+        -DLLVM_INCLUDE_TESTS=OFF ^
+        -DLLVM_INCLUDE_BENCHMARKS=OFF ^
+        -DLLVM_INCLUDE_UTILS=OFF ^
+        -DLLVM_INSTALL_UTILS=OFF ^
+        -DLLVM_ENABLE_DIA_SDK=OFF ^
+        -DLLVM_ENABLE_PDB=OFF ^
+        -DLLVM_USE_INTEL_JITEVENTS=ON ^
+        "$(SolutionDir)3rdparty\llvm\llvm\llvm"
    </CmakeDebugCLI>
    <CmakeCleanCLI>
      echo Cleaning..
--- a/3rdparty/protobuf/protobuf_build.vcxproj
+++ b/3rdparty/protobuf/protobuf_build.vcxproj
@ -41,12 +41,54 @@
    <CmakeReleaseCLI>call vsdevcmd.bat -arch=amd64
      if not exist "$(SolutionDir)build\tmp\protobuf_build-$(Configuration)-$(Platform)" mkdir "$(SolutionDir)build\tmp\protobuf_build-$(Configuration)-$(Platform)"
      cd "$(SolutionDir)build\tmp\protobuf_build-$(Configuration)-$(Platform)"
-      cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_STANDARD=20 -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX="$(SolutionDir)build\lib\$(Configuration)-$(Platform)\protobuf_build" -DCMAKE_SYSTEM_VERSION=10.0 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -Dprotobuf_INSTALL=ON -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_BUILD_CONFORMANCE=OFF -Dprotobuf_BUILD_EXAMPLES=OFF -Dprotobuf_BUILD_PROTOBUF_BINARIES=ON -Dprotobuf_BUILD_PROTOC_BINARIES=OFF -Dprotobuf_BUILD_LIBPROTOC=OFF -Dprotobuf_BUILD_LIBUPB=OFF -Dprotobuf_ALLOW_CCACHE=ON -Dprotobuf_FORCE_FETCH_DEPENDENCIES=ON -Dprotobuf_WITH_ZLIB=OFF -Dprotobuf_MSVC_STATIC_RUNTIME=ON "$(SolutionDir)3rdparty\protobuf\protobuf"
+      cmake -G Ninja ^
+        -DCMAKE_CXX_COMPILER="cl.exe" ^
+        -DCMAKE_C_COMPILER="cl.exe" ^
+        -DCMAKE_CXX_STANDARD=20 ^
+        -DCMAKE_BUILD_TYPE="Release" ^
+        -DCMAKE_INSTALL_PREFIX="$(SolutionDir)build\lib\$(Configuration)-$(Platform)\protobuf_build" ^
+        -DCMAKE_SYSTEM_VERSION=10.0 ^
+        -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) ^
+        -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded ^
+        -Dprotobuf_INSTALL=ON ^
+        -Dprotobuf_BUILD_TESTS=OFF ^
+        -Dprotobuf_BUILD_CONFORMANCE=OFF ^
+        -Dprotobuf_BUILD_EXAMPLES=OFF ^
+        -Dprotobuf_BUILD_PROTOBUF_BINARIES=ON ^
+        -Dprotobuf_BUILD_PROTOC_BINARIES=OFF ^
+        -Dprotobuf_BUILD_LIBPROTOC=OFF ^
+        -Dprotobuf_BUILD_LIBUPB=OFF ^
+        -Dprotobuf_ALLOW_CCACHE=ON ^
+        -Dprotobuf_FORCE_FETCH_DEPENDENCIES=ON ^
+        -Dprotobuf_WITH_ZLIB=OFF ^
+        -Dprotobuf_MSVC_STATIC_RUNTIME=ON ^
+        "$(SolutionDir)3rdparty\protobuf\protobuf"
    </CmakeReleaseCLI>
    <CmakeDebugCLI>call vsdevcmd.bat -arch=amd64
      if not exist "$(SolutionDir)build\tmp\protobuf_build-$(Configuration)-$(Platform)" mkdir "$(SolutionDir)build\tmp\protobuf_build-$(Configuration)-$(Platform)"
      cd "$(SolutionDir)build\tmp\protobuf_build-$(Configuration)-$(Platform)"
-      cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_STANDARD=20 -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_INSTALL_PREFIX="$(SolutionDir)build\lib\$(Configuration)-$(Platform)\protobuf_build" -DCMAKE_SYSTEM_VERSION=10.0 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebugDLL -Dprotobuf_INSTALL=ON -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_BUILD_CONFORMANCE=OFF -Dprotobuf_BUILD_EXAMPLES=OFF -Dprotobuf_BUILD_PROTOBUF_BINARIES=ON -Dprotobuf_BUILD_PROTOC_BINARIES=OFF -Dprotobuf_BUILD_LIBPROTOC=OFF -Dprotobuf_BUILD_LIBUPB=OFF -Dprotobuf_ALLOW_CCACHE=ON -Dprotobuf_FORCE_FETCH_DEPENDENCIES=ON -Dprotobuf_WITH_ZLIB=OFF -Dprotobuf_MSVC_STATIC_RUNTIME=OFF "$(SolutionDir)3rdparty\protobuf\protobuf"
+      cmake -G Ninja ^
+        -DCMAKE_CXX_COMPILER="cl.exe" ^
+        -DCMAKE_C_COMPILER="cl.exe" ^
+        -DCMAKE_CXX_STANDARD=20 ^
+        -DCMAKE_BUILD_TYPE="Debug" ^
+        -DCMAKE_INSTALL_PREFIX="$(SolutionDir)build\lib\$(Configuration)-$(Platform)\protobuf_build" ^
+        -DCMAKE_SYSTEM_VERSION=10.0 ^
+        -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) ^
+        -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebugDLL ^
+        -Dprotobuf_INSTALL=ON ^
+        -Dprotobuf_BUILD_TESTS=OFF ^
+        -Dprotobuf_BUILD_CONFORMANCE=OFF ^
+        -Dprotobuf_BUILD_EXAMPLES=OFF ^
+        -Dprotobuf_BUILD_PROTOBUF_BINARIES=ON ^
+        -Dprotobuf_BUILD_PROTOC_BINARIES=OFF ^
+        -Dprotobuf_BUILD_LIBPROTOC=OFF ^
+        -Dprotobuf_BUILD_LIBUPB=OFF ^
+        -Dprotobuf_ALLOW_CCACHE=ON ^
+        -Dprotobuf_FORCE_FETCH_DEPENDENCIES=ON ^
+        -Dprotobuf_WITH_ZLIB=OFF ^
+        -Dprotobuf_MSVC_STATIC_RUNTIME=OFF ^
+        "$(SolutionDir)3rdparty\protobuf\protobuf"
    </CmakeDebugCLI>
    <CmakeCleanCLI>
      echo Cleaning..
--- 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`.
--- 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;