Changes in code.

Author: sys-igc

IGC/AdaptorOCL/SPIRV/SPIRVReader.cpp

@@ -1121,7 +1121,7 @@ class SPIRVToLLVMDbgTran {
       return diModule;
   }
 
-  DINode* createImportedEntity(SPIRVExtInst* inst, SmallVector<TrackingMDNodeRef, 4>& allImportedModules)
+  DINode* createImportedEntity(SPIRVExtInst* inst)
   {
       if (auto n = getExistingNode<DINode*>(inst))
           return n;
@@ -1139,18 +1139,6 @@ class SPIRVToLLVMDbgTran {
       {
           auto diModule = createModuleINTEL(BM->get<SPIRVExtInst>(entity));
           diNode = addMDNode(inst, Builder.createImportedModule(scope, diModule, file, line));
-          DIImportedEntity* IE = Builder.createImportedModule(scope, diModule, file, line);
-          diNode = addMDNode(inst, IE);
-
-          IGC_ASSERT_MESSAGE(scope, "Invalid Scope encoding!");
-          if (isa<DILocalScope>(scope))
-          {
-              allImportedModules.emplace_back(IE);
-          }
-          else
-          {
-              // TODO? ReplaceImportedEntities = true;
-          }
       }
 
       return diNode;
@@ -1323,21 +1311,12 @@ class SPIRVToLLVMDbgTran {
       if (!Enable)
           return;
 
-      DICompileUnit* CU = getCompileUnit();
-
       auto importedEntities = BM->getImportedEntities();
 
-      SmallVector<TrackingMDNodeRef, 4> AllImportedModules;
       for (auto& importedEntity : importedEntities)
       {
-          (void)createImportedEntity(importedEntity, AllImportedModules);
+          (void)createImportedEntity(importedEntity);
       }
-
-      if (!AllImportedModules.empty())
-          CU->replaceImportedEntities(
-              MDTuple::get(CU->getContext(), SmallVector<Metadata*, 16>(AllImportedModules.begin(), AllImportedModules.end())));
-      else
-          CU->replaceImportedEntities(nullptr);  // If there were no local scope imported entities, we can map the whole list to nullptr.
   }
 
   void transDbgInfo(SPIRVValue *SV, Value *V);

IGC/DebugInfo/DwarfCompileUnit.cpp

@@ -446,20 +446,6 @@ void CompileUnit::addSourceLine(DIE* Die, DIScope* S, unsigned Line)
     addUInt(Die, dwarf::DW_AT_decl_line, None, Line);
 }
 
-/// addSourceLine - Add location information to specified debug information
-/// entry.
-void CompileUnit::addSourceLine(DIE* Die, DIImportedEntity* IE, unsigned Line)
-{
-    // If the line number is 0, don't add it.
-    if (Line == 0)
-        return;
-
-    unsigned FileID = DD->getOrCreateSourceID(IE->getFile()->getFilename(), IE->getFile()->getDirectory(), getUniqueID());
-    IGC_ASSERT_MESSAGE(FileID, "Invalid file id");
-    addUInt(Die, dwarf::DW_AT_decl_file, None, FileID);
-    addUInt(Die, dwarf::DW_AT_decl_line, None, Line);
-}
-
 /// addSourceLine - Add location information to specified debug information
 /// entry.
 void CompileUnit::addSourceLine(DIE* Die, DIVariable* V)
@@ -756,6 +742,7 @@ IGC::DIE* CompileUnit::getOrCreateContextDIE(DIScope* Context)
         return getOrCreateModuleDIE(MD);
 
     return getDIE(Context);
+
 }
 
 /// getOrCreateTypeDIE - Find existing DIE or create new DIE for the
@@ -2030,36 +2017,6 @@ void CompileUnit::constructTemplateValueParameterDIE(
     }
 }
 
