Force support and usage for dynamic BTIs allocation

Refactored conditions based on the supportDynamicBTIsAllocation() condition, as if it was always true. It depended on ZEBinary format usage, which is always used.

Author: michalkr52

IGC/Compiler/CISACodeGen/Platform.hpp

@@ -554,13 +554,6 @@ class CPlatform {
     return m_platformInfo.eRenderCoreFamily == IGFX_XE_HPC_CORE && IGC_IS_FLAG_ENABLED(EnableQWRotateInstructions);
   }
 
-  // Some workloads use handcrafted ISA kernels and generate patch tokens for them by compiling a
-  // dummy kernel. They depend on static BTIs allocation in IGC, that's why dynamic allocation
-  // can't be enabled by default for all platforms. That is not an issue when ZEBin is enabled by
-  // default since a workload can generate ZEBin sections by itself, without depending on a dummy kernel
-  // compilation by IGC.
-  bool supportDynamicBTIsAllocation() const { return supportsZEBin(); }
-
   bool supportsZEBin() const {
     switch (m_platformInfo.eProductFamily) {
     default:

IGC/Compiler/Optimizer/OpenCLPasses/ResourceAllocator/ResourceAllocator.cpp

@@ -296,16 +296,10 @@ bool ResourceAllocator::runOnFunction(llvm::Function &F) {
       break;
 
     case AllocationTypeEnum::Other:
-      if (ctx->platform.supportDynamicBTIsAllocation()) {
-        // Use default arg allocator for UAV resources
-        // Intentionally not allocating index here, since it will
-        // be done in StatelessToSatefull or PromoteStatelessToBindless
-        argAlloc = defaultArgAlloc;
-      } else {
-        argAlloc.type = ResourceTypeEnum::UAVResourceType;
-        argAlloc.indexType = numUAVs;
-        numUAVs++;
-      }
+      // Use default arg allocator for UAV resources
+      // Intentionally not allocating index here, since it will
+      // be done in StatelessToStateful or PromoteStatelessToBindless
+      argAlloc = defaultArgAlloc;
       break;
 
     default:

IGC/Compiler/Optimizer/OpenCLPasses/StatelessToStateful/StatelessToStateful.cpp

@@ -887,7 +887,6 @@ void StatelessToStateful::promote() {
   if (m_promotionMap.empty())
     return;
 
-  CodeGenContext *ctx = getAnalysis<CodeGenContextWrapper>().getCodeGenContext();
   ModuleMetaData *modMD = getAnalysis<MetaDataUtilsWrapper>().getModuleMetaData();
   FunctionMetaData *funcMD = &modMD->FuncMD[m_F];
   ResourceAllocMD *resAllocMD = &funcMD->resAllocMD;
@@ -905,15 +904,8 @@ void StatelessToStateful::promote() {
       setModuleUsesBindless();
     } else {
       ArgAllocMD *argAlloc = &resAllocMD->argAllocMDList[baseArgIndex];
-
-      // If the support for dynamic BTIs allocation is disabled, then BTIs are pre-assigned
-      // in ResourceAllocator pass for all resources independently whether they are
-      // accessed through stateful addressing model or not.
-      if (ctx->platform.supportDynamicBTIsAllocation()) {
-        argAlloc->type = ResourceTypeEnum::UAVResourceType;
-        argAlloc->indexType = resAllocMD->uavsNumType + bufferPos;
-      }
-
+      argAlloc->type = ResourceTypeEnum::UAVResourceType;
+      argAlloc->indexType = resAllocMD->uavsNumType + bufferPos;
       statefullAddrspace = encodeBindfulAddrspace(argAlloc->indexType);
     }
 

IGC/Compiler/PromoteStatelessToBindless.cpp

@@ -141,7 +141,6 @@ void PromoteStatelessToBindless::GetAccessInstToSrcPointerMap(Instruction *inst,
 }
 
 void PromoteStatelessToBindless::PromoteStatelessToBindlessBuffers(Function &F) const {
-  CodeGenContext *ctx = getAnalysis<CodeGenContextWrapper>().getCodeGenContext();
   ModuleMetaData *modMD = getAnalysis<MetaDataUtilsWrapper>().getModuleMetaData();
   MetaDataUtils *pMdUtils = getAnalysis<MetaDataUtilsWrapper>().getMetaDataUtils();
   ImplicitArgs implicitArgs(F, pMdUtils);
@@ -152,8 +151,6 @@ void PromoteStatelessToBindless::PromoteStatelessToBindlessBuffers(Function &F)
   FunctionMetaData *funcMD = &modMD->FuncMD[&F];
   ResourceAllocMD *resourceAlloc = &funcMD->resAllocMD;
 
-  bool supportDynamicBTIsAllocation = ctx->platform.supportDynamicBTIsAllocation() && ctx->enableZEBinary();
-
   for (auto &iter : m_SrcPtrToAccessMap) {
     Argument *srcPtr = cast<Argument>(iter.first);
 
@@ -176,10 +173,8 @@ void PromoteStatelessToBindless::PromoteStatelessToBindlessBuffers(Function &F)
         continue;
     }
 
-    if (supportDynamicBTIsAllocation) {
-      argInfo->indexType = resourceAlloc->uavsNumType +
-                           (unsigned)std::distance(m_SrcPtrToAccessMap.begin(), m_SrcPtrToAccessMap.find(srcPtr));
-    }
+    argInfo->indexType = resourceAlloc->uavsNumType +
+                         (unsigned)std::distance(m_SrcPtrToAccessMap.begin(), m_SrcPtrToAccessMap.find(srcPtr));
 
     // Loop through all access instructions for srcPtr
     for (auto &insts : iter.second) {
@@ -238,6 +233,5 @@ void PromoteStatelessToBindless::PromoteStatelessToBindlessBuffers(Function &F)
     }
   }
 
-  if (supportDynamicBTIsAllocation)
-    resourceAlloc->uavsNumType += m_SrcPtrToAccessMap.size();
+  resourceAlloc->uavsNumType += m_SrcPtrToAccessMap.size();
 }