[SYCL][NFC] Stop using deprecated InsertionPoint constructor (intel…

…#16658) See llvm/llvm-project#102608
lbushi25 · Jan 17, 2025 · 9219ede · 9219ede
1 parent a73541c
commit 9219ede
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 22 deletions.
diff --git a/llvm/lib/SYCLLowerIR/ESIMD/ESIMDOptimizeVecArgCallConv.cpp b/llvm/lib/SYCLLowerIR/ESIMD/ESIMDOptimizeVecArgCallConv.cpp
@@ -354,9 +354,8 @@ optimizeFunction(Function *OldF,
       // preserve data flow equality to the original.
       unsigned OldArgNo = PI.getFormalParam().getArgNo();
       unsigned NewArgNo = oldArgNo2NewArgNo(OldArgNo, SretInd);
-      Instruction *At = nullptr;
       Value *Val = NewF->getArg(NewArgNo);
-      StoreInst *St = new StoreInst(Val, Alloca, false, Al, At);
+      StoreInst *St = new StoreInst(Val, Alloca, false, Al);
       NewInsts.push_back(St);
     }
   }

diff --git a/llvm/lib/SYCLLowerIR/ESIMD/LowerESIMD.cpp b/llvm/lib/SYCLLowerIR/ESIMD/LowerESIMD.cpp
@@ -1239,7 +1239,7 @@ static Instruction *addCastInstIfNeeded(Instruction *OldI, Instruction *NewI,
   if (OITy != NITy) {
     auto CastOpcode = CastInst::getCastOpcode(NewI, false, OITy, false);
     NewI = CastInst::Create(CastOpcode, NewI, OITy,
-                            NewI->getName() + ".cast.ty", OldI);
+                            NewI->getName() + ".cast.ty", OldI->getIterator());
     NewI->setDebugLoc(OldI->getDebugLoc());
   }
   return NewI;
@@ -1565,7 +1565,7 @@ static void translateESIMDIntrinsicCall(CallInst &CI) {
   CallInst *NewCI = IntrinsicInst::Create(
       NewFDecl, GenXArgs,
       NewFDecl->getReturnType()->isVoidTy() ? "" : CI.getName() + ".esimd",
-      &CI);
+      CI.getIterator());
   NewCI->setDebugLoc(CI.getDebugLoc());
   if (DoesFunctionReturnStructure) {
     IRBuilder<> Builder(&CI);

diff --git a/llvm/lib/SYCLLowerIR/GlobalOffset.cpp b/llvm/lib/SYCLLowerIR/GlobalOffset.cpp
@@ -250,7 +250,7 @@ void GlobalOffsetPass::addImplicitParameterToCallers(
           /* Func= */ CalleeWithImplicitParam,
           /* Args= */ ImplicitOffsets,
           /* NameStr= */ Twine(),
-          /* InsertBefore= */ CallToOld);
+          /* InsertBefore= */ CallToOld->getIterator());
       NewCallInst->setTailCallKind(CallToOld->getTailCallKind());
       NewCallInst->copyMetadata(*CallToOld);
       CallToOld->replaceAllUsesWith(NewCallInst);

diff --git a/llvm/lib/SYCLLowerIR/LocalAccessorToSharedMemory.cpp b/llvm/lib/SYCLLowerIR/LocalAccessorToSharedMemory.cpp
@@ -177,7 +177,7 @@ Function *LocalAccessorToSharedMemoryPass::processKernel(Module &M,
               ConstantInt::get(Type::getInt32Ty(M.getContext()), 0, false),
               NFA,
           },
-          /* NameStr= */ Twine{NFA->getName()}, InsertBefore);
+          /* NameStr= */ Twine{NFA->getName()}, InsertBefore->getIterator());
       // Then create a bitcast to make sure the new pointer is the same type
       // as the old one. This will only ever be a `i8 addrspace(3)*` to `i32
       // addrspace(3)*` type of cast.

diff --git a/llvm/lib/SYCLLowerIR/LowerInvokeSimd.cpp b/llvm/lib/SYCLLowerIR/LowerInvokeSimd.cpp
@@ -461,8 +461,8 @@ bool processInvokeSimdCall(CallInst *InvokeSimd,
     NewInvokeSimdArgs.push_back(NewHelper);
     auto ThirdArg = std::next(InvokeSimd->arg_begin(), 2);
     NewInvokeSimdArgs.append(ThirdArg, InvokeSimd->arg_end());
-    CallInst *NewInvokeSimd =
-        CallInst::Create(NewInvokeSimdF, NewInvokeSimdArgs, "", InvokeSimd);
+    CallInst *NewInvokeSimd = CallInst::Create(
+        NewInvokeSimdF, NewInvokeSimdArgs, "", InvokeSimd->getIterator());
     // - transfer flags, attributes (with shrinking), calling convention:
     NewInvokeSimd->copyIRFlags(InvokeSimd);
     NewInvokeSimd->setCallingConv(InvokeSimd->getCallingConv());

diff --git a/llvm/lib/SYCLLowerIR/LowerWGScope.cpp b/llvm/lib/SYCLLowerIR/LowerWGScope.cpp
@@ -981,7 +981,7 @@ Value *spirv::genPseudoLocalID(Instruction &Before, const Triple &TT) {
       Align Alignment = M.getDataLayout().getPreferredAlign(G);
       G->setAlignment(MaybeAlign(Alignment));
     }
-    Value *Res = new LoadInst(G->getValueType(), G, "", &Before);
+    Value *Res = new LoadInst(G->getValueType(), G, "", Before.getIterator());
     return Res;
   }
 }

