Backout of e05cf8e

Change-Id: Iaa9b0863114c59957e60df81f9f47238d92f205a

Author: sys-d3djenkins

IGC/AdaptorOCL/OCL/sp/spp_g8.cpp

@@ -54,6 +54,13 @@ CGen8OpenCLProgram::~CGen8OpenCLProgram()
         delete data.kernelDebugData;
     }
 
+    ClearKernelOutput();
+}
+
+void CGen8OpenCLProgram::ClearKernelOutput()
+{
+    // Should be called by CodeGen on each try to clear
+    // the KernelShaderMap and the SystemThreadKernelOutput
     for (auto k : m_KernelShaderMap)
     {
         IGC::CShaderProgram* kernel = k.second;

IGC/AdaptorOCL/OCL/sp/spp_g8.h

@@ -29,7 +29,11 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "../util/BinaryStream.h"
 #include "usc.h"
 #include "sp_g8.h"
-#include <map>
+
+#include "common/LLVMWarningsPush.hpp"
+#include <llvm/ADT/MapVector.h>
+#include <llvm/IR/Function.h>
+#include "common/LLVMWarningsPop.hpp"
 
 namespace IGC
 {
@@ -54,6 +58,8 @@ class CGen8OpenCLProgram : DisallowCopy
 
     ~CGen8OpenCLProgram();
 
+    void ClearKernelOutput();
+
     RETVAL GetProgramBinary(
         Util::BinaryStream& programBinary,
         unsigned int pointerSizeInBytes );
@@ -65,7 +71,7 @@ class CGen8OpenCLProgram : DisallowCopy
     void CreateProgramScopePatchStream(const IGC::SOpenCLProgramInfo& programInfo);
 
     // Used to track the kernel info from CodeGen
-    std::map<std::string, IGC::CShaderProgram*> m_KernelShaderMap;
+    llvm::MapVector<llvm::Function*, IGC::CShaderProgram*> m_KernelShaderMap;
     USC::SSystemThreadKernelOutput* m_pSystemThreadKernelOutput = nullptr;
 
     // Used to store per-kernel binary streams and kernelInfo

IGC/Compiler/CISACodeGen/OpenCLKernelCodeGen.cpp

@@ -1732,10 +1732,11 @@ void CodeGen(OpenCLProgramContext* ctx)
     //Clear spill parameters of retry manager in the very begining of code gen
 	ctx->m_retryManager.ClearSpillParams();
 
-    CShaderProgram::KernelShaderMap shaders;
-    CodeGen(ctx, shaders);
+    // Clear the saved kernel outputs for each try
+    ctx->m_programOutput.ClearKernelOutput();
+
+    CodeGen(ctx, ctx->m_programOutput.m_KernelShaderMap);
 
-    if (ctx->m_programOutput.m_pSystemThreadKernelOutput == nullptr)
     {
         const auto options = ctx->m_InternalOptions;
         if (options.IncludeSIPCSR         ||
@@ -1768,27 +1769,15 @@ void CodeGen(OpenCLProgramContext* ctx)
         }
     }
 
-    ctx->m_retryManager.kernelSet.clear();
-
     // gather data to send back to the driver
-    for (auto k : shaders)
+    for (auto k : ctx->m_programOutput.m_KernelShaderMap)
     {
         Function* pFunc = k.first;
         CShaderProgram *pKernel = static_cast<CShaderProgram*>(k.second);
         COpenCLKernel* simd8Shader = static_cast<COpenCLKernel*>(pKernel->GetShader(SIMDMode::SIMD8));
         COpenCLKernel* simd16Shader = static_cast<COpenCLKernel*>(pKernel->GetShader(SIMDMode::SIMD16));
         COpenCLKernel* simd32Shader = static_cast<COpenCLKernel*>(pKernel->GetShader(SIMDMode::SIMD32));
 
-        std::string kernelName = pFunc->getName().str();
-        if (ctx->m_programOutput.m_KernelShaderMap.find(kernelName) != ctx->m_programOutput.m_KernelShaderMap.end())
-        {
-            // Delete the old program created in previous try
-            delete ctx->m_programOutput.m_KernelShaderMap[kernelName];
-        }
-
-        // Save the shader program to the state processer to be handled later
-        ctx->m_programOutput.m_KernelShaderMap[kernelName] = pKernel;
-
         if (ctx->m_DriverInfo.sendMultipleSIMDModes())
         {
             //Gather the kernel binary for each compiled kernel

IGC/Compiler/CodeGenPublic.h

@@ -611,6 +611,7 @@ namespace IGC
         std::set<std::string> kernelSet;
 
         void ClearSpillParams() {
+            kernelSet.clear();
             lastSpillSize = 0;
             numInstructions = 0;
         }