diff --git a/.cirrus.yml b/.cirrus.yml
index 41132c0bce..b107b475e9 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -8,8 +8,8 @@ env:
   RPCS3_TOKEN: ENCRYPTED[100ebb8e3552bf2021d0ef55dccda3e58d27be5b6cab0b0b92843ef490195d3c4edaefa087e4a3b425caa6392300b9b1]
   QT_VER_MAIN: '6'
   QT_VER: '6.9.0'
-  LLVM_COMPILER_VER: '19'
-  LLVM_VER: '19.1.7'
+  LLVM_COMPILER_VER: '20'
+  LLVM_VER: '20.1.6'
 
 # windows_task:
 #   matrix:
diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml
index 2d7f0a8282..cd49735c8d 100644
--- a/.github/workflows/rpcs3.yml
+++ b/.github/workflows/rpcs3.yml
@@ -133,7 +133,7 @@ jobs:
       CI_HAS_ARTIFACTS: true
       QT_VER: '6.7.3'
       QT_VER_MAIN: '6'
-      LLVM_COMPILER_VER: '19'
+      LLVM_COMPILER_VER: '20'
       RELEASE_MESSAGE: ../GitHubReleaseMessage.txt
       UPLOAD_COMMIT_HASH: ${{ matrix.UPLOAD_COMMIT_HASH }}
       UPLOAD_REPO_FULL_NAME: ${{ matrix.UPLOAD_REPO_FULL_NAME }}
@@ -160,7 +160,7 @@ jobs:
           restore-keys: ${{ runner.os }}-qt-${{ matrix.name }}-${{ env.QT_VER }}
 
       - name: Build
-        run: ${{ matrix.build_sh }}      
+        run: ${{ matrix.build_sh }}
 
       - name: Upload artifacts
         uses: actions/upload-artifact@main
@@ -185,7 +185,7 @@ jobs:
         env:
           RPCS3_TOKEN: ${{ secrets.RPCS3_TOKEN }}
         run: .ci/github-upload.sh
-      
+
       - name: Save Build Ccache
         if: github.ref == 'refs/heads/master'
         uses: actions/cache/save@main
@@ -211,7 +211,7 @@ jobs:
       QT_VER: '6.9.0'
       QT_VER_MSVC: 'msvc2022'
       QT_DATE: '202503301022'
-      LLVM_VER: '19.1.7'
+      LLVM_VER: '20.1.6'
       VULKAN_VER: '1.3.268.0'
       VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5'
       CCACHE_SHA: '1f39f3ad5aae3fe915e99ad1302633bc8f6718e58fa7c0de2b0ba7e080f0f08c'
diff --git a/3rdparty/llvm/CMakeLists.txt b/3rdparty/llvm/CMakeLists.txt
index 8723728f4a..2552c89dbd 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 20.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..47addd4540 160000
--- a/3rdparty/llvm/llvm
+++ b/3rdparty/llvm/llvm
@@ -1 +1 @@
-Subproject commit cd708029e0b2869e80abe31ddb175f7c35361f90
+Subproject commit 47addd4540b4c393e478ba92bea2589e330c57fb
diff --git a/BUILDING.md b/BUILDING.md
index 09f523d567..fe4aba4a8e 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -130,7 +130,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-20.1.6/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 d8df69d503..1da0daba2b 100644
--- a/buildfiles/msvc/rpcs3_default.props
+++ b/buildfiles/msvc/rpcs3_default.props
@@ -43,8 +43,8 @@
         LLVMBitstreamReader.lib;
         LLVMBitWriter.lib;
         LLVMCFGuard.lib;
+        LLVMCGData.lib;
         LLVMCodeGen.lib;
-        LLVMCodeGenData.lib;
         LLVMCodeGenTypes.lib;
         LLVMCore.lib;
         LLVMCoroutines.lib;
@@ -66,6 +66,7 @@
         LLVMExecutionEngine.lib;
         LLVMExtensions.lib;
         LLVMFileCheck.lib;
+        LLVMFrontendAtomic.lib;
         LLVMFrontendDriver.lib;
         LLVMFrontendHLSL.lib;
         LLVMFrontendOffloading.lib;
@@ -118,6 +119,7 @@
         LLVMTableGenCommon.lib;
         LLVMTarget.lib;
         LLVMTargetParser.lib;
+        LLVMTelemetry.lib;
         LLVMTextAPI.lib;
         LLVMTextAPIBinaryReader.lib;
         LLVMTransformUtils.lib;