Force use of Bindful mode for specific kernels

Force use of Bindful mode for specific kernels

Author: mateuszchudyk

IGC/AdaptorCommon/AddImplicitArgs.cpp

@@ -14,6 +14,7 @@ SPDX-License-Identifier: MIT
 #include "Compiler/DebugInfo/ScalarVISAModule.h"
 #include "Compiler/Optimizer/OCLBIUtils.h"
 #include "Compiler/MetaDataApi/IGCMetaDataHelper.h"
+#include "Compiler/Optimizer/OpenCLPasses/StatelessToStateful/StatelessToStateful.hpp"
 #include "LLVM3DBuilder/MetadataBuilder.h"
 
 #include "common/LLVMWarningsPush.hpp"
@@ -104,7 +105,8 @@ bool AddImplicitArgs::runOnModule(Module &M)
         }
 
         if (ctx->getModuleMetaData()->compOpt.UseBindlessMode &&
-            !ctx->getModuleMetaData()->compOpt.UseLegacyBindlessMode)
+            !ctx->getModuleMetaData()->compOpt.UseLegacyBindlessMode &&
+            !StatelessToStateful::WA_ForcedUsedOfBindfulMode(func))
         {
             ImplicitArgs::addBindlessOffsetArgs(func, m_pMdUtils, ctx->getModuleMetaData());
         }

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

@@ -566,7 +566,7 @@ void StatelessToStateful::promoteIntrinsic(InstructionInfo& II)
     GenISAIntrinsic::ID const intrinID = I->getIntrinsicID();
     PointerType* pTy = IGCLLVM::getWithSamePointeeType(dyn_cast<PointerType>(II.ptr->getType()), II.getStatefulAddrSpace());
 
-    if (m_targetAddressing == TargetAddressing::BINDLESS)
+    if (m_targetAddressing == TargetAddressing::BINDLESS && !WA_ForcedUsedOfBindfulMode(*m_F))
     {
         Argument* srcOffset = m_pImplicitArgs->getNumberedImplicitArg(*m_F, ImplicitArg::BINDLESS_OFFSET, II.getBaseArgIndex());
         auto newBasePtr = IntToPtrInst::Create(Instruction::IntToPtr, srcOffset, pTy, "", I);
@@ -593,7 +593,7 @@ void StatelessToStateful::promoteIntrinsic(InstructionInfo& II)
         return;
     }
 
-    IGC_ASSERT(m_targetAddressing == TargetAddressing::BINDFUL);
+    IGC_ASSERT(m_targetAddressing == TargetAddressing::BINDFUL || WA_ForcedUsedOfBindfulMode(*m_F));
 
     Instruction* statefulPtr = IntToPtrInst::Create(Instruction::IntToPtr, II.offset, pTy, "", I);
     Instruction* statefulInst = nullptr;
@@ -684,7 +684,7 @@ void StatelessToStateful::promoteLoad(InstructionInfo& II)
 
     const DebugLoc& DL = I->getDebugLoc();
 
-    if (m_targetAddressing == TargetAddressing::BINDLESS)
+    if (m_targetAddressing == TargetAddressing::BINDLESS && !WA_ForcedUsedOfBindfulMode(*m_F))
     {
         Argument* srcOffset = m_pImplicitArgs->getNumberedImplicitArg(*m_F, ImplicitArg::BINDLESS_OFFSET, II.getBaseArgIndex());
         auto newBasePtr = IntToPtrInst::Create(Instruction::IntToPtr, srcOffset, pTy, "", I);
@@ -696,7 +696,7 @@ void StatelessToStateful::promoteLoad(InstructionInfo& II)
         I->replaceAllUsesWith(bindlessLoad);
         I->eraseFromParent();
     }
