Minor source code refactoring: move FixAddressSpaceInAllUses() to helper file.

Private memory resolution minor refactoring: convert int64 directly to pointer to allocated type.

Author: lfilipko

IGC/Compiler/CISACodeGen/helper.cpp

@@ -2454,4 +2454,30 @@ namespace IGC
 
         return ProcessedType;
     }
+
+    // Function modifies address space in selected uses of given input value
+    void FixAddressSpaceInAllUses(llvm::Value* ptr, uint newAS, uint oldAS)
+    {
+        IGC_ASSERT(newAS != oldAS);
+
+        for (auto UI = ptr->user_begin(), E = ptr->user_end(); UI != E; ++UI)
+        {
+            Instruction* inst = dyn_cast<Instruction>(*UI);
+            PointerType* instType = nullptr;
+            if (isa<BitCastInst>(inst) || isa<GetElementPtrInst>(inst) ||
+                isa<AddrSpaceCastInst>(inst) || isa<PHINode>(inst))
+            {
+                instType = dyn_cast<PointerType>(inst->getType());
+            }
+
+            if (instType && instType->getAddressSpace() == oldAS)
+            {
+                Type* eltType = instType->getElementType();
+                PointerType* ptrType = PointerType::get(eltType, newAS);
+                inst->mutateType(ptrType);
+                FixAddressSpaceInAllUses(inst, newAS, oldAS);
+            }
+        }
+    }
+
 } // namespace IGC

IGC/Compiler/CISACodeGen/helper.h

@@ -471,4 +471,7 @@ namespace IGC
 
     // Return base type of complex type or nullptr if it cannot be processed
     llvm::Type* GetBaseType(llvm::Type* ProcessedType);
+
+    // Function modifies address space in selected uses of given input value
+    void FixAddressSpaceInAllUses(llvm::Value* ptr, uint newAS, uint oldAS);
 } // namespace IGC

IGC/Compiler/FixResourcePtr.cpp

@@ -89,35 +89,6 @@ bool FixResourcePtr::runOnFunction(llvm::Function& F)
     return m_changed;
 }
 
-
-// Function modifies address space in all BitCast or GEP uses input pointer.
-void FixResourcePtr::FixAddressSpaceInAllUses(Value* ptr, uint newAS, uint oldAS)
-{
-    IGC_ASSERT(newAS != oldAS);
-
-    for (auto UI = ptr->user_begin(), E = ptr->user_end(); UI != E; ++UI)
-    {
-        Instruction* inst = dyn_cast<Instruction>(*UI);
-        PointerType* instType = nullptr;
-        if (BitCastInst * bitCastInst = dyn_cast<BitCastInst>(inst))
-        {
-            instType = dyn_cast<PointerType>(bitCastInst->getType());
-        }
-        else if (GetElementPtrInst * gepInst = dyn_cast<GetElementPtrInst>(inst))
-        {
-            instType = dyn_cast<PointerType>(gepInst->getType());
-        }
-
-        if (instType && instType->getAddressSpace() == oldAS)
-        {
-            Type* eltType = instType->getElementType();
-            PointerType* ptrType = PointerType::get(eltType, newAS);
-            inst->mutateType(ptrType);
-            FixAddressSpaceInAllUses(inst, newAS, oldAS);
-        }
-    }
-}
-
 void FixResourcePtr::RemoveGetBufferPtr(GenIntrinsicInst* bufPtr, Value* bufIdx)
 {
     uint outAS = bufPtr->getType()->getPointerAddressSpace();

IGC/Compiler/FixResourcePtr.hpp

@@ -63,8 +63,6 @@ namespace IGC
 
         llvm::Value* CreateStoreIntrinsic(llvm::StoreInst* inst, llvm::Instruction* bufPtr, llvm::Value* offsetVal);
 
-        void FixAddressSpaceInAllUses(llvm::Value* ptr, uint newAS, uint oldAS);
-
         /// @brief  Indicates if the pass changed the processed function
         bool m_changed;
         /// Function we are processing

IGC/Compiler/Optimizer/OpenCLPasses/PrivateMemory/PrivateMemoryResolution.cpp

@@ -943,7 +943,7 @@ bool PrivateMemoryResolution::resolveAllocaInstructions(bool privateOnStack)
             Value* totalOffset = builder.CreateAdd(bufferOffset, perLaneOffset, VALUE_NAME(pAI->getName() + ".totalOffset"));
             totalOffset = builder.CreateZExt(totalOffset, privateBase->getType());
             Value* threadOffset = builder.CreateAdd(privateBase, totalOffset, VALUE_NAME(pAI->getName() + ".threadOffset"));
-            Value* privateBufferPTR = builder.CreateIntToPtr(threadOffset, Type::getInt8Ty(C)->getPointerTo(scratchMemoryAddressSpace), VALUE_NAME(pAI->getName() + ".privateBufferPTR"));
+            Value* privateBufferPTR = builder.CreateIntToPtr(threadOffset, pAI->getAllocatedType()->getPointerTo(scratchMemoryAddressSpace), VALUE_NAME(pAI->getName() + ".privateBufferPTR"));
             Value* privateBuffer = builder.CreatePointerCast(privateBufferPTR, pAI->getType(), VALUE_NAME(pAI->getName() + ".privateBuffer"));
 
             if (TransposeMemLayout)
@@ -957,6 +957,7 @@ bool PrivateMemoryResolution::resolveAllocaInstructions(bool privateOnStack)
             // Replace all uses of original alloca with the bitcast
             pAI->replaceAllUsesWith(privateBuffer);
             pAI->eraseFromParent();
+
         }
 
         return true;