Set minimum LLVM to 15+

.github/workflows/bcload.yml

@@ -11,9 +11,9 @@ jobs:
  fail-fast: false
  matrix:
  # BCLoad tests only run with old pass manager [aka up to and including 13]
- llvm: ["11", "12", "13"]
+ llvm: ["16"]
  build: ["Release"] # "RelWithDebInfo"
- os: [ubuntu-20.04]
+ os: [ubuntu-22.04]
 
  timeout-minutes: 30
  steps:
@@ -23,10 +23,6 @@ jobs:
  sudo apt-add-repository "deb http://apt.llvm.org/`lsb_release -c | cut -f2`/ llvm-toolchain-`lsb_release -c | cut -f2`-${{ matrix.llvm }} main" || true
  sudo apt-get install -y cmake gcc g++ llvm-${{ matrix.llvm }}-dev clang-${{ matrix.llvm }} libclang-${{ matrix.llvm }}-dev
  sudo python3 -m pip install --upgrade pip lit
- if [[ '${{ matrix.llvm }}' == '13' ]]; then
- sudo sed -i 's/add_executable(llvm-omp-device-info IMPORTED)//g' /usr/lib/llvm-${{matrix.llvm}}/lib/cmake/llvm/LLVMExports*.cmake
- sudo sed -i 's/llvm-omp-device-info//g' /usr/lib/llvm-${{matrix.llvm}}/lib/cmake/llvm/LLVMExports*.cmake
- fi
  - uses: actions/checkout@v4
  - name: mkdir
  run: cd enzyme && rm -rf build && mkdir build

.github/workflows/benchmark.yml

@@ -21,7 +21,7 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- llvm: ["13", "14", "15", "16"]
+ llvm: ["16", "17", "18"]
  build: ["Release", "Debug"] # "RelWithDebInfo"
  os: [openstack18]
  timeout-minutes: 120 
@@ -33,10 +33,6 @@ jobs:
  sudo apt-get install -y python3-pip autoconf cmake gcc g++ libtool gfortran libblas-dev llvm-${{ matrix.llvm }}-dev clang-${{ matrix.llvm }} libeigen3-dev libboost-dev
  sudo python3 -m pip install lit pathlib
  sudo touch /usr/lib/llvm-${{ matrix.llvm }}/bin/yaml-bench
- if [[ '${{ matrix.llvm }}' == '13' ]]; then
- sudo sed -i 's/add_executable(llvm-omp-device-info IMPORTED)//g' /usr/lib/llvm-${{matrix.llvm}}/lib/cmake/llvm/LLVMExports*.cmake
- sudo sed -i 's/llvm-omp-device-info//g' /usr/lib/llvm-${{matrix.llvm}}/lib/cmake/llvm/LLVMExports*.cmake
- fi
  - uses: actions/checkout@v4
  - name: mkdir
  run: rm -rf build && mkdir build

.github/workflows/ccpp.yml

@@ -17,9 +17,9 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- llvm: ["11", "12", "13", "14", "15", "16", "17"]
+ llvm: ["15", "16", "17", "18"]
  build: ["Release"] # "RelWithDebInfo"
- os: [ubuntu-20.04]
+ os: [ubuntu-22.04]
 
  timeout-minutes: 45
 
@@ -31,10 +31,6 @@ jobs:
  sudo apt-add-repository "deb http://apt.llvm.org/`lsb_release -c | cut -f2`/ llvm-toolchain-`lsb_release -c | cut -f2`-${{ matrix.llvm }} main" || true
  sudo apt-get install -y cmake gcc g++ llvm-${{ matrix.llvm }}-dev libomp-${{ matrix.llvm }}-dev lld-${{ matrix.llvm }} clang-${{ matrix.llvm }} libclang-${{ matrix.llvm }}-dev libeigen3-dev libboost-dev libzstd-dev
  sudo python3 -m pip install --upgrade pip lit
- if [[ '${{ matrix.llvm }}' == '13' ]]; then
- sudo sed -i 's/add_executable(llvm-omp-device-info IMPORTED)//g' /usr/lib/llvm-${{matrix.llvm}}/lib/cmake/llvm/LLVMExports*.cmake
- sudo sed -i 's/llvm-omp-device-info//g' /usr/lib/llvm-${{matrix.llvm}}/lib/cmake/llvm/LLVMExports*.cmake
- fi
  - uses: actions/checkout@v4
  - name: mkdir
  run: rm -rf build && mkdir build

.github/workflows/doxygen.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
  docs:
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-22.04
  steps:
  - uses: actions/checkout@v4
 

.github/workflows/enzyme-ci.yml

