Reduce usage of pointer element types (24).

This change replaces calls to getNonOpaquePtrEltTy 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/AdaptorOCL/ResolveConstExprCalls.cpp

@@ -14,6 +14,7 @@ SPDX-License-Identifier: MIT
 
 #include "llvmWrapper/IR/Attributes.h"
 #include "llvmWrapper/IR/Type.h"
+#include "llvmWrapper/IR/Function.h"
 
 #include <llvm/Pass.h>
 #include <llvm/IR/Module.h>
@@ -124,12 +125,12 @@ bool transformConstExprCastCall(CallInst& Call) {
         // sized type and the sized type has to have the same size as the old type.
         if (ParamTy != ActTy && IGCLLVM::hasParamAttr(CallerPAL, i, llvm::Attribute::ByVal)) {
             PointerType* ParamPTy = dyn_cast<PointerType>(ParamTy);
-            if (!ParamPTy || !IGCLLVM::getNonOpaquePtrEltTy(ParamPTy)->isSized())
+            if (!ParamPTy || !IGCLLVM::getArg(*Callee, i)->getParamByValType()->isSized())
                 return false;
 
             Type* CurElTy = Call.getParamByValType(i);
             if (DL.getTypeAllocSize(CurElTy) !=
-                DL.getTypeAllocSize(IGCLLVM::getNonOpaquePtrEltTy(ParamPTy)))
+                DL.getTypeAllocSize(IGCLLVM::getArg(*Callee, i)->getParamByValType()))
                 return false;
         }
     }
