Switch to LLVM versions 20/21 as supported versions.

LLVM 21.1.0 has been released, so by our policy of supporting the two
most recent LLVM releases, we can now move from LLVM 19/20 to
LLVM 20/21.

Author: hvdijk

llvm/lib/SYCLNativeCPUUtils/compiler_passes/compiler_pipeline/include/multi_llvm/dibuilder.h

@@ -36,9 +36,6 @@ struct BinOpHelper;
 #define LLVM 20
 #include <multi_llvm/instructions.inc>
 #undef LLVM
-#define LLVM 19
-#include <multi_llvm/instructions.inc>
-#undef LLVM
 
 }  // namespace detail
 

llvm/lib/SYCLNativeCPUUtils/compiler_passes/compiler_pipeline/include/multi_llvm/instructions.h

@@ -14,20 +14,13 @@
 //
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#if LLVM == 19
-template <typename T>
-struct BinOpHelper<T, std::enable_if_t<T::LAST_BINOP - T::FIRST_BINOP == 16>>
-#define BINOP_LLVM20(OP, STR)
-#define BINOP_LLVM21(OP, STR)
-#elif LLVM == 20
+#if LLVM == 20
 template <typename T>
 struct BinOpHelper<T, std::enable_if_t<T::LAST_BINOP - T::FIRST_BINOP == 18>>
-#define BINOP_LLVM20(OP, STR) BINOP(OP, STR)
 #define BINOP_LLVM21(OP, STR)
 #elif LLVM == 21
 template <typename T, typename>
 struct BinOpHelper
-#define BINOP_LLVM20(OP, STR) BINOP(OP, STR)
 #define BINOP_LLVM21(OP, STR) BINOP(OP, STR)
 #endif
 {
@@ -51,8 +44,8 @@ struct BinOpHelper
   BINOP_LLVM21(FMinimum, "fminumum") \
   BINOP(UIncWrap, "uincwrap")        \
   BINOP(UDecWrap, "udecwrap")        \
-  BINOP_LLVM20(USubCond, "usubcond") \
-  BINOP_LLVM20(USubSat, "usubsat")
+  BINOP(USubCond, "usubcond")        \
+  BINOP(USubSat, "usubsat")
 
   static std::optional<T> consume_front_with_underscore(
       llvm::StringRef &String) {
@@ -79,6 +72,5 @@ struct BinOpHelper
   }
 
 #undef BINOPS
-#undef BINOP_LLVM20
 #undef BINOP_LLVM21
 };

llvm/lib/SYCLNativeCPUUtils/compiler_passes/compiler_pipeline/include/multi_llvm/instructions.inc

