Reduce usage of pointer element types.

This change replaces calls to getNonOpaquePtrEltTy in compute-related
passes with element type information got through other means. This
change is part of the effort to support opaque pointers in newer LLVM
versions.

Author: ViacheslavRb

IGC/Compiler/CISACodeGen/GenCodeGenModule.cpp

@@ -1,6 +1,6 @@
 /*========================== begin_copyright_notice ============================
 
-Copyright (C) 2017-2023 Intel Corporation
+Copyright (C) 2017-2024 Intel Corporation
 
 SPDX-License-Identifier: MIT
 
@@ -31,6 +31,7 @@ SPDX-License-Identifier: MIT
 #include "llvm/IR/InstVisitor.h"
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Transforms/IPO/Inliner.h"
+#include "llvmWrapper/IR/DerivedTypes.h"
 #include "llvmWrapper/Transforms/Utils/Cloning.h"
 #include "llvm/IR/DebugInfo.h"
 #include "llvm/IR/DIBuilder.h"
@@ -1371,14 +1372,14 @@ void SubroutineInliner::visitMemCpyInst(MemCpyInst& I)
         if (origSrc->getType()->getPointerAddressSpace() != Src->getType()->getPointerAddressSpace())
         {
             Value* SrcCast = BitCastInst::Create(Instruction::BitCast, origSrc,
-                PointerType::get(IGCLLVM::getNonOpaquePtrEltTy(Src->getType()), origSrc->getType()->getPointerAddressSpace()),
+                IGCLLVM::getWithSamePointeeType(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,
-                PointerType::get(IGCLLVM::getNonOpaquePtrEltTy(Dst->getType()), origDst->getType()->getPointerAddressSpace()),
+                IGCLLVM::getWithSamePointeeType(dyn_cast<PointerType>(Dst->getType()), origDst->getType()->getPointerAddressSpace()),
                 "", &I);
             I.replaceUsesOfWith(Dst, DstCast);
         }

IGC/Compiler/Optimizer/OpenCLPasses/GenericAddressResolution/LowerGPCallArg.cpp

@@ -1,6 +1,6 @@
 /*========================== begin_copyright_notice ============================
 
-Copyright (C) 2017-2022 Intel Corporation
+Copyright (C) 2017-2024 Intel Corporation
 
 SPDX-License-Identifier: MIT
 
@@ -16,6 +16,7 @@ SPDX-License-Identifier: MIT
 #include "llvm/ADT/PostOrderIterator.h"
 #include <llvm/IR/DIBuilder.h>
 #include "common/LLVMWarningsPop.hpp"
+#include "llvmWrapper/IR/DerivedTypes.h"
 
 // (1)
 // Optimization pass to lower generic pointers in function arguments.
@@ -157,7 +158,7 @@ Function* LowerGPCallArg::createFuncWithLoweredArgs(Function* F, GenericPointerA
     std::vector<Type*> newParamTypes(pFuncType->param_begin(), pFuncType->param_end());
     for (auto& argInfo : argsInfo)
     {
-        PointerType* ptrType = PointerType::get(IGCLLVM::getNonOpaquePtrEltTy(newParamTypes[argInfo.argNo]),
+        PointerType* ptrType = IGCLLVM::getWithSamePointeeType(dyn_cast<PointerType>(newParamTypes[argInfo.argNo]),
             argInfo.addrSpace);
         newParamTypes[argInfo.argNo] = ptrType;
     }

IGC/Compiler/Optimizer/OpenCLPasses/StatelessToStateful/StatelessToStateful.cpp

@@ -1,6 +1,6 @@
 /*========================== begin_copyright_notice ============================
 
-Copyright (C) 2017-2023 Intel Corporation
+Copyright (C) 2017-2024 Intel Corporation
 
 SPDX-License-Identifier: MIT
 
@@ -13,6 +13,7 @@ SPDX-License-Identifier: MIT
 #include "common/Stats.hpp"
 #include "common/secure_string.h"
 #include "common/LLVMWarningsPush.hpp"
+#include "llvmWrapper/IR/DerivedTypes.h"
 #include "llvmWrapper/IR/Instructions.h"
 #include "llvmWrapper/Support/Alignment.h"
 #include <llvm/IR/Function.h>
@@ -557,7 +558,7 @@ void StatelessToStateful::promoteIntrinsic(InstructionInfo& II)
     Module* M = m_F->getParent();
     const DebugLoc& DL = I->getDebugLoc();
     GenISAIntrinsic::ID const intrinID = I->getIntrinsicID();
-    PointerType* pTy = PointerType::get(IGCLLVM::getNonOpaquePtrEltTy(II.ptr->getType()), II.getStatefulAddrSpace());
+    PointerType* pTy = IGCLLVM::getWithSamePointeeType(dyn_cast<PointerType>(II.ptr->getType()), II.getStatefulAddrSpace());
 
     if (m_targetAddressing == TargetAddressing::BINDLESS)
     {
@@ -663,7 +664,7 @@ void StatelessToStateful::promoteLoad(InstructionInfo& II)
     {
         auto newBasePtr = IntToPtrInst::Create(Instruction::IntToPtr, II.offset, pTy, "", I);
         auto bindfulLoad = new LoadInst(
-            IGCLLVM::getNonOpaquePtrEltTy(newBasePtr->getType()),
+            I->getType(),
             newBasePtr,
             "",
             I->isVolatile(),

IGC/Compiler/PromoteResourceToDirectAS.cpp

@@ -1,6 +1,6 @@
 /*========================== begin_copyright_notice ============================
 
-Copyright (C) 2017-2021 Intel Corporation
+Copyright (C) 2017-2024 Intel Corporation
 
 SPDX-License-Identifier: MIT
 
@@ -12,6 +12,7 @@ SPDX-License-Identifier: MIT
 #include <llvm/IR/Constants.h>
 #include <llvm/IR/Module.h>
 #include <llvm/IR/Function.h>
+#include "llvmWrapper/IR/DerivedTypes.h"
 #include <llvmWrapper/IR/Type.h>
 #include <llvmWrapper/Support/Alignment.h>
 #include "common/LLVMWarningsPop.hpp"
@@ -280,7 +281,7 @@ void PromoteResourceToDirectAS::PromoteSamplerTextureToDirectAS(GenIntrinsicInst
         }
 
         addrSpace = IGC::EncodeAS4GFXResource(*bufferId, bufTy);
-        PointerType* newptrType = PointerType::get(IGCLLVM::getNonOpaquePtrEltTy(resourcePtr->getType()), addrSpace);
+        PointerType* newptrType = IGCLLVM::getWithSamePointeeType(dyn_cast<PointerType>(resourcePtr->getType()), addrSpace);
 
         Value* mutePtr = nullptr;
         if (llvm::isa<llvm::ConstantInt>(bufferId))
@@ -364,7 +365,7 @@ bool PatchGetElementPtr(const std::vector<Value*>& instList, Type* dstTy, unsign
         }
         else if (BitCastInst * cast = dyn_cast<BitCastInst>(inst))
         {
-            PointerType* newptrType = PointerType::get(IGCLLVM::getNonOpaquePtrEltTy(cast->getType()), directAS);
+            PointerType* newptrType = IGCLLVM::getWithSamePointeeType(dyn_cast<PointerType>(cast->getType()), directAS);
             patchedInst = BitCastInst::Create(Instruction::BitCast, patchedInst, newptrType, "", cast);
             if (BitCastInst* castPathedInst = dyn_cast<BitCastInst>(patchedInst))
             {
@@ -447,7 +448,7 @@ bool PatchInstructionAddressSpace(const std::vector<Value*>& instList, Type* dst
     }
     else if (phiNode)
     {
-        PointerType* newPhiTy = PointerType::get(IGCLLVM::getNonOpaquePtrEltTy(phiNode->getType()), directAS);
+        PointerType* newPhiTy = IGCLLVM::getWithSamePointeeType(dyn_cast<PointerType>(phiNode->getType()), directAS);
         PHINode* pNewPhi = PHINode::Create(newPhiTy, phiNode->getNumIncomingValues(), "", phiNode);
         for (unsigned int i = 0; i < phiNode->getNumIncomingValues(); ++i)
         {

IGC/Compiler/PromoteStatelessToBindless.cpp

@@ -1,6 +1,6 @@
 /*========================== begin_copyright_notice ============================
 
-Copyright (C) 2019-2021 Intel Corporation
+Copyright (C) 2019-2024 Intel Corporation
 
 SPDX-License-Identifier: MIT
 
@@ -10,6 +10,7 @@ SPDX-License-Identifier: MIT
 #include "AdaptorCommon/ImplicitArgs.hpp"
 #include "Compiler/IGCPassSupport.h"
 #include "common/LLVMWarningsPush.hpp"
+#include "llvmWrapper/IR/DerivedTypes.h"
 #include <llvm/IR/Constants.h>
 #include <llvm/IR/Function.h>
 #include "common/LLVMWarningsPop.hpp"
@@ -225,7 +226,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 = PointerType::get(IGCLLVM::getNonOpaquePtrEltTy(resourcePtr->getType()), bindlessAS);
+            PointerType* basePointerType = IGCLLVM::getWithSamePointeeType(dyn_cast<PointerType>(resourcePtr->getType()), bindlessAS);
             Value* bufferOffset = builder.CreatePtrToInt(resourcePtr, builder.getInt32Ty());
 
             Value* basePointer = nullptr;