[Autobackout][FuncReg]Revert of change: 707ef15

 Adding support to detect Bindless Constant Address

Adding support to get bindless constant Address

Author: jhananit

IGC/Compiler/CISACodeGen/helper.cpp

@@ -800,7 +800,7 @@ namespace IGC
     }
 
     // Get constant address from load/ldraw instruction
-    bool getConstantAddress(llvm::Instruction& I, ConstantAddress& cl, CodeGenContext* pContext, bool& directBuf, bool& statelessBuf, bool& bindlessBuf, unsigned int& TableOffset)
+    bool getConstantAddress(llvm::Instruction& I, ConstantAddress& cl, CodeGenContext* pContext, bool& directBuf, bool& statelessBuf, bool& bindlessBuf)
     {
         // Check if the load instruction is with constant buffer address
         unsigned as;
@@ -828,20 +828,7 @@ namespace IGC
             as = ldRaw->getResourceValue()->getType()->getPointerAddressSpace();
             ptrVal = ldRaw->getResourceValue();
             offsetVal = ldRaw->getOffsetValue();
-            bindlessBuf = (DecodeBufferType(as) == SSH_BINDLESS_CONSTANT_BUFFER) ||
-                                    (DecodeBufferType(as) == BINDLESS_CONSTANT_BUFFER);
-            if (IntToPtrInst* ptrToInt = dyn_cast<IntToPtrInst>(ptrVal))
-            {
-                if (Instruction* instr = dyn_cast<Instruction>(ptrToInt->getOperand(0)))
-                {
-                    if (instr->getOpcode() == Instruction::Add &&
-                        isa<ConstantInt>(instr->getOperand(1)))
-                    {
-                        ConstantInt* src1 = cast<ConstantInt>(instr->getOperand(1));
-                        TableOffset = int_cast<unsigned int>(src1->getZExtValue()) >> pContext->platform.getBSOLocInExtDescriptor();
-                    }
-                }
-            }
+            bindlessBuf = (DecodeBufferType(as) == SSH_BINDLESS_CONSTANT_BUFFER);
         }
         else
             return false;
@@ -871,14 +858,6 @@ namespace IGC
                         break;
                     }
                 }
-                for (unsigned int& runtimeValueIndex : pushInfo.bindlessPushInfo)
-                {
-                    if (bufIdOrGRFOffset == runtimeValueIndex)
-                    {
-                        isPushableAddr = true;
-                        break;
-                    }
-                }
             }
         }
         else

IGC/Compiler/CISACodeGen/helper.h

@@ -162,7 +162,7 @@ namespace IGC
     bool GetStatelessBufferInfo(llvm::Value* pointer, unsigned& bufIdOrGRFOffset, IGC::BufferType& bufferTy, llvm::Value*& bufferSrcPtr, bool& isDirectBuf);
     // try to evaluate the address if it is constant.
     bool EvalConstantAddress(llvm::Value* address, unsigned int& offset, const llvm::DataLayout* pDL, llvm::Value* ptrSrc = nullptr);
-    bool getConstantAddress(llvm::Instruction& I, ConstantAddress& cl, CodeGenContext* pContext, bool& directBuf, bool& statelessBuf, bool& bindlessBuf, unsigned int& TableOffset);
+    bool getConstantAddress(llvm::Instruction& I, ConstantAddress& cl, CodeGenContext* pContext, bool& directBuf, bool& statelessBuf, bool& bindlessBuf);
 
 
     bool isSampleLoadGather4InfoInstruction(llvm::Instruction* inst);

IGC/Compiler/CustomSafeOptPass.cpp

@@ -3113,8 +3113,8 @@ Constant* IGCConstProp::replaceShaderConstant(Instruction* inst)
     bool directBuf = false;
     bool statelessBuf = false;
     bool bindlessBuf = false;
-    unsigned int tableOffset = 0;
-    if (getConstantAddress(*inst, cl, ctx, directBuf, statelessBuf, bindlessBuf, tableOffset))
+
+    if (getConstantAddress(*inst, cl, ctx, directBuf, statelessBuf, bindlessBuf))
     {
         if (size_in_bytes)
         {

IGC/common/MDFrameWork.h

@@ -386,7 +386,7 @@ namespace IGC
         std::vector<StatelessPushInfo> pushableAddresses;
 
         // Indices of RuntimeValues that can be used to compute surface state
-        // offsets for the bindless push along with the Descriptor Table Offset.
+        // offsets for the bindless push.
         std::vector<unsigned int> bindlessPushInfo;
 
         // Dynamic buffer offsets info.