Support bindful reads in ConstantCoalescing

This change is to support new patterns in ConstantCoalescing: indirect read accesses from bindful resources.

Author: krystian-andrzejewski

IGC/Compiler/CISACodeGen/ConstantCoalescing.cpp

@@ -417,14 +417,6 @@ void ConstantCoalescing::ProcessBlock(
             BufferType bufType = DecodeAS4GFXResource(
                 ldRaw->getResourceValue()->getType()->getPointerAddressSpace(), directIdx, bufId);
 
-            if ((bufType != BINDLESS_CONSTANT_BUFFER)
-                && (bufType != BINDLESS_TEXTURE)
-                && (bufType != SSH_BINDLESS_CONSTANT_BUFFER)
-                && (bufType != BINDLESS)
-                )
-            {
-                continue;
-            }
 
             uint offsetInBytes = 0;
             Value* baseOffsetInBytes = nullptr;
@@ -457,12 +449,9 @@ void ConstantCoalescing::ProcessBlock(
                         Extension,
                         baseOffsetInBytes ? indcb_owloads : dircb_owloads);
                 }
-                else if (bufType == BINDLESS_CONSTANT_BUFFER
-                         || bufType == SSH_BINDLESS_CONSTANT_BUFFER
-                        || bufType == BINDLESS
-                         )
+                else if (IsUntypedBuffer(bufType))
                 {
-                    if (UsesTypedConstantBuffer(m_ctx, bufType) && (bufType != BINDLESS))
+                    if (UsesTypedConstantBuffer(m_ctx, bufType))
                     {
                         ScatterToSampler(
                             ldRaw,
@@ -474,7 +463,8 @@ void ConstantCoalescing::ProcessBlock(
                     }
                     else if (IGC_IS_FLAG_DISABLED(DisableConstantCoalescingOfStatefulNonUniformLoads))
                     {
-                        if (bufType != BINDLESS)
+                        // TODO: remove this condition
+                        if (!IsWritableBuffer(bufType))
                         {
                             MergeScatterLoad(
                                 ldRaw,
@@ -488,7 +478,7 @@ void ConstantCoalescing::ProcessBlock(
                         }
                     }
                 }
-                else if (bufType == BINDLESS_TEXTURE && IGC_IS_FLAG_ENABLED(EnableTextureLoadCoalescing))
+                else if (IsTypedBuffer(bufType) && IGC_IS_FLAG_ENABLED(EnableTextureLoadCoalescing))
                 {
                     MergeScatterLoad(
                         ldRaw,

IGC/Compiler/CISACodeGen/helper.cpp

@@ -182,9 +182,10 @@ namespace IGC
         const CodeGenContext* pContext,
         const BufferType bufType)
     {
-        IGC_ASSERT(bufType == CONSTANT_BUFFER ||
-            bufType == BINDLESS_CONSTANT_BUFFER ||
-            bufType == BINDLESS);
+        if (!IsUntypedBuffer(bufType) || IsWritableBuffer(bufType))
+        {
+            return false;
+        }
 
         if (pContext->m_DriverInfo.ForceUntypedBindlessConstantBuffers() &&
             bufType == BINDLESS_CONSTANT_BUFFER)

IGC/Compiler/CISACodeGen/helper.h

@@ -217,13 +217,56 @@ namespace IGC
     bool IsDirectIdx(unsigned addrSpace);
     bool isNaNCheck(llvm::FCmpInst& FC);
 
+    inline bool IsBindfull(BufferType t)
+    {
+        return t == UAV ||
+            t == CONSTANT_BUFFER ||
+            t == RESOURCE;
+    }
     inline bool IsBindless(BufferType t)
     {
-        return t == BINDLESS || t == BINDLESS_CONSTANT_BUFFER || t == BINDLESS_TEXTURE;
+        return t == BINDLESS ||
+            t == BINDLESS_CONSTANT_BUFFER ||
+            t == BINDLESS_TEXTURE;
     }
     inline bool IsSSHbindless(BufferType t)
     {
-        return t == SSH_BINDLESS || t == SSH_BINDLESS_CONSTANT_BUFFER || t == SSH_BINDLESS_TEXTURE;
+        return t == SSH_BINDLESS ||
+            t == SSH_BINDLESS_CONSTANT_BUFFER ||
+            t == SSH_BINDLESS_TEXTURE;
+    }
+    inline bool IsStatelessBuffer(BufferType t)
+    {
+        return t == STATELESS ||
+            t == STATELESS_READONLY ||
+            t == STATELESS_A32;
+    }
+    inline bool IsTypedBuffer(BufferType t)
+    {
+        return t == RESOURCE ||
+            t == BINDLESS_TEXTURE ||
+            t == SSH_BINDLESS_TEXTURE;
+    }
+    inline bool IsUntypedBuffer(BufferType t)
+    {
+        return t == UAV ||
+            t == CONSTANT_BUFFER ||
+            t == BINDLESS ||
+            t == BINDLESS_CONSTANT_BUFFER ||
+            t == SSH_BINDLESS ||
+            t == SSH_BINDLESS_CONSTANT_BUFFER;
+    }
+    inline bool IsWritableBuffer(BufferType t)
+    {
+        BufferAccessType accessType = getDefaultAccessType(t);
+        return accessType == BufferAccessType::ACCESS_WRITE ||
+            accessType == BufferAccessType::ACCESS_READWRITE;
+    }
+    inline bool IsReadableBuffer(BufferType t)
+    {
+        BufferAccessType accessType = getDefaultAccessType(t);
+        return accessType == BufferAccessType::ACCESS_READ ||
+            accessType == BufferAccessType::ACCESS_READWRITE;
     }
 
     bool IsUnsignedCmp(const llvm::CmpInst::Predicate Pred);