Merge pull request intel#46 from frasercrmck/llvm-17-updates

Update construction kit to build with LLVM 17

Author: frasercrmck

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

@@ -27,28 +27,18 @@ inline bool isOpaquePointerTy(llvm::Type *Ty) {
   return false;
 }
 
-inline bool isOpaqueOrPointeeTypeMatches(llvm::PointerType *PTy,
-                                         llvm::Type *EltTy) {
-#if LLVM_VERSION_MAJOR >= 15
-  (void)EltTy;
+inline bool isOpaqueOrPointeeTypeMatches(llvm::PointerType *PTy, llvm::Type *) {
   (void)PTy;
   assert(PTy->isOpaque() && "No support for typed pointers in LLVM 15+");
   return true;
-#else
-  return PTy->isOpaque() || PTy->getPointerElementType() == EltTy;
-#endif
 }
 
 inline llvm::Type *getPtrElementType(llvm::PointerType *PTy) {
   if (PTy->isOpaque()) {
     return nullptr;
   }
-#if LLVM_VERSION_MAJOR >= 15
-  assert(false && "No support for typed pointers in LLVM 15+");
+  assert(false && "No support for typed pointers");
   return nullptr;
-#else
-  return PTy->getPointerElementType();
-#endif
 }
 
 };  // namespace multi_llvm

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

@@ -64,18 +64,6 @@ class Optional : public llvm::Optional<T> {
   inline constexpr bool has_value() const {
     return llvm::Optional<T>::hasValue();
   }
-
-#if (LLVM_VERSION_MAJOR <= 14)
-  inline constexpr const T &value() const {
-    return llvm::Optional<T>::getValue();
-  }
-  inline constexpr T &value() { return llvm::Optional<T>::getValue(); }
-
-  template <typename U>
-  constexpr T value_or(U &&alt) const & {
-    return llvm::Optional<T>::getValueOr(alt);
-  }
-#endif
 };
 
 #endif

llvm/lib/SYCLNativeCPUUtils/compiler_passes/vecz/source/transform/basic_mem2reg_pass.cpp

