Changes in code.

Change-Id: I0504b2d96e1c4d3b5eba6a26c31079b9b6f4b2cb

Author: zuban32

visa/BuildCISAIRImpl.cpp

@@ -1000,11 +1000,18 @@ int CISA_IR_Builder::Compile(const char* nameInput, std::ostream* os, bool emit_
                     m_cisaBinary->patchKernel(kernelCount, genxBufferSize, genxBuffer, getGenxPlatformEncoding());
                     kernelCount++;
                 }
-                else
-                {
-                    m_cisaBinary->patchFunction(functionCount);
-                    functionCount++;
-                }
+            }
+            iter = m_kernels.begin();
+            for (int i = 0; iter != end; iter++, i++)
+            {
+              VISAKernelImpl * kTemp = *iter;
+              unsigned int genxBufferSize = 0;
+              if (!kTemp->getIsKernel())
+              {
+                genxBufferSize = kTemp->getGenxBinarySize();
+                m_cisaBinary->patchFunction(functionCount, genxBufferSize);
+                functionCount++;
+              }
             }
         }
 

visa/Common_ISA_framework.cpp

@@ -412,11 +412,14 @@ void CisaBinary::patchKernel(int index, unsigned int genxBufferSize, void * buff
     this->genxBinariesSize+= genxBufferSize;
 }
 
-void CisaBinary::patchFunction(int index)
+void CisaBinary::patchFunction(int index, unsigned genxBufferSize)
 {
     m_header.functions[index].offset += genxBinariesSize;
     size_t copySize = sizeof(m_header.functions[index].offset);
     memcpy_s(&m_header_buffer[this->m_functionOffsetLocationsArray[index]], copySize, &m_header.functions[index].offset, copySize);
+
+    m_header.functions[index].binary_size = genxBufferSize;
+    this->genxBinariesSize += genxBufferSize;
 }
 
 void CisaBinary::isaDumpVerify(

visa/Common_ISA_framework.h

@@ -284,7 +284,7 @@ class CisaBinary
     void setFunctionsVisaGenxBinarySize(int i, unsigned short size){ m_header.functions[i].binary_size = size; }
 
     void patchKernel(int index, unsigned int genxBufferSize, void * buffer, int platform);
-    void patchFunction(int index);
+    void patchFunction(int index, unsigned genxBufferSize);
 
     Options *getOptions(){ return m_options; }
 

visa/RegAlloc.cpp

@@ -2365,7 +2365,7 @@ void LivenessAnalysis::computeGenKillandPseudoKill(G4_BB* bb,
                     {
                         // All bytes of dst written at this point, so this is a good place to insert
                         // pseudo kill inst
-                        pseudoKills.emplace_back(topdcl, rit);
+                        pseudoKills.emplace_back(topdcl, nextIt);
                     }
 
                     // Reset gen