@@ -15,9 +15,9 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- llvm: ["11", "12", "13", "14", "15", "16"]
+ llvm: ["15", "16", "17", "18"]
  build: ["Release", "Debug"] # "RelWithDebInfo"
- os: [ubuntu-20.04]
+ os: [ubuntu-22.04]
 
  timeout-minutes: 30 
 
@@ -28,10 +28,6 @@ jobs:
  sudo apt-add-repository "deb http://apt.llvm.org/`lsb_release -c | cut -f2`/ llvm-toolchain-`lsb_release -c | cut -f2`-${{ matrix.llvm }} main" || true
  sudo apt-get install -y cmake gcc g++ llvm-${{ matrix.llvm }}-dev libzstd-dev
  sudo python3 -m pip install --upgrade pip lit
- if [[ '${{ matrix.llvm }}' == '13' ]]; then
- sudo sed -i 's/add_executable(llvm-omp-device-info IMPORTED)//g' /usr/lib/llvm-${{matrix.llvm}}/lib/cmake/llvm/LLVMExports*.cmake
- sudo sed -i 's/llvm-omp-device-info//g' /usr/lib/llvm-${{matrix.llvm}}/lib/cmake/llvm/LLVMExports*.cmake
- fi
  - uses: actions/checkout@v4
  - name: mkdir
  run: rm -rf build && mkdir build
@@ -61,7 +57,7 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- llvm: ["12", "13", "14", "15", "16"]
+ llvm: ["15", "16", "17", "18"]
  build: ["Release", "Debug"] # "RelWithDebInfo"
 
  timeout-minutes: 30 
@@ -100,7 +96,7 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- llvm: ["13"] #, "14"]
+ llvm: ["16"]
  build: ["Release"] # "RelWithDebInfo"
 
  timeout-minutes: 30

.github/workflows/enzyme-julia.yml

@@ -18,9 +18,8 @@ jobs:
  fail-fast: false
  matrix:
  version:
- - '1.6'
- - '1.7'
- - '1.8'
+ - '1.10'
+ - '1.11'
  os:
  - ubuntu-latest
  - macOS-latest
@@ -31,7 +30,7 @@ jobs:
  - uses: actions/checkout@v4
  - uses: actions/checkout@v4
  with:
- repository: 'wsmoses/Enzyme.jl'
+ repository: 'EnzymeAD/Enzyme.jl'
  path: ./jl
  ref: main
  - uses: julia-actions/setup-julia@v1

.github/workflows/tagger.yml

@@ -45,7 +45,7 @@ jobs:
  token: ${{ steps.generate_token.outputs.token }}
  reviewers: vchuravy
  branch: enzyme/${{ github.ref }}
- body: "Automatic PR generated for https://github.com/wsmoses/Enzyme "
+ body: "Automatic PR generated for https://github.com/EnzymeAD/Enzyme "
  - name: Check outputs
  run: |
  echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"

enzyme/BCLoad/CMakeLists.txt

@@ -81,15 +81,6 @@ set_target_properties(blasheaders PROPERTIES EXCLUDE_FROM_ALL TRUE)
 endif()
 
 if ((NOT ("${BC_LOAD_HEADER}" STREQUAL "")) OR ${Clang_FOUND})
-if (${LLVM_VERSION_MAJOR} LESS 8)
- add_llvm_loadable_module( BCPass-${LLVM_VERSION_MAJOR}
- BCLoader.cpp ClangBCLoader.cpp
- DEPENDS
- intrinsics_gen
- PLUGIN_TOOL
- opt
- )
-else()
 # on windows `PLUGIN_TOOL` doesn't link against LLVM.dll
 if ((WIN32 OR CYGWIN) AND LLVM_LINK_LLVM_DYLIB)
  add_llvm_library( BCPass-${LLVM_VERSION_MAJOR}
@@ -112,7 +103,6 @@ else()
  BUILDTREE_ONLY
  )
 endif()
-endif()
 
 add_dependencies(BCPass-${LLVM_VERSION_MAJOR} blasheaders)
 target_include_directories(BCPass-${LLVM_VERSION_MAJOR} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/gsl)

enzyme/CMakeLists.txt

@@ -220,8 +220,8 @@ message("LLVM_INCLUDE_DIRS: ${LLVM_INCLUDE_DIRS}")
 message("found LLVM definitions " ${LLVM_DEFINITIONS})
 message("found LLVM version " ${LLVM_VERSION_MAJOR})
 
-if(LLVM_VERSION_MAJOR LESS 9)
- message(FATAL_ERROR "LLVM version < 9 is not supported")
+if(LLVM_VERSION_MAJOR LESS 15)
+ message(FATAL_ERROR "LLVM version < 15 is not supported")
 endif()
 
 option(ENZYME_FLANG_VERSION "Build for non-version compliant FLANG" OFF)
