_Revert fix for retry

Manually revert the initial fix for xdeps-3640 completely as autobackout
script failed.

Author: itsimbal

IGC/Compiler/CISACodeGen/CISABuilder.cpp

@@ -6015,7 +6015,6 @@ namespace IGC
             (m_program->HasStackCalls() || m_program->IsIntelSymbolTableVoidProgram()))
         {
             context->m_retryManager.Disable();
-            context->m_retryManager.kernelSkip.insert(m_program->entry->getName().str());
         }
 
 #if (GET_SHADER_STATS && !PRINT_DETAIL_SHADER_STATS)

IGC/Compiler/CISACodeGen/OpenCLKernelCodeGen.cpp

@@ -2382,19 +2382,21 @@ namespace IGC
         pShader->FillKernel(simdMode);
         SProgramOutput* pOutput = pShader->ProgramOutput();
 
+        //  Need a better heuristic for NoRetry
         FunctionInfoMetaDataHandle funcInfoMD = pMdUtils->getFunctionsInfoItem(pFunc);
+        int subGrpSize = funcInfoMD->getSubGroupSize()->getSIMD_size();
+        bool noRetry = ((subGrpSize > 0 || pOutput->m_scratchSpaceUsedBySpills < 1000) &&
+            ctx->m_instrTypes.mayHaveIndirectOperands);
 
         bool optDisable = false;
         if (ctx->getModuleMetaData()->compOpt.OptDisable)
         {
             optDisable = true;
         }
 
-        //  Need a better heuristic for NoRetry. Currently spill size is used
-        if (pOutput->m_scratchSpaceUsedBySpills < 1000 ||
+        if (pOutput->m_scratchSpaceUsedBySpills == 0 ||
+            noRetry ||
             ctx->m_retryManager.IsLastTry() ||
-            (!ctx->m_retryManager.kernelSkip.empty() &&
-             ctx->m_retryManager.kernelSkip.count(pFunc->getName().str())) ||
             optDisable)
         {
             // Save the shader program to the state processor to be handled later
@@ -2473,7 +2475,6 @@ namespace IGC
             }
         }
 
-        // Clear the retry set and collect kernels for retry in the loop below.
         ctx->m_retryManager.kernelSet.clear();
 
         // gather data to send back to the driver
@@ -2507,10 +2508,6 @@ namespace IGC
                     GatherDataForDriver(ctx, simd8Shader, pKernel, pFunc, pMdUtils, SIMDMode::SIMD8);
             }
         }
-
-        // The skip set to avoid retry is not needed. Clear it and collect a new set
-        // during retry compilation.
-        ctx->m_retryManager.kernelSkip.clear();
     }
 
     bool COpenCLKernel::hasReadWriteImage(llvm::Function& F)

IGC/Compiler/CodeGenContext.cpp

@@ -39,7 +39,7 @@ namespace IGC
         { false, true, true, true, false, false, false, false, false, 500 }
     };
 
-    RetryManager::RetryManager() : enabled(false), perKernel(false)
+    RetryManager::RetryManager() : enabled(false)
     {
         memset(m_simdEntries, 0, sizeof(m_simdEntries));
         firstStateId = IGC_GET_FLAG_VALUE(RetryManagerFirstStateId);
@@ -107,11 +107,7 @@ namespace IGC
     unsigned RetryManager::GetRetryId() const { return stateId; }
 
     void RetryManager::Enable() { enabled = true; }
-    void RetryManager::Disable() {
-        if (!perKernel) {
-            enabled = false;
-        }
-    }
+    void RetryManager::Disable() { enabled = false; }
 
     void RetryManager::SetSpillSize(unsigned int spillSize) { lastSpillSize = spillSize; }
     unsigned int RetryManager::GetLastSpillSize() { return lastSpillSize; }

IGC/Compiler/CodeGenPublic.h

@@ -976,17 +976,8 @@ namespace IGC
         void SetSpillSize(unsigned int spillSize);
         unsigned int GetLastSpillSize();
         unsigned int numInstructions = 0;
-        // For OCL the retry manager will work on per-kernel basis, that means
-        // Disable() will disable only specific kernel. Other kernels still can
-        // be retried. To keep the old behavior for other shader types, Disable()
-        // will check the field and keep the old behavior. If other shader
-        // types want to follow OCL this has to be set, see CodeGenContext
-        // constructor.
-        bool perKernel;
         /// the set of OCL kernels that need to recompile
         std::set<std::string> kernelSet;
-        /// the set of OCL kernels that need to skip recompilation
-        std::set<std::string> kernelSkip;
 
         void ClearSpillParams();
         // save entry for given SIMD mode, to avoid recompile for next retry.
@@ -1209,9 +1200,6 @@ namespace IGC
 
             // Per context flag adjustment
             setFlagsPerCtx();
-
-            // Set retry behavor for Disable()
-            m_retryManager.perKernel = (type == ShaderType::OPENCL_SHADER);
         }
 
         CodeGenContext(CodeGenContext&) = delete;