Index: include/llvm/CodeGen/Passes.h =================================================================== --- include/llvm/CodeGen/Passes.h +++ include/llvm/CodeGen/Passes.h @@ -639,6 +639,9 @@ /// the intrinsic for later emission to the StackMap. extern char &StackMapLivenessID; + /// ExtendDebugRangeLocation pass + extern char &ExtendDebugRangeLocationID; + /// createJumpInstrTables - This pass creates jump-instruction tables. ModulePass *createJumpInstrTablesPass(); Index: include/llvm/InitializePasses.h =================================================================== --- include/llvm/InitializePasses.h +++ include/llvm/InitializePasses.h @@ -292,6 +292,7 @@ void initializeMachineFunctionPrinterPassPass(PassRegistry&); void initializeMIRPrintingPassPass(PassRegistry&); void initializeStackMapLivenessPass(PassRegistry&); +void initializeExtendDebugRangeLocationPass(PassRegistry&); void initializeMachineCombinerPass(PassRegistry &); void initializeLoadCombinePass(PassRegistry&); void initializeRewriteSymbolsPass(PassRegistry&); Index: lib/CodeGen/CMakeLists.txt =================================================================== --- lib/CodeGen/CMakeLists.txt +++ lib/CodeGen/CMakeLists.txt @@ -20,6 +20,7 @@ ExecutionDepsFix.cpp ExpandISelPseudos.cpp ExpandPostRAPseudos.cpp + ExtendDebugRangeLocation.cpp FaultMaps.cpp GCMetadata.cpp GCMetadataPrinter.cpp Index: lib/CodeGen/CodeGen.cpp =================================================================== --- lib/CodeGen/CodeGen.cpp +++ lib/CodeGen/CodeGen.cpp @@ -66,6 +66,7 @@ initializeSlotIndexesPass(Registry); initializeStackColoringPass(Registry); initializeStackMapLivenessPass(Registry); + initializeExtendDebugRangeLocationPass(Registry); initializeStackProtectorPass(Registry); initializeStackSlotColoringPass(Registry); initializeTailDuplicatePassPass(Registry); Index: lib/CodeGen/ExtendDebugRangeLocation.cpp =================================================================== --- /dev/null +++ lib/CodeGen/ExtendDebugRangeLocation.cpp @@ -0,0 +1,485 @@ +//===-- ExtendDebugRangeLocation.cpp - Fixup Debug Value MIs -----------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// Fixup DBG_VALUE MachineInstructions +// a. Fixup debug ranges by inserting new DBG_VALUE instructions at bb join +// points. Current idea is to not build any true ranges here. Only temporary +// ranges are built to calculate DBG_VALUE at join points. True ranges are +// built in DbgValueHistoryCalculator. +// b. Try to infer the presence of a debug variable at multiple locations from +// move instructions (TODO). +// c. Add missing DBG_VALUE instructions, if possible (TODO). +// d. Any DBG_VALUE instruction related code. +// +// This is a separate pass from DbgValueHistoryCalculator because the +// MachineFunction(MF) is to be modified (like adding a new DBG_VALUE MI while +// handling multiple locations etc) and DbgValueHistoryCalculator has a `const' +// MF. Also it would be neat to do the above fixups in this separate pass and +// allow the existing DbgValueHistoryCalculator logic to take over. +// +//===----------------------------------------------------------------------===// + +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/SmallVector.h" +#include "llvm/CodeGen/MachineFunction.h" +#include "llvm/CodeGen/MachineFunctionPass.h" +#include "llvm/CodeGen/MachineInstrBuilder.h" +#include "llvm/CodeGen/Passes.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/Support/raw_ostream.h" +#include "llvm/Target/TargetRegisterInfo.h" +#include "llvm/Target/TargetInstrInfo.h" +#include "llvm/Target/TargetSubtargetInfo.h" +#include +#include + +using namespace llvm; + +#define DEBUG_TYPE "extend-dbg-range-loc" + +STATISTIC(NumInserted, "Number of DBG_VALUE instructions inserted"); +STATISTIC(NumDeleted, "Number of redundant DBG_VALUE instructions deleted"); + +namespace { + +class ExtendDebugRangeLocation : public MachineFunctionPass { + +public: + static char ID; + + /// \brief Default construct and initialize the pass. + ExtendDebugRangeLocation(); + + /// \brief Tell the pass manager which passes we depend on and what + /// information we preserve. + void getAnalysisUsage(AnalysisUsage &AU) const override; + + /// \brief Print to ostream with a message + void print(const char *msg, raw_ostream &Out) const; + + /// \brief Calculate the liveness information for the given machine function. + bool runOnMachineFunction(MachineFunction &MF) override; + +private: + + const TargetRegisterInfo *TRI; + const TargetInstrInfo *TII; + + typedef std::pair + InlinedVariable; + + // Member variables and functions for Range Extension across basic blocks + // Var location in BB + typedef std::pair VarInBB; + // MachineInstr should be a DBG_VALUE instr + typedef std::pair VarLoc; + typedef std::list VarLocList; + + VarLocList OpenRanges; // Ranges that are open until end of bb + VarLocList OutgoingLocs; // Ranges that exist beyond bb + + bool OLChanged; // OutgoingLocs got changed for this bb + bool MBBJoined; // The MBB was joined + + void transfer(MachineInstr &MI, bool HandleMultipleLocations = false); + void join(MachineBasicBlock &MBB); + + void ExtendRanges(MachineFunction &MF); + + MachineBasicBlock::iterator RemoveRedundantDbgVals(MachineInstr &MI); + void clearExtendDebugRangeLocationData(); +}; +} // namespace + + +//===----------------------------------------------------------------------===// +// Implementation +//===----------------------------------------------------------------------===// + +char ExtendDebugRangeLocation::ID = 0; +char &llvm::ExtendDebugRangeLocationID = ExtendDebugRangeLocation::ID; +INITIALIZE_PASS(ExtendDebugRangeLocation, "extend-dbg-range-loc", + "Extend DBG_VALUE Range and Location Pass", false, false) + +/// Default construct and initialize the pass. +ExtendDebugRangeLocation::ExtendDebugRangeLocation() : MachineFunctionPass(ID) { + initializeExtendDebugRangeLocationPass(*PassRegistry::getPassRegistry()); +} + +/// Tell the pass manager which passes we depend on and what information we +/// preserve. +void ExtendDebugRangeLocation::getAnalysisUsage(AnalysisUsage &AU) const { + MachineFunctionPass::getAnalysisUsage(AU); +} + +void ExtendDebugRangeLocation::clearExtendDebugRangeLocationData() { + OLChanged = MBBJoined = false; + OpenRanges.clear(); + OutgoingLocs.clear(); +} + +// \brief If @MI is a DBG_VALUE with debug value described by a +// defined register, returns the number of this register. +// In the other case, returns 0. +static unsigned isDescribedByReg(const MachineInstr &MI) { + assert(MI.isDebugValue()); + assert(MI.getNumOperands() == 4); + // If location of variable is described using a register (directly or + // indirecltly), this register is always a first operand. + return MI.getOperand(0).isReg() ? MI.getOperand(0).getReg() : 0; +} + +// \brief Return true if @MI1 and @MI2 have equal offsets +static bool areOffsetsEqual(const MachineInstr &MI1, const MachineInstr &MI2) { + assert(MI1.isDebugValue()); + assert(MI1.getNumOperands() == 4); + + assert(MI2.isDebugValue()); + assert(MI2.getNumOperands() == 4); + + if (!MI1.isIndirectDebugValue() && !MI2.isIndirectDebugValue()) + return true; + + // Check if both MIs are indirect and they are equal + if (MI1.isIndirectDebugValue() && MI2.isIndirectDebugValue()) + return MI1.getOperand(1).getImm() == MI2.getOperand(1).getImm(); + + return false; +} + +// Look for redundant DBG_VALUE instrs starting from @MI and remove the +// redundant ones. The lookup is only till the first non-DBG_VALUE instr. +// Notify caller by returning the next instruction to start with. +MachineBasicBlock::iterator +ExtendDebugRangeLocation::RemoveRedundantDbgVals(MachineInstr &MI) { + + DEBUG(dbgs() << "Remove redundant DBG_VALUEs from: " << MI << "\n"); + + // Instructions that are unique + SmallVector UniqueInstrs; + + // Instructions to erase and an MI to replace in OutgoingLocs + typedef std::pair EraseAndOLReplacePair; + SmallVector EraseInstrs; + + // Iterate till the non-DBG_VALUE instr and delete duplicate DBG_VALUE instrs. + auto i = MachineBasicBlock::iterator(MI); + for (auto e = MI.getParent()->end(); i != e; ++i) { + if (!i->isDebugValue()) + break; + + bool Unique = true; // Is the instruction unique? Currently yes. + for (auto u = UniqueInstrs.begin(), ue = UniqueInstrs.end(); u != ue; ++u) { + MachineInstr *U = *u; + if (i->isIdenticalTo(U)) { + assert(Unique && "Redundant uniques!?!"); + EraseInstrs.push_back(std::make_pair(i, U)); + Unique = false; // The instruction is no more unique + } else { + // This instruction is identical to 'U' except for their registers where + // one is subreg of the other. In this case, the instr with super-reg of + // the other instr's reg is retained and the other deleted. + bool OpEqual = true; // Check if all operands other than reg are equal + if (! ((i->getNumOperands() == 4) && (U->getNumOperands() == 4)) ) + OpEqual = false; + for (unsigned OpNum = 1; OpEqual && (OpNum < 4); OpNum++) + if (!i->getOperand(OpNum).isIdenticalTo(U->getOperand(OpNum))) + OpEqual = false; + + unsigned iReg = isDescribedByReg(*i); + unsigned uReg = isDescribedByReg(*U); + if (! (OpEqual && iReg && uReg)) + continue; + + // All operands other than reg are equal; now check if one is subreg of + // the other and retain the instr with super-reg + MachineInstr *DelInstr = nullptr, *OLReplace = nullptr; + // If iReg is subreg of uReg, erase 'i' and replace in OL with 'U' + for (MCSubRegIterator SRI(uReg, TRI); SRI.isValid(); ++SRI) { + if (*SRI == iReg) { + DelInstr = i; + OLReplace = U; + Unique = false; + break; + } + } + // If uReg is subreg of iReg, erase 'U' and replace in OL with 'i' + // Also erase 'U' from UniqueInstrs + for (MCSubRegIterator SRI(iReg, TRI); SRI.isValid(); ++SRI) { + if (*SRI == uReg) { + assert(!(DelInstr && OLReplace) && + "iReg was already a subreg of ureg!"); + DelInstr = U; + OLReplace = i; + UniqueInstrs.erase(u); // 'i' is now unique in place of 'U' + break; + } + } + + if (DelInstr && OLReplace) + EraseInstrs.push_back(std::make_pair(DelInstr, OLReplace)); + + } // end if isIdenticalTo + } // end for UniqueInstrs + + if (Unique) { + // Add to UniqueInstrs + UniqueInstrs.push_back(i); + } + } + + // Finally erase all instructions in EraseInstr + for (auto e = EraseInstrs.begin(), ee = EraseInstrs.end(); e != ee; ) { + auto eCur = e++; + MachineInstr *Erase = eCur->first; + MachineInstr *OLReplace = eCur->second; + // Remove 'Erase' if present in OutgoingLocs + for (auto o = OutgoingLocs.begin(), oe = OutgoingLocs.end(); o != oe; ) { + auto oCur = o++; + if (Erase == oCur->second ) { // replace with 'OLReplace' in OutgoingLocs + OutgoingLocs.push_back(std::make_pair(oCur->first, OLReplace)); + OutgoingLocs.erase(oCur); + } + } // end OutgoingLocs + DEBUG(dbgs() << "Removing redundant DBG_VALUE instr: " << *Erase << "\n"); + Erase->eraseFromParent(); + ++NumDeleted; + } + return i; +} + +//===----------------------------------------------------------------------===// +// Debug Range Extension Implementation +//===----------------------------------------------------------------------===// + +// Print OpenRanges and OutgoingLocs +void ExtendDebugRangeLocation::print(const char *msg, raw_ostream &Out) const { + Out << "\nPrint " << msg << "\n"; + Out << "Printing OpenRanges:\n"; + for (const auto &OR : OpenRanges) { + Out << "MBB: " << OR.first.first->getName() + << " Var: " << OR.first.second.first->getName(); + Out << " MI: "; (*OR.second).dump(); Out << "\n"; + } + Out << "Printing OutgoingLocs:\n"; + for (const auto &OL : OutgoingLocs) { + Out << "MBB: " << OL.first.first->getName() + << " Var: " << OL.first.second.first->getName(); + Out << " MI: "; (*OL.second).dump(); Out << "\n"; + } + Out << "\n"; +} + +// This is a common transfer function for extending debug ranges and tracking +// multiple locations for a variable. When HandleMultipleLocations is true, few +// extra tasks are performed for tracking multiple locations. +void ExtendDebugRangeLocation::transfer(MachineInstr &MI, bool HandleMultipleLocations) { + DEBUG(dbgs() << "transfer MI: "; MI.dump()); + + if (MI.isDebugValue()) { + // Use the base variable (without any DW _OP_piece expressions) + // as index into History. The full variables including the + // piece expressions are attached to the MI. + const DILocalVariable *RawVar = MI.getDebugVariable(); + assert(RawVar->isValidLocationForIntrinsic(MI.getDebugLoc()) && + "Expected inlined-at fields to agree"); + InlinedVariable Var(RawVar, MI.getDebugLoc()->getInlinedAt()); + + // End all previous ranges of Var + VarLocList::iterator ORi = OpenRanges.begin(), ORe = OpenRanges.end(); + while (ORi != ORe) { + VarLocList::iterator ORiSave = ORi; + ORi++; + if (Var == ORiSave->first.second) { + OpenRanges.erase(ORiSave); + ORi = OpenRanges.begin(), ORe = OpenRanges.end(); + } + } + // Add Var to OpenRanges from this DBG_VALUE + // TODO: Currently handles DBG_VALUE which has only reg as location + if (isDescribedByReg(MI)) + OpenRanges.push_back(std::make_pair( + std::make_pair(MI.getParent(), Var), &MI)); + } + + // A definition of a register may mark the end of a range + for (const MachineOperand &MO : MI.operands()) { + // Old register clobbering equivalent code + if (MO.isReg() && MO.isDef() && MO.getReg()) { + // Remove ranges of all aliased registers + for (MCRegAliasIterator RAI(MO.getReg(), TRI, true); + RAI.isValid(); ++RAI) { + VarLocList::iterator ORi = OpenRanges.begin(), ORe = OpenRanges.end(); + while(ORi != ORe) { + VarLocList::iterator ORiSave = ORi; + ORi++; + if (*RAI == isDescribedByReg(*ORiSave->second)) { + OpenRanges.erase(ORiSave); + ORi = OpenRanges.begin(), ORe = OpenRanges.end(); + } // end if + } // end while + } // end reg alias iter + } // end if + } // end for + + // Early return. Multiple locations need not track OutgoingLocs (code below). + if (HandleMultipleLocations) + return; + + // End all ranges at the end of the current basic block + if (MI.isTerminator() || (&MI == &MI.getParent()->instr_back())) { + VarLocList::iterator ORi = OpenRanges.begin(), ORe = OpenRanges.end(); + while (ORi != ORe) { + // Copy OpenRanges to OutgoingLocs, if not already present + if (std::find(OutgoingLocs.begin(), OutgoingLocs.end(), + std::make_pair(ORi->first, ORi->second)) == OutgoingLocs.end()) { + assert(ORi->second->isDebugValue()); + DEBUG(dbgs() << "Add to OutgoingLocs: "; ORi->second->dump();); + OutgoingLocs.push_back(std::make_pair(ORi->first, ORi->second)); + OLChanged = true; + } + + // Delete this open range + OpenRanges.erase(ORi); + ORi = OpenRanges.begin(), ORe = OpenRanges.end(); + } // end while + } // end terminator instr +} + +// This routine inserts a new DBG_VALUE instruction at the start of the MBB +// when the same source variable in all `n' predecessors of MBB reside in the +// same location. +// TODO: Currently handling when n = {1, 2}. Can mostly do better by having +// OutgoingLocs in bitvector +void ExtendDebugRangeLocation::join(MachineBasicBlock &MBB) { + DEBUG(dbgs() << "join MBB: " << MBB.getName() << "\n"); + + MBBJoined = false; + if (MBB.pred_size() == 0 || MBB.pred_size() > 2) + return; + + if (MBB.pred_size() == 1) { + // Propagate all OutgoingLocs into the current MBB + for (auto &OL : OutgoingLocs) { + if (OL.first.first == *MBB.pred_begin()) { + const MachineInstr *DMI = OL.second; + MachineInstr *MI = BuildMI(MBB, MBB.instr_begin(), DMI->getDebugLoc(), + DMI->getDesc(), DMI->isIndirectDebugValue(), + DMI->getOperand(0).getReg(), 0, + DMI->getDebugVariable(), DMI->getDebugExpression()); + if (DMI->isIndirectDebugValue()) + MI->getOperand(1).setImm(DMI->getOperand(1).getImm()); + DEBUG(dbgs() << "Inserted: "; MI->dump();); + ++NumInserted; + MBBJoined = true; + } + } + return; + } + + MachineBasicBlock *pred1 = *MBB.pred_begin(); + MachineBasicBlock *pred2 = *(++MBB.pred_begin()); + + // Search through OutgoingLocs to match 2 entries: + // and TODO: use bitvectors + for (VarLocList::iterator OLi = OutgoingLocs.begin(), + OLe = OutgoingLocs.end(); OLi != OLe; OLi++) { + for (VarLocList::iterator OLii = OutgoingLocs.begin(), + OLie = OutgoingLocs.end(); OLii != OLie; OLii++) { + // Check for equality of the 2 entries + if ((OLi != OLii) && + (OLi->first.first == pred1 && OLii->first.first == pred2) && + (OLi->first.second == OLii->first.second)) { + // Now the two locations should be same - reg and offset + if ( (isDescribedByReg(*OLi->second) == + isDescribedByReg(*OLii->second) ) && + (areOffsetsEqual((*OLi->second), (*OLii->second))) ) { + // Currently a new range is started for the var from the bb's + // beginning by inserting a new DBG_VALUE + // transfer() will end this range however appropriate + const MachineInstr *DMI = OLi->second; + MachineInstr *MI = BuildMI(MBB, MBB.instr_begin(), DMI->getDebugLoc(), + DMI->getDesc(), DMI->isIndirectDebugValue(), + DMI->getOperand(0).getReg(), 0, + DMI->getDebugVariable(), DMI->getDebugExpression()); + if (DMI->isIndirectDebugValue()) + MI->getOperand(1).setImm(DMI->getOperand(1).getImm()); + DEBUG(dbgs() << "Inserted: "; MI->dump(); dbgs() << "\n";); + ++NumInserted; + MBBJoined = true; // Rerun transfer() function + } // end inner if + } // end if + } // end inner while OLi + } // end while OLii +} + +/// Calculate the liveness information for the given machine function and +/// extend ranges across basic blocks +void ExtendDebugRangeLocation::ExtendRanges(MachineFunction &MF) { + + DEBUG(dbgs() << "\nDebug Range Extension\n"); + + clearExtendDebugRangeLocationData(); + + std::deque BBWorklist; + + // Initialize every mbb with OutgoingLocs + for (auto &MBB : MF) + for (auto &MI : MBB) + transfer(MI); + DEBUG(print("After OutgoingLocs Initialize", dbgs())); + + // Construct a worklist of MBBs + for (auto &MBB : MF) + BBWorklist.push_back(&MBB); + + // Perform join() and trasfer() using the worklist until the ranges converge + // Ranges have converged when the worklist is empty + while (!BBWorklist.empty()) { + MachineBasicBlock *MBB = BBWorklist.front(); + BBWorklist.pop_front(); + + join(*MBB); + + if (MBBJoined) { + for (auto &MI : *MBB) + transfer(MI); + DEBUG(print("After propagating joined MBB", dbgs())); + + if (OLChanged) { + OLChanged = false; + for (MachineBasicBlock::const_succ_iterator si = MBB->succ_begin(), + se = MBB->succ_end(); si != se; ++si) + if (std::find(BBWorklist.begin(), BBWorklist.end(), *si) + == BBWorklist.end()) // add if not already present + BBWorklist.push_back(*si); + } + } + } + DEBUG(print("Final OutgoingLocs", dbgs())); +} + +bool ExtendDebugRangeLocation::runOnMachineFunction(MachineFunction &MF) { + TRI = MF.getSubtarget().getRegisterInfo(); + TII = MF.getSubtarget().getInstrInfo(); + + ExtendRanges(MF); + + // Remove Redundant DBG_VALUE instructions + for (auto &MBB : MF) { + for (auto MBBI = MBB.begin(), MBBE = MBB.end(); MBBI != MBBE; ) { + if (MBBI->isDebugValue()) { + MBBI = RemoveRedundantDbgVals(*MBBI); + } else + ++MBBI; + } + } + return true; +} Index: lib/CodeGen/Passes.cpp =================================================================== --- lib/CodeGen/Passes.cpp +++ lib/CodeGen/Passes.cpp @@ -581,6 +581,7 @@ addPreEmitPass(); addPass(&StackMapLivenessID, false); + addPass(&ExtendDebugRangeLocationID); AddingMachinePasses = false; } Index: test/DebugInfo/X86/array.ll =================================================================== --- test/DebugInfo/X86/array.ll +++ test/DebugInfo/X86/array.ll @@ -17,6 +17,8 @@ ; rdar://problem/14874886 ; ; CHECK: ##DEBUG_VALUE: main:array <- [R{{.*}}+0] +; CHECK: ##DEBUG_VALUE: main:array <- [R{{.*}}+0] +; CHECK: ##DEBUG_VALUE: main:array <- [R{{.*}}+0] ; CHECK-NOT: ##DEBUG_VALUE: main:array <- R{{.*}} target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.9.0" Index: test/DebugInfo/X86/fission-ranges.ll =================================================================== --- test/DebugInfo/X86/fission-ranges.ll +++ test/DebugInfo/X86/fission-ranges.ll @@ -29,16 +29,16 @@ ; CHECK-NEXT: Location description: 11 00 ; CHECK-NEXT: {{^$}} ; CHECK-NEXT: Beginning address index: 3 -; CHECK-NEXT: Length: 21 +; CHECK-NEXT: Length: 25 ; CHECK-NEXT: Location description: 50 93 04 ; CHECK: [[E]]: Beginning address index: 4 -; CHECK-NEXT: Length: 19 +; CHECK-NEXT: Length: 23 ; CHECK-NEXT: Location description: 50 93 04 ; CHECK: [[B]]: Beginning address index: 5 -; CHECK-NEXT: Length: 17 +; CHECK-NEXT: Length: 21 ; CHECK-NEXT: Location description: 50 93 04 ; CHECK: [[D]]: Beginning address index: 6 -; CHECK-NEXT: Length: 17 +; CHECK-NEXT: Length: 21 ; CHECK-NEXT: Location description: 50 93 04 ; Make sure we don't produce any relocations in any .dwo section (though in particular, debug_info.dwo) Index: test/DebugInfo/X86/pieces-3.ll =================================================================== --- test/DebugInfo/X86/pieces-3.ll +++ test/DebugInfo/X86/pieces-3.ll @@ -26,7 +26,7 @@ ; CHECK: .debug_loc ; CHECK: [[LOC]]: ; CHECK: Beginning address offset: 0x0000000000000000 -; CHECK: Ending address offset: 0x0000000000000004 +; CHECK: Ending address offset: 0x0000000000000008 ; rdi, piece 0x00000008, piece 0x00000004, rsi, piece 0x00000004 ; CHECK: Location description: 55 93 08 93 04 54 93 04 ; Index: test/DebugInfo/X86/sret.ll =================================================================== --- test/DebugInfo/X86/sret.ll +++ test/DebugInfo/X86/sret.ll @@ -3,8 +3,8 @@ ; Based on the debuginfo-tests/sret.cpp code. -; CHECK: DW_AT_GNU_dwo_id [DW_FORM_data8] (0x51ac5644b1937aa1) -; CHECK: DW_AT_GNU_dwo_id [DW_FORM_data8] (0x51ac5644b1937aa1) +; CHECK: DW_AT_GNU_dwo_id [DW_FORM_data8] ([[ADDR:0x[0-9a-z]*]]) +; CHECK: DW_AT_GNU_dwo_id [DW_FORM_data8] ([[ADDR]]) %class.A = type { i32 (...)**, i32 } %class.B = type { i8 } Index: test/DebugInfo/extend-debug-range.ll =================================================================== --- /dev/null +++ test/DebugInfo/extend-debug-range.ll @@ -0,0 +1,146 @@ +; RUN: llc -filetype=asm %s -o - | FileCheck %s + +; Test the extension of debug ranges from predecessors. +; Generated from the source file ExtendDebugRange.c: +; #include +; int m; +; extern int inc(int n); +; extern int change(int n); +; extern int modify(int n); +; int main(int argc, char **argv) { +; int n; +; if (argc != 2) +; n = 2; +; else +; n = atoi(argv[1]); +; n = change(n); +; if (n > 10) { +; m = modify(n); +; m = m + n; // var `m' doesn't has a dbg.value +; } +; else +; m = inc(n); // var `m' doesn't has a dbg.value +; printf("m(main): %d\n", m); +; return 0; +; } +; with clang -g -emit-llvm ExtendDebugRange.c -c -o edr.bc +; then opt -O3 -S -o extend-debug-range.ll edr.bc +; This case will also produce multiple locations but only the debug range +; extension is tested here. + +; DBG_VALUE for variable "n" is extended into BB#5 from its predecessors BB#3 +; and BB#4. +; CHECK: .LBB0_5: +; CHECK-NEXT: #DEBUG_VALUE: main:argv <- RSI +; CHECK-NEXT: #DEBUG_VALUE: main:n <- EBX + + +; ModuleID = 'edr.bc' +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-unknown-linux-gnu" + +@m = common global i32 0, align 4 +@.str = private unnamed_addr constant [13 x i8] c"m(main): %d\0A\00", align 1 + +; Function Attrs: nounwind uwtable +define i32 @main(i32 %argc, i8** nocapture readonly %argv) #0 { +entry: + tail call void @llvm.dbg.value(metadata i32 %argc, i64 0, metadata !16, metadata !17), !dbg !18 + tail call void @llvm.dbg.value(metadata i8** %argv, i64 0, metadata !19, metadata !17), !dbg !20 + %cmp = icmp eq i32 %argc, 2, !dbg !21 + br i1 %cmp, label %if.else, label %if.end, !dbg !23 + +if.else: ; preds = %entry + %arrayidx = getelementptr inbounds i8*, i8** %argv, i64 1, !dbg !24 + %0 = load i8*, i8** %arrayidx, align 8, !dbg !24 + %call = tail call i32 (i8*, ...) bitcast (i32 (...)* @atoi to i32 (i8*, ...)*)(i8* %0) #4, !dbg !25 + tail call void @llvm.dbg.value(metadata i32 %call, i64 0, metadata !26, metadata !17), !dbg !27 + br label %if.end + +if.end: ; preds = %entry, %if.else + %n.0 = phi i32 [ %call, %if.else ], [ 2, %entry ] + %call1 = tail call i32 @change(i32 %n.0) #4, !dbg !28 + tail call void @llvm.dbg.value(metadata i32 %call1, i64 0, metadata !26, metadata !17), !dbg !27 + %cmp2 = icmp sgt i32 %call1, 10, !dbg !29 + br i1 %cmp2, label %if.then.3, label %if.else.5, !dbg !31 + +if.then.3: ; preds = %if.end + %call4 = tail call i32 @modify(i32 %call1) #4, !dbg !32 + %add = add nsw i32 %call4, %call1, !dbg !34 + br label %if.end.7, !dbg !35 + +if.else.5: ; preds = %if.end + %call6 = tail call i32 @inc(i32 %call1) #4, !dbg !36 + br label %if.end.7 + +if.end.7: ; preds = %if.else.5, %if.then.3 + %storemerge = phi i32 [ %call6, %if.else.5 ], [ %add, %if.then.3 ] + store i32 %storemerge, i32* @m, align 4, !dbg !37 + %call8 = tail call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([13 x i8], [13 x i8]* @.str, i64 0, i64 0), i32 %storemerge) #4, !dbg !38 + ret i32 0, !dbg !39 +} + +declare i32 @atoi(...) #1 + +declare i32 @change(i32) #1 + +declare i32 @modify(i32) #1 + +declare i32 @inc(i32) #1 + +; Function Attrs: nounwind +declare i32 @printf(i8* nocapture readonly, ...) #2 + +; Function Attrs: nounwind readnone +declare void @llvm.dbg.value(metadata, i64, metadata, metadata) #3 + +attributes #0 = { nounwind uwtable "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+sse,+sse2" "unsafe-fp-math"="false" "use-soft-float"="false" } +attributes #1 = { "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+sse,+sse2" "unsafe-fp-math"="false" "use-soft-float"="false" } +attributes #2 = { nounwind "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+sse,+sse2" "unsafe-fp-math"="false" "use-soft-float"="false" } +attributes #3 = { nounwind readnone } +attributes #4 = { nounwind } + +!llvm.dbg.cu = !{!0} +!llvm.module.flags = !{!13, !14} +!llvm.ident = !{!15} + +!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 3.8.0 (trunk 243841)", isOptimized: false, runtimeVersion: 0, emissionKind: 1, enums: !2, subprograms: !3, globals: !11) +!1 = !DIFile(filename: "ExtendDebugRanges.c", directory: "/home/vt/vikram/newTests") +!2 = !{} +!3 = !{!4} +!4 = !DISubprogram(name: "main", scope: !1, file: !1, line: 6, type: !5, isLocal: false, isDefinition: true, scopeLine: 6, flags: DIFlagPrototyped, isOptimized: false, function: i32 (i32, i8**)* @main, variables: !2) +!5 = !DISubroutineType(types: !6) +!6 = !{!7, !7, !8} +!7 = !DIBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed) +!8 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !9, size: 64, align: 64) +!9 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !10, size: 64, align: 64) +!10 = !DIBasicType(name: "char", size: 8, align: 8, encoding: DW_ATE_signed_char) +!11 = !{!12} +!12 = !DIGlobalVariable(name: "m", scope: !0, file: !1, line: 2, type: !7, isLocal: false, isDefinition: true, variable: i32* @m) +!13 = !{i32 2, !"Dwarf Version", i32 4} +!14 = !{i32 2, !"Debug Info Version", i32 3} +!15 = !{!"clang version 3.8.0 (trunk 243841)"} +!16 = !DILocalVariable(name: "argc", arg: 1, scope: !4, file: !1, line: 6, type: !7) +!17 = !DIExpression() +!18 = !DILocation(line: 6, column: 14, scope: !4) +!19 = !DILocalVariable(name: "argv", arg: 2, scope: !4, file: !1, line: 6, type: !8) +!20 = !DILocation(line: 6, column: 27, scope: !4) +!21 = !DILocation(line: 8, column: 12, scope: !22) +!22 = distinct !DILexicalBlock(scope: !4, file: !1, line: 8, column: 7) +!23 = !DILocation(line: 8, column: 7, scope: !4) +!24 = !DILocation(line: 11, column: 14, scope: !22) +!25 = !DILocation(line: 11, column: 9, scope: !22) +!26 = !DILocalVariable(name: "n", scope: !4, file: !1, line: 7, type: !7) +!27 = !DILocation(line: 7, column: 7, scope: !4) +!28 = !DILocation(line: 12, column: 7, scope: !4) +!29 = !DILocation(line: 13, column: 9, scope: !30) +!30 = distinct !DILexicalBlock(scope: !4, file: !1, line: 13, column: 7) +!31 = !DILocation(line: 13, column: 7, scope: !4) +!32 = !DILocation(line: 14, column: 9, scope: !33) +!33 = distinct !DILexicalBlock(scope: !30, file: !1, line: 13, column: 15) +!34 = !DILocation(line: 15, column: 11, scope: !33) +!35 = !DILocation(line: 16, column: 3, scope: !33) +!36 = !DILocation(line: 18, column: 9, scope: !30) +!37 = !DILocation(line: 15, column: 7, scope: !33) +!38 = !DILocation(line: 19, column: 3, scope: !4) +!39 = !DILocation(line: 20, column: 3, scope: !4) Index: test/DebugInfo/redundant-dbg_val.ll =================================================================== --- /dev/null +++ test/DebugInfo/redundant-dbg_val.ll @@ -0,0 +1,76 @@ +; RUN: llc -filetype=asm %s -o - | FileCheck %s + +; Test that the redundant DBG_VALUE instruction is removed. +; struct some_struct { +; int a_field; +; int b_field; +; }; +; struct some_struct values[50]; +; void marker4 (long d) { values[0].a_field = d; } + +; Test that the DBG_VALUE instr with location RDI is retained while the instr +; with location EDI (subreg of RDI) is removed. +; CHECK: #DEBUG_VALUE: marker4:d <- RDI +; CHECK-NOT: #DEBUG_VALUE: marker4:d <- EDI + + +; ModuleID = 'RedundantDbgVal.c' +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-unknown-linux-gnu" + +%struct.some_struct = type { i32, i32 } + +@values = common global [50 x %struct.some_struct] zeroinitializer, align 16 + +; Function Attrs: nounwind uwtable +define void @marker4(i64 %d) #0 { +entry: + tail call void @llvm.dbg.value(metadata i64 %d, i64 0, metadata !9, metadata !23), !dbg !24 + %conv = trunc i64 %d to i32, !dbg !25 + store i32 %conv, i32* getelementptr inbounds ([50 x %struct.some_struct], [50 x %struct.some_struct]* @values, i64 0, i64 0, i32 0), align 16, !dbg !26, !tbaa !27 + ret void, !dbg !32 +} + +; Function Attrs: nounwind readnone +declare void @llvm.dbg.value(metadata, i64, metadata, metadata) #1 + +attributes #0 = { nounwind uwtable "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+sse,+sse2" "unsafe-fp-math"="false" "use-soft-float"="false" } +attributes #1 = { nounwind readnone } + +!llvm.dbg.cu = !{!0} +!llvm.module.flags = !{!20, !21} +!llvm.ident = !{!22} + +!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 3.8.0 (trunk 245228)", isOptimized: true, runtimeVersion: 0, emissionKind: 1, enums: !2, subprograms: !3, globals: !10) +!1 = !DIFile(filename: "RedundantDbgVal.c", directory: "/home/vt/julia/test/vikram") +!2 = !{} +!3 = !{!4} +!4 = !DISubprogram(name: "marker4", scope: !1, file: !1, line: 9, type: !5, isLocal: false, isDefinition: true, scopeLine: 9, flags: DIFlagPrototyped, isOptimized: true, function: void (i64)* @marker4, variables: !8) +!5 = !DISubroutineType(types: !6) +!6 = !{null, !7} +!7 = !DIBasicType(name: "long int", size: 64, align: 64, encoding: DW_ATE_signed) +!8 = !{!9} +!9 = !DILocalVariable(name: "d", arg: 1, scope: !4, file: !1, line: 9, type: !7) +!10 = !{!11} +!11 = !DIGlobalVariable(name: "values", scope: !0, file: !1, line: 7, type: !12, isLocal: false, isDefinition: true, variable: [50 x %struct.some_struct]* @values) +!12 = !DICompositeType(tag: DW_TAG_array_type, baseType: !13, size: 3200, align: 32, elements: !18) +!13 = !DICompositeType(tag: DW_TAG_structure_type, name: "some_struct", file: !1, line: 1, size: 64, align: 32, elements: !14) +!14 = !{!15, !17} +!15 = !DIDerivedType(tag: DW_TAG_member, name: "a_field", scope: !13, file: !1, line: 3, baseType: !16, size: 32, align: 32) +!16 = !DIBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed) +!17 = !DIDerivedType(tag: DW_TAG_member, name: "b_field", scope: !13, file: !1, line: 4, baseType: !16, size: 32, align: 32, offset: 32) +!18 = !{!19} +!19 = !DISubrange(count: 50) +!20 = !{i32 2, !"Dwarf Version", i32 4} +!21 = !{i32 2, !"Debug Info Version", i32 3} +!22 = !{!"clang version 3.8.0 (trunk 245228)"} +!23 = !DIExpression() +!24 = !DILocation(line: 9, column: 20, scope: !4) +!25 = !DILocation(line: 9, column: 45, scope: !4) +!26 = !DILocation(line: 9, column: 43, scope: !4) +!27 = !{!28, !29, i64 0} +!28 = !{!"some_struct", !29, i64 0, !29, i64 4} +!29 = !{!"int", !30, i64 0} +!30 = !{!"omnipotent char", !31, i64 0} +!31 = !{!"Simple C/C++ TBAA"} +!32 = !DILocation(line: 9, column: 48, scope: !4)