Reduce usage of pointer element types (18).

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/Compiler/CISACodeGen/ConstantCoalescing.cpp

@@ -1051,15 +1051,15 @@ void ConstantCoalescing::CombineTwoLoads(
                 eac, PointerType::get(vty, addrSpace), "twoScalar", load0);
             m_TT->RegisterNewValueAndAssignID(ptrcast);
             wiAns->incUpdateDepend(ptrcast, WIAnalysis::RANDOM);
-            cov_chunk->chunkIO = irBuilder->CreateLoad(ptrcast, false);
+            cov_chunk->chunkIO = irBuilder->CreateLoad(vty, ptrcast, false);
             cast<LoadInst>(cov_chunk->chunkIO)->setAlignment(getAlign(4)); // \todo, more precise
             wiAns->incUpdateDepend(cov_chunk->chunkIO, WIAnalysis::RANDOM);
         }
         else
         {
             IGC_ASSERT(isa<IntToPtrInst>(addr_ptr));
             addr_ptr->mutateType(PointerType::get(vty, addrSpace));
-            cov_chunk->chunkIO = irBuilder->CreateLoad(addr_ptr, false);
+            cov_chunk->chunkIO = irBuilder->CreateLoad(cov_chunk->chunkIO->getType(), addr_ptr, false);
             cast<LoadInst>(cov_chunk->chunkIO)->setAlignment(getAlign(4));  // \todo, more precise
             wiAns->incUpdateDepend(cov_chunk->chunkIO, WIAnalysis::RANDOM);
             // modify the address calculation if the chunk-start is changed
@@ -1764,7 +1764,7 @@ Instruction* ConstantCoalescing::CreateChunkLoad(
         // Update debug location
         ptr->setDebugLoc(irBuilder->getCurrentDebugLocation());
         wiAns->incUpdateDepend(ptr, wiAns->whichDepend(seedi));
-        chunkLoad = irBuilder->CreateLoad(ptr);
+        chunkLoad = irBuilder->CreateLoad(vty, ptr);
         chunkLoad->setAlignment(getAlign(alignment));
         CopyMetadata(chunkLoad, seedi);
         chunk->chunkIO = chunkLoad;

IGC/Compiler/CISACodeGen/ConstantCoalescing.hpp

@@ -144,40 +144,18 @@ namespace IGC
                 m_TT->RegisterNewValueAndAssignID(val);
                 return val;
             }
-            // This wrapper function is deprecated because it uses typed pointer and
-            // should no longer be used in LLVM 14+ compatible code.
-            LoadInst* CreateLoad(Value* Ptr, const char* Name) {
-                llvm::Type* ptrType = IGCLLVM::getNonOpaquePtrEltTy(Ptr->getType());
-                LoadInst* val = IGCIRBuilder<>::CreateLoad(ptrType, Ptr, Name);
-                m_TT->RegisterNewValueAndAssignID(val);
-                return val;
-            }
+
             LoadInst* CreateLoad(Type* Ty, Value* Ptr, const Twine& Name = "") {
                 LoadInst* val = IGCIRBuilder<>::CreateLoad(Ty, Ptr, Name);
                 m_TT->RegisterNewValueAndAssignID(val);
                 return val;
             }
-            // This wrapper function is deprecated because it uses typed pointer and
-            // should no longer be used in LLVM 14+ compatible code.
-            LoadInst* CreateLoad(Value* Ptr, const Twine& Name = "") {
-                llvm::Type* ptrType = IGCLLVM::getNonOpaquePtrEltTy(Ptr->getType());
-                LoadInst* val = IGCIRBuilder<>::CreateLoad(ptrType, Ptr, Name);
-                m_TT->RegisterNewValueAndAssignID(val);
-                return val;
-            }
+
             LoadInst* CreateLoad(Type* Ty, Value* Ptr, bool isVolatile, const Twine& Name = "") {
                 LoadInst* val = IGCIRBuilder<>::CreateLoad(Ty, Ptr, isVolatile, Name);
                 m_TT->RegisterNewValueAndAssignID(val);
                 return val;
             }
-            // This wrapper function is deprecated because it uses typed pointer and
-            // should no longer be used in LLVM 14+ compatible code.
-            LoadInst* CreateLoad(Value* Ptr, bool isVolatile, const Twine& Name = "") {
-                llvm::Type* ptrType = IGCLLVM::getNonOpaquePtrEltTy(Ptr->getType());
-                LoadInst* val = IGCIRBuilder<>::CreateLoad(ptrType, Ptr, isVolatile, Name);
-                m_TT->RegisterNewValueAndAssignID(val);
-                return val;
-            }
 
             CallInst* CreateCall2(Value* Callee, Value* Arg1, Value* Arg2,
                 const Twine& Name = "") {