Expanding BufferType

Buffer Type range is set to 32 instead of 16.

Author: jhananit

IGC/Compiler/CISACodeGen/helper.cpp

@@ -43,9 +43,9 @@ namespace IGC
         struct _bits
         {
             unsigned int       bufId : 16;
-            unsigned int       bufType : 4;
+            unsigned int       bufType : 5;
             unsigned int       indirect : 1;     // bool
-            unsigned int       reserved : 11;
+            unsigned int       reserved : 10;
         } bits;
         uint32_t u32Val;
     } GFXResourceAddrSpace;
@@ -61,8 +61,9 @@ namespace IGC
         GFXResourceAddrSpace temp;
         static_assert(sizeof(temp) == 4, "Code below may need and update.");
         temp.u32Val = 0;
-        IGC_ASSERT((bufType + 1) < 16);
+        IGC_ASSERT((bufType + 1) < BUFFER_TYPE_UNKNOWN + 1);
         temp.bits.bufType = bufType + 1;
+
         if (bufType == SLM)
         {
             return ADDRESS_SPACE_LOCAL;

IGC/Compiler/CodeGenPublicEnums.h

@@ -93,7 +93,7 @@ namespace IGC
         STATELESS,
         STATELESS_READONLY,
         STATELESS_A32,
-        BUFFER_TYPE_UNKNOWN = 15,
+        BUFFER_TYPE_UNKNOWN = 31
     };
 
     enum BufferAccessType : short

IGC/Compiler/PromoteResourceToDirectAS.cpp

@@ -522,7 +522,7 @@ void PromoteResourceToDirectAS::PromoteBufferToDirectAS(Instruction* inst, Value
     // Vulkan encodes address space differently, with the reserve bits set.
     // TODO: Investigate how addrspace is encoded in Vulkan,
     // for now skip promoting if it's an address space we dont recognize.
-    if ((addrSpace & 0xFFE00000) != 0x0)
+    if ((addrSpace & 0xFFC00000) != 0x0)
     {
         return;
     }

IGC/LLVM3DBuilder/BuiltinsFrontendDefinitions.hpp

@@ -23,9 +23,9 @@ typedef union _gfxResourceAddressSpace
     struct _bits
     {
         unsigned int  bufId    : 16;
-        unsigned int  bufType  : 4;
+        unsigned int  bufType  : 5;
         unsigned int  indirect : 1;     // bool
-        unsigned int  reserved : 11;
+        unsigned int  reserved : 10;
     } bits;
     unsigned int   u32Val;
 } GFXResourceAddressSpace;
@@ -51,7 +51,7 @@ unsigned LLVM3DBuilder<preserveNames, T, Inserter>::EncodeASForGFXResource(
     static_assert(sizeof(temp) == 4, "Code below may need and update.");
 
     temp.u32Val = 0;
-    IGC_ASSERT((bufType + 1) < 16);
+    IGC_ASSERT((bufType + 1) < IGC::BUFFER_TYPE_UNKNOWN + 1);
     temp.bits.bufType = bufType + 1;
     if (bufType == IGC::BufferType::SLM)
     {