Fix for ManageableBarriers

Fix for ManageableBarriers in SimpleMode. There was broken encoding of the barrier count in zebin.

Author: lwesiers

IGC/Compiler/CISACodeGen/CISABuilder.cpp

@@ -6655,7 +6655,8 @@ namespace IGC
 
         // Depend on vISA information about barriers presence to make sure that it's
         // always set properly, even if a barrier is used as a part of Inline vISA code only.
-        if (jitInfo->numBarriers != 0)
+        if (jitInfo->numBarriers != 0 &&
+            !m_program->m_State.GetHasBarrier())
         {
             if (context->getModuleMetaData()->NBarrierCnt > 0 ||
                 additionalVISAAsmToLink)

IGC/Compiler/Optimizer/OpenCLPasses/ManageableBarriers/ManageableBarriersResolution.cpp

@@ -509,8 +509,8 @@ ManageableBarriersResolution::~ManageableBarriersResolution(void)
 
 bool ManageableBarriersResolution::runOnModule(Module& M)
 {
-    mSimpleBarrierIDCount = 1;
     mModule = &M;
+    bool isManageableBarriersAdded = false;
     mCurrentMode = static_cast<MBMode>(IGC_GET_FLAG_VALUE(ManageableBarriersMode));
     for (auto& F : M)
     {
@@ -520,6 +520,9 @@ bool ManageableBarriersResolution::runOnModule(Module& M)
 
             if (mManageBarrierInstructionsInit.size() > 0)
             {
+                mSimpleBarrierIDCount = 1;
+                isManageableBarriersAdded = true;
+
                 if (mCurrentMode == MBMode::Mix ||
                     mCurrentMode == MBMode::SimpleOnly)
                 {
@@ -552,13 +555,12 @@ bool ManageableBarriersResolution::runOnModule(Module& M)
         }
     }
 
-    if (isManageableBarriersAdded())
+    if (isManageableBarriersAdded)
     {
         // Add attribute NBarrierCnt to metadata
         auto MD = getAnalysis<MetaDataUtilsWrapper>().getModuleMetaData();
         // Adding max as it could be dynamic
         MD->NBarrierCnt = getMaxNamedBarrierCount();
-
         return true;
     }
     return false;

IGC/Compiler/Optimizer/OpenCLPasses/ManageableBarriers/ManageableBarriersResolution.hpp

@@ -156,13 +156,6 @@ namespace IGC
         void visitCallInst(llvm::CallInst& CI);
 
         static bool HasHWSupport(GFXCORE_FAMILY GFX_CORE);
-
-    private:
-        /// @brief  Indicates if the pass changed the processed function
-        inline bool isManageableBarriersAdded()
-        {
-            return mGlobalDataPoolPerFunc.size() > 0;
-        }
     };
 
 } // namespace IGC