From e7d55b5e680c441be4b0efbfd4438005d98ca728 Mon Sep 17 00:00:00 2001
From: Wenju He <wenju.he@intel.com>
Date: Wed, 27 Aug 2025 04:36:59 +0200
Subject: [PATCH] Update LLVM version to 22.0 for opencl-clang main branch

---
 .github/workflows/codeql.yml                           | 2 +-
 .github/workflows/on-push-verification-out-of-tree.yml | 2 +-
 .github/workflows/scheduled-verification.yml           | 2 +-
 CMakeLists.txt                                         | 8 ++++----
 README.md                                              | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index ebf7cdd9..e6b9b9eb 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -10,7 +10,7 @@ permissions:
   contents: read
 
 env:
-  LLVM_VERSION: 21
+  LLVM_VERSION: 22
   LLVM_VERSION_MINOR: 0
 
 jobs:
diff --git a/.github/workflows/on-push-verification-out-of-tree.yml b/.github/workflows/on-push-verification-out-of-tree.yml
index b6a5f0d0..a94d0706 100644
--- a/.github/workflows/on-push-verification-out-of-tree.yml
+++ b/.github/workflows/on-push-verification-out-of-tree.yml
@@ -9,7 +9,7 @@ permissions:
   contents: read
 
 env:
-  LLVM_VERSION: 21
+  LLVM_VERSION: 22
   LLVM_VERSION_MINOR: 0
 
 on:
diff --git a/.github/workflows/scheduled-verification.yml b/.github/workflows/scheduled-verification.yml
index 90132de7..fe91094f 100644
--- a/.github/workflows/scheduled-verification.yml
+++ b/.github/workflows/scheduled-verification.yml
@@ -34,7 +34,7 @@ jobs:
     name: Verify `ocl-open-${{ matrix.llvm_version }}` release branch
     strategy:
       matrix:
-        llvm_version: [ 14, 15, 16, 17, 18, 19, 20 ]
+        llvm_version: [ 14, 15, 16, 17, 18, 19, 20, 21 ]
     runs-on: ubuntu-22.04
     steps:
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7bc803dd..1d71e875 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
     add_definitions(-DUSE_PREBUILT_LLVM)
 
     if(NOT PREFERRED_LLVM_VERSION)
-        set(PREFERRED_LLVM_VERSION "21.0")
+        set(PREFERRED_LLVM_VERSION "22.0")
     endif(NOT PREFERRED_LLVM_VERSION)
     message(STATUS "[OPENCL-CLANG] Looking for LLVM version ${PREFERRED_LLVM_VERSION}")
     find_package(LLVM ${PREFERRED_LLVM_VERSION} REQUIRED)
@@ -152,9 +152,9 @@ if(NOT USE_PREBUILT_LLVM)
         )
     endif()
 
-    set(CLANG_BASE_REVISION master)
-    set(SPIRV_BASE_REVISION master)
-    set(TARGET_BRANCH "ocl-open-110")
+    set(CLANG_BASE_REVISION main)
+    set(SPIRV_BASE_REVISION main)
+    set(TARGET_BRANCH main)
 
     apply_patches(${CLANG_SOURCE_DIR}
                   ${CMAKE_CURRENT_SOURCE_DIR}/patches/clang
diff --git a/README.md b/README.md
index 10ca26ec..8356af93 100644
--- a/README.md
+++ b/README.md
@@ -77,7 +77,7 @@ LLVM by using the `PREFERRED_LLVM_VERSION` cmake option:
 
 Example:
 ```bash
-cmake -DPREFERRED_LLVM_VERSION="21.0" ../opencl-clang
+cmake -DPREFERRED_LLVM_VERSION="22.0" ../opencl-clang
 ```
 
 ##### Custom LLVM installation