Add support for LLVM 22

Add support for the addrspacecast instruction and constant expression.

Disable a few memcheck/static_array tests that are failing with
optimizations enabled.

Switch Windows LLVM build on CI to use the monolithic source package,
since the LLVM 22 release is not shipping individual project tarballs.

Author: jrprice

.github/workflows/ci.yml

@@ -3,7 +3,7 @@ on: [push, pull_request]
 
 env:
   RELEASE_VERSION: "21.10"
-  RELEASE_LLVM: "21"
+  RELEASE_LLVM: "22"
 
 jobs:
   check-format:
@@ -31,7 +31,7 @@ jobs:
         os: [ubuntu-24.04, macos-15]
         compiler: [gcc, clang]
         build_type: [Release, Debug]
-        llvm: [18, 19, 20, 21]
+        llvm: [18, 19, 20, 21, 22]
         exclude:
           - os: macos-15
             compiler: gcc
@@ -107,7 +107,7 @@ jobs:
       fail-fast: false
       matrix:
         platform: [Win32, x64]
-        llvm: [18, 19, 20, 21]
+        llvm: [18, 19, 20, 21, 22]
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/install-deps.sh

@@ -29,29 +29,11 @@ elif [[ "`uname`" == "MINGW64"* ]]; then
     if [ ! -r llvm-${LLVM_VERSION}/install/lib/cmake/llvm/LLVMConfig.cmake ]; then
         URL="https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_FULL_VERSION}"
 
-        # Get LLVM
-        ARCHIVE="llvm-${LLVM_FULL_VERSION}.src.tar.xz"
-        mkdir -p llvm-${LLVM_VERSION}/llvm
+        # Get the monolithic LLVM project source package.
+        ARCHIVE="llvm-project-${LLVM_FULL_VERSION}.src.tar.xz"
+        mkdir -p llvm-${LLVM_VERSION}/
         curl -OL "$URL/$ARCHIVE"
-        tar xf "$ARCHIVE" --strip-components 1 -C llvm-${LLVM_VERSION}/llvm
-
-        # Get Clang
-        ARCHIVE="clang-${LLVM_FULL_VERSION}.src.tar.xz"
-        mkdir -p llvm-${LLVM_VERSION}/clang
-        curl -OL "$URL/$ARCHIVE"
-        tar xf "$ARCHIVE" --strip-components 1 -C llvm-${LLVM_VERSION}/clang
-
-        # Get CMake helpers
-        mkdir -p llvm-${LLVM_VERSION}/cmake
-        ARCHIVE="cmake-${LLVM_FULL_VERSION}.src.tar.xz"
-        curl -OL "$URL/$ARCHIVE"
-        tar xf "$ARCHIVE" --strip-components 1 -C llvm-${LLVM_VERSION}/cmake
-
-        # Get third_party
-        mkdir -p llvm-${LLVM_VERSION}/third-party
-        ARCHIVE="third-party-${LLVM_FULL_VERSION}.src.tar.xz"
-        curl -OL "$URL/$ARCHIVE"
-        tar xf "$ARCHIVE" --strip-components 1 -C llvm-${LLVM_VERSION}/third-party
+        tar xf "$ARCHIVE" --strip-components 1 -C llvm-${LLVM_VERSION}
 
         # Build LLVM + Clang
         mkdir -p llvm-${LLVM_VERSION}/build

CMakeLists.txt

@@ -118,10 +118,17 @@ find_library(CLANG_LIB "clangFrontend"
              PATHS "${CLANG_ROOT}/lib" "${LLVM_LIBRARY_DIRS}"
              NO_DEFAULT_PATH)
 find_library(CLANG_LIB "clangFrontend")