@@ -257,20 +257,7 @@ file(READ ${LLVM_IDIR}/llvm/Analysis/TargetLibraryInfo.h INPUT_TEXT)
 string(REPLACE "class TargetLibraryInfo {" "class TargetLibraryInfo {public:" INPUT_TEXT "${INPUT_TEXT}")
 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/include/SCEV/TargetLibraryInfo.h" "${INPUT_TEXT}")
 
-if (${LLVM_VERSION_MAJOR} GREATER_EQUAL 11)
 file(READ ${LLVM_IDIR}/llvm/Transforms/Utils/ScalarEvolutionExpander.h INPUT_TEXT)
-else()
-file(READ ${LLVM_IDIR}/llvm/Analysis/ScalarEvolutionExpander.h INPUT_TEXT)
-endif()
-
-if (${LLVM_VERSION_MAJOR} LESS 12)
-string(REPLACE "#define LLVM_ANALYSIS_SCALAREVOLUTIONEXPANDER_H" "#define LLVM_ANALYSIS_SCALAREVOLUTIONEXPANDER_H\n#include \"SCEV/ScalarEvolution.h\"" INPUT_TEXT "${INPUT_TEXT}")
-string(REPLACE "LLVM_ANALYSIS" "FAKELLVM_ANALYSIS" INPUT_TEXT "${INPUT_TEXT}")
-string(REPLACE "class SCEVExpander " "namespace fake {\n class SCEVExpander " INPUT_TEXT "${INPUT_TEXT}")
-string(REPLACE "struct SCEVOperand " "namespace fake {\n struct SCEVOperand " INPUT_TEXT "${INPUT_TEXT}")
-string(REPLACE "};\n}" "};\n}}" INPUT_TEXT "${INPUT_TEXT}")
-string(REPLACE "const SCEV* S;\n};\n" "const SCEV* S;\n};\n}\n" INPUT_TEXT "${INPUT_TEXT}")
-endif()
 
 find_library(MPFR_LIB_PATH mpfr)
 CHECK_INCLUDE_FILE("mpfr.h" HAS_MPFR_H)

enzyme/Enzyme/ActivityAnalysis.cpp

@@ -65,12 +65,10 @@
 
 using namespace llvm;
 
-#if LLVM_VERSION_MAJOR >= 14
 #define addAttribute addAttributeAtIndex
 #define removeAttribute removeAttributeAtIndex
 #define getAttribute getAttributeAtIndex
 #define hasAttribute hasAttributeAtIndex
