[fix] strided load|store intrinsic declarations

Author: Simon Moll

llvm/lib/IR/IntrinsicInst.cpp

@@ -618,13 +618,13 @@ static VPIntrinsic::ShortTypeVec getVPIntrinsicTypes(Intrinsic::ID ID,
     return VPIntrinsic::ShortTypeVec{VectorTy};
 
   case Intrinsic::experimental_vp_strided_load:
-    return VPIntrinsic::ShortTypeVec{VecRetTy, VecPtrTy,
-                                     Type::getInt64Ty(VectorTy->getContext())};
+    return VPIntrinsic::ShortTypeVec{VecRetTy,
+                                     Type::getInt64Ty(VecRetTy->getContext())};
   case Intrinsic::vp_gather:
   case Intrinsic::vp_load:
     return VPIntrinsic::ShortTypeVec{VecRetTy, VecPtrTy};
   case Intrinsic::experimental_vp_strided_store:
-    return VPIntrinsic::ShortTypeVec{VectorTy, VecPtrTy,
+    return VPIntrinsic::ShortTypeVec{VectorTy,
                                      Type::getInt64Ty(VectorTy->getContext())};
   case Intrinsic::vp_scatter:
   case Intrinsic::vp_store:

llvm/lib/IR/VPBuilder.cpp

@@ -178,11 +178,10 @@ Value &VPBuilder::CreateStridedLoad(Type *ReturnTy, Value &Ptr,
                                     MaybeAlign AlignOpt, int64_t Stride) {
   auto &ElemPtr = GetAsElementPointer(Ptr);
   // auto &VecTy = getVectorType(*ElemPtr.getType()->getPointerElementType());
-  auto *LoadFunc = VPIntrinsic::getDeclarationForParams(
-      &getModule(), Intrinsic::experimental_vp_strided_load, ReturnTy,
-      {&ElemPtr});
   auto *StrideConst = Builder.getInt64((uint64_t)Stride);
   ShortValueVec Args{&ElemPtr, StrideConst, &RequestPred(), &RequestEVL()};
+  auto *LoadFunc = VPIntrinsic::getDeclarationForParams(
+      &getModule(), Intrinsic::experimental_vp_strided_load, ReturnTy, Args);
   CallInst &LoadCall = *Builder.CreateCall(LoadFunc, Args);
   if (AlignOpt.hasValue()) {
     unsigned PtrPos =