[Autobackout][FunctionalRegression]Revert of change: ef7a1aa: Add getPrimitiveIndexDelta

Add getPrimitiveIndexDelta and minor refactor.

Author: sys-igc

IGC/AdaptorCommon/RayTracing/AutoGenRTStackAccessPrivateOS.h

@@ -1479,16 +1479,6 @@ auto* _getGeometryIndex_Xe(Value* arg_0, Value* arg_1, Value* arg_2, const Twine
   return V_18;
 }
 
-auto* _getPrimitiveIndexDelta_Xe(Value* arg_0, Value* arg_1, const Twine& _ReturnName = "")
-{
-  auto* V_2 = CreateInBoundsGEP(_struct_RTStackFormat__RTStack(*Ctx.getModule()), arg_0, { getInt64(0), getInt32(0), getInt32(3) });
-  auto* V_3 = CreateInBoundsGEP(_struct_RTStackFormat__RTStack(*Ctx.getModule()), arg_0, { getInt64(0), getInt32(1), getInt32(3) });
-  auto* V_4 = CreateSelect(arg_1, V_2, V_3);
-  auto* V_5 = CreateLoad(getInt32Ty(), V_4);
-  auto* V_6 = CreateAnd(V_5, getInt32(65535), _ReturnName);
-  return V_6;
-}
-
 void _createPotentialHit2CommittedHit_Xe(Value* arg_0)
 {
   auto* V_1 = CreateInBoundsGEP(_struct_RTStackFormat__RTStack(*Ctx.getModule()), arg_0, { getInt64(0), getInt32(1), getInt32(0) });

IGC/AdaptorCommon/RayTracing/RTBuilder.cpp

@@ -41,7 +41,6 @@ using namespace llvm;
 using namespace RTStackFormat;
 using namespace IGC;
 
-
 namespace {
     class VAdapt
     {
@@ -872,11 +871,11 @@ Value* RTBuilder::getPrimitiveIndex(
     }
 }
 
-Value* RTBuilder::getPrimitiveIndex(
+PHINode* RTBuilder::getPrimitiveIndex(
     RTBuilder::StackPointerVal* perLaneStackPtr, Value* leafType, bool Committed)
 {
-        switch (getMemoryStyle())
-        {
+    switch (getMemoryStyle())
+    {
 #define STYLE(X)                        \
     case RTMemoryStyle::X:              \
         return _getPrimitiveIndex_##X(  \
@@ -886,12 +885,11 @@ Value* RTBuilder::getPrimitiveIndex(
             VALUE_NAME("primitiveIndex"));
 #include "RayTracingMemoryStyle.h"
 #undef STYLE
-        }
-        IGC_ASSERT(0);
-        return nullptr;
+    }
+    IGC_ASSERT(0);
+    return {};
 }
 
-
 Value* RTBuilder::getGeometryIndex(
     RTBuilder::StackPointerVal* perLaneStackPtr,
     Instruction* I,
@@ -906,36 +904,37 @@ Value* RTBuilder::getGeometryIndex(
         auto [ValidBB, PN] =
             validateInstanceLeafPtr(perLaneStackPtr, I, (ShaderTy == CallableShaderTypeMD::ClosestHit));
         this->SetInsertPoint(ValidBB->getTerminator());
-        Value* validGeomIndex = getGeometryIndex(perLaneStackPtr, leafType, ShaderTy == CallableShaderTypeMD::ClosestHit);
+        Value* validGeomIndex = getGeometryIndex(perLaneStackPtr, &*BB->rbegin(), leafType, ShaderTy);
         PN->addIncoming(validGeomIndex, getUnsetPhiBlock(PN));
         this->SetInsertPoint(I);
         return PN;
     }
     else
     {
-        return getGeometryIndex(perLaneStackPtr, leafType, ShaderTy == CallableShaderTypeMD::ClosestHit);
+        return getGeometryIndex(perLaneStackPtr, I, leafType, ShaderTy);
     }
 }
 
 Value* RTBuilder::getGeometryIndex(
     RTBuilder::StackPointerVal* perLaneStackPtr,
+    Instruction* I,
     Value* leafType,
-    bool committed)
+    IGC::CallableShaderTypeMD ShaderTy)
 {
-        switch (getMemoryStyle())
-        {
+    switch (getMemoryStyle())
+    {
 #define STYLE(X)                                     \
     case RTMemoryStyle::X:                           \
         return _getGeometryIndex_##X(                \
             perLaneStackPtr,                         \
             leafType,                                \
-            VAdapt{ *this, committed }, \
+            VAdapt{ *this, ShaderTy == ClosestHit }, \
             VALUE_NAME("geometryIndex"));
 #include "RayTracingMemoryStyle.h"
 #undef STYLE
-        }
-        IGC_ASSERT(0);
-        return nullptr;
+    }
+    IGC_ASSERT(0);
+    return {};
 }
 
 Value* RTBuilder::getInstanceContributionToHitGroupIndex(

IGC/AdaptorCommon/RayTracing/RTBuilder.h

@@ -57,7 +57,6 @@ class RTBuilder : public IGCIRBuilder<>
     //TODO: this is hardcoded string, we might want to put all "printf" of different adaptors to one place eventually
     static constexpr char *PrintfFuncName = "printf";
 
-
     bool isChildOfXe2 = false;
 
     // Field for explicit GlobalBufferPtr - used on OpenCL path.
@@ -401,8 +400,8 @@ class RTBuilder : public IGCIRBuilder<>
     Value* getRTStackSize(uint32_t Align);
     SyncStackPointerVal* getSyncStackPointer(Value* syncStackOffset, RTBuilder::RTMemoryAccessMode Mode);
     Value* getGeometryIndex(
-        StackPointerVal* perLaneStackPtr, Value* leafType, bool committed);
-    Value* getPrimitiveIndex(
+        StackPointerVal* perLaneStackPtr, Instruction* I, Value* leafType, IGC::CallableShaderTypeMD ShaderTy);
+    PHINode* getPrimitiveIndex(
         StackPointerVal* perLaneStackPtr, Value* leafType, bool Committed);
     Value* getInstanceIndex(
         StackPointerVal* perLaneStackPtr, IGC::CallableShaderTypeMD ShaderTy);