diff --git a/llvm/lib/SYCLLowerIR/SpecConstants.cpp b/llvm/lib/SYCLLowerIR/SpecConstants.cpp
@@ -514,15 +514,15 @@ Instruction *emitCall(Type *RetTy, StringRef BaseFunctionName,
       auto *NewFT = FunctionType::get(NewRetTy, ArgTys, false /*isVarArg*/);
       auto NewFC = M->getOrInsertFunction(FunctionName, NewFT);
 
-      auto *Call =
-          CallInst::Create(NewFT, NewFC.getCallee(), Args, "", InsertBefore);
+      auto *Call = CallInst::Create(NewFT, NewFC.getCallee(), Args, "",
+                                    InsertBefore->getIterator());
       if (IsSPIROrSPIRV) {
         cast<Function>(NewFC.getCallee())
             ->setCallingConv(CallingConv::SPIR_FUNC);
         Call->setCallingConv(CallingConv::SPIR_FUNC);
       }
       return CastInst::CreateTruncOrBitCast(Call, RetTy, "tobool",
-                                            InsertBefore);
+                                            InsertBefore->getIterator());
     }
   }
 
@@ -711,22 +711,22 @@ Value *createLoadFromBuffer(CallInst *InsertBefore, Value *Buffer,
   Type *Int32Ty = Type::getInt32Ty(C);
   GetElementPtrInst *GEP = GetElementPtrInst::Create(
       Int8Ty, Buffer, {ConstantInt::get(Int32Ty, Offset, false)}, "gep",
-      InsertBefore);
+      InsertBefore->getIterator());
 
   Instruction *BitCast = nullptr;
   if (SCType->isIntegerTy(1)) // No bitcast to i1 before load
     BitCast = GEP;
   else
     BitCast =
         new BitCastInst(GEP, PointerType::get(SCType, GEP->getAddressSpace()),
-                        "bc", InsertBefore);
+                        "bc", InsertBefore->getIterator());
 
   // When we encounter i1 spec constant, we still load the whole byte
   Value *Load = new LoadInst(SCType->isIntegerTy(1) ? Int8Ty : SCType, BitCast,
-                             "load", InsertBefore);
+                             "load", InsertBefore->getIterator());
   if (SCType->isIntegerTy(1)) // trunc back to i1 if necessary
     Load = CastInst::CreateIntegerCast(Load, SCType, /* IsSigned */ false,
-                                       "tobool", InsertBefore);
+                                       "tobool", InsertBefore->getIterator());
 
   return Load;
 }
@@ -993,8 +993,8 @@ PreservedAnalyses SpecConstantsPass::run(Module &M,
         if (SCTy->isIntegerTy(1)) {
           assert(DefaultValue->getType()->isIntegerTy(8) &&
                  "For bool spec constant default value is expected to be i8");
-          Replacement =
-              new TruncInst(DefaultValue, Type::getInt1Ty(Ctx), "bool", CI);
+          Replacement = new TruncInst(DefaultValue, Type::getInt1Ty(Ctx),
+                                      "bool", CI->getIterator());
         } else
           Replacement = DefaultValue;
       }
@@ -1021,9 +1021,9 @@ PreservedAnalyses SpecConstantsPass::run(Module &M,
         Value *ArraySize =
             Mode == HandlingMode::emulation ? DefaultValue : Replacement;
         assert(ArraySize->getType()->isIntegerTy() && "Expecting integer type");
-        Replacement =
-            new AllocaInst(Intr->getAllocatedType(), Intr->getAddressSpace(),
-                           ArraySize, Intr->getAlign(), "alloca", CI);
+        Replacement = new AllocaInst(
+            Intr->getAllocatedType(), Intr->getAddressSpace(), ArraySize,
+            Intr->getAlign(), "alloca", CI->getIterator());
       }
 
       if (HasSretParameter)

diff --git a/llvm/lib/SYCLNativeCPUUtils/PrepareSYCLNativeCPU.cpp b/llvm/lib/SYCLNativeCPUUtils/PrepareSYCLNativeCPU.cpp
@@ -426,7 +426,7 @@ PreservedAnalyses PrepareSYCLNativeCPUPass::run(Module &M,
       if (nullptr == ReplaceFunc)
         ReplaceFunc = getReplaceFunc(M, Entry.second, Use, Args);
       auto *NewI = CallInst::Create(ReplaceFunc->getFunctionType(), ReplaceFunc,
-                                    Args, "", I);
+                                    Args, "", I->getIterator());
       // If the parent function has debug info, we need to make sure that the
       // CallInstructions in it have debug info, otherwise we end up with
       // invalid IR after inlining.