@@ -182,7 +182,11 @@ bool BasicMem2RegPass::promoteAlloca(AllocaInst *Alloca) const {
       StoredValue = Store->getValueOperand();
       ToDelete.push_back(Store);
       DIBuilder DIB(*Alloca->getModule(), /*AllowUnresolved*/ false);
+#if LLVM_VERSION_GREATER_EQUAL(17, 0)
+      auto DbgIntrinsics = FindDbgDeclareUses(Alloca);
+#else
       auto DbgIntrinsics = FindDbgAddrUses(Alloca);
+#endif
       for (auto oldDII : DbgIntrinsics) {
         ConvertDebugDeclareToDebugValue(oldDII, Store, DIB);
       }

llvm/lib/SYCLNativeCPUUtils/compiler_passes/vecz/source/transform/control_flow_conversion_pass.cpp

@@ -31,8 +31,7 @@
 #include <llvm/IR/IRBuilder.h>
 #include <llvm/Support/Debug.h>
 #include <llvm/Support/raw_ostream.h>
-#include <multi_llvm/multi_llvm.h>
-#include <multi_llvm/vector_type_helper.h>
+#include <multi_llvm/optional_helper.h>
 
 #include <queue>
 #include <utility>
@@ -3064,11 +3063,7 @@ bool ControlFlowConversionState::Impl::simplifyMasks() {
         if (I.use_empty()) {
           toDelete.push_back(&I);
         } else {
-#if LLVM_VERSION_GREATER_EQUAL(15, 0)
           Value *simpleMask = simplifyInstruction(&I, Q);
-#else
-          Value *simpleMask = SimplifyInstruction(&I, Q);
-#endif
           if (simpleMask && simpleMask != &I) {
             I.replaceAllUsesWith(simpleMask);
             toDelete.push_back(&I);

llvm/lib/SYCLNativeCPUUtils/compiler_passes/vecz/source/transform/scalarizer.cpp

@@ -27,7 +27,6 @@
 #include <llvm/IR/Intrinsics.h>
 #include <llvm/Support/Debug.h>
 #include <llvm/Support/raw_ostream.h>
-#include <multi_llvm/llvm_version.h>
 #include <multi_llvm/multi_llvm.h>
 #include <multi_llvm/vector_type_helper.h>
 
@@ -667,11 +666,7 @@ SimdPacket *Scalarizer::extractLanes(llvm::Value *V, PacketMask PM) {
     }
 
     Value *Idx = B.getInt32(i);
-#if LLVM_VERSION_GREATER_EQUAL(15, 0)
     Value *Extract = simplifyExtractElementInst(V, Idx, Q);
-#else
-    Value *Extract = SimplifyExtractElementInst(V, Idx, Q);
-#endif
     if (!Extract) {
       Extract = B.CreateExtractElement(V, Idx);
     }

llvm/lib/SYCLNativeCPUUtils/compiler_passes/vecz/source/vector_target_info_riscv.cpp

@@ -360,10 +360,8 @@ llvm::Value *TargetInfoRISCV::createScalableExtractElement(
                                  indices, zero);
 
   SmallVector<Value *, 4> ops;
-#if LLVM_VERSION_GREATER_EQUAL(15, 0)
-  // LLVM 15+ has a pass-through operand - we set it to undef.
+  // Add the a pass-through operand - we set it to undef.
   ops.push_back(UndefValue::get(srcTy));
-#endif
   ops.push_back(src);
   ops.push_back(indices);
   ops.push_back(avl);
@@ -428,10 +426,8 @@ llvm::Value *TargetInfoRISCV::createScalableBroadcast(llvm::IRBuilder<> &B,
   auto *const avl = getIntrinsicVL(B, VL, wideTy, getTargetMachine());
 
   SmallVector<Value *, 4> ops;
-#if LLVM_VERSION_GREATER_EQUAL(15, 0)
-  // LLVM 15+ has a pass-through operand - we set it to undef.
+  // Add the pass-through operand - we set it to undef.
   ops.push_back(UndefValue::get(vs2->getType()));
-#endif
   ops.push_back(vs2);
   ops.push_back(vs1);
   ops.push_back(avl);
@@ -641,10 +637,8 @@ llvm::Value *TargetInfoRISCV::createVectorShuffle(llvm::IRBuilder<> &B,
   auto *const avl = getIntrinsicVL(B, VL, gatherTy, getTargetMachine());
 
   SmallVector<Value *, 4> ops;
-#if LLVM_VERSION_GREATER_EQUAL(15, 0)
-  // LLVM 15+ has a pass-through operand - we set it to undef.
+  // Add the pass-through operand - we set it to undef.
   ops.push_back(UndefValue::get(gatherTy));
-#endif
   ops.push_back(src);
   ops.push_back(mask);
   ops.push_back(avl);
@@ -676,10 +670,8 @@ llvm::Value *TargetInfoRISCV::createVectorSlideUp(llvm::IRBuilder<> &B,
   auto *const avl = getIntrinsicVL(B, VL, srcTy, getTargetMachine());
 
   SmallVector<Value *, 4> ops;
-#if LLVM_VERSION_GREATER_EQUAL(15, 0)
-  // LLVM 15+ has a pass-through operand - we set it to undef.
+  // Add the pass-through operand - we set it to undef.
   ops.push_back(UndefValue::get(srcTy));
-#endif
   ops.push_back(src);
   ops.push_back(insert);
   ops.push_back(avl);
@@ -745,7 +737,11 @@ Value *TargetInfoRISCV::createVPKernelWidth(IRBuilder<> &B,
   auto *const I64Ty = Type::getInt64Ty(B.getContext());
 
   auto *const VL =
+#if LLVM_VERSION_GREATER_EQUAL(17, 0)
+      B.CreateIntrinsic(Intrinsic::RISCVIntrinsics::riscv_vsetvli, {I64Ty},
+#else
       B.CreateIntrinsic(Intrinsic::RISCVIntrinsics::riscv_vsetvli_opt, {I64Ty},
+#endif
                         {RemainingIters, VSEW, VLMul});
 
   return B.CreateTrunc(VL, I32Ty);