debug info fixes for VC

Author: aparshin-intel

IGC/DebugInfo/VISADebugEmitter.cpp

@@ -53,6 +53,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "Probe/Assertion.h"
 #include "secure_mem.h"
 
+#define DEBUG_TYPE "GENX_DEBUG_INFO"
+
 using namespace llvm;
 using namespace IGC;
 
@@ -157,8 +159,8 @@ std::vector<char> DebugEmitter::Finalize(bool finalize, DbgDecoder* decodedDbg)
         // Emit src line mapping directly instead of
         // relying on dbgmerge. elf generated will have
         // text section and debug_line sections populated.
-        auto& VISAIndexToInst = m_pVISAModule->VISAIndexToInst;
-        auto& VISAIndexToSize = m_pVISAModule->VISAIndexToSize;
+        const auto& VISAIndexToInst = m_pVISAModule->VISAIndexToInst;
+        const auto& VISAIndexToSize = m_pVISAModule->VISAIndexToSize;
         std::vector<std::pair<unsigned int, unsigned int>> GenISAToVISAIndex;
         unsigned int subEnd = m_pVISAModule->GetCurrentVISAId();
         unsigned int prevLastGenOff = lastGenOff;
@@ -328,6 +330,8 @@ std::vector<char> DebugEmitter::Finalize(bool finalize, DbgDecoder* decodedDbg)
         if (m_pVISAModule->isDirectElfInput)
             setElfType(is64Bit, Result.data());
 
+        LLVM_DEBUG(dbgs() << "Finalized Visa Module:\n");
+        LLVM_DEBUG(m_pVISAModule->dump());
         // Reset all members and prepare for next beginModule() call.
         Reset();
 

IGC/DebugInfo/VISAModule.cpp

@@ -357,7 +357,6 @@ void VISAModule::buildDirectElfMaps()
             VISAIndexToSize.insert(std::make_pair(index,
                 std::make_pair(currOffset, currSize)));
     }
-
     GenISAToVISAIndex.clear();
     for (auto i = 0;
         i != co->CISAIndexMap.size();
@@ -522,6 +521,18 @@ void VISAModule::coalesceRanges(std::vector<std::pair<unsigned int, unsigned int
         it++;
     }
 }
+void VISAModule::print (raw_ostream &OS) const {
+
+  OS << "[DBG] VisaModule\n";
+  OS << "  Module VISAIndexToInst Dump\n  ---\n";
+  for (const auto &Item: VISAIndexToInst)
+      OS << "    visa_index: " << Item.first << " ->  inst: " <<
+          *(Item.second) << "\n";
+  OS << "  Module VISAIndexToSize Dump\n  ---\n";
+  for (const auto &Item: VISAIndexToSize)
+      OS << "    visa_index: " << Item.first << " -> {offset: " <<
+          Item.second.first << ", size: " << Item.second.second << "}\n";
+}
 
 std::vector<std::pair<unsigned int, unsigned int>> VISAModule::getGenISARange(const InsnRange& Range)
 {

IGC/DebugInfo/VISAModule.hpp

@@ -30,6 +30,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "llvm/Support/DataTypes.h"
 #include "llvm/IR/Function.h"
 #include "llvm/ADT/APInt.h"
+#include "llvm/Support/Debug.h"
 #include "common/LLVMWarningsPop.hpp"
 
 #include "VISAIDebugEmitter.hpp"
@@ -534,6 +535,9 @@ namespace IGC
         // This function coalesces GenISARange which is a vector of <start ip, end ip>
         static void coalesceRanges(std::vector<std::pair<unsigned int, unsigned int>>& GenISARange);
 
+        void dump() const { print(llvm::dbgs()); }
+        void print (llvm::raw_ostream &OS) const;
+
     private:
         std::string m_triple = "vISA_64";
         const llvm::Module* m_pModule = nullptr;

IGC/VectorCompiler/lib/GenXCodeGen/GenXCisaBuilder.cpp

@@ -1305,6 +1305,8 @@ void GenXKernelBuilder::buildInstructions() {
 
     unsigned LabelID = getOrCreateLabel(Func, LABEL_SUBROUTINE);
     CISA_CALL(Kernel->AppendVISACFLabelInst(Labels[LabelID]));
+    GM->updateVisaMapping(KernFunc, nullptr, Kernel->getvIsaInstCount(),
+                          "SubRoutine");
 
     beginFunction(Func);
     LastAlloca = nullptr;
@@ -4863,17 +4865,23 @@ void GenXKernelBuilder::addDebugInfo() {
         sys::path::append(Filename, PendingFilename);
       }
       CISA_CALL(Kernel->AppendVISAMiscFileInst(Filename.c_str()));
+      GM->updateVisaMapping(KernFunc, nullptr, Kernel->getvIsaInstCount(),
+                            "FILE");
       LastDirectory = PendingDirectory;
       LastFilename = PendingFilename;
     }
     if (PendingLine != LastLine) {
       LLVM_DEBUG(dbgs() << "LOC instruction appended:" << PendingLine << "\n");
       CISA_CALL(Kernel->AppendVISAMiscLOC(PendingLine));
+      GM->updateVisaMapping(KernFunc, nullptr, Kernel->getvIsaInstCount(),
+                            "LOC");
       LastLine = PendingLine;
       PendingLine = 0;
     }
   }
-  GM->updateVisaDebugInfo(KernFunc, CurrentInst);
+  // +1 since we update debug info BEFORE appending the instruction
+  GM->updateVisaMapping(KernFunc, CurrentInst, Kernel->getvIsaInstCount() + 1,
+                        CurrentInst ? CurrentInst->getName() : "Init_Special");
 }
 
 void GenXKernelBuilder::emitOptimizationHints() {
@@ -4902,7 +4910,7 @@ void GenXKernelBuilder::emitOptimizationHints() {
  * addLabelInst : add a label instruction for a basic block or join
  */
 void GenXKernelBuilder::addLabelInst(Value *BB) {
-  GM->updateVisaDebugInfo(KernFunc, nullptr);
+  GM->updateVisaMapping(KernFunc, nullptr, Kernel->getvIsaInstCount(), "LBL");
   // Skip this for now, because we don't know how to patch labels of branches.
   if (0) { // LastLabel >= 0) {
     // There has been no code since the last label, so use the same label