Returns spill memory per function from VISA through program output

Change-Id: I6e13cad826594d4ccb3d7130daae8d3345106d9b

Author: dlei6g

IGC/Compiler/CISACodeGen/CISABuilder.cpp

@@ -4765,17 +4765,28 @@ namespace IGC
             vISA::GenFuncAttribEntry entry;
             Function* F = it.first;
 
-            // Ignore internal functions
-            if (!isEntryFunc(m_program->GetContext()->getMetaDataUtils(), F) &&
-                !F->hasFnAttribute("IndirectlyCalled"))
-                continue;
-
             assert(F->getName().size() <= vISA::MAX_SYMBOL_NAME_LENGTH);
             strcpy_s(entry.f_name, vISA::MAX_SYMBOL_NAME_LENGTH, F->getName().str().c_str());
             entry.f_isKernel = it.second.isKernel ? 1 : 0;
             entry.f_hasBarrier = it.second.hasBarrier ? 1 : 0;
             entry.f_privateMemPerThread = (uint32_t) (it.second.argumentStackSize + it.second.allocaStackSize);
 
+            // Get spill mem usage from visa
+            VISAKernel* visaFunc = nullptr;
+            if (it.second.isKernel)
+            {
+                visaFunc = vMainKernel;
+            }
+            else
+            {
+                auto Iter = stackFuncMap.find(F);
+                assert(Iter != stackFuncMap.end() && "vISA function not found");
+                visaFunc = Iter->second;
+            }
+            FINALIZER_INFO* jitInfo;
+            visaFunc->GetJitInfo(jitInfo);
+            entry.f_spillMemPerThread = jitInfo->spillMemUsed;
+
             attribTable.push_back(entry);
         }
 

IGC/Compiler/CISACodeGen/CISABuilder.hpp

@@ -587,17 +587,20 @@ namespace IGC
 
     public:
         // Used by EmitVISAPass to set function attributes
-        void SetFunctionIsKernel(llvm::Function* F) {
-            funcAttributeMap[F].isKernel = true;
+        void InitFuncAttribute(llvm::Function* F, bool isKernel = false) {
+            funcAttributeMap[F].isKernel = isKernel;
         }
         void SetFunctionHasBarrier(llvm::Function* F) {
-            funcAttributeMap[F].hasBarrier = true;
+            if (funcAttributeMap.find(F) != funcAttributeMap.end())
+                funcAttributeMap[F].hasBarrier = true;
         }
         void SetFunctionMaxArgumentStackSize(llvm::Function* F, unsigned size) {
-            funcAttributeMap[F].argumentStackSize = MAX(funcAttributeMap[F].argumentStackSize, size);
+            if (funcAttributeMap.find(F) != funcAttributeMap.end())
+                funcAttributeMap[F].argumentStackSize = MAX(funcAttributeMap[F].argumentStackSize, size);
         }
         void SetFunctionAllocaStackSize(llvm::Function* F, unsigned size) {
-            funcAttributeMap[F].allocaStackSize = size;
+            if (funcAttributeMap.find(F) != funcAttributeMap.end())
+                funcAttributeMap[F].allocaStackSize = size;
         }
     };
 

IGC/Compiler/CISACodeGen/CShader.cpp

@@ -313,8 +313,6 @@ void CShader::InitKernelStack(CVariable*& stackBase, CVariable*& stackAllocSize,
             encoder.SetFunctionAllocaStackSize(entry, totalAllocaSize);
         }
     }
-    // Indicate this is the kernel function
-    encoder.SetFunctionIsKernel(entry);
 
     // modify private-memory size to a large setting
     m_ModuleMetadata->FuncMD[entry].privateMemoryPerWI = 8192;

IGC/Compiler/CISACodeGen/EmitVISAPass.cpp

@@ -504,6 +504,7 @@ bool EmitPass::runOnFunction(llvm::Function& F)
         m_currShader->PreCompile();
         if (hasStackCall)
         {
+            m_encoder->InitFuncAttribute(&F, true);
             CVariable* pStackBase = nullptr;
             CVariable* pStackSize = nullptr;
             m_currShader->InitKernelStack(pStackBase, pStackSize, ptr64bits);
@@ -520,6 +521,7 @@ bool EmitPass::runOnFunction(llvm::Function& F)
         m_currShader->BeginFunction(&F);
         if (m_FGA && m_FGA->useStackCall(&F))
         {
+            m_encoder->InitFuncAttribute(&F, false);
             emitStackFuncEntry(&F, ptr64bits);
         }
     }

visa/include/RelocationInfo.h

@@ -75,6 +75,7 @@ typedef struct {
     uint8_t    f_isKernel;      // Is the function a kernel
     uint8_t    f_hasBarrier;    // Does the function use barriers
     uint32_t   f_privateMemPerThread; // Total private memory (in bytes) used by this function per thread
+    uint32_t   f_spillMemPerThread;  // Spill mem used (in bytes) in scratch space for this function
     char       f_name[MAX_SYMBOL_NAME_LENGTH]; // The function's name
 } GenFuncAttribEntry;