Adding support to detect Bindless Constant Address

Adding support to detect Bindless Constant Address

Author: jhananit

IGC/Compiler/CISACodeGen/helper.cpp

@@ -846,7 +846,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)
+    bool getConstantAddress(llvm::Instruction& I, ConstantAddress& cl, CodeGenContext* pContext, bool& directBuf, bool& statelessBuf, bool& bindlessBuf, unsigned int& TableOffset)
     {
         // Check if the load instruction is with constant buffer address
         unsigned as;
@@ -874,7 +874,23 @@ namespace IGC
             as = ldRaw->getResourceValue()->getType()->getPointerAddressSpace();
             ptrVal = ldRaw->getResourceValue();
             offsetVal = ldRaw->getOffsetValue();
-            bindlessBuf = (DecodeBufferType(as) == SSH_BINDLESS_CONSTANT_BUFFER);
+            bindlessBuf = (DecodeBufferType(as) == SSH_BINDLESS_CONSTANT_BUFFER) ||
+                                    (DecodeBufferType(as) == BINDLESS_CONSTANT_BUFFER);
+            if (bindlessBuf)
+            {
+                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();
+                        }
+                    }
+                }
+            }
         }
         else
             return false;

IGC/Compiler/CISACodeGen/helper.h

@@ -163,7 +163,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);
+    bool getConstantAddress(llvm::Instruction& I, ConstantAddress& cl, CodeGenContext* pContext, bool& directBuf, bool& statelessBuf, bool& bindlessBuf, unsigned int& TableOffset);
 
 
     bool isSampleLoadGather4InfoInstruction(const llvm::Instruction* inst);

IGC/Compiler/CustomSafeOptPass.cpp

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

IGC/common/MDFrameWork.h

@@ -293,7 +293,10 @@ namespace IGC
         unsigned int eltId = 0;
         unsigned int size = 0;
     };
-
+    struct ConstantAddressDescriptorTable : ConstantAddress
+    {
+        unsigned int tableOffset = 0;
+    };
     bool operator < (const ConstantAddress &a, const ConstantAddress &b);
 
     //to hold metadata of every function
@@ -303,7 +306,6 @@ namespace IGC
         WorkGroupWalkOrderMD workGroupWalkOrder;
         std::vector<FuncArgMD> funcArgs;
         FunctionTypeMD functionType = KernelFunction;
-        std::map<ConstantAddress, uint32_t> inlineDynConstants;
         RayTraceShaderInfo rtInfo;
         ResourceAllocMD resAllocMD;
         std::vector<unsigned> maxByteOffsets;
@@ -531,7 +533,7 @@ namespace IGC
         std::vector<StatelessPushInfo> pushableAddresses;
 
         // Indices of RuntimeValues that can be used to compute surface state
-        // offsets for the bindless push.
+        // offsets for the bindless push along with the Descriptor Table Offset.
         std::vector<unsigned int> bindlessPushInfo;
 
         // Dynamic buffer offsets info.
@@ -597,6 +599,7 @@ namespace IGC
 
     struct SPIRVCapabilities
     {
+
         bool globalVariableDecorationsINTEL = false;
     };