@@ -22,19 +22,7 @@
 
 namespace multi_llvm {
 
-static inline auto GetOrInsertIntrinsicDeclaration(
-    llvm::Module *M, llvm::Intrinsic::ID id,
-    llvm::ArrayRef<llvm::Type *> Tys = {}) {
-#if LLVM_VERSION_GREATER_EQUAL(20, 0)
-  return llvm::Intrinsic::getOrInsertDeclaration(M, id, Tys);
-#else
-  return llvm::Intrinsic::getDeclaration(M, id, Tys);
-#endif
-}
-
-// Drop getAttributes workaround when LLVM 20 is minimum version
-// This can also be simplified once DPC++ catches up with getAttributes
-// with FunctionType as the last argument.
+// Drop getAttributes workaround when LLVM 21 is minimum version
 namespace detail {
 template <typename... T>
 auto getAttributes(T... args)

llvm/lib/SYCLNativeCPUUtils/compiler_passes/compiler_pipeline/include/multi_llvm/intrinsic.h

@@ -18,6 +18,5 @@
 #define MULTI_LLVM_MULTI_LLVM_H_INCLUDED
 
 #include <multi_llvm/llvm_version.h>
-#include <multi_llvm/loop_utils.h>
 
 #endif  // MULTI_LLVM_MULTI_LLVM_H_INCLUDED

llvm/lib/SYCLNativeCPUUtils/compiler_passes/compiler_pipeline/include/multi_llvm/loop_utils.h

@@ -545,7 +545,7 @@ Function *BuiltinInfo::getScalarEquivalent(const Builtin &B, Module *M) {
     Type *ScalarType = VecRetTy->getElementType();
     // Get the scalar version of the intrinsic
     Function *ScalarIntrinsic =
-        multi_llvm::GetOrInsertIntrinsicDeclaration(M, IntrinsicID, ScalarType);
+        Intrinsic::getOrInsertDeclaration(M, IntrinsicID, ScalarType);
 
     return ScalarIntrinsic;
   }

llvm/lib/SYCLNativeCPUUtils/compiler_passes/compiler_pipeline/include/multi_llvm/multi_llvm.h

@@ -28,7 +28,6 @@
 #include <llvm/IR/Intrinsics.h>
 #include <llvm/IR/Module.h>
 #include <llvm/TargetParser/Triple.h>
-#include <multi_llvm/intrinsic.h>
 #include <multi_llvm/vector_type_helper.h>
 
 #define DEBUG_TYPE "ca-optimal-builtins"
@@ -63,7 +62,7 @@ Value *OptimalBuiltinReplacementPass::replaceAbacusCLZ(
   // Get the declaration for the intrinsic
   auto *const ArgTy = Args[0]->getType();
   auto *const Intrinsic =
-      multi_llvm::GetOrInsertIntrinsicDeclaration(M, Intrinsic::ctlz, ArgTy);
+      llvm::Intrinsic::getOrInsertDeclaration(M, Intrinsic::ctlz, ArgTy);
   // If we didn't find the intrinsic or the return type isn't what we
   // expect, skip this optimization
   Function *Callee = CB.getCalledFunction();

llvm/lib/SYCLNativeCPUUtils/compiler_passes/compiler_pipeline/source/builtin_info.cpp

@@ -30,7 +30,6 @@
 #include <llvm/IR/Instructions.h>
 #include <llvm/IR/Intrinsics.h>
 #include <llvm/Transforms/Utils/LoopUtils.h>
-#include <multi_llvm/intrinsic.h>
 #include <multi_llvm/vector_type_helper.h>
 
 #include "debugging.h"
@@ -241,7 +240,7 @@ Value *createMaybeVPReduction(IRBuilderBase &B, Value *Val, RecurKind Kind,
   assert(isa<VectorType>(Val->getType()) && "Must be vector type");
   // If VL is null, it's not a vector-predicated reduction.
   if (!VL) {
-    return multi_llvm::createSimpleReduction(B, Val, Kind);
+    return createSimpleReduction(B, Val, Kind);
   }
   auto IntrinsicOp = Intrinsic::not_intrinsic;
   switch (Kind) {
@@ -290,7 +289,7 @@ Value *createMaybeVPReduction(IRBuilderBase &B, Value *Val, RecurKind Kind,
       break;
   }
 
-  auto *const F = multi_llvm::GetOrInsertIntrinsicDeclaration(
+  auto *const F = Intrinsic::getOrInsertDeclaration(
       B.GetInsertBlock()->getModule(), IntrinsicOp, Val->getType());
   assert(F && "Could not declare vector-predicated reduction intrinsic");
 

llvm/lib/SYCLNativeCPUUtils/compiler_passes/compiler_pipeline/source/optimal_builtin_replacement_pass.cpp

@@ -120,7 +120,7 @@ InstructionCost calculateBoolReductionCost(LLVMContext &context, Module *module,
   auto *F = Function::Create(new_fty, Function::InternalLinkage, "tmp", module);
   auto *BB = BasicBlock::Create(context, "reduce", F);
   IRBuilder<> B(BB);
-  multi_llvm::createSimpleReduction(B, &*F->arg_begin(), RecurKind::And);
+  createSimpleReduction(B, &*F->arg_begin(), RecurKind::And);
   const InstructionCost cost = calculateBlockCost(*BB, TTI);
 
   // We don't really need that function in the module anymore because it's