-set(CLANG_LIBS
-  clangCodeGen clangFrontend clangSerialization clangDriver
-  clangParse clangSema clangAnalysis clangEdit clangAST clangASTMatchers
-  clangLex clangAPINotes clangBasic clangSupport)
+if (${LLVM_PACKAGE_VERSION} VERSION_GREATER_EQUAL "22.0")
+  set(CLANG_LIBS
+    clangCodeGen clangFrontend clangOptions clangSerialization clangDriver
+    clangParse clangSema clangAnalysis clangAnalysisLifetimeSafety clangEdit
+    clangAST clangASTMatchers clangLex clangAPINotes clangBasic clangSupport)
+else()
+  set(CLANG_LIBS
+    clangCodeGen clangFrontend clangSerialization clangDriver
+    clangParse clangSema clangAnalysis clangEdit clangAST clangASTMatchers
+    clangLex clangAPINotes clangBasic clangSupport)
+endif()
 
 if ("${CLANG_LIB}" STREQUAL "CLANG_LIB-NOTFOUND")
   # https://releases.llvm.org/10.0.0/tools/clang/docs/ReleaseNotes.html#build-system-changes

src/core/Program.cpp

@@ -503,8 +503,13 @@ bool Program::build(BuildType buildType, const char* options,
     new clang::CompilerInvocation);
   clang::CompilerInvocation::CreateFromArgs(*invocation, args, diags);
   clang::CompilerInstance compiler(invocation);
+#if LLVM_VERSION >= 220
+  compiler.createDiagnostics(diagConsumer, false);
+#else
   compiler.createDiagnostics(*llvm::vfs::getRealFileSystem(), diagConsumer,
                              false);
+#endif
+
 #else
   clang::TextDiagnosticPrinter* diagConsumer =
     new clang::TextDiagnosticPrinter(buildLog, diagOpts);

src/core/WorkItem.cpp

@@ -135,6 +135,9 @@ void WorkItem::dispatch(const llvm::Instruction* instruction,
   case llvm::Instruction::Add:
     add(instruction, result);
     break;
+  case llvm::Instruction::AddrSpaceCast:
+    addrspacecast(instruction, result);
+    break;
   case llvm::Instruction::Alloca:
     alloc(instruction, result);
     break;
@@ -775,6 +778,12 @@ INSTRUCTION(add)
   }
 }
 
+INSTRUCTION(addrspacecast)
+{
+  TypedValue operand = getOperand(instruction->getOperand(0));
+  memcpy(result.data, operand.data, result.size * result.num);
+}
+
 INSTRUCTION(alloc)
 {
   const llvm::AllocaInst* allocInst = ((const llvm::AllocaInst*)instruction);

src/core/WorkItem.h

@@ -129,6 +129,7 @@ class WorkItem
 #define INSTRUCTION(name)                                                      \
   void name(const llvm::Instruction* instruction, TypedValue& result)
   INSTRUCTION(add);
+  INSTRUCTION(addrspacecast);
   INSTRUCTION(alloc);
   INSTRUCTION(ashr);
   INSTRUCTION(bitcast);

src/core/common.cpp

@@ -492,7 +492,8 @@ llvm::Instruction* getConstExprAsInstruction(const llvm::ConstantExpr* expr)
     FATAL_ERROR("Unsupported constant expression: icmp/fcmp");
 #endif
   case llvm::Instruction::AddrSpaceCast:
-    FATAL_ERROR("Unsupported constant expression: addrspacecast");
+    return llvm::AddrSpaceCastInst::CreatePointerBitCastOrAddrSpaceCast(
+      operands[0], expr->getType());
   default:
     assert(expr->getNumOperands() == 2 && "Must be binary operator?");
 

tests/kernels/CMakeLists.txt

@@ -39,5 +39,12 @@ if (${LLVM_PACKAGE_VERSION} VERSION_GREATER_EQUAL "21.0")
   set(XFAIL ${XFAIL} interactive/struct_member)
 endif()
 
+# https://github.com/jrprice/Oclgrind/issues/224
+if (${LLVM_PACKAGE_VERSION} VERSION_GREATER_EQUAL "22.0")
+  set(XFAIL ${XFAIL} memcheck/casted_static_array)
+  set(XFAIL ${XFAIL} memcheck/static_array)
+  set(XFAIL ${XFAIL} memcheck/static_array_padded_struct)
+endif()
+
 # Expected failures
 set_tests_properties(${XFAIL} PROPERTIES WILL_FAIL TRUE)