Changes in code.

Change-Id: Ic47189303ad0567ead4f74884960009734e73d02

Author: Jay-Jiewu-Lu

IGC/Compiler/CISACodeGen/CShader.cpp

@@ -308,8 +308,7 @@ void CShader::CreateImplicitArgs()
     // Push Args are only for entry function
     unsigned numPushArgsEntry = m_ModuleMetadata->pushInfo.pushAnalysisWIInfos.size();
     unsigned numPushArgs = (isEntryFunc(m_pMdUtils, entry) && !isNonEntryMultirateShader(entry) ? numPushArgsEntry : 0);
-    int numFuncArgs = IGCLLVM::GetFuncArgSize(entry) - numImplicitArgs - numPushArgs;
-    IGC_ASSERT(numFuncArgs >= 0 && "Function arg size does not match meta data and push args.");
+    unsigned numFuncArgs = IGCLLVM::GetFuncArgSize(entry) - numImplicitArgs - numPushArgs;
 
     // Create symbol for every arguments [5/2019]
     //   (Previously, symbols are created only for implicit args.)
@@ -345,7 +344,7 @@ void CShader::CreateImplicitArgs()
     };
 
     llvm::Function::arg_iterator arg = entry->arg_begin();
-    for (int i = 0; i < numFuncArgs; ++i, ++arg)
+    for (unsigned i = 0; i < numFuncArgs; ++i, ++arg)
     {
         Value* ArgVal = arg;
         if (ArgVal->use_empty())
@@ -399,25 +398,6 @@ void CShader::CreateImplicitArgs()
     CreateAliasVars();
 }
 
-void CShader::GetPrintfStrings(std::vector<std::pair<unsigned int, std::string>>& printfStrings)
-{
-    std::string MDNodeName = "printf.strings";
-    NamedMDNode* printfMDNode = entry->getParent()->getOrInsertNamedMetadata(MDNodeName);
-
-    for (uint i = 0, NumStrings = printfMDNode->getNumOperands();
-        i < NumStrings;
-        i++)
-    {
-        llvm::MDNode* argMDNode = printfMDNode->getOperand(i);
-        llvm::ConstantInt* indexOpndVal =
-            mdconst::dyn_extract<llvm::ConstantInt>(argMDNode->getOperand(0));
-        llvm::MDString* stringOpndVal =
-            dyn_cast<llvm::MDString>(argMDNode->getOperand(1));
-
-        printfStrings.push_back(
-            std::pair<unsigned int, std::string>(int_cast<unsigned int>(indexOpndVal->getZExtValue()), stringOpndVal->getString().data()));
-    }
-}
 // For sub-vector aliasing, pre-allocating cvariables for those
 // valeus that have sub-vector aliasing before emit instructions.
 // (The sub-vector aliasing is done in VariableReuseAnalysis.)

IGC/Compiler/CISACodeGen/DriverInfo.hpp

@@ -279,12 +279,6 @@ namespace IGC
         /// add shader hash code after EOT for debug purposes
         virtual bool EnableShaderDebugHashCodeInKernel() const { return false; }
 
-        // The size of output printf buffer is 4 MB by default by agreement with Runtime.
-        virtual uint32_t getPrintfBufferSize() const
-        {
-            return 4 * sizeof(MEGABYTE);
-        }
-
 
     };
 

IGC/Compiler/CISACodeGen/OpenCLKernelCodeGen.cpp

