Expand DerivedTypes wrapper for LLVM17

amielcza · igcbot · commit c654498198fe · 2025-11-25T14:06:46.000+01:00
Expand DerivedTypes wrapper for LLVM17 - this covers the removal of typed pointers.
diff --git a/IGC/Compiler/CISACodeGen/GenCodeGenModule.cpp b/IGC/Compiler/CISACodeGen/GenCodeGenModule.cpp
@@ -1164,19 +1164,15 @@ void SubroutineInliner::visitMemCpyInst(MemCpyInst &I) {
   // Copying from alloca to alloca, but has addrspace mismatch due to incorrect bitcast
   if (isa<AllocaInst>(origSrc) && isa<AllocaInst>(origDst)) {
     if (origSrc->getType()->getPointerAddressSpace() != Src->getType()->getPointerAddressSpace()) {
-      Value *SrcCast =
-          BitCastInst::Create(Instruction::BitCast, origSrc,
-                              IGCLLVM::getWithSamePointeeType(dyn_cast<PointerType>(Src->getType()),
-                                                              origSrc->getType()->getPointerAddressSpace()),
-                              "", &I);
+      Value *SrcCast = BitCastInst::Create(
+          Instruction::BitCast, origSrc,
+          IGCLLVM::get(dyn_cast<PointerType>(Src->getType()), origSrc->getType()->getPointerAddressSpace()), "", &I);
       I.replaceUsesOfWith(Src, SrcCast);
     }
     if (origDst->getType()->getPointerAddressSpace() != Dst->getType()->getPointerAddressSpace()) {
-      Value *DstCast =
-          BitCastInst::Create(Instruction::BitCast, origDst,
-                              IGCLLVM::getWithSamePointeeType(dyn_cast<PointerType>(Dst->getType()),
-                                                              origDst->getType()->getPointerAddressSpace()),
-                              "", &I);
+      Value *DstCast = BitCastInst::Create(
+          Instruction::BitCast, origDst,
+          IGCLLVM::get(dyn_cast<PointerType>(Dst->getType()), origDst->getType()->getPointerAddressSpace()), "", &I);
       I.replaceUsesOfWith(Dst, DstCast);
     }
   }
diff --git a/IGC/Compiler/CISACodeGen/helper.cpp b/IGC/Compiler/CISACodeGen/helper.cpp
@@ -2643,7 +2643,7 @@ void FixAddressSpaceInAllUses(llvm::Value *ptr, uint newAS, uint oldAS) {
     }
 
     if (instType && instType->getAddressSpace() == oldAS) {
-      PointerType *ptrType = IGCLLVM::getWithSamePointeeType(dyn_cast<PointerType>(instType), newAS);
+      PointerType *ptrType = IGCLLVM::get(dyn_cast<PointerType>(instType), newAS);
       inst->mutateType(ptrType);
       FixAddressSpaceInAllUses(inst, newAS, oldAS);
     }
diff --git a/IGC/Compiler/Optimizer/BuiltInFuncImport.cpp b/IGC/Compiler/Optimizer/BuiltInFuncImport.cpp
@@ -494,7 +494,7 @@ void BIImport::fixInvalidBitcasts(llvm::Module &M) {
       PointerType *DstPtrType = dyn_cast<PointerType>(BitCastI->getType());
 
       // New bitcast
-      PointerType *FinalBitCastType = IGCLLVM::getWithSamePointeeType(DstPtrType, SrcPtrType->getAddressSpace());
+      PointerType *FinalBitCastType = IGCLLVM::get(DstPtrType, SrcPtrType->getAddressSpace());
       BitCastInst *NewBitCastI = new BitCastInst(BitCastI->getOperand(0), FinalBitCastType, "bcast", BitCastI);
 
       // New addrspacecast
@@ -864,7 +864,7 @@ void BIImport::removeFunctionBitcasts(Module &M) {
                 destVal = newASC;
               }
               PointerType *pSrcType = cast<PointerType>(srcType);
-              if (!pSrcType->isOpaqueOrPointeeTypeMatches(destType)) {
+              if (!IGCLLVM::isOpaqueOrPointeeTypeMatches(pSrcType, destType)) {
                 BitCastInst *newBT = new BitCastInst(destVal, srcType, destVal->getName() + ".bcast");
                 castInsts.push_back(newBT);
                 destVal = newBT;
diff --git a/IGC/Compiler/Optimizer/OpenCLPasses/GenericAddressResolution/GASPropagator.cpp b/IGC/Compiler/Optimizer/OpenCLPasses/GenericAddressResolution/GASPropagator.cpp
@@ -102,7 +102,7 @@ bool GASPropagator::visitAddrSpaceCastInst(AddrSpaceCastInst &I) {
     return false;
 
   Value *Src = TheVal;
-  if (!SrcPtrTy->isOpaqueOrPointeeTypeMatches(DstPtrTy)) {
+  if (IGCLLVM::isOpaqueOrPointeeTypeMatches(SrcPtrTy, DstPtrTy)) {
     BuilderType::InsertPointGuard Guard(IRB);
     IRB.SetInsertPoint(&I);
     Src = IRB.CreateBitCast(Src, DstPtrTy);
@@ -272,7 +272,7 @@ bool GASPropagator::visitSelect(SelectInst &I) {
 
   // Push 'addrspacecast' forward by changing the select return type to non-GAS pointer
   // followed by a new 'addrspacecast' to GAS
-  PointerType *TransPtrTy = IGCLLVM::getWithSamePointeeType(DstPtrTy, NonGASPtrTy->getAddressSpace());
+  PointerType *TransPtrTy = IGCLLVM::get(DstPtrTy, NonGASPtrTy->getAddressSpace());
   I.mutateType(TransPtrTy);
   Value *NewPtr = IRB.CreateAddrSpaceCast(&I, DstPtrTy);
 
diff --git a/IGC/Compiler/Optimizer/OpenCLPasses/GenericAddressResolution/GASResolving.cpp b/IGC/Compiler/Optimizer/OpenCLPasses/GenericAddressResolution/GASResolving.cpp
@@ -237,7 +237,7 @@ void GASResolving::convertLoadToGlobal(LoadInst *LI) const {
 
   PointerType *PtrTy = cast<PointerType>(LI->getType());
   IRB->SetInsertPoint(LI->getNextNode());
-  PointerType *GlobalPtrTy = IGCLLVM::getWithSamePointeeType(PtrTy, ADDRESS_SPACE_GLOBAL);
+  PointerType *GlobalPtrTy = IGCLLVM::get(PtrTy, ADDRESS_SPACE_GLOBAL);
   Value *GlobalAddr = IRB->CreateAddrSpaceCast(LI, GlobalPtrTy);
   Value *GenericCopyAddr = IRB->CreateAddrSpaceCast(GlobalAddr, PtrTy);
 
diff --git a/IGC/Compiler/Optimizer/OpenCLPasses/GenericAddressResolution/GASRetValuePropagator.cpp b/IGC/Compiler/Optimizer/OpenCLPasses/GenericAddressResolution/GASRetValuePropagator.cpp
@@ -146,7 +146,7 @@ PointerType *GASRetValuePropagator::getRetValueNonGASType(Function *F) {
 
   PointerType *retTy = cast<PointerType>(F->getReturnType());
 
-  return originAddrSpace ? IGCLLVM::getWithSamePointeeType(retTy, originAddrSpace.value()) : nullptr;
+  return originAddrSpace ? IGCLLVM::get(retTy, originAddrSpace.value()) : nullptr;
 }
 
 Function *GASRetValuePropagator::createNewFunctionDecl(Function *oldFunc, Type *newRetTy) {
diff --git a/IGC/Compiler/Optimizer/OpenCLPasses/GenericAddressResolution/GenericAddressDynamicResolution.cpp b/IGC/Compiler/Optimizer/OpenCLPasses/GenericAddressResolution/GenericAddressDynamicResolution.cpp
@@ -243,7 +243,7 @@ void GenericAddressDynamicResolution::resolveGAS(Instruction &I, Value *pointerO
   auto createBlock = [&](const Twine &BlockName, const Twine &LoadName, IGC::ADDRESS_SPACE addressSpace, Value *&load) {
     BasicBlock *BB = BasicBlock::Create(I.getContext(), BlockName, convergeBlock->getParent(), convergeBlock);
     builder.SetInsertPoint(BB);
-    PointerType *ptrType = IGCLLVM::getWithSamePointeeType(pointerType, addressSpace);
+    PointerType *ptrType = IGCLLVM::get(pointerType, addressSpace);
     Value *ptr = builder.CreateAddrSpaceCast(pointerOperand, ptrType);
     Instruction *generatedLoadStore = nullptr;
 
@@ -313,7 +313,7 @@ void GenericAddressDynamicResolution::resolveGASWithoutBranches(Instruction &I,
 
   Value *nonLocalLoad = nullptr;
 
-  PointerType *ptrType = IGCLLVM::getWithSamePointeeType(pointerType, ADDRESS_SPACE_GLOBAL);
+  PointerType *ptrType = IGCLLVM::get(pointerType, ADDRESS_SPACE_GLOBAL);
   Value *globalPtr = builder.CreateAddrSpaceCast(pointerOperand, ptrType);
   Instruction *generatedLoadStore = nullptr;
 
@@ -397,7 +397,7 @@ bool GenericAddressDynamicResolution::visitIntrinsicCall(CallInst &I) {
     // If Block
     {
       IRBuilder<> ifBuilder(ifBlock);
-      PointerType *ptrType = IGCLLVM::getWithSamePointeeType(pointerType, targetAS);
+      PointerType *ptrType = IGCLLVM::get(pointerType, targetAS);
       newPtr = ifBuilder.CreateAddrSpaceCast(arg, ptrType);
       ifBuilder.CreateBr(convergeBlock);
     }
diff --git a/IGC/Compiler/Optimizer/OpenCLPasses/GenericAddressResolution/LowerGPCallArg.cpp b/IGC/Compiler/Optimizer/OpenCLPasses/GenericAddressResolution/LowerGPCallArg.cpp
@@ -148,8 +148,7 @@ Function *LowerGPCallArg::createFuncWithLoweredArgs(Function *F, GenericPointerA
   FunctionType *pFuncType = F->getFunctionType();
   std::vector<Type *> newParamTypes(pFuncType->param_begin(), pFuncType->param_end());
   for (auto &argInfo : argsInfo) {
-    PointerType *ptrType =
-        IGCLLVM::getWithSamePointeeType(dyn_cast<PointerType>(newParamTypes[argInfo.argNo]), argInfo.addrSpace);
+    PointerType *ptrType = IGCLLVM::get(dyn_cast<PointerType>(newParamTypes[argInfo.argNo]), argInfo.addrSpace);
     newParamTypes[argInfo.argNo] = ptrType;
   }
 
diff --git a/IGC/Compiler/Optimizer/OpenCLPasses/GenericAddressResolution/StaticGASResolution.cpp b/IGC/Compiler/Optimizer/OpenCLPasses/GenericAddressResolution/StaticGASResolution.cpp
@@ -53,7 +53,7 @@ bool StaticGASResolution::runOnFunction(llvm::Function &F) {
       Value *Ptr = LI ? LI->getPointerOperand() : SI->getPointerOperand();
       if (!toSkip(Ptr)) {
         PointerType *PtrTy = cast<PointerType>(Ptr->getType());
-        PointerType *glbPtrTy = IGCLLVM::getWithSamePointeeType(PtrTy, ADDRESS_SPACE_GLOBAL);
+        PointerType *glbPtrTy = IGCLLVM::get(PtrTy, ADDRESS_SPACE_GLOBAL);
 
         IRB.SetInsertPoint(I);
         Value *NewPtr = IRB.CreateAddrSpaceCast(Ptr, glbPtrTy);
diff --git a/IGC/Compiler/Optimizer/OpenCLPasses/StatelessToStateful/StatelessToStateful.cpp b/IGC/Compiler/Optimizer/OpenCLPasses/StatelessToStateful/StatelessToStateful.cpp
@@ -666,8 +666,7 @@ void StatelessToStateful::promoteIntrinsic(InstructionInfo &II) {
   Module *M = m_F->getParent();
   const DebugLoc &DL = I->getDebugLoc();
   GenISAIntrinsic::ID const intrinID = I->getIntrinsicID();
-  PointerType *pTy =
-      IGCLLVM::getWithSamePointeeType(dyn_cast<PointerType>(II.ptr->getType()), II.getStatefulAddrSpace());
+  PointerType *pTy = IGCLLVM::get(dyn_cast<PointerType>(II.ptr->getType()), II.getStatefulAddrSpace());
 
   if (m_targetAddressing == TargetAddressing::BINDLESS) {
     Argument *srcOffset =
diff --git a/IGC/Compiler/PromoteResourceToDirectAS.cpp b/IGC/Compiler/PromoteResourceToDirectAS.cpp
@@ -236,7 +236,7 @@ void PromoteResourceToDirectAS::PromoteSamplerTextureToDirectAS(GenIntrinsicInst
     }
 
     addrSpace = IGC::EncodeAS4GFXResource(*bufferId, bufTy);
-    PointerType *newptrType = IGCLLVM::getWithSamePointeeType(dyn_cast<PointerType>(resourcePtr->getType()), addrSpace);
+    PointerType *newptrType = IGCLLVM::get(dyn_cast<PointerType>(resourcePtr->getType()), addrSpace);
 
     Value *mutePtr = nullptr;
     if (llvm::isa<llvm::ConstantInt>(bufferId)) {
@@ -304,7 +304,7 @@ bool PatchGetElementPtr(const std::vector<Value *> &instList, Type *dstTy, unsig
         gepPatchedInst->setDebugLoc(gepInst->getDebugLoc());
       }
     } else if (BitCastInst *cast = dyn_cast<BitCastInst>(inst)) {
-      PointerType *newptrType = IGCLLVM::getWithSamePointeeType(dyn_cast<PointerType>(cast->getType()), directAS);
+      PointerType *newptrType = IGCLLVM::get(dyn_cast<PointerType>(cast->getType()), directAS);
       patchedInst = BitCastInst::Create(Instruction::BitCast, patchedInst, newptrType, "", cast);
       if (BitCastInst *castPathedInst = dyn_cast<BitCastInst>(patchedInst)) {
         castPathedInst->setDebugLoc(cast->getDebugLoc());
@@ -373,7 +373,7 @@ bool PatchInstructionAddressSpace(const std::vector<Value *> &instList, Type *ds
       }
     }
   } else if (phiNode) {
-    PointerType *newPhiTy = IGCLLVM::getWithSamePointeeType(dyn_cast<PointerType>(phiNode->getType()), directAS);
+    PointerType *newPhiTy = IGCLLVM::get(dyn_cast<PointerType>(phiNode->getType()), directAS);
     PHINode *pNewPhi = PHINode::Create(newPhiTy, phiNode->getNumIncomingValues(), "", phiNode);
     for (unsigned int i = 0; i < phiNode->getNumIncomingValues(); ++i) {
       Value *incomingVal = phiNode->getIncomingValue(i);
diff --git a/IGC/Compiler/PromoteStatelessToBindless.cpp b/IGC/Compiler/PromoteStatelessToBindless.cpp
@@ -191,8 +191,7 @@ void PromoteStatelessToBindless::PromoteStatelessToBindlessBuffers(Function &F)
       Value *resourcePtr = IGC::GetBufferOperand(accessInst);
       IGC_ASSERT(resourcePtr);
       unsigned bindlessAS = IGC::EncodeAS4GFXResource(*UndefValue::get(builder.getInt32Ty()), IGC::BINDLESS);
-      PointerType *basePointerType =
-          IGCLLVM::getWithSamePointeeType(dyn_cast<PointerType>(resourcePtr->getType()), bindlessAS);
+      PointerType *basePointerType = IGCLLVM::get(dyn_cast<PointerType>(resourcePtr->getType()), bindlessAS);
       Value *bufferOffset = builder.CreatePtrToInt(resourcePtr, builder.getInt32Ty());
 
       Value *basePointer = nullptr;
diff --git a/IGC/VectorCompiler/include/vc/Utils/General/Types.h b/IGC/VectorCompiler/include/vc/Utils/General/Types.h
@@ -37,7 +37,7 @@ enum Enum {
 // and the original pointee type.
 inline llvm::PointerType *changeAddrSpace(llvm::PointerType *OrigTy,
                                           int AddrSpace) {
-  return IGCLLVM::getWithSamePointeeType(OrigTy, AddrSpace);
+  return IGCLLVM::get(OrigTy, AddrSpace);
 }
 
 // Changes addrspace inside a vector of pointers type.
diff --git a/IGC/VectorCompiler/lib/GenXOpts/CMTrans/CMABI.cpp b/IGC/VectorCompiler/lib/GenXOpts/CMTrans/CMABI.cpp
@@ -1338,7 +1338,7 @@ bool CMLowerVLoadVStore::lowerLoadStore(Function &F) {
           IRBuilder<> Builder(&Inst);
           if (GenXIntrinsic::isVStore(&Inst)) {
             auto PtrTy = cast<PointerType>(Inst.getOperand(1)->getType());
-            PtrTy = PointerType::getWithSamePointeeType(PtrTy, AS1);
+            PtrTy = IGCLLVM::get(PtrTy, AS1);
             auto PtrCast =
                 Builder.CreateAddrSpaceCast(Inst.getOperand(1), PtrTy);
             Type *Tys[] = {Inst.getOperand(0)->getType(), PtrCast->getType()};
@@ -1348,7 +1348,7 @@ bool CMLowerVLoadVStore::lowerLoadStore(Function &F) {
             Builder.CreateCall(Fn, Args, Inst.getName());
           } else {
             auto PtrTy = cast<PointerType>(Inst.getOperand(0)->getType());
-            PtrTy = PointerType::getWithSamePointeeType(PtrTy, AS1);
+            PtrTy = IGCLLVM::get(PtrTy, AS1);
             auto PtrCast =
                 Builder.CreateAddrSpaceCast(Inst.getOperand(0), PtrTy);
             Type *Tys[] = {Inst.getType(), PtrCast->getType()};
diff --git a/IGC/VectorCompiler/lib/Utils/General/Types.cpp b/IGC/VectorCompiler/lib/Utils/General/Types.cpp
@@ -21,8 +21,7 @@ IGCLLVM::FixedVectorType *vc::changeAddrSpace(IGCLLVM::FixedVectorType *OrigTy,
   IGC_ASSERT_MESSAGE(OrigTy, "wrong argument");
   auto *PtrTy = cast<PointerType>(OrigTy->getElementType());
   auto EC = OrigTy->getNumElements();
-  return IGCLLVM::FixedVectorType::get(
-      IGCLLVM::getWithSamePointeeType(PtrTy, AddrSpace), EC);
+  return IGCLLVM::FixedVectorType::get(IGCLLVM::get(PtrTy, AddrSpace), EC);
 }
 
 Type *vc::changeAddrSpace(Type *OrigTy, int AddrSpace) {
diff --git a/IGC/WrapperLLVM/include/llvmWrapper/IR/DerivedTypes.h b/IGC/WrapperLLVM/include/llvmWrapper/IR/DerivedTypes.h
@@ -39,9 +39,22 @@ inline llvm::Type *getWithNewBitWidth(const llvm::Type *Ty, unsigned NewBitWidth
   return Ty->getWithNewBitWidth(NewBitWidth);
 }
 
-inline llvm::PointerType *getWithSamePointeeType(llvm::PointerType *PT, unsigned AddressSpace) {
+inline llvm::PointerType *get(llvm::PointerType *PT, unsigned AddressSpace) {
+#if LLVM_VERSION_MAJOR < 17
   return llvm::PointerType::getWithSamePointeeType(PT, AddressSpace);
+#else
+  return llvm::PointerType::get(PT, AddressSpace);
+#endif
 }
+
+inline bool isOpaqueOrPointeeTypeMatches(llvm::PointerType *PT, llvm::Type *Ty) {
+#if LLVM_VERSION_MAJOR < 17
+  return PT->isOpaqueOrPointeeTypeMatches(Ty);
+#else
+  return true;
+#endif
+}
+
 } // namespace IGCLLVM
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -2643,7 +2643,7 @@ void FixAddressSpaceInAllUses(llvm::Value *ptr, uint newAS, uint oldAS) {`
`2643`	`2643`	`}`
`2644`	`2644`
`2645`	`2645`	`if (instType && instType->getAddressSpace() == oldAS) {`
`2646`		`- PointerType *ptrType = IGCLLVM::getWithSamePointeeType(dyn_cast<PointerType>(instType), newAS);`
	`2646`	`+ PointerType *ptrType = IGCLLVM::get(dyn_cast<PointerType>(instType), newAS);`
`2647`	`2647`	`inst->mutateType(ptrType);`
`2648`	`2648`	`FixAddressSpaceInAllUses(inst, newAS, oldAS);`
`2649`	`2649`	`}`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ PointerType GASRetValuePropagator::getRetValueNonGASType(Function F) {`
`146`	`146`
`147`	`147`	`PointerType *retTy = cast<PointerType>(F->getReturnType());`
`148`	`148`
`149`		`- return originAddrSpace ? IGCLLVM::getWithSamePointeeType(retTy, originAddrSpace.value()) : nullptr;`
	`149`	`+ return originAddrSpace ? IGCLLVM::get(retTy, originAddrSpace.value()) : nullptr;`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`Function GASRetValuePropagator::createNewFunctionDecl(Function oldFunc, Type *newRetTy) {`
Original file line number	Diff line number	Diff line change
`@@ -148,8 +148,7 @@ Function LowerGPCallArg::createFuncWithLoweredArgs(Function F, GenericPointerA`
`148`	`148`	`FunctionType *pFuncType = F->getFunctionType();`
`149`	`149`	`std::vector<Type *> newParamTypes(pFuncType->param_begin(), pFuncType->param_end());`
`150`	`150`	`for (auto &argInfo : argsInfo) {`
`151`		`- PointerType *ptrType =`
`152`		`- IGCLLVM::getWithSamePointeeType(dyn_cast<PointerType>(newParamTypes[argInfo.argNo]), argInfo.addrSpace);`
	`151`	`+ PointerType *ptrType = IGCLLVM::get(dyn_cast<PointerType>(newParamTypes[argInfo.argNo]), argInfo.addrSpace);`
`153`	`152`	`newParamTypes[argInfo.argNo] = ptrType;`
`154`	`153`	`}`
`155`	`154`