vector compiler now uses DebugInfo library

Change-Id: I7f8bbf584bf3360e7c974b8f820c7ca0db41dfea

Author: aparshin-intel

IGC/AdaptorOCL/OCL/sp/spp_g8.cpp

@@ -393,7 +393,8 @@ CGen8CMProgram::~CGen8CMProgram()
 
 void CGen8CMProgram::CreateKernelBinaries()
 {
-    for (auto *kernel : m_kernels) {
+    for (auto *kernel : m_kernels)
+    {
         // Create the kernel binary streams.
         KernelData data;
         data.kernelBinary = new Util::BinaryStream;
@@ -408,6 +409,17 @@ void CGen8CMProgram::CreateKernelBinaries()
             m_pSystemThreadKernelOutput,
             kernel->getProgramOutput().m_unpaddedProgramSize);
 
+        if (kernel->getProgramOutput().m_debugDataVISASize)
+        {
+            data.kernelDebugData = new Util::BinaryStream();
+            m_StateProcessor.CreateKernelDebugData(
+                reinterpret_cast<const char*>(kernel->getProgramOutput().m_debugDataVISA),
+                kernel->getProgramOutput().m_debugDataVISASize,
+                reinterpret_cast<const char*>(kernel->getProgramOutput().m_debugDataGenISA),
+                kernel->getProgramOutput().m_debugDataGenISASize,
+                kernel->m_kernelInfo.m_kernelName,
+                *(data.kernelDebugData));
+        }
         m_KernelBinaries.push_back(data);
     }
 }

IGC/AdaptorOCL/dllInterfaceCompute.cpp

@@ -1475,13 +1475,21 @@ static std::error_code getErrorVC(std::error_code Err,
 }
 
 static void outputBinaryVC(llvm::StringRef Binary,
+                           llvm::StringRef DebugInfo,
                            STB_TranslateOutputArgs* pOutputArgs)
 {
-    size_t BinarySize = static_cast<size_t>(Binary.size());
+    size_t BinarySize = Binary.size();
     char* pBinaryOutput = new char[BinarySize];
     memcpy_s(pBinaryOutput, BinarySize, Binary.data(), BinarySize);
     pOutputArgs->OutputSize = static_cast<uint32_t>(BinarySize);
     pOutputArgs->pOutput = pBinaryOutput;
+    if (DebugInfo.size())
+    {
+        char* pDebugInfo = new char[DebugInfo.size()];
+        memcpy_s(pDebugInfo, DebugInfo.size(), DebugInfo.data(), DebugInfo.size());
+        pOutputArgs->pDebugData = pDebugInfo;
+        pOutputArgs->DebugDataSize = DebugInfo.size();
+    }
 }
 
 // Similar to ShaderHashOCL though reinterpretation is hidden inside
@@ -1564,7 +1572,7 @@ static std::error_code TranslateBuildVC(
     case vc::BinaryKind::CM:
     {
         auto &CompileResult = std::get<vc::cm::CompileOutput>(Res);
-        outputBinaryVC(CompileResult.IsaBinary, pOutputArgs);
+        outputBinaryVC(CompileResult.IsaBinary, llvm::StringRef(), pOutputArgs);
         break;
     }
     case vc::BinaryKind::OpenCL:
@@ -1578,7 +1586,13 @@ static std::error_code TranslateBuildVC(
                                    CompileResult.PointerSizeInBytes);
         llvm::StringRef BinaryRef{ProgramBinary.GetLinearPointer(),
             static_cast<std::size_t>(ProgramBinary.Size())};
-        outputBinaryVC(BinaryRef, pOutputArgs);
+
+        Util::BinaryStream ProgramDebugData;
+        CMProgram.GetProgramDebugData(ProgramDebugData);
+        llvm::StringRef DebugInfoRef{ProgramDebugData.GetLinearPointer(),
+            static_cast<std::size_t>(ProgramDebugData.Size())};
+
+        outputBinaryVC(BinaryRef, DebugInfoRef, pOutputArgs);
         break;
     }
     case vc::BinaryKind::ZE:
