[llvm] r335264 - [DebugInfo] Ignore DBG_VALUE instructions in PostRA Machine Sink
Matt Davis via llvm-commits
llvm-commits at lists.llvm.org
Thu Jun 21 10:59:53 PDT 2018
Author: mattd
Date: Thu Jun 21 10:59:52 2018
New Revision: 335264
URL: http://llvm.org/viewvc/llvm-project?rev=335264&view=rev
Log:
[DebugInfo] Ignore DBG_VALUE instructions in PostRA Machine Sink
Summary:
The logic for handling the sinking of COPY instructions was generating
different code when building with debug flags.
The original code did not take into consideration debug instructions. This
resulted in the registers in the DBG_VALUE instructions being treated as used,
and prevented the COPY from being sunk. This patch avoids analyzing debug
instructions when trying to sink COPY instructions.
This patch also creates a routine from the code in MachineSinking::SinkInstruction to
perform the logic of sinking an instruction along with its debug instructions.
This functionality is used in multiple places, including the code for sinking COPY instrs.
Reviewers: junbuml, javed.absar, MatzeB, bjope
Reviewed By: bjope
Subscribers: aprantl, probinson, thegameg, jonpa, bjope, vsk, kristof.beyls, JDevlieghere, llvm-commits
Tags: #debug-info
Differential Revision: https://reviews.llvm.org/D45637
Added:
llvm/trunk/test/CodeGen/X86/postra-ignore-dbg-instrs.mir
Modified:
llvm/trunk/lib/CodeGen/MachineSink.cpp
Modified: llvm/trunk/lib/CodeGen/MachineSink.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineSink.cpp?rev=335264&r1=335263&r2=335264&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/MachineSink.cpp (original)
+++ llvm/trunk/lib/CodeGen/MachineSink.cpp Thu Jun 21 10:59:52 2018
@@ -753,6 +753,37 @@ static bool SinkingPreventsImplicitNullC
MBP.LHS.getReg() == BaseReg;
}
+/// Sink an instruction and its associated debug instructions.
+static void performSink(MachineInstr &MI, MachineBasicBlock &SuccToSinkTo,
+ MachineBasicBlock::iterator InsertPos) {
+ // Collect matching debug values.
+ SmallVector<MachineInstr *, 2> DbgValuesToSink;
+ collectDebugValues(MI, DbgValuesToSink);
+
+ // If we cannot find a location to use (merge with), then we erase the debug
+ // location to prevent debug-info driven tools from potentially reporting
+ // wrong location information.
+ if (!SuccToSinkTo.empty() && InsertPos != SuccToSinkTo.end())
+ MI.setDebugLoc(DILocation::getMergedLocation(MI.getDebugLoc(),
+ InsertPos->getDebugLoc()));
+ else
+ MI.setDebugLoc(DebugLoc());
+
+ // Move the instruction.
+ MachineBasicBlock *ParentBlock = MI.getParent();
+ SuccToSinkTo.splice(InsertPos, ParentBlock, MI,
+ ++MachineBasicBlock::iterator(MI));
+
+ // Move previously adjacent debug value instructions to the insert position.
+ for (SmallVectorImpl<MachineInstr *>::iterator DBI = DbgValuesToSink.begin(),
+ DBE = DbgValuesToSink.end();
+ DBI != DBE; ++DBI) {
+ MachineInstr *DbgMI = *DBI;
+ SuccToSinkTo.splice(InsertPos, ParentBlock, DbgMI,
+ ++MachineBasicBlock::iterator(DbgMI));
+ }
+}
+
/// SinkInstruction - Determine whether it is safe to sink the specified machine
/// instruction out of its current block into a successor.
bool MachineSinking::SinkInstruction(MachineInstr &MI, bool &SawStore,
@@ -866,30 +897,7 @@ bool MachineSinking::SinkInstruction(Mac
while (InsertPos != SuccToSinkTo->end() && InsertPos->isPHI())
++InsertPos;
- // collect matching debug values.
- SmallVector<MachineInstr *, 2> DbgValuesToSink;
- collectDebugValues(MI, DbgValuesToSink);
-
- // Merge or erase debug location to ensure consistent stepping in profilers
- // and debuggers.
- if (!SuccToSinkTo->empty() && InsertPos != SuccToSinkTo->end())
- MI.setDebugLoc(DILocation::getMergedLocation(MI.getDebugLoc(),
- InsertPos->getDebugLoc()));
- else
- MI.setDebugLoc(DebugLoc());
-
-
- // Move the instruction.
- SuccToSinkTo->splice(InsertPos, ParentBlock, MI,
- ++MachineBasicBlock::iterator(MI));
-
- // Move previously adjacent debug value instructions to the insert position.
- for (SmallVectorImpl<MachineInstr *>::iterator DBI = DbgValuesToSink.begin(),
- DBE = DbgValuesToSink.end(); DBI != DBE; ++DBI) {
- MachineInstr *DbgMI = *DBI;
- SuccToSinkTo->splice(InsertPos, ParentBlock, DbgMI,
- ++MachineBasicBlock::iterator(DbgMI));
- }
+ performSink(MI, *SuccToSinkTo, InsertPos);
// Conservatively, clear any kill flags, since it's possible that they are no
// longer correct.
@@ -1118,6 +1126,9 @@ bool PostRAMachineSinking::tryToSinkCopy
MachineInstr *MI = &*I;
++I;
+ if (MI->isDebugInstr())
+ continue;
+
// Do not move any instruction across function call.
if (MI->isCall())
return false;
@@ -1158,7 +1169,7 @@ bool PostRAMachineSinking::tryToSinkCopy
// block.
clearKillFlags(MI, CurBB, UsedOpsInCopy, UsedRegUnits, TRI);
MachineBasicBlock::iterator InsertPos = SuccBB->getFirstNonPHI();
- SuccBB->splice(InsertPos, &CurBB, MI);
+ performSink(*MI, *SuccBB, InsertPos);
updateLiveIn(MI, SuccBB, UsedOpsInCopy, DefedRegsInCopy);
Changed = true;
Added: llvm/trunk/test/CodeGen/X86/postra-ignore-dbg-instrs.mir
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/postra-ignore-dbg-instrs.mir?rev=335264&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/X86/postra-ignore-dbg-instrs.mir (added)
+++ llvm/trunk/test/CodeGen/X86/postra-ignore-dbg-instrs.mir Thu Jun 21 10:59:52 2018
@@ -0,0 +1,88 @@
+# RUN: llc -mtriple=x86_64-none-linux-gnu -run-pass=postra-machine-sink -verify-machineinstrs -o - %s | FileCheck %s
+#
+# This test was originally generated from the following sample:
+#
+# int x0;
+# extern void x3(int, int);
+# void x1(int x2) {
+# if (x0)
+# x3(0, x2);
+# }
+#
+# The code generates a COPY instruction which the PostRA Machine Sink pass will
+# try to sink. Earlier versions were not performing the sink due to a
+# DBG_VALUE instruction confusing the sinking algorithm.
+
+--- |
+ @x0 = common dso_local global i32 0, align 4, !dbg !0
+
+ define dso_local void @x1(i32) !dbg !11 {
+ %2 = alloca i32, align 4
+ store i32 %0, i32* %2, align 4
+ call void @llvm.dbg.declare(metadata i32* %2, metadata !14, metadata !DIExpression()), !dbg !16
+ %3 = load i32, i32* @x0, align 4, !dbg !16
+ %4 = icmp ne i32 %3, 0, !dbg !16
+ br i1 %4, label %5, label %7, !dbg !16
+
+ ; <label>:5: ; preds = %1
+ %6 = load i32, i32* %2, align 4, !dbg !16
+ call void @x3(i32 0, i32 %6), !dbg !16
+ br label %7, !dbg !16
+
+ ; <label>:7: ; preds = %5, %1
+ ret void, !dbg !16
+ }
+
+ declare void @llvm.dbg.declare(metadata, metadata, metadata)
+ declare dso_local void @x3(i32, i32)
+
+ !llvm.dbg.cu = !{!2}
+ !llvm.module.flags = !{!7, !8}
+
+ !0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+ !1 = distinct !DIGlobalVariable(name: "x0", scope: !2, file: !3, line: 1, type: !6, isLocal: false, isDefinition: true)
+ !2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5)
+ !3 = !DIFile(filename: "test.c", directory: "")
+ !4 = !{}
+ !5 = !{!0}
+ !6 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+ !7 = !{i32 2, !"Dwarf Version", i32 4}
+ !8 = !{i32 2, !"Debug Info Version", i32 3}
+ !11 = distinct !DISubprogram(name: "x1", scope: !3, file: !3, line: 3, type: !12, isLocal: false, isDefinition: true, scopeLine: 3, flags: DIFlagPrototyped, isOptimized: false, unit: !2)
+ !12 = !DISubroutineType(types: !13)
+ !13 = !{null, !6}
+ !14 = !DILocalVariable(name: "x2", arg: 1, scope: !11, file: !3, line: 3, type: !6)
+ !15 = distinct !DILexicalBlock(scope: !11, file: !3, line: 4, column: 7)
+ !16 = !DILocation(line: 4, column: 7, scope: !15)
+
+...
+---
+# CHECK: name: x1
+# CHECK: bb.0:
+# CHECK-NOT: $eax = COPY $edi
+# CHECK: bb.1:
+# CHECK: renamable $eax = COPY $edi
+# CHECK-NEXT: DBG_VALUE debug-use $eax,
+# CHECK: bb.2:
+name: x1
+alignment: 4
+tracksRegLiveness: true
+body: |
+ bb.0:
+ successors: %bb.2, %bb.1; %bb.2, %bb.1
+ liveins: $edi
+ DBG_VALUE debug-use $edi, debug-use $noreg, !14, !DIExpression(), debug-location !16
+ renamable $eax = COPY $edi
+ DBG_VALUE debug-use $eax, debug-use $noreg, !14, !DIExpression(), debug-location !16
+ CMP32mi8 $rip, 1, $noreg, @x0, $noreg, 0, implicit-def $eflags, debug-location !16
+ JE_1 %bb.2, implicit killed $eflags, debug-location !16
+ JMP_1 %bb.1, debug-location !16
+
+ bb.1:
+ liveins: $eax
+ $edi = MOV32r0 implicit-def dead $eflags, debug-location !16
+ $esi = COPY killed renamable $eax, debug-location !16
+
+ bb.2:
+ RET 0, debug-location !16
+...
More information about the llvm-commits
mailing list