-    else if (m_targetAddressing == TargetAddressing::BINDFUL)
+    else if (m_targetAddressing == TargetAddressing::BINDFUL || WA_ForcedUsedOfBindfulMode(*m_F))
     {
         auto newBasePtr = IntToPtrInst::Create(Instruction::IntToPtr, II.offset, pTy, "", I);
         auto bindfulLoad = new LoadInst(
@@ -738,7 +738,7 @@ void StatelessToStateful::promoteStore(InstructionInfo& II)
 
     const DebugLoc& DL = I->getDebugLoc();
 
-    if (m_targetAddressing == TargetAddressing::BINDLESS)
+    if (m_targetAddressing == TargetAddressing::BINDLESS && !WA_ForcedUsedOfBindfulMode(*m_F))
     {
         Argument* srcOffset = m_pImplicitArgs->getNumberedImplicitArg(*m_F, ImplicitArg::BINDLESS_OFFSET, II.getBaseArgIndex());
         auto newBasePtr = IntToPtrInst::Create(Instruction::IntToPtr, srcOffset, pTy, "", I);
@@ -749,7 +749,7 @@ void StatelessToStateful::promoteStore(InstructionInfo& II)
 
         I->eraseFromParent();
     }
-    else if (m_targetAddressing == TargetAddressing::BINDFUL)
+    else if (m_targetAddressing == TargetAddressing::BINDFUL || WA_ForcedUsedOfBindfulMode(*m_F))
     {
         auto newBasePtr = IntToPtrInst::Create(Instruction::IntToPtr, II.offset, pTy, "", I);
         auto bindfulStore = new StoreInst(
@@ -804,7 +804,7 @@ void StatelessToStateful::promote()
         IGC_ASSERT(bufferPos < maxPromotionCount);
 
         unsigned statefullAddrspace = 0;
-        if (m_targetAddressing == TargetAddressing::BINDLESS)
+        if (m_targetAddressing == TargetAddressing::BINDLESS && !WA_ForcedUsedOfBindfulMode(*m_F))
         {
             statefullAddrspace =
                 IGC::EncodeAS4GFXResource(
@@ -989,6 +989,15 @@ void StatelessToStateful::visitStoreInst(StoreInst& I)
     }
 }
 
+bool StatelessToStateful::WA_ForcedUsedOfBindfulMode(const Function& F)
+{
+    static const std::array kernels{
+        "_ZTSZ42oneapi_kernel_integrator_intersect_closestP16KernelGlobalsGPUyyRN4sycl3_V17handlerEPKiPfiEUlNS2_7nd_itemILi1EEENS2_14kernel_handlerEE_",
+    };
+
+    return std::any_of(kernels.begin(), kernels.end(), [&F](const auto& it) { return it == F.getName(); });
+}
+
 void StatelessToStateful::findPromotableInstructions()
 {
     // fill m_promotionMap

IGC/Compiler/Optimizer/OpenCLPasses/StatelessToStateful/StatelessToStateful.hpp

@@ -63,6 +63,8 @@ namespace IGC
         void visitStoreInst(llvm::StoreInst& I);
         void visitCallInst(llvm::CallInst& I);
 
+        static bool WA_ForcedUsedOfBindfulMode(const llvm::Function& F);
+
     private:
         struct InstructionInfo {
             InstructionInfo(llvm::Instruction* I, llvm::Value* ptr, llvm::Value* offset):

IGC/Compiler/SPIRMetaDataTranslation.cpp

@@ -393,6 +393,26 @@ bool SPIRMetaDataTranslation::runOnModule(Module& M)
 
     pIgcMDUtils->save(M.getContext());
 
+    WA_ForceUseBindfulModeIfSpecificKernelExistsInModule(M);
+
     return true;
 }
 
+void SPIRMetaDataTranslation::WA_ForceUseBindfulModeIfSpecificKernelExistsInModule(Module& M)
+{
+    bool forceUseBindful = std::any_of(M.begin(), M.end(), [](auto const& it) { return StatelessToStateful::WA_ForcedUsedOfBindfulMode(it); });
+    if (forceUseBindful)
+    {
+        auto modMD = getAnalysis<MetaDataUtilsWrapper>().getModuleMetaData();
+        auto ctx = getAnalysis<CodeGenContextWrapper>().getCodeGenContext();
+        auto clContext = static_cast<OpenCLProgramContext*>(ctx);
+        auto internalOptions = const_cast<InternalOptions*>(&clContext->m_InternalOptions);
+
+        modMD->compOpt.UseBindlessMode = false;
+        modMD->compOpt.UseLegacyBindlessMode = true;
+
+        internalOptions->UseBindlessMode = false;
+        internalOptions->UseBindlessLegacyMode = true;
+        internalOptions->PromoteStatelessToBindless = false;
+    }
+}

IGC/Compiler/SPIRMetaDataTranslation.h

@@ -10,6 +10,7 @@ SPDX-License-Identifier: MIT
 
 #include "Compiler/CodeGenContextWrapper.hpp"
 #include "Compiler/MetaDataUtilsWrapper.h"
+#include "Compiler/Optimizer/OpenCLPasses/StatelessToStateful/StatelessToStateful.hpp"
 #include "common/LLVMWarningsPush.hpp"
 #include <llvm/Pass.h>
 #include "common/LLVMWarningsPop.hpp"
@@ -38,6 +39,8 @@ namespace IGC
             AU.addRequired<MetaDataUtilsWrapper>();
         }
 
+    private:
+        void WA_ForceUseBindfulModeIfSpecificKernelExistsInModule(llvm::Module& M);
     };
 
 } // namespace IGC