[Autobackout][FunctionalRegression]Revert of change: 921b614: Do not promote StatelessToBindful if StatelessToBindless promotion has been done before

Do not promote StatelessToBindful if StatelessToBindless promotion has been done before.

    Co-authored-by: Patryk Kwasniewski <[email protected]>

Author: sys-igc

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

@@ -138,49 +138,33 @@ static cl::opt<TargetAddressing> targetAddressingMode(
 
 char StatelessToStateful::ID = 0;
 
-StatelessToStateful::StatelessToStateful() : ModulePass(ID), m_targetAddressing(targetAddressingMode) {}
+StatelessToStateful::StatelessToStateful() : FunctionPass(ID), m_targetAddressing(targetAddressingMode) {}
 
 StatelessToStateful::StatelessToStateful(TargetAddressing addressing)
-    : ModulePass(ID),
+    : FunctionPass(ID),
     m_targetAddressing(addressing)
 {
     initializeStatelessToStatefulPass(*PassRegistry::getPassRegistry());
 }
 
-bool StatelessToStateful::runOnModule(llvm::Module& M)
-{
-    m_Module = &M;
-
-    if (m_targetAddressing == TargetAddressing::BINDFUL && getModuleUsesBindless() == true)
-    {
-        return false;
-    }
-
-    for (auto& it : M.functions())
-    {
-        handleFunction(it);
-    }
-
-    return m_changed;
-}
-
-void StatelessToStateful::handleFunction(llvm::Function& F)
+bool StatelessToStateful::runOnFunction(llvm::Function& F)
 {
     MetaDataUtils* pMdUtils = getAnalysis<MetaDataUtilsWrapper>().getMetaDataUtils();
     ModuleMetaData* modMD = getAnalysis<MetaDataUtilsWrapper>().getModuleMetaData();
 
     if (modMD->compOpt.OptDisable)
     {
         IGC_ASSERT_MESSAGE(0, "StatelessToStateful should be disabled for -O0!");
-        return;
+        return false;
     }
 
     // skip non-entry functions
     if (!isEntryFunc(pMdUtils, &F))
     {
-        return;
+        return false;
     }
 
+    m_Module = F.getParent();
     m_F = &F;
 
     if (IGC_IS_FLAG_ENABLED(EnableCodeAssumption))
@@ -216,6 +200,7 @@ void StatelessToStateful::handleFunction(llvm::Function& F)
     delete m_pImplicitArgs;
     delete m_pKernelArgs;
     m_promotionMap.clear();
+    return m_changed;
 }
 
 Argument* StatelessToStateful::getBufferOffsetArg(Function* F, uint32_t ArgNumber)
@@ -594,8 +579,6 @@ void StatelessToStateful::promoteIntrinsic(InstructionInfo& II)
             newBlockRead->setDebugLoc(I->getDebugLoc());
             I->replaceAllUsesWith(newBlockRead);
             I->eraseFromParent();
-
-            setModuleUsesBindless();
         }
         else if (intrinID == GenISAIntrinsic::GenISA_simdBlockWrite)
         {
@@ -606,8 +589,6 @@ void StatelessToStateful::promoteIntrinsic(InstructionInfo& II)
             newBlockWrite->setDebugLoc(I->getDebugLoc());
             I->replaceAllUsesWith(newBlockWrite);
             I->eraseFromParent();
-
-            setModuleUsesBindless();
         }
         return;
     }
@@ -714,7 +695,6 @@ void StatelessToStateful::promoteLoad(InstructionInfo& II)
 
         I->replaceAllUsesWith(bindlessLoad);
         I->eraseFromParent();
-        setModuleUsesBindless();
     }
     else if (m_targetAddressing == TargetAddressing::BINDFUL || WA_ForcedUsedOfBindfulMode(*m_F))
     {
@@ -768,7 +748,6 @@ void StatelessToStateful::promoteStore(InstructionInfo& II)
         bindlessStore->setDebugLoc(DL);
 
         I->eraseFromParent();
-        setModuleUsesBindless();
     }
     else if (m_targetAddressing == TargetAddressing::BINDFUL || WA_ForcedUsedOfBindfulMode(*m_F))
     {
@@ -832,7 +811,6 @@ void StatelessToStateful::promote()
                     *UndefValue::get(Type::getInt32Ty(m_Module->getContext())),
                     IGC::BINDLESS);
             setPointerSizeTo32bit(statefullAddrspace, m_Module);
-            setModuleUsesBindless();
         }
         else
         {
@@ -1120,15 +1098,3 @@ void StatelessToStateful::finalizeArgInitialValue(Function* F)
         AddInst->eraseFromParent();
     }
 }
-
-void StatelessToStateful::setModuleUsesBindless()
-{
-    auto MD = getAnalysis<MetaDataUtilsWrapper>().getModuleMetaData();
-    MD->ModuleUsesBindless = true;
-    IGC::serialize(*MD, m_Module);
-}
-
-bool StatelessToStateful::getModuleUsesBindless()
-{
-    return getAnalysis<MetaDataUtilsWrapper>().getModuleMetaData()->ModuleUsesBindless;
-}

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

@@ -32,7 +32,7 @@ namespace IGC
         BINDLESS
     };
 
-    class StatelessToStateful : public llvm::ModulePass, public llvm::InstVisitor<StatelessToStateful>
+    class StatelessToStateful : public llvm::FunctionPass, public llvm::InstVisitor<StatelessToStateful>
     {
     public:
         typedef llvm::DenseMap<const KernelArg*, int> ArgInfoMap;
@@ -57,7 +57,7 @@ namespace IGC
             return "StatelessToStateful";
         }
 
-        virtual bool runOnModule(llvm::Module &M) override;
+        virtual bool runOnFunction(llvm::Function& F) override;
 
         void visitLoadInst(llvm::LoadInst& I);
         void visitStoreInst(llvm::StoreInst& I);
@@ -86,11 +86,6 @@ namespace IGC
             std::optional<unsigned> statefulAddrSpace;
         };
 
-        void handleFunction(llvm::Function& F);
-
-        void setModuleUsesBindless();
-        bool getModuleUsesBindless();
-
         void findPromotableInstructions();
         void addToPromotionMap(llvm::Instruction& I, llvm::Value* Ptr);
 

IGC/common/MDFrameWork.h

@@ -785,11 +785,6 @@ namespace IGC
         uint8_t SIMD32_SpillThreshold = 0;
 
         CacheControlOverride m_CacheControlOption;
-
-        // Set to true by StatelessToStateful(Bindless) if any instruction in
-        // a module was promoted to stateless. Used to avoid bindless and bindful
-        // mode in one module.
-        bool ModuleUsesBindless = false;
     };
 
     void serialize(const IGC::ModuleMetaData &moduleMD, llvm::Module* module);