Move llvmlite to LLVM 20

.github/workflows/llvmlite_conda_builder.yml

@@ -92,7 +92,8 @@ jobs:
         with:
           auto-update-conda: true
           auto-activate-base: true
-          activate-environment: ""
+          activate-environment: cibuild
+          python-version: '3.12'
 
       - name: Install conda-build
         run: conda install conda-build
@@ -112,7 +113,7 @@ jobs:
           if [ "${{ inputs.llvmdev_run_id }}" != "" ]; then
               LLVMDEV_CHANNEL="file:///${{ github.workspace }}/llvmdev_conda_packages"
           else
-              LLVMDEV_CHANNEL="numba"
+              LLVMDEV_CHANNEL="numba/label/dev"
           fi
           CONDA_CHANNEL_DIR="conda_channel_dir"
           mkdir $CONDA_CHANNEL_DIR
@@ -144,6 +145,9 @@ jobs:
     steps:
       - name: Setup miniconda
         uses: conda-incubator/setup-miniconda@835234971496cad1653abb28a638a281cf32541f # v3.2.0
+        with:
+          activate-environment: cibuild
+          python-version: '3.12'
 
       - name: Download llvmlite artifact
         uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0

.github/workflows/llvmlite_linux-64_wheel_builder.yml

@@ -21,8 +21,8 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  FALLBACK_LLVMDEV_VERSION: "15"
-  CONDA_CHANNEL_NUMBA: numba/label/manylinux2014_x86_64
+  FALLBACK_LLVMDEV_VERSION: "20"
+  CONDA_CHANNEL_NUMBA: numba/label/llvm20-wheel
   VALIDATION_PYTHON_VERSION: "3.12"
   ARTIFACT_RETENTION_DAYS: 7
   MANYLINUX_IMAGE: "manylinux2014_x86_64"

.github/workflows/llvmlite_linux-aarch64_wheel_builder.yml

@@ -21,8 +21,8 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  FALLBACK_LLVMDEV_VERSION: "15"
-  CONDA_CHANNEL_NUMBA: numba/label/manylinux2014_aarch64
+  FALLBACK_LLVMDEV_VERSION: "20"
+  CONDA_CHANNEL_NUMBA: numba/label/llvm20-wheel
   VALIDATION_PYTHON_VERSION: "3.12"
   ARTIFACT_RETENTION_DAYS: 7
   MANYLINUX_IMAGE: "manylinux_2_28_aarch64"

.github/workflows/llvmlite_osx-64_wheel_builder.yml

@@ -21,8 +21,8 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  FALLBACK_LLVMDEV_VERSION: "15"
-  CONDA_CHANNEL_NUMBA: numba/label/osx_wheel
+  FALLBACK_LLVMDEV_VERSION: "20"
+  CONDA_CHANNEL_NUMBA: numba/label/llvm20-wheel
   VALIDATION_PYTHON_VERSION: "3.12"
   ARTIFACT_RETENTION_DAYS: 7
 

.github/workflows/llvmlite_osx-arm64_wheel_builder.yml

@@ -21,8 +21,8 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  FALLBACK_LLVMDEV_VERSION: "15"
-  CONDA_CHANNEL_NUMBA: numba/label/osx_wheel
+  FALLBACK_LLVMDEV_VERSION: "20"
+  CONDA_CHANNEL_NUMBA: numba/label/llvm20-wheel
   VALIDATION_PYTHON_VERSION: "3.12"
   ARTIFACT_RETENTION_DAYS: 7
 

.github/workflows/llvmlite_win-64_wheel_builder.yml

@@ -22,8 +22,8 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  FALLBACK_LLVMDEV_VERSION: "15"
-  CONDA_CHANNEL_NUMBA: numba/label/win64_wheel
+  FALLBACK_LLVMDEV_VERSION: "20"
+  CONDA_CHANNEL_NUMBA: numba/label/llvm20-wheel
   VALIDATION_PYTHON_VERSION: "3.12"
   ARTIFACT_RETENTION_DAYS: 7
 

buildscripts/azure/azure-linux-macos.yml

@@ -6,7 +6,7 @@ parameters:
 
 jobs:
 - job: ${{ parameters.name }}
-  pool: 
+  pool:
     vmImage: ${{ parameters.vmImage }}
   strategy:
     maxParallel: 11

buildscripts/github/validate_win-64_wheel.py

@@ -31,6 +31,7 @@
         "api-ms-win-crt-string-l1-1-0.dll",
         "api-ms-win-crt-time-l1-1-0.dll",
         "api-ms-win-crt-utility-l1-1-0.dll",
