IGCLLVM::getNonOpaquePtrEltTy elimination in load insts creation

This change is part of the effort to support opaque pointers in newer
LLVM versions

Author: mshelego

IGC/VectorCompiler/lib/GenXCodeGen/GenXBaling.cpp

@@ -2230,8 +2230,8 @@ static bool skipTransform(Instruction *DefI, Instruction *UseI) {
 // gstore w, G
 static void normalizeGStore(StoreInst &SI) {
   Value *PointerOp = SI.getPointerOperand();
-  auto LI = new LoadInst(IGCLLVM::getNonOpaquePtrEltTy(PointerOp->getType()),
-                         PointerOp, ".gload", true /*volatile*/, &SI);
+  auto LI = new LoadInst(SI.getValueOperand()->getType(), PointerOp, ".gload",
+                         true /*volatile*/, &SI);
   Value *StoreOp = SI.getValueOperand();
   Region R(StoreOp);
   auto WrR =

IGC/VectorCompiler/lib/GenXCodeGen/GenXLegalization.cpp

@@ -1849,12 +1849,10 @@ Value *GenXLegalization::joinWrRegion(Value *PrevSliceRes, BaleInst BInst,
   // last time round.
   Value *In = !StartIdx ? BInst.Inst->getOperand(0) : PrevSliceRes;
   if (CurSplitKind == SplitKind::SplitKind_GStore && StartIdx != 0) {
-    Instruction *ST = B.getHead()->Inst;
-    IGC_ASSERT(isa<StoreInst>(ST));
-    Value *GV = ST->getOperand(1);
-    auto *Load =
-        new LoadInst(IGCLLVM::getNonOpaquePtrEltTy(GV->getType()), GV, ".gload",
-                     /*volatile*/ true, InsertBefore);
+    auto *SI = cast<StoreInst>(B.getHead()->Inst);
+    auto *Load = new LoadInst(SI->getValueOperand()->getType(),
+                              SI->getPointerOperand(), ".gload",
+                              /*volatile*/ true, InsertBefore);
     Load->setDebugLoc(BInst.Inst->getDebugLoc());
     In = Load;
   }

IGC/VectorCompiler/lib/GenXCodeGen/GenXLowering.cpp

@@ -2042,9 +2042,8 @@ bool GenXLowering::processInst(Instruction *Inst) {
     case GenXIntrinsic::genx_vload: {
       if (!Inst->use_empty()) {
         Value *Ptr = Inst->getOperand(0);
-        LoadInst *LI =
-            new LoadInst(IGCLLVM::getNonOpaquePtrEltTy(Ptr->getType()), Ptr, "",
-                         /*volatile*/ true, Inst);
+        LoadInst *LI = new LoadInst(Inst->getType(), Ptr, "",
+                                    /*volatile*/ true, Inst);
         LI->takeName(Inst);
         LI->setDebugLoc(Inst->getDebugLoc());
         Inst->replaceAllUsesWith(LI);

IGC/VectorCompiler/lib/GenXCodeGen/GenXUtil.cpp

@@ -1725,7 +1725,7 @@ Instruction *genx::foldBitCastInst(Instruction *Inst) {
     if (auto CI = dyn_cast<BitCastInst>(LI->user_back())) {
       auto NewPtrTy = PointerType::get(CI->getType(), LI->getPointerAddressSpace());
       auto NewPtr = ConstantExpr::getBitCast(GV, NewPtrTy);
-      auto NewLI = new LoadInst(IGCLLVM::getNonOpaquePtrEltTy(NewPtrTy), NewPtr, "",
+      auto NewLI = new LoadInst(CI->getType(), NewPtr, "",
                                 /*volatile*/ LI->isVolatile(), Inst);
       NewLI->takeName(LI);
       NewLI->setDebugLoc(LI->getDebugLoc());

IGC/VectorCompiler/lib/GenXOpts/CMTrans/CMImpParam.cpp

@@ -1,6 +1,6 @@
 /*========================== begin_copyright_notice ============================
 
-Copyright (C) 2017-2023 Intel Corporation
+Copyright (C) 2017-2024 Intel Corporation
 
 SPDX-License-Identifier: MIT
 
@@ -769,9 +769,9 @@ void CMImpParam::replaceWithGlobal(CallInst *CI) {
                      "genx or vc internal intrinsic is expected");
   auto IID = vc::getAnyIntrinsicID(CI->getCalledFunction());
   GlobalVariable *GV = getOrCreateGlobalForIID(CI->getFunction(), IID);
-  LoadInst *Load = new LoadInst(IGCLLVM::getNonOpaquePtrEltTy(GV->getType()), GV, "",
-                                /* isVolatile */ false,
-                                IGCLLVM::getCorrectAlign(GV->getAlignment()), CI);
+  LoadInst *Load = new LoadInst(
+      GV->getValueType(), GV, "",
+      /* isVolatile */ false, IGCLLVM::getCorrectAlign(GV->getAlignment()), CI);
   Load->takeName(CI);
   Load->setDebugLoc(CI->getDebugLoc());
   CI->replaceAllUsesWith(Load);

IGC/VectorCompiler/lib/Utils/General/InstRebuilder.cpp

@@ -1,6 +1,6 @@
 /*========================== begin_copyright_notice ============================
 
-Copyright (C) 2021 Intel Corporation
+Copyright (C) 2021-2024 Intel Corporation
 
 SPDX-License-Identifier: MIT
 
@@ -95,15 +95,13 @@ class cloneInstWithNewOpsImpl
 
   Instruction *visitLoadInst(LoadInst &OrigLoad) {
     Value &Ptr = getSingleNewOperand();
-    auto *NewLoad =
-        new LoadInst{IGCLLVM::getNonOpaquePtrEltTy(Ptr.getType()),
-                     &Ptr,
-                     "",
-                     OrigLoad.isVolatile(),
-                     IGCLLVM::getAlign(OrigLoad),
-                     OrigLoad.getOrdering(),
-                     OrigLoad.getSyncScopeID()};
-    return NewLoad;
+    return new LoadInst{OrigLoad.getType(),
+                        &Ptr,
+                        "",
+                        OrigLoad.isVolatile(),
+                        IGCLLVM::getAlign(OrigLoad),
+                        OrigLoad.getOrdering(),
+                        OrigLoad.getSyncScopeID()};
   }
 
   StoreInst *visitStoreInst(StoreInst &OrigStore) {