Fixed GetVISAKernel to return kernel by name (if provided).

This resolves a problem with several kernels/functions in a module -
prevoiusly the function it returned the last added one.

Change-Id: I9f54f567e42f6fda01585140cf706aea3b99a488

Author: zuban32

visa/BuildCISAIR.h

@@ -93,7 +93,7 @@ class CISA_IR_Builder : public VISABuilder
     VISA_BUILDER_API virtual int WriteVISAHeader();
     VISA_BUILDER_API std::stringstream& GetAsmTextStream() { return m_ssIsaAsm; }
     VISA_BUILDER_API std::stringstream& GetAsmTextHeaderStream() { return m_ssIsaAsmHeader; }
-    VISA_BUILDER_API virtual VISAKernel* GetVISAKernel();
+    VISA_BUILDER_API virtual VISAKernel* GetVISAKernel(const std::string& kernelName);
     VISA_BUILDER_API virtual int ClearAsmTextStreams();
 
     /**************END VISA BUILDER API*************************/
@@ -726,6 +726,10 @@ class CISA_IR_Builder : public VISABuilder
     std::list<VISAKernelImpl *> m_kernels;
     //keeps track of functions for stitching purposes, after compilation.
     std::vector<VISAFunction *> m_functionsVector;
+    // for cases of several kernels/functions in one CisaBuilder
+    // we need to keep a mapping of kernels to names
+    // to make GetVISAKernel() work
+    std::map<std::string, VISAKernelImpl *> m_nameToKernel;
 
     void emitFCPatchFile();
 

visa/BuildCISAIRImpl.cpp

@@ -340,9 +340,11 @@ bool CISA_IR_Builder::CISA_IR_initialization(char *kernel_name,
     return true;
 }
 
-VISAKernel* CISA_IR_Builder::GetVISAKernel()
+VISAKernel* CISA_IR_Builder::GetVISAKernel(const std::string& kernelName)
 {
-    return static_cast<VISAKernel*>(m_kernel);
+    if (kernelName.empty())
+        return static_cast<VISAKernel*>(m_kernel);
+    return static_cast<VISAKernel*>(m_nameToKernel.at(kernelName));
 }
 
 int CISA_IR_Builder::ClearAsmTextStreams()
@@ -380,6 +382,7 @@ int CISA_IR_Builder::AddKernel(VISAKernel *& kernel, const char* kernelName)
     m_kernel->InitializeKernel(kernelName);
     m_kernel->SetGTPinInit(getGtpinInit());
     this->m_kernel_count++;
+    this->m_nameToKernel[kernelName] = m_kernel;
 
     if (m_options.getOption(vISA_IsaAssembly))
     {

visa/include/VISABuilderAPIDefinition.h

@@ -827,7 +827,7 @@ class VISABuilder
     VISA_BUILDER_API virtual int WriteVISAHeader() = 0;
     VISA_BUILDER_API virtual std::stringstream& GetAsmTextStream() = 0;
     VISA_BUILDER_API virtual std::stringstream& GetAsmTextHeaderStream() = 0;
-    VISA_BUILDER_API virtual VISAKernel* GetVISAKernel() = 0;
+    VISA_BUILDER_API virtual VISAKernel* GetVISAKernel(const std::string& kernelName = "") = 0;
     VISA_BUILDER_API virtual int ClearAsmTextStreams() = 0;
     VISA_BUILDER_API virtual std::string GetCriticalMsg() = 0;
 };