@@ -177,7 +178,7 @@ bool transformConstExprCastCall(CallInst& Call) {
         // Add any parameter attributes.
         if (IGCLLVM::hasParamAttr(CallerPAL, i, llvm::Attribute::ByVal)) {
             IGCLLVM::AttrBuilder AB(FT->getContext(), IGCLLVM::getParamAttrs(CallerPAL, i));
-            AB.addByValAttr(IGCLLVM::getNonOpaquePtrEltTy(NewArg->getType()));
+            AB.addByValAttr(IGCLLVM::getArg(*Callee, i)->getParamByValType());
             ArgAttrs.push_back(AttributeSet::get(Ctx, AB));
         }
         else

IGC/AdaptorOCL/SPIRV/SPIRVReader.cpp

@@ -2700,9 +2700,7 @@ SPIRVToLLVM::postProcessFunctionsReturnStruct(Function *F) {
       Args.insert(Args.begin(), Alloca);
       auto NewCI = CallInst::Create(NewF, Args, "", CI);
       NewCI->setCallingConv(CI->getCallingConv());
-      auto Load = new LoadInst(
-      IGCLLVM::getNonOpaquePtrEltTy(Alloca->getType()),
-      Alloca,"",CI);
+      auto Load = new LoadInst(Alloca->getAllocatedType(), Alloca, "", CI);
       CI->replaceAllUsesWith(Load);
       CI->eraseFromParent();
     }
@@ -3483,7 +3481,9 @@ SPIRVToLLVM::transValueWithoutDecoration(SPIRVValue *BV, Function *F,
             for (unsigned I = 0, E = CS->getNumOperands(); I != E; I++)
             {
                 auto *op = CS->getOperand(I);
-                auto *pGEP = IRB.CreateConstInBoundsGEP2_32(IGCLLVM::getNonOpaquePtrEltTy(pointer->getType()), pointer, 0, I);
+                Type* elTy = isa<AllocaInst>(pointer) ? cast<AllocaInst>(pointer)->getAllocatedType()
+                    : cast<GetElementPtrInst>(pointer)->getResultElementType();
+                auto* pGEP = IRB.CreateConstInBoundsGEP2_32(elTy, pointer, 0, I);
                 if (auto *InnerCS = dyn_cast<ConstantStruct>(op))
                     LowerConstantStructStore(InnerCS, pGEP);
                 else
@@ -3520,7 +3520,7 @@ SPIRVToLLVM::transValueWithoutDecoration(SPIRVValue *BV, Function *F,
     IGC_ASSERT_MESSAGE(BB, "Invalid BB");
     auto val = transValue(BL->getSrc(), F, BB);
     LoadInst* LI = new LoadInst(
-      IGCLLVM::getNonOpaquePtrEltTy(val->getType()),
+      transType(BL->getType()),
       val,
       BV->getName(),
       BL->hasDecorate(DecorationVolatile) || BL->SPIRVMemoryAccess::isVolatile() != 0,
@@ -3555,11 +3555,13 @@ SPIRVToLLVM::transValueWithoutDecoration(SPIRVValue *BV, Function *F,
               Type* Int8Ty = Type::getInt8Ty(Dst->getContext());
               llvm::Value* Src = ConstantInt::get(Int8Ty, 0);
               llvm::Value* newDst = Dst;
-              if (!IGCLLVM::getNonOpaquePtrEltTy(Dst->getType())->isIntegerTy(8)) {
-                  Type* Int8PointerTy = Type::getInt8PtrTy(Dst->getContext(),
-                      Dst->getType()->getPointerAddressSpace());
-                  newDst = llvm::BitCastInst::CreatePointerCast(Dst,
-                      Int8PointerTy, "", BB);
+              if (!IGCLLVM::isOpaquePointerTy(Dst->getType())) {
+                  if (!IGCLLVM::getNonOpaquePtrEltTy(Dst->getType())->isIntegerTy(8)) {      // Legacy code: getNonOpaquePtrEltTy
+                      Type* Int8PointerTy = Type::getInt8PtrTy(Dst->getContext(),
+                          Dst->getType()->getPointerAddressSpace());
+                      newDst = llvm::BitCastInst::CreatePointerCast(Dst,
+                          Int8PointerTy, "", BB);
+                  }
               }
               CI = Builder.CreateMemSet(newDst, Src, Size, IGCLLVM::getCorrectAlign(Align), IsVolatile);
           }
@@ -3640,7 +3642,7 @@ SPIRVToLLVM::transValueWithoutDecoration(SPIRVValue *BV, Function *F,
   case OpInBoundsPtrAccessChain: {
     auto AC = static_cast<SPIRVAccessChainBase *>(BV);
     auto Base = transValue(AC->getBase(), F, BB);
-    Type *BaseTy = IGCLLVM::getNonOpaquePtrEltTy(Base->getType());
+    Type* BaseTy = transType(AC->getBase()->getType()->getPointerElementType());
     auto Index = transValue(AC->getIndices(), F, BB);
     if (!AC->hasPtrIndex())
       Index.insert(Index.begin(), getInt32(M, 0));
@@ -3841,7 +3843,7 @@ SPIRVToLLVM::transValueWithoutDecoration(SPIRVValue *BV, Function *F,
     auto func = transValue(BC->getCalledValue(), F, BB);
     auto Call = CallInst::Create(
         llvm::cast<llvm::FunctionType>(
-            IGCLLVM::getNonOpaquePtrEltTy(func->getType())),
+            transType(BC->getCalledValue()->getType()->getPointerElementType())),
         func,
         transValue(BC->getArgumentValues(), F, BB),
         BC->getName(),
@@ -4243,8 +4245,10 @@ SPIRVToLLVM::transFunction(SPIRVFunction *BF) {
 #if LLVM_VERSION_MAJOR >= 12
      Attribute::AttrKind LLVMKind = SPIRSPIRVFuncParamAttrMap::rmap(Kind);
      Type *AttrTy = nullptr;
-     if (LLVMKind == Attribute::AttrKind::ByVal || LLVMKind == Attribute::AttrKind::StructRet)
-       AttrTy = IGCLLVM::getNonOpaquePtrEltTy(I->getType());
+     if (LLVMKind == Attribute::AttrKind::ByVal)
+         AttrTy = I->getParamByValType();
+     else if (LLVMKind == Attribute::AttrKind::StructRet)
+         AttrTy = I->getParamStructRetType();
 
      // Make sure to use a correct constructor for a typed/typeless attribute
      auto A = AttrTy ? Attribute::get(*Context, LLVMKind, AttrTy)

IGC/AdaptorOCL/preprocess_spvir/HandleSPIRVDecorations/HandleSpirvDecorationMetadata.cpp

@@ -529,9 +529,6 @@ void HandleSpirvDecorationMetadata::handleCacheControlINTELForOCL1DBlockPrefetch
     Function* F = I.getCalledFunction();
     IGC_ASSERT(F);
 
-    Type* pointeeTy = IGCLLVM::getNonOpaquePtrEltTy(I.getArgOperand(0)->getType());
-    IGC_ASSERT(pointeeTy->isIntegerTy());
-
     StringRef numElementsFromName = Matches[3] != "" ? Matches[3] : "1";
     uint32_t numElementsToPrefetch = std::stoi(numElementsFromName.str());
     IGC_ASSERT(numElementsToPrefetch == 1 ||
@@ -540,10 +537,17 @@ void HandleSpirvDecorationMetadata::handleCacheControlINTELForOCL1DBlockPrefetch
                numElementsToPrefetch == 8 ||
                numElementsToPrefetch == 16);
 
-    uint32_t typeSizeInBytes = pointeeTy->getIntegerBitWidth() / 8;
-
-    Value* numBytesArg =
-        (ConstantInt::get(Type::getInt32Ty(I.getContext()), (typeSizeInBytes * numElementsToPrefetch)));
+    uint32_t typeSizeInBytes = 0;
+    if (Matches[2].equals("uc"))
+        typeSizeInBytes = 1;
+    else if (Matches[2].equals("us"))
+        typeSizeInBytes = 2;
+    else if (Matches[2].equals("ui"))
+        typeSizeInBytes = 4;
+    else if (Matches[2].equals("ul"))
+        typeSizeInBytes = 8;
+    else
+        IGC_ASSERT(0 && "Unsupported type prefetch!");
 
     std::string typeName;
     switch (typeSizeInBytes)
@@ -565,6 +569,9 @@ void HandleSpirvDecorationMetadata::handleCacheControlINTELForOCL1DBlockPrefetch
             break;
     }
 
+    Value* numBytesArg =
+        (ConstantInt::get(Type::getInt32Ty(I.getContext()), (typeSizeInBytes * numElementsToPrefetch)));
+
     SmallVector<Value*, 3> args(I.args());
     args.push_back(numBytesArg);
     args.push_back(ConstantInt::get(Type::getInt32Ty(I.getContext()), cacheControl.value));