+        "ntdll.dll",
     }
     assert imports == expected_imports, (
         f"Unexpected imports: {imports - expected_imports}\n"

buildscripts/incremental/build.cmd

@@ -15,9 +15,5 @@ call activate %CONDA_ENV%
 @rem - https://github.com/conda-forge/llvmdev-feedstock/issues/175
 @rem - https://github.com/conda-forge/llvmdev-feedstock/pull/223
 @rem - https://github.com/MicrosoftDocs/visualstudio-docs/issues/7774
-if "%LLVM%"=="16" (
-  call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
-  if %errorlevel% neq 0 exit /b %errorlevel%
-)
 
 python setup.py build

buildscripts/incremental/setup_conda_environment.cmd

@@ -10,12 +10,6 @@ if %errorlevel% neq 0 exit /b %errorlevel%
 call activate %CONDA_ENV%
 if %errorlevel% neq 0 exit /b %errorlevel%
 
-@rem Install llvmdev
-if "%LLVM%"=="16" (
-  set LLVMDEV_CHANNEL="conda-forge"
-) else (
-  set LLVMDEV_CHANNEL="numba"
-)
-
-call conda install -y -q -c %LLVMDEV_CHANNEL% llvmdev="%LLVM%" libxml2
+@rem Install llvmdev 20
+call conda install -y -q -c numba/label/dev llvmdev=20 libxml2
 if %errorlevel% neq 0 exit /b %errorlevel%

buildscripts/incremental/setup_conda_environment.sh

@@ -22,12 +22,8 @@ set +v
 source activate $CONDA_ENV
 set -v
 
-# Install llvmdev (separate channel, for now)
-if [ "$LLVM" == "16" ]; then
-    $CONDA_INSTALL -c conda-forge llvmdev="16"
-else
-    $CONDA_INSTALL -c numba llvmdev="15.*"
-fi
+# Install llvmdev 20
+$CONDA_INSTALL -c numba/label/dev llvmdev=20
 
 # Install the compiler toolchain, for osx, bootstrapping needed
 # which happens in build.sh

buildscripts/manylinux/build_llvmlite.sh

@@ -24,14 +24,7 @@ conda activate $envname
 if [ -n "$LLVMDEV_ARTIFACT_PATH" ] && [ -d "$LLVMDEV_ARTIFACT_PATH" ]; then
     conda install -y "$LLVMDEV_ARTIFACT_PATH"/llvmdev-*.conda --no-deps
 else
-    if [[ $(uname -m) == "aarch64" ]] ; then
-        conda install -y numba/label/manylinux_2_28::llvmdev --no-deps
-    elif [[ $(uname -m) == "x86_64" ]] ; then
-        conda install -y numba/label/manylinux_2_17::llvmdev --no-deps
-    else
-        echo "Error: Unsupported architecture: $(uname -m)"
-        exit 1
-    fi
+    conda install -y -c numba/label/llvm20-wheel llvmdev=20 --no-deps
 fi
 
 # Prepend builtin Python Path

conda-recipes/llvmlite/meta.yaml

@@ -25,7 +25,7 @@ requirements:
     - python
     - setuptools
     # On channel https://anaconda.org/numba/
-    - llvmdev 15.*
+    - llvmdev 20
     - vs2015_runtime # [win]
     # llvmdev is built with libz compression support
     - zlib           # [unix]

docs/environment.yml

@@ -5,7 +5,7 @@ dependencies:
   - python
   # pip for installing llvmlite itself
   - pip
-  - llvmdev=15
+  - llvmdev=20
   - cmake
   - make
   - docutils==0.16

docs/source/conf.py

@@ -301,7 +301,7 @@
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {
     'python': ('https://docs.python.org/3', None),
-    'llvm': ('http://llvm.org/releases/15.0.0/docs', None),
+    'llvm': ('https://releases.llvm.org/20.1.0/docs', None),
     }
 
 nitpicky = True

docs/source/user-guide/examples/ll_fpadd.py

@@ -6,7 +6,6 @@
 
 
 # All these initializations are required for code generation!
-llvm.initialize()
 llvm.initialize_native_target()
 llvm.initialize_native_asmprinter()  # yes, even this one
 

docs/source/user-guide/examples/parseasm.py

@@ -1,7 +1,6 @@
 from llvmlite import binding as llvm
 from llvmlite import ir as lc
 
-llvm.initialize()
 llvm.initialize_native_target()
 llvm.initialize_native_asmprinter()
 

docs/source/user-guide/examples/sum.py

@@ -18,7 +18,6 @@
 import llvmlite.binding as llvm
 
 
-llvm.initialize()
 llvm.initialize_native_target()
 llvm.initialize_native_asmprinter()
 

examples/ll_fpadd.py

@@ -6,7 +6,6 @@
 
 
 # All these initializations are required for code generation!
-llvm.initialize()
 llvm.initialize_native_target()
 llvm.initialize_native_asmprinter()  # yes, even this one
 

examples/lljit.py

@@ -10,7 +10,6 @@
 import llvmlite.binding as llvm
 import numpy as np
 
-llvm.initialize()
 llvm.initialize_native_target()
 llvm.initialize_native_asmprinter()  # yes, even this one
 

examples/npm_passes.py

@@ -10,7 +10,6 @@
 faulthandler.enable()
 
 # All are required to initialize LLVM
-llvm.initialize()
 llvm.initialize_native_target()
 llvm.initialize_native_asmprinter()
 

examples/npm_pipeline.py

@@ -15,7 +15,6 @@
 faulthandler.enable()
 
 # All are required to initialize LLVM
-llvm.initialize()
 llvm.initialize_native_target()
 llvm.initialize_native_asmprinter()
 

examples/opaque_pointers/sum.py

@@ -21,7 +21,6 @@
 import llvmlite.binding as llvm
 
 
-llvm.initialize()
 llvm.initialize_native_target()
 llvm.initialize_native_asmprinter()
 

examples/parseasm.py

@@ -1,7 +1,6 @@
 from llvmlite import binding as llvm
 from llvmlite import ir as lc
 
-llvm.initialize()
 llvm.initialize_native_target()
 llvm.initialize_native_asmprinter()
 

examples/sum.py

@@ -18,7 +18,6 @@
 import llvmlite.binding as llvm
 
 
-llvm.initialize()
 llvm.initialize_native_target()
 llvm.initialize_native_asmprinter()
 

ffi/CMakeLists.txt

@@ -19,7 +19,7 @@ message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
 message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
 
 # NOTE: Keep this in sync with the version that llvmlite is declared to support
-set(LLVMLITE_SUPPORTED_LLVM_VERSION_DEFAULT 15)
+set(LLVMLITE_SUPPORTED_LLVM_VERSION_DEFAULT 20)
 
 # Check LLVM version is supported or intentionally overridden.
 if (NOT DEFINED LLVM_VERSION_MAJOR)
@@ -164,11 +164,10 @@ ${LLVM_ENABLE_RTTI}.")
 endif()
 
 # Define the shared library
-add_library(llvmlite SHARED assembly.cpp bitcode.cpp core.cpp initfini.cpp
-            module.cpp value.cpp executionengine.cpp transforms.cpp type.cpp
-            passmanagers.cpp targets.cpp dylib.cpp linker.cpp object_file.cpp
-            custom_passes.cpp orcjit.cpp memorymanager.cpp newpassmanagers.cpp
-            config.cpp)
+add_library(llvmlite SHARED assembly.cpp bitcode.cpp config.cpp core.cpp initfini.cpp
+            module.cpp value.cpp executionengine.cpp type.cpp
+            targets.cpp dylib.cpp linker.cpp object_file.cpp
+            custom_passes.cpp orcjit.cpp memorymanager.cpp newpassmanagers.cpp)
 
 
 # Determine whether libstdc++ should be statically linked (or not).

ffi/PASSREGISTRY.def

@@ -140,7 +140,6 @@ MODULE_PASS("sample-profile", SampleProfileLoaderPass())
 MODULE_PASS("scc-oz-module-inliner",buildInlinerPipeline(OptimizationLevel::Oz, ThinOrFullLTOPhase::None))
 MODULE_PASS("pseudo-probe", SampleProfileProbePass(TM))
 MODULE_PASS("strip-nonlinetable-debuginfo", StripNonLineTableDebugInfoPass())
-MODULE_PASS("synthetic-counts-propagation", SyntheticCountsPropagation())
 MODULE_PASS("trigger-crash", TriggerCrashPass())
 MODULE_PASS("verify", VerifierPass())
 MODULE_PASS("view-callgraph", CallGraphViewerPass())

ffi/core.cpp

@@ -23,16 +23,12 @@ LLVMPY_DisposeString(const char *msg) { free(const_cast<char *>(msg)); }
 API_EXPORT(LLVMContextRef)
 LLVMPY_GetGlobalContext() {
     auto context = LLVMGetGlobalContext();
-    // FIXME: Remove with LLVM >= 17.
-    LLVMContextSetOpaquePointers(context, true);
     return context;
 }
 
 API_EXPORT(LLVMContextRef)
 LLVMPY_ContextCreate() {
     LLVMContextRef context = LLVMContextCreate();
-    // FIXME: Remove with LLVM >= 17.
-    LLVMContextSetOpaquePointers(context, true);
     return context;
 }