@@ -580,18 +580,30 @@ namespace IGC
 
     void COpenCLKernel::CreatePrintfStringAnnotations()
     {
-        std::vector<std::pair<unsigned int, std::string>> printfStrings;
-        GetPrintfStrings(printfStrings);
+        std::string MDNodeName = "printf.strings";
+        NamedMDNode* printfMDNode = entry->getParent()->getOrInsertNamedMetadata(MDNodeName);
 
-        for (auto printfString : printfStrings)
+        for (uint i = 0, NumStrings = printfMDNode->getNumOperands();
+            i < NumStrings;
+            i++)
         {
             iOpenCL::PrintfStringAnnotation* printfAnnotation = new iOpenCL::PrintfStringAnnotation();
+
+            llvm::MDNode* argMDNode = printfMDNode->getOperand(i);
+
+            llvm::ConstantInt* indexOpndVal =
+                mdconst::dyn_extract<llvm::ConstantInt>(argMDNode->getOperand(0));
+            llvm::Metadata* stringOpnd = argMDNode->getOperand(1);
+            llvm::MDString* stringOpndVal = dyn_cast<llvm::MDString>(stringOpnd);
+
+            llvm::StringRef stringData(stringOpndVal->getString());
+
             printfAnnotation->AnnotationSize = sizeof(printfAnnotation);
-            printfAnnotation->Index = printfString.first;
-            printfAnnotation->StringSize = printfString.second.size() + 1;
+            printfAnnotation->Index = int_cast<unsigned int>(indexOpndVal->getZExtValue());
+            printfAnnotation->StringSize = stringData.size() + 1;
             printfAnnotation->StringData = new char[printfAnnotation->StringSize + 1];
 
-            memcpy_s(printfAnnotation->StringData, printfAnnotation->StringSize, printfString.second.c_str(), printfAnnotation->StringSize);
+            memcpy_s(printfAnnotation->StringData, printfAnnotation->StringSize, stringData.data(), printfAnnotation->StringSize);
             printfAnnotation->StringData[printfAnnotation->StringSize - 1] = '\0';
 
             m_kernelInfo.m_printfStringAnnotations.push_back(printfAnnotation);

IGC/Compiler/CISACodeGen/ShaderCodeGen.hpp

@@ -467,8 +467,6 @@ class CShader
 
     e_alignment getGRFAlignment() const { return CVariable::getAlignment(getGRFSize()); }
 
-protected:
-    void GetPrintfStrings(std::vector<std::pair<unsigned int, std::string>>& printfStrings);
 private:
     // Return DefInst's CVariable if it could be reused for UseInst, and return
     // nullptr otherwise.

IGC/Compiler/CISACodeGen/WIAnalysis.cpp

@@ -443,18 +443,17 @@ void WIAnalysisRunner::updateArgsDependency(llvm::Function* pF)
     bool IsSubroutine = !isEntryFunc(m_pMdUtils, pF) || isNonEntryMultirateShader(pF);
 
     ImplicitArgs implicitArgs(*pF, m_pMdUtils);
-    int implicitArgStart = (unsigned)(IGCLLVM::GetFuncArgSize(pF)
+    unsigned implicitArgStart = (unsigned)(IGCLLVM::GetFuncArgSize(pF)
         - implicitArgs.size()
         - (IsSubroutine ? 0 : m_ModMD->pushInfo.pushAnalysisWIInfos.size()));
-    IGC_ASSERT(implicitArgStart >= 0 && "Function arg size does not match meta data and push args.");
 
     llvm::Function::arg_iterator ai, ae;
     ai = pF->arg_begin();
     ae = pF->arg_end();
 
     // 1. add all kernel function args as uniform, or
     //    add all subroutine function args as random
-    for (int i = 0; i < implicitArgStart; ++i, ++ai)
+    for (unsigned i = 0; i < implicitArgStart; ++i, ++ai)
     {
         IGC_ASSERT(ai != ae);
         incUpdateDepend(&(*ai), IsSubroutine ? WIAnalysis::RANDOM : WIAnalysis::UNIFORM);

IGC/Compiler/Optimizer/OpenCLPasses/OpenCLPrintf/OpenCLPrintfAnalysis.cpp

@@ -58,37 +58,33 @@ const StringRef OpenCLPrintfAnalysis::OPENCL_PRINTF_FUNCTION_NAME = "printf";
 
 bool OpenCLPrintfAnalysis::runOnModule(Module& M)
 {
+    m_hasPrintf = false;
+
     visit(M);
 
-    if (m_hasPrintfs.size())
+    if (m_hasPrintf)
     {
         for (Function& func : M.getFunctionList())
         {
-            if (!func.isDeclaration() &&
-                m_hasPrintfs.find(&func) != m_hasPrintfs.end())
+            if (!func.isDeclaration())
             {
                 addPrintfBufferArgs(func);
             }
         }
     }
 
-    return m_hasPrintfs.size();
+    return m_hasPrintf;
 }
 
 void OpenCLPrintfAnalysis::visitCallInst(llvm::CallInst& callInst)
 {
-    Function* pF = callInst.getParent()->getParent();
-    if (!callInst.getCalledFunction() || m_hasPrintfs.find(pF)!=m_hasPrintfs.end())
+    if (!callInst.getCalledFunction())
     {
         return;
     }
 
     StringRef  funcName = callInst.getCalledFunction()->getName();
-    bool hasPrintf = (funcName == OpenCLPrintfAnalysis::OPENCL_PRINTF_FUNCTION_NAME);
-    if (hasPrintf)
-    {
-        m_hasPrintfs.insert(pF);
-    }
+    m_hasPrintf |= (funcName == OpenCLPrintfAnalysis::OPENCL_PRINTF_FUNCTION_NAME);
 }
 
 void OpenCLPrintfAnalysis::addPrintfBufferArgs(Function& F)

IGC/Compiler/Optimizer/OpenCLPasses/OpenCLPrintf/OpenCLPrintfAnalysis.hpp

@@ -75,7 +75,7 @@ namespace IGC
         ///         size of the buffer.
         void addPrintfBufferArgs(llvm::Function& F);
 
-        std::unordered_set < llvm::Function*> m_hasPrintfs;
+        bool m_hasPrintf;
     };
 
 } // namespace IGC

IGC/Compiler/Optimizer/OpenCLPasses/OpenCLPrintf/OpenCLPrintfResolution.cpp

@@ -55,6 +55,10 @@ IGC_INITIALIZE_PASS_END(OpenCLPrintfResolution, PASS_FLAG, PASS_DESCRIPTION, PAS
 
 char OpenCLPrintfResolution::ID = 0;
 
+#define KB                                  ( 1024 )
+#define MB                                  ( 1024 * KB )
+const unsigned int  PrintfBufferSize = 4 * MB;
+
 //
 // FORMAT OF PRINTF OUTPUT BUFFER:
 // ================================
@@ -516,7 +520,8 @@ void OpenCLPrintfResolution::expandPrintfCall(CallInst& printfCall, Function& F)
     Instruction* endOffset = BinaryOperator::CreateAdd(writeOffset, dataSizeVal, "end_offset", &printfCall);
     endOffset->setDebugLoc(m_DL);
 
-    Value* bufferMaxSize = ConstantInt::get(m_int32Type, m_CGContext->m_DriverInfo.getPrintfBufferSize());
+    // The size of output printf buffer is 4 MB by agreement with Runtime.
+    Value* bufferMaxSize = ConstantInt::get(m_int32Type, PrintfBufferSize);
 
     // write_ptr = buffer_ptr + write_offset;
     if (m_ptrSizeIntType != writeOffset->getType())