Replacing usages of getNonOpaquePtrEltTy in AdaptorCommon - part 3

This change set is to prepare for removing dependencies on references to non-opaque pointers.

Author: krystian-andrzejewski

IGC/AdaptorCommon/RayTracing/RTBuilder.cpp

@@ -497,15 +497,15 @@ std::pair<BasicBlock*, PHINode*> RTBuilder::validateInstanceLeafPtr(
 //      % "&ShadowMemory.RayQueryObjects".first = alloca[5 x % "struct.RTStackFormat::RTStack2"]
 //  % "&ShadowMemory.RayQueryObjects".second = alloca[5 x int8]
 //
-std::pair<Value*, Value*> RTBuilder::createAllocaRayQueryObjects(unsigned int size, bool bShrinkSMStack, const llvm::Twine& Name)
+std::pair<AllocaInst*, AllocaInst*> RTBuilder::createAllocaRayQueryObjects(unsigned int size, bool bShrinkSMStack, const llvm::Twine& Name)
 {
     //FIXME: Temp solution: to shrink ShadowMemory, if ShrinkShadowMemoryIfNoSpillfill is true (we know no spillfill), then,
     //we alloca SMStack instead of RTStack to reduce the size. Also, here, we simply cast SMStack pointer to RTStack which is risky
     //and it's safe now if we only shrink the last variable of RTStack (MemTravStack).
     //But don't shrink data in the middle of RTStack which will lead to holes.
     auto* RTStackTy = bShrinkSMStack ? getSMStack2Ty() : getRTStack2Ty();
 
-    Value* rtStacks = this->CreateAlloca(
+    AllocaInst* rtStacks = this->CreateAlloca(
         ArrayType::get(RTStackTy, size),
         nullptr,
         Name);
@@ -516,7 +516,7 @@ std::pair<Value*, Value*> RTBuilder::createAllocaRayQueryObjects(unsigned int si
     //to WA this, let's temporily use DW, but sure, this won't solve all other issues.
     //  %0 = alloca <3 x float>
     //  store <3 x float> zeroinitializer, <3 x float>* %0
-    Value* rtCtrls = this->CreateAlloca(
+    AllocaInst* rtCtrls = this->CreateAlloca(
         ArrayType::get(this->getInt32Ty(), size),
         nullptr,
         Name);
@@ -1388,15 +1388,14 @@ void RTBuilder::setHitValid(StackPointerVal* StackPointer, bool CommittedHit)
     }
 }
 
-Value* RTBuilder::getSyncTraceRayControl(Value* ptrCtrl)
+LoadInst* RTBuilder::getSyncTraceRayControl(GetElementPtrInst* ptrCtrl)
 {
-    return this->CreateLoad(ptrCtrl, VALUE_NAME("rayQueryObject.traceRayControl"));
+    return this->CreateLoad(ptrCtrl->getResultElementType(), ptrCtrl, VALUE_NAME("rayQueryObject.traceRayControl"));
 }
 
-void RTBuilder::setSyncTraceRayControl(Value* ptrCtrl, RTStackFormat::TraceRayCtrl ctrl)
+void RTBuilder::setSyncTraceRayControl(GetElementPtrInst* ptrCtrl, RTStackFormat::TraceRayCtrl ctrl)
 {
-    Type* eleType = IGCLLVM::getNonOpaquePtrEltTy(ptrCtrl->getType());
-    this->CreateStore(llvm::ConstantInt::get(eleType, (uint32_t)ctrl), ptrCtrl);
+    this->CreateStore(llvm::ConstantInt::get(ptrCtrl->getResultElementType(), (uint32_t)ctrl), ptrCtrl);
 }
 
 Value* RTBuilder::getHitBaryCentric(

IGC/AdaptorCommon/RayTracing/RTBuilder.h

@@ -272,7 +272,7 @@ class RTBuilder : public IGCIRBuilder<>
 
     std::pair<BasicBlock*, PHINode*>
         validateInstanceLeafPtr(RTBuilder::StackPointerVal* perLaneStackPtr, Instruction* I, bool forCommitted);
-    std::pair<Value*, Value*> createAllocaRayQueryObjects(unsigned int size, bool bShrinkSMStack, const llvm::Twine& Name = "");
+    std::pair<AllocaInst*, AllocaInst*> createAllocaRayQueryObjects(unsigned int size, bool bShrinkSMStack, const llvm::Twine& Name = "");
 
     void setDoneBit(StackPointerVal* StackPointer, bool Committed);
     Value* alignVal(Value* V, uint64_t Align);
@@ -356,8 +356,8 @@ class RTBuilder : public IGCIRBuilder<>
         bool Committed);
     Value* getHitValid(StackPointerVal* StackPointer, bool CommittedHit);
     void   setHitValid(StackPointerVal* StackPointer, bool CommittedHit);
-    Value* getSyncTraceRayControl(Value* ptrCtrl);
-    void   setSyncTraceRayControl(Value* ptrCtrl, RTStackFormat::TraceRayCtrl ctrl);
+    LoadInst* getSyncTraceRayControl(GetElementPtrInst* ptrCtrl);
+    void   setSyncTraceRayControl(GetElementPtrInst* ptrCtrl, RTStackFormat::TraceRayCtrl ctrl);
     Value* getHitBaryCentric(StackPointerVal* StackPointer, uint32_t idx, bool CommittedHit);
 
 

IGC/AdaptorCommon/RayTracing/TraceRayInlineLoweringPass.cpp

@@ -55,9 +55,9 @@ class TraceRayInlineLoweringPass : public FunctionPass
     //m_ShMemRTCtrls  is an array of RTStackFormat::RTCtrl in ShadowMemory
     //together, they are RayQueryObjects[n]
     //RTStack2/SMStack2 m_ShMemRTStacks[n]
-    Value* m_ShMemRTStacks = nullptr;
+    AllocaInst* m_ShMemRTStacks = nullptr;
     //RayQueryStateInfo m_ShMemRTCtrls[n]
-    Value* m_ShMemRTCtrls = nullptr;
+    AllocaInst* m_ShMemRTCtrls = nullptr;
     CodeGenContext* m_CGCtx = nullptr;
     bool singleRQMemRayStore = false;
     //if there is only one Proceed and it's not in a loop, then, we only need to prepare data for Proceed() once
@@ -78,14 +78,14 @@ class TraceRayInlineLoweringPass : public FunctionPass
     void LowerCommitProceduralPrimitiveHit(Function& F);
 
     //return m_ShMemRTCtrls[index]
-    Value* getShMemRTCtrl(RTBuilder& builder, unsigned queryIndex) {
+    GetElementPtrInst* getShMemRTCtrl(RTBuilder& builder, unsigned queryIndex) {
         return getShMemRTCtrl(builder, builder.getInt32(queryIndex));
     }
 
     //return m_ShMemRTCtrls[index]
-    Value* getShMemRTCtrl(RTBuilder& builder, Value* queryIndex) {
-        return builder.CreateGEP(cast<llvm::AllocaInst>(m_ShMemRTCtrls)->getAllocatedType(),
-            m_ShMemRTCtrls, { builder.getInt32(0), queryIndex }, VALUE_NAME("&shadowMem.RTCtrl"));
+    GetElementPtrInst* getShMemRTCtrl(RTBuilder& builder, Value* queryIndex) {
+        return GetElementPtrInst::Create(m_ShMemRTCtrls->getAllocatedType(),
+            m_ShMemRTCtrls, { builder.getInt32(0), queryIndex }, VALUE_NAME("&shadowMem.RTCtrl"), &(*builder.GetInsertPoint()));
     }
 
     //return rtStacks[index]
@@ -96,7 +96,7 @@ class TraceRayInlineLoweringPass : public FunctionPass
     //return rtStacks[index]
     RTBuilder::SyncStackPointerVal* getShMemRayQueryRTStack(RTBuilder& builder, Value* queryIndex) {
         return static_cast<RTBuilder::SyncStackPointerVal*>(
-            builder.CreateGEP(cast<llvm::AllocaInst>(m_ShMemRTStacks)->getAllocatedType(),
+            builder.CreateGEP(m_ShMemRTStacks->getAllocatedType(),
                 m_ShMemRTStacks, { builder.getInt32(0), queryIndex }, VALUE_NAME("&shadowMem.RTStack")));
     }
 
@@ -360,8 +360,8 @@ Value* TraceRayInlineLoweringPass::emitProceedMainBody(
     builder.copyMemHitInProceed(HWStackPointer, ShadowMemStackPointer, singleRQProceed, usesDeprecatedCopyMemHitInRQProceed);
 
     //get ray Current ray control for object
-    Value* ShdowMemRTCtrlPtr = getShMemRTCtrl(builder, queryObjIndex);
-    Value* traceRayCtrl = builder.getSyncTraceRayControl(ShdowMemRTCtrlPtr);
+    GetElementPtrInst* ShdowMemRTCtrlPtr = getShMemRTCtrl(builder, queryObjIndex);
+    LoadInst* traceRayCtrl = builder.getSyncTraceRayControl(ShdowMemRTCtrlPtr);
 
     if (IGC_IS_FLAG_ENABLED(DisableLoadAsFenceOpInRaytracing))
     {