-#endif
 
 extern "C" {
 cl::opt<bool>
@@ -301,9 +299,7 @@ const StringSet<> KnownInactiveFunctions = {
 };
 
 const std::set<Intrinsic::ID> KnownInactiveIntrinsics = {
-#if LLVM_VERSION_MAJOR >= 12
  Intrinsic::experimental_noalias_scope_decl,
-#endif
  Intrinsic::objectsize,
  Intrinsic::floor,
  Intrinsic::ceil,
@@ -559,11 +555,7 @@ bool ActivityAnalyzer::isFunctionArgumentConstant(CallInst *CI, Value *val) {
 
  bool all_inactive = val != CI->getCalledOperand();
 
-#if LLVM_VERSION_MAJOR >= 14
  for (size_t i = 0; i < CI->arg_size(); i++)
-#else
- for (size_t i = 0; i < CI->getNumArgOperands(); i++)
-#endif
  {
  if (val == CI->getArgOperand(i)) {
  if (!CI->getAttributes().hasParamAttr(i, "enzyme_inactive") &&
@@ -663,11 +655,7 @@ static inline void propagateArgumentInformation(
  }
 
  if (Name == "julia.call" || Name == "julia.call2") {
-#if LLVM_VERSION_MAJOR >= 14
  for (size_t i = 1; i < CI.arg_size(); i++)
-#else
- for (size_t i = 1; i < CI.getNumArgOperands(); i++)
-#endif
  {
  propagateFromOperand(CI.getOperand(i));
  }
@@ -707,11 +695,7 @@ static inline void propagateArgumentInformation(
  // For other calls, check all operands of the instruction
  // as conservatively they may impact the activity of the call
  size_t i = 0;
-#if LLVM_VERSION_MAJOR >= 14
  for (auto &a : CI.args())
-#else
- for (auto &a : CI.arg_operands())
-#endif
  {
 
  if (CI.getAttributes().hasParamAttr(i, "enzyme_inactive") ||
@@ -1941,13 +1925,8 @@ bool ActivityAnalyzer::isConstantValue(TypeResults const &TR, Value *Val) {
  }
  }
 
-#if LLVM_VERSION_MAJOR >= 12
  auto AARes = AA.getModRefInfo(
  I, MemoryLocation(memval, LocationSize::beforeOrAfterPointer()));
-#else
- auto AARes =
- AA.getModRefInfo(I, MemoryLocation(memval, LocationSize::unknown()));
-#endif
 
  // Still having failed to replace the location used by AA, fall back to
  // getModref against any location.
@@ -2974,11 +2953,7 @@ bool ActivityAnalyzer::isValueInactiveFromUsers(TypeResults const &TR,
  auto F = getFunctionFromCall(call);
 
  size_t idx = 0;
-#if LLVM_VERSION_MAJOR >= 14
  for (auto &arg : call->args())
-#else
- for (auto &arg : call->arg_operands())
-#endif
  {
  if (arg != parent) {
  idx++;
@@ -3138,11 +3113,7 @@ bool ActivityAnalyzer::isValueInactiveFromUsers(TypeResults const &TR,
  if (isa<LoadInst>(operand)) {
  bool legal = true;
 
-#if LLVM_VERSION_MAJOR >= 14
  for (unsigned i = 0; i < call->arg_size() + 1; ++i)
-#else
- for (unsigned i = 0; i < call->getNumArgOperands() + 1; ++i)
-#endif
  {
  Value *a = call->getOperand(i);
 

enzyme/Enzyme/ActivityAnalysis.h

@@ -31,15 +31,10 @@
 #include <deque>
 
 #include <llvm/Config/llvm-config.h>
-#if LLVM_VERSION_MAJOR >= 16
 #define private public
 #include "llvm/Analysis/ScalarEvolution.h"
 #include "llvm/Transforms/Utils/ScalarEvolutionExpander.h"
 #undef private
-#else
-#include "SCEV/ScalarEvolution.h"
-#include "SCEV/ScalarEvolutionExpander.h"
-#endif
 
 #include "llvm/Analysis/AliasAnalysis.h"
 #include "llvm/IR/Constants.h"

enzyme/Enzyme/ActivityAnalysisPrinter.cpp

@@ -24,13 +24,8 @@
 //===----------------------------------------------------------------------===//
 #include <llvm/Config/llvm-config.h>
 
-#if LLVM_VERSION_MAJOR >= 16
 #include "llvm/Analysis/ScalarEvolution.h"
 #include "llvm/Transforms/Utils/ScalarEvolutionExpander.h"
-#else
-#include "SCEV/ScalarEvolution.h"
-#include "SCEV/ScalarEvolutionExpander.h"
-#endif
 
 #include "llvm/ADT/SmallVector.h"
 
@@ -90,18 +85,14 @@ bool printActivityAnalysis(llvm::Function &F, TargetLibraryInfo &TLI) {
  dt = ConcreteType(a.getType()->getScalarType());
  } else if (a.getType()->isPointerTy()) {
 #if LLVM_VERSION_MAJOR < 17
-#if LLVM_VERSION_MAJOR >= 13
  if (a.getContext().supportsTypedPointers()) {
-#endif
  auto et = a.getType()->getPointerElementType();
  if (et->isFPOrFPVectorTy()) {
  dt = TypeTree(ConcreteType(et->getScalarType())).Only(-1, nullptr);
  } else if (et->isPointerTy()) {
  dt = TypeTree(ConcreteType(BaseType::Pointer)).Only(-1, nullptr);
  }
-#if LLVM_VERSION_MAJOR >= 13
  }
-#endif
 #endif
  } else if (a.getType()->isIntOrIntVectorTy()) {
  dt = ConcreteType(BaseType::Integer);
@@ -119,18 +110,14 @@ bool printActivityAnalysis(llvm::Function &F, TargetLibraryInfo &TLI) {
  dt = ConcreteType(F.getReturnType()->getScalarType());
  } else if (F.getReturnType()->isPointerTy()) {
 #if LLVM_VERSION_MAJOR < 17
-#if LLVM_VERSION_MAJOR >= 13
  if (F.getContext().supportsTypedPointers()) {
-#endif
  auto et = F.getReturnType()->getPointerElementType();
  if (et->isFPOrFPVectorTy()) {
  dt = TypeTree(ConcreteType(et->getScalarType())).Only(-1, nullptr);
  } else if (et->isPointerTy()) {
  dt = TypeTree(ConcreteType(BaseType::Pointer)).Only(-1, nullptr);
  }
-#if LLVM_VERSION_MAJOR >= 13
  }
-#endif
 #endif
  } else if (F.getReturnType()->isIntOrIntVectorTy()) {
  dt = ConcreteType(BaseType::Integer);