@@ -1590,7 +1604,13 @@ static std::error_code TranslateBuildVC(
         llvm::raw_svector_ostream ProgramBinaryOS{ProgramBinary};
         CMProgram.GetZEBinary(ProgramBinaryOS, CompileResult.PointerSizeInBytes);
         llvm::StringRef BinaryRef{ProgramBinary.data(), ProgramBinary.size()};
-        outputBinaryVC(BinaryRef, pOutputArgs);
+
+        Util::BinaryStream ProgramDebugData;
+        CMProgram.GetProgramDebugData(ProgramDebugData);
+        llvm::StringRef DebugInfoRef{ProgramDebugData.GetLinearPointer(),
+            static_cast<std::size_t>(ProgramDebugData.Size())};
+
+        outputBinaryVC(BinaryRef, DebugInfoRef, pOutputArgs);
         break;
     }
     }

IGC/VectorCompiler/igcdeps/src/cmc.cpp

@@ -509,6 +509,7 @@ static void populateKernelInfo_v2(const vc::ocl::KernelInfo& info,
                                   const FINALIZER_INFO& JITInfo,
                                   const vc::ocl::GTPinInfo* GtpinInfo,
                                   llvm::ArrayRef<uint8_t> genBin,
+                                  llvm::ArrayRef<uint8_t> dbgInfo,
                                   CMKernel& kernel)
 {
     kernel.m_GRFSizeInBytes = info.GRFSizeInBytes;
@@ -570,7 +571,17 @@ static void populateKernelInfo_v2(const vc::ocl::KernelInfo& info,
     kernel.getProgramOutput().m_unpaddedProgramSize = size;
     kernel.getProgramOutput().m_InstructionCount = JITInfo.numAsmCount;
 
-    if (JITInfo.numBytesScratchGtpin > 0) {
+    const size_t DbgSize = dbgInfo.size();
+    if (DbgSize)
+    {
+        void* debugInfo = IGC::aligned_malloc(DbgSize, sizeof(void*));
+        memcpy_s(debugInfo, DbgSize, dbgInfo.data(), DbgSize);
+        kernel.getProgramOutput().m_debugDataVISA = debugInfo;
+        kernel.getProgramOutput().m_debugDataVISASize = DbgSize;
+    }
+
+    if (JITInfo.numBytesScratchGtpin > 0)
+    {
         kernel.getProgramOutput().m_scratchSpaceUsedByGtpin = JITInfo.numBytesScratchGtpin;
         kInfo.m_executionEnivronment.PerThreadScratchSpace += JITInfo.numBytesScratchGtpin;
     }
@@ -632,7 +643,10 @@ void vc::createBinary(
         llvm::ArrayRef<uint8_t> GenBin{
             reinterpret_cast<const uint8_t*>(Info.GenBinary.data()),
             Info.GenBinary.size()};
+        llvm::ArrayRef<uint8_t> DbgInfo{
+            reinterpret_cast<const uint8_t*>(Info.DebugInfo.data()),
+            Info.DebugInfo.size()};
         populateKernelInfo_v2(Info.KernelInfo, Info.JitInfo, &(Info.GtpinInfo),
-                              GenBin, *K);
+                              GenBin, DbgInfo, *K);
     }
 }

IGC/VectorCompiler/include/vc/GenXCodeGen/GenXWrapper.h

@@ -119,6 +119,7 @@ struct CompileInfo {
   FINALIZER_INFO JitInfo;
   GTPinInfo GtpinInfo;
   std::vector<char> GenBinary;
+  std::vector<char> DebugInfo;
 };
 
 struct CompileOutput {

IGC/VectorCompiler/lib/GenXCodeGen/GenX.h

@@ -115,6 +115,7 @@ FunctionPass *createGenXTidyControlFlowPass();
 FunctionGroupPass *createGenXVisaRegAllocPass();
 FunctionGroupPass *createGenXCisaBuilderPass();
 ModulePass *createGenXFinalizerPass(raw_pwrite_stream &o);
+ModulePass *createGenXDebugInfoPass();
 ModulePass *createGenXImportBiFPass();
 
 namespace genx {

IGC/VectorCompiler/lib/GenXCodeGen/GenXCisaBuilder.cpp

@@ -58,8 +58,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "llvm/GenXIntrinsics/GenXIntrinsicInst.h"
 
-#include "common.h"
-#include "visaBuilder_interface.h"
+#include "visa/include/visaBuilder_interface.h"
+#include "visa/common.h"
 
 #include "llvm/ADT/IndexedMap.h"
 #include "llvm/ADT/StringExtras.h"
@@ -109,10 +109,6 @@ static cl::list<std::string>
 static cl::opt<bool> EmitVisa("emit-visa", cl::init(false), cl::Hidden,
                               cl::desc("Generate Visa instead of fat binary."));
 
-static cl::opt<bool> GenerateDebugInfo(
-    "emit-debug-info", cl::init(false), cl::Hidden,
-    cl::desc("Generate DWARF debug info for each compiled kernel"));
-
 static cl::opt<std::string> AsmNameOpt("asm-name", cl::init(""), cl::Hidden,
     cl::desc("Output assembly code to this file during compilation."));
 
@@ -5667,19 +5663,10 @@ class GenXFinalizer : public ModulePass {
     AU.setPreservesAll();
   }
 
-  void emitDebugInformation(VISABuilder &VB, const GenXModule &GM,
-                            const FunctionGroupAnalysis &FGA,
-                            const GenXSubtarget &ST);
-
   bool runOnModule(Module &M) {
     Ctx = &M.getContext();
 
     GenXModule &GM = getAnalysis<GenXModule>();
-    FunctionGroupAnalysis &FGA = getAnalysis<FunctionGroupAnalysis>();
-    const GenXSubtarget &ST = getAnalysis<TargetPassConfig>()
-                                  .getTM<GenXTargetMachine>()
-                                  .getGenXSubtarget();
-
     std::stringstream ss;
     VISABuilder *CisaBuilder = GM.GetCisaBuilder();
     if (GM.HasInlineAsm())
@@ -5688,9 +5675,6 @@ class GenXFinalizer : public ModulePass {
 
     dbgs() << CisaBuilder->GetCriticalMsg();
 
-    if (GenerateDebugInfo)
-      emitDebugInformation(*CisaBuilder, GM, FGA, ST);
-
     Out << ss.str();
     return false;
   }
@@ -5703,33 +5687,6 @@ ModulePass *llvm::createGenXFinalizerPass(raw_pwrite_stream &o) {
   return new GenXFinalizer(o);
 }
 
-void GenXFinalizer::emitDebugInformation(VISABuilder &VB, const GenXModule &GM,
-                                         const FunctionGroupAnalysis &FGA,
-                                         const GenXSubtarget &ST) {
-  for (const auto *FG : FGA) {
-    const auto *KF = FG->getHead();
-    llvm::SmallVector<char, 1000> ElfImage;
-
-    const genx::VisaDebugInfo &DbgInfo = *GM.getVisaDebugInfo(KF);
-    VISAKernel *VK = VB.GetVISAKernel(KF->getName().str());
-    IGC_ASSERT_MESSAGE(VK, "Kernel is null");
-    auto Err = genx::generateDebugInfo(ElfImage, *VK, DbgInfo, *KF,
-                                       ST.getTargetTriple().str());
-    if (Err)
-      llvm::report_fatal_error(toString(std::move(Err)));
-
-    std::error_code EC;
-    llvm::raw_fd_ostream OS(("dbg_" + KF->getName() + ".elf").str(), EC);
-    if (!EC) {
-      OS << StringRef(ElfImage.data(), ElfImage.size());
-      OS.close();
-    }
-
-    if (EC)
-      llvm::report_fatal_error(EC.message());
-  }
-}
-
 static SmallVector<const char *, 8>
 collectFinalizerArgs(StringSaver &Saver, const GenXSubtarget &ST) {
   SmallVector<const char *, 8> Argv;