-/// constructImportedEntityDIE - Create a DIE for DIImportedEntity.
-IGC::DIE* CompileUnit::constructImportedEntityDIE(
-    DIImportedEntity* Module)
-{
-    DIE* IMDie = new(DIEValueAllocator) DIE((dwarf::Tag)Module->getTag());
-    insertDIE(Module, IMDie);
-    DIE* EntityDie;
-    auto* Entity = Module->getEntity();
-    if (auto* NS = dyn_cast<DINamespace>(Entity))
-        EntityDie = getOrCreateNameSpace(NS);
-    else if (auto* M = dyn_cast<DIModule>(Entity))
-        EntityDie = getOrCreateModuleDIE(M);
-    else if (auto* SP = dyn_cast<DISubprogram>(Entity))
-        EntityDie = getOrCreateSubprogramDIE(SP);
-    else if (auto* T = dyn_cast<DIType>(Entity))
-        EntityDie = getOrCreateTypeDIE(T);
-    //    else if (auto* GV = dyn_cast<DIGlobalVariable>(Entity))  // TODO missing support
-    //        EntityDie = getOrCreateGlobalVariableDIE(GV, {});
-    else
-        EntityDie = getDIE(Entity);
-    assert(EntityDie);
-
-    addSourceLine(IMDie, Module, Module->getLine());
-    addDIEEntry(IMDie, dwarf::DW_AT_import, EntityDie);
-    StringRef Name = Module->getName();
-    if (!Name.empty())
-        addString(IMDie, dwarf::DW_AT_name, Name);
-
-    return IMDie;
-}
 
 /// getOrCreateNameSpace - Create a DIE for DINameSpace.
 IGC::DIE* CompileUnit::getOrCreateNameSpace(DINamespace* NS)
@@ -2224,33 +2181,10 @@ IGC::DIE* CompileUnit::getOrCreateModuleDIE(DIModule* MD)
     // Construct the context before querying for the existence of the DIE in case
     // such construction creates the DIE (as is the case for member function
     // declarations).
-    DIE* ContextDIE = getOrCreateContextDIE(MD->getScope());
 
     IGC_ASSERT_MESSAGE(false, "Missing implementation for DIModule!");
-    DIE* MDDie = getDIE(MD);
-    if (MDDie)
-        return MDDie;
-
-    MDDie = createAndAddDIE(dwarf::DW_TAG_module, *ContextDIE, MD);
-
-    if (!MD->getName().empty())
-    {
-        addString(MDDie, dwarf::DW_AT_name, MD->getName());
-    }
-
-#if LLVM_VERSION_MAJOR >= 12
-    if (!MD->getIsDecl())
-    {
-        addSourceLine(MDDie, MD, MD->getLineNo());
-    }
-    else
-    {
-        addFlag(MDDie, dwarf::DW_AT_declaration);
-    }
-#endif  // LLVM_VERSION_MAJOR >= 12.
 
     return nullptr;
-    return MDDie;
 }
 
 /// constructSubrangeDIE - Construct subrange DIE from DISubrange.

IGC/DebugInfo/DwarfCompileUnit.hpp

@@ -22,11 +22,9 @@ See LICENSE.TXT for details.
 #include "llvm/Config/llvm-config.h"
 
 #include "common/LLVMWarningsPush.hpp"
-#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/SmallVector.h"
+#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/StringMap.h"
-#include "llvm/ADT/StringRef.h"
 #include "llvm/IR/DebugInfo.h"
 #include "llvm/IR/GlobalValue.h"
 #include "common/LLVMWarningsPop.hpp"
@@ -100,11 +98,6 @@ namespace IGC
         DIEInteger* DIEIntegerOne;
 
     public:
-        using ImportedEntityList = llvm::SmallVector<const llvm::MDNode*, 8>;
-        using ImportedEntityMap = llvm::DenseMap<const llvm::MDNode*, ImportedEntityList>;
-
-        ImportedEntityMap ImportedEntities;
-
         CompileUnit(unsigned UID, DIE* D, llvm::DICompileUnit* CU,
             StreamEmitter* A, IGC::DwarfDebug* DW);
         ~CompileUnit();
@@ -212,7 +205,6 @@ namespace IGC
         /// addSourceLine - Add location information to specified debug information
         /// entry.
         void addSourceLine(DIE* Die, llvm::DIScope* S, unsigned Line);
-        void addSourceLine(DIE* Die, llvm::DIImportedEntity* IE, unsigned Line);
         void addSourceLine(DIE* Die, llvm::DIVariable* V);
         void addSourceLine(DIE* Die, llvm::DISubprogram* SP);
         void addSourceLine(DIE* Die, llvm::DIType* Ty);
@@ -306,9 +298,6 @@ namespace IGC
                                     const DbgDecoder::LiveIntervalsVISA& lr,
                                     uint64_t varSizeInBits, uint64_t offsetInBits);
 
-        /// Construct import_module DIE.
-        IGC::DIE* constructImportedEntityDIE(llvm::DIImportedEntity* Module);
-
         /// getOrCreateNameSpace - Create a DIE for DINameSpace.
         DIE* getOrCreateNameSpace(llvm::DINamespace* NS);
 
@@ -336,20 +325,6 @@ namespace IGC
         /// call insertDIE if MD is not null.
         DIE* createAndAddDIE(unsigned Tag, DIE& Parent, llvm::DINode* N = nullptr);
 
-        void addImportedEntity(const llvm::DIImportedEntity* IE)
-        {
-            llvm::DIScope* Scope = IE->getScope();
-            assert(Scope && "Invalid Scope encoding!");
-            if (!llvm::isa<llvm::DILocalScope>(Scope))
-            {
-                // No need to add imported enities that are not local declaration.
-                return;
-            }
-
-            auto* LocalScope = llvm::cast<llvm::DILocalScope>(Scope)->getNonLexicalBlockFileScope();
-            ImportedEntities[LocalScope].push_back(IE);
-        }
-
         /// Compute the size of a header for this unit, not including the initial
         /// length field.
         unsigned getHeaderSize() const

IGC/DebugInfo/DwarfDebug.cpp

@@ -778,14 +778,6 @@ DIE* DwarfDebug::createScopeChildrenDIE(CompileUnit* TheCU, LexicalScope* Scope,
         }
     }
 
-    // There is no need to emit empty lexical block DIE.
-    for (auto* constIE : TheCU->ImportedEntities[Scope->getScopeNode()])
-    {
-        auto* IE = const_cast<llvm::MDNode*>(constIE);
-        Children.push_back(
-            TheCU->constructImportedEntityDIE(cast<llvm::DIImportedEntity>(IE)));
-    }
-
     const SmallVectorImpl<LexicalScope*>& Scopes = Scope->getChildren();
     for (unsigned j = 0, M = Scopes.size(); j < M; ++j)
     {
@@ -1022,9 +1014,6 @@ CompileUnit* DwarfDebug::constructCompileUnit(DICompileUnit* DIUnit)
         FirstCU = NewCU;
     }
 
-    for (auto* IE : DIUnit->getImportedEntities())
-        NewCU->addImportedEntity(IE);
-
     CUs.push_back(NewCU);
 
     CUMap.insert(std::make_pair(DIUnit, NewCU));
@@ -1055,15 +1044,6 @@ void DwarfDebug::constructSubprogramDIE(CompileUnit* TheCU, const MDNode* N)
     TheCU->getOrCreateSubprogramDIE(SP);
 }
 
-void DwarfDebug::constructThenAddImportedEntityDIE(CompileUnit* TheCU,
-    DIImportedEntity* IE)
-{
-    if (isa<DILocalScope>(IE->getScope()))
-        return;
-    if (DIE* D = TheCU->getOrCreateContextDIE(IE->getScope()))
-        D->addChild(TheCU->constructImportedEntityDIE(IE));
-}
-
 void DwarfDebug::discoverDISPNodes(DwarfDISubprogramCache &Cache)
 {
     IGC_ASSERT(DISubprogramNodes.empty());
@@ -1119,21 +1099,14 @@ void DwarfDebug::beginModule()
             CU->getOrCreateTypeDIE(RetainedTypes[i]);
         }
 
-        // Emit imported_modules last so that the relevant context is already
-        // available.
-        for (auto* IE : CUNode->getImportedEntities())
-        {
-            constructThenAddImportedEntityDIE(CU, IE);
-        }
-
         // Assume there is a single CU
         break;
     }
 
     // Prime section data.
     SectionMap[Asm->GetTextSection()];
 
-    if (DwarfFrameSectionNeeded())
+    if(DwarfFrameSectionNeeded())
     {
         Asm->SwitchSection(Asm->GetDwarfFrameSection());
         if (m_pModule->hasOrIsStackCall(*decodedDbg))

IGC/DebugInfo/DwarfDebug.hpp

@@ -637,10 +637,6 @@ namespace IGC
             return nullptr;
         }
 
-        /// Construct imported_module or imported_declaration DIE.
-        void constructThenAddImportedEntityDIE(CompileUnit* TheCU,
-            llvm::DIImportedEntity* IE);
-
     private:
 
         // DISubprograms used by the currently processed shader