Revert functionality that allows to disable bindless for specific kernels

This change reverts the following commit: 513f91d

Author: aratajew

IGC/AdaptorCommon/AddImplicitArgs.cpp

@@ -14,7 +14,6 @@ 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"
@@ -105,8 +104,7 @@ bool AddImplicitArgs::runOnModule(Module &M)
         }
 
         if (ctx->getModuleMetaData()->compOpt.UseBindlessMode &&
-            !ctx->getModuleMetaData()->compOpt.UseLegacyBindlessMode &&
-            !StatelessToStateful::WA_ForcedUsedOfBindfulMode(func))
+            !ctx->getModuleMetaData()->compOpt.UseLegacyBindlessMode)
         {
             ImplicitArgs::addBindlessOffsetArgs(func, m_pMdUtils, ctx->getModuleMetaData());
         }

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

@@ -762,7 +762,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 && !WA_ForcedUsedOfBindfulMode(*m_F))
+    if (m_targetAddressing == TargetAddressing::BINDLESS)
     {
         Argument* srcOffset = m_pImplicitArgs->getNumberedImplicitArg(*m_F, ImplicitArg::BINDLESS_OFFSET, II.getBaseArgIndex());
         auto newBasePtr = IntToPtrInst::Create(Instruction::IntToPtr, srcOffset, pTy, "", I);
@@ -793,7 +793,7 @@ void StatelessToStateful::promoteIntrinsic(InstructionInfo& II)
         return;
     }
 
-    IGC_ASSERT(m_targetAddressing == TargetAddressing::BINDFUL || WA_ForcedUsedOfBindfulMode(*m_F));
+    IGC_ASSERT(m_targetAddressing == TargetAddressing::BINDFUL);
 
     Instruction* statefulPtr = IntToPtrInst::Create(Instruction::IntToPtr, II.offset, pTy, "", I);
     Instruction* statefulInst = nullptr;
@@ -884,7 +884,7 @@ void StatelessToStateful::promoteLoad(InstructionInfo& II)
 
     const DebugLoc& DL = I->getDebugLoc();
 
-    if (m_targetAddressing == TargetAddressing::BINDLESS && !WA_ForcedUsedOfBindfulMode(*m_F))
+    if (m_targetAddressing == TargetAddressing::BINDLESS)
     {
         Argument* srcOffset = m_pImplicitArgs->getNumberedImplicitArg(*m_F, ImplicitArg::BINDLESS_OFFSET, II.getBaseArgIndex());
         auto newBasePtr = IntToPtrInst::Create(Instruction::IntToPtr, srcOffset, pTy, "", I);
@@ -897,7 +897,7 @@ void StatelessToStateful::promoteLoad(InstructionInfo& II)
         I->eraseFromParent();
         setModuleUsesBindless();
     }
-    else if (m_targetAddressing == TargetAddressing::BINDFUL || WA_ForcedUsedOfBindfulMode(*m_F))
+    else if (m_targetAddressing == TargetAddressing::BINDFUL)
     {
         auto newBasePtr = IntToPtrInst::Create(Instruction::IntToPtr, II.offset, pTy, "", I);
         auto bindfulLoad = new LoadInst(
@@ -939,7 +939,7 @@ void StatelessToStateful::promoteStore(InstructionInfo& II)
 
     const DebugLoc& DL = I->getDebugLoc();
 
-    if (m_targetAddressing == TargetAddressing::BINDLESS && !WA_ForcedUsedOfBindfulMode(*m_F))
+    if (m_targetAddressing == TargetAddressing::BINDLESS)
     {
         Argument* srcOffset = m_pImplicitArgs->getNumberedImplicitArg(*m_F, ImplicitArg::BINDLESS_OFFSET, II.getBaseArgIndex());
         auto newBasePtr = IntToPtrInst::Create(Instruction::IntToPtr, srcOffset, pTy, "", I);
@@ -951,7 +951,7 @@ void StatelessToStateful::promoteStore(InstructionInfo& II)
         I->eraseFromParent();
         setModuleUsesBindless();
     }
-    else if (m_targetAddressing == TargetAddressing::BINDFUL || WA_ForcedUsedOfBindfulMode(*m_F))
+    else if (m_targetAddressing == TargetAddressing::BINDFUL)
     {
         auto newBasePtr = IntToPtrInst::Create(Instruction::IntToPtr, II.offset, pTy, "", I);
         auto bindfulStore = new StoreInst(
@@ -1006,7 +1006,7 @@ void StatelessToStateful::promote()
         IGC_ASSERT(bufferPos < maxPromotionCount);
 
         unsigned statefullAddrspace = 0;
-        if (m_targetAddressing == TargetAddressing::BINDLESS && !WA_ForcedUsedOfBindfulMode(*m_F))
+        if (m_targetAddressing == TargetAddressing::BINDLESS)
         {
             statefullAddrspace =
                 IGC::EncodeAS4GFXResource(
@@ -1192,15 +1192,6 @@ 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,8 +63,6 @@ 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,26 +393,6 @@ 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,7 +10,6 @@ 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"
@@ -39,8 +38,6 @@ namespace IGC
             AU.addRequired<MetaDataUtilsWrapper>();
         }
 
-    private:
-        void WA_ForceUseBindfulModeIfSpecificKernelExistsInModule(llvm::Module& M);
     };
 
 } // namespace IGC