[llvm] [DebugInfo][LICM] Fix missing debug location updates (PR #91729)
Shan Huang via llvm-commits
llvm-commits at lists.llvm.org
Fri May 10 09:10:30 PDT 2024
https://github.com/Apochens updated https://github.com/llvm/llvm-project/pull/91729
>From c219efb994c29ed9466d7a5d46e266a5963e5486 Mon Sep 17 00:00:00 2001
From: Apochens <52285902006 at stu.ecnu.edu.cn>
Date: Fri, 10 May 2024 11:08:38 +0000
Subject: [PATCH 1/2] add debugloc updates for fdiv and fmul
---
llvm/lib/Transforms/Scalar/LICM.cpp | 2 +
.../LICM/preversing-debugloc-fmul.ll | 78 +++++++++++++++++++
2 files changed, 80 insertions(+)
create mode 100644 llvm/test/Transforms/LICM/preversing-debugloc-fmul.ll
diff --git a/llvm/lib/Transforms/Scalar/LICM.cpp b/llvm/lib/Transforms/Scalar/LICM.cpp
index e50413de46b1b..6aa4188d1cc4d 100644
--- a/llvm/lib/Transforms/Scalar/LICM.cpp
+++ b/llvm/lib/Transforms/Scalar/LICM.cpp
@@ -933,12 +933,14 @@ bool llvm::hoistRegion(DomTreeNode *N, AAResults *AA, LoopInfo *LI,
ReciprocalDivisor->setFastMathFlags(I.getFastMathFlags());
SafetyInfo->insertInstructionTo(ReciprocalDivisor, I.getParent());
ReciprocalDivisor->insertBefore(&I);
+ ReciprocalDivisor->setDebugLoc(I.getDebugLoc());
auto Product =
BinaryOperator::CreateFMul(I.getOperand(0), ReciprocalDivisor);
Product->setFastMathFlags(I.getFastMathFlags());
SafetyInfo->insertInstructionTo(Product, I.getParent());
Product->insertAfter(&I);
+ Product->setDebugLoc(I.getDebugLoc());
I.replaceAllUsesWith(Product);
eraseInstruction(I, *SafetyInfo, MSSAU);
diff --git a/llvm/test/Transforms/LICM/preversing-debugloc-fmul.ll b/llvm/test/Transforms/LICM/preversing-debugloc-fmul.ll
new file mode 100644
index 0000000000000..a43eb83d8f3a4
--- /dev/null
+++ b/llvm/test/Transforms/LICM/preversing-debugloc-fmul.ll
@@ -0,0 +1,78 @@
+; RUN: opt -passes=licm -verify-memoryssa -S < %s | FileCheck %s
+
+; Test that LICM's hoistRegin()
+
+define zeroext i1 @invariant_denom(double %v) !dbg !5 {
+; CHECK: loop:
+; CHECK: [[TMP1:%.*]] = fmul fast double {{.*}}, !dbg [[DBG29:![0-9]+]]
+; CHECK: [[DBG29]] = !DILocation(line: 5,
+;
+entry:
+ br label %loop, !dbg !25
+
+loop: ; preds = %loop, %entry
+ %v3 = phi i32 [ 0, %entry ], [ %v11, %loop ], !dbg !26
+ %v4 = phi i32 [ 0, %entry ], [ %v12, %loop ], !dbg !27
+ %v5 = uitofp i32 %v4 to double, !dbg !28
+ %v6 = fdiv fast double %v5, %v, !dbg !29
+ %v7 = fptoui double %v6 to i64, !dbg !30
+ %v8 = and i64 %v7, 1, !dbg !31
+ %v9 = xor i64 %v8, 1, !dbg !32
+ %v10 = trunc i64 %v9 to i32, !dbg !33
+ %v11 = add i32 %v10, %v3, !dbg !34
+ %v12 = add nuw i32 %v4, 1, !dbg !35
+ %v13 = icmp eq i32 %v12, -1, !dbg !36
+ br i1 %v13, label %end, label %loop, !dbg !37
+
+end: ; preds = %loop
+ %v15 = phi i32 [ %v11, %loop ], !dbg !38
+ %v16 = icmp ne i32 %v15, 0, !dbg !39
+ ret i1 %v16, !dbg !40
+}
+
+
+!llvm.dbg.cu = !{!0}
+!llvm.debugify = !{!2, !3}
+!llvm.module.flags = !{!4}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C, file: !1, producer: "debugify", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug)
+!1 = !DIFile(filename: "preserving-debugloc.ll", directory: "/")
+!2 = !{i32 16}
+!3 = !{i32 13}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = distinct !DISubprogram(name: "invariant_denom", linkageName: "invariant_denom", scope: null, file: !1, line: 1, type: !6, scopeLine: 1, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !8)
+!6 = !DISubroutineType(types: !7)
+!7 = !{}
+!8 = !{!9, !11, !12, !14, !15, !16, !17, !18, !19, !20, !21, !23, !24}
+!9 = !DILocalVariable(name: "1", scope: !5, file: !1, line: 2, type: !10)
+!10 = !DIBasicType(name: "ty32", size: 32, encoding: DW_ATE_unsigned)
+!11 = !DILocalVariable(name: "2", scope: !5, file: !1, line: 3, type: !10)
+!12 = !DILocalVariable(name: "3", scope: !5, file: !1, line: 4, type: !13)
+!13 = !DIBasicType(name: "ty64", size: 64, encoding: DW_ATE_unsigned)
+!14 = !DILocalVariable(name: "4", scope: !5, file: !1, line: 5, type: !13)
+!15 = !DILocalVariable(name: "5", scope: !5, file: !1, line: 6, type: !13)
+!16 = !DILocalVariable(name: "6", scope: !5, file: !1, line: 7, type: !13)
+!17 = !DILocalVariable(name: "7", scope: !5, file: !1, line: 8, type: !13)
+!18 = !DILocalVariable(name: "8", scope: !5, file: !1, line: 9, type: !10)
+!19 = !DILocalVariable(name: "9", scope: !5, file: !1, line: 10, type: !10)
+!20 = !DILocalVariable(name: "10", scope: !5, file: !1, line: 11, type: !10)
+!21 = !DILocalVariable(name: "11", scope: !5, file: !1, line: 12, type: !22)
+!22 = !DIBasicType(name: "ty8", size: 8, encoding: DW_ATE_unsigned)
+!23 = !DILocalVariable(name: "12", scope: !5, file: !1, line: 14, type: !10)
+!24 = !DILocalVariable(name: "13", scope: !5, file: !1, line: 15, type: !22)
+!25 = !DILocation(line: 1, column: 1, scope: !5)
+!26 = !DILocation(line: 2, column: 1, scope: !5)
+!27 = !DILocation(line: 3, column: 1, scope: !5)
+!28 = !DILocation(line: 4, column: 1, scope: !5)
+!29 = !DILocation(line: 5, column: 1, scope: !5)
+!30 = !DILocation(line: 6, column: 1, scope: !5)
+!31 = !DILocation(line: 7, column: 1, scope: !5)
+!32 = !DILocation(line: 8, column: 1, scope: !5)
+!33 = !DILocation(line: 9, column: 1, scope: !5)
+!34 = !DILocation(line: 10, column: 1, scope: !5)
+!35 = !DILocation(line: 11, column: 1, scope: !5)
+!36 = !DILocation(line: 12, column: 1, scope: !5)
+!37 = !DILocation(line: 13, column: 1, scope: !5)
+!38 = !DILocation(line: 14, column: 1, scope: !5)
+!39 = !DILocation(line: 15, column: 1, scope: !5)
+!40 = !DILocation(line: 16, column: 1, scope: !5)
>From dc9899d05d081345b3e2d44d1f77a34da8a5719c Mon Sep 17 00:00:00 2001
From: Apochens <52285902006 at stu.ecnu.edu.cn>
Date: Fri, 10 May 2024 16:10:13 +0000
Subject: [PATCH 2/2] add checks for dropping the debugloc of fdiv
---
.../LICM/debugloc-preserve-fmul-drop-fdiv.ll | 66 ++++++++++++++++
.../LICM/preversing-debugloc-fmul.ll | 78 -------------------
2 files changed, 66 insertions(+), 78 deletions(-)
create mode 100644 llvm/test/Transforms/LICM/debugloc-preserve-fmul-drop-fdiv.ll
delete mode 100644 llvm/test/Transforms/LICM/preversing-debugloc-fmul.ll
diff --git a/llvm/test/Transforms/LICM/debugloc-preserve-fmul-drop-fdiv.ll b/llvm/test/Transforms/LICM/debugloc-preserve-fmul-drop-fdiv.ll
new file mode 100644
index 0000000000000..e6e6f077fd6d2
--- /dev/null
+++ b/llvm/test/Transforms/LICM/debugloc-preserve-fmul-drop-fdiv.ll
@@ -0,0 +1,66 @@
+; RUN: opt -passes=licm -verify-memoryssa -S < %s | FileCheck %s
+
+; JumpThreading's hoistRegion() replaces the `fdiv` (%v6), of which the second
+; operand (%v) is a loop invariant, with a loop invariant `fdiv` and a `fmul`.
+; This test checks that the debug location propagates to the new `fmul` from
+; the old `fdiv` it replaces in block `loop` and the debug location drop of new
+; `fdiv`, which is hoisted to block `entry` after being created.
+
+define zeroext i1 @invariant_denom(double %v) !dbg !5 {
+; CHECK: entry:
+; CHECK-NEXT: [[TMP0:%.*]] = fdiv fast double 1.000000e+00, [[V:%.*]]{{$}}
+; CHECK: loop:
+; CHECK: [[TMP1:%.*]] = fmul fast double {{.*}}, !dbg [[DBG12:![0-9]+]]
+; CHECK: [[DBG12]] = !DILocation(line: 5,
+;
+entry:
+ br label %loop, !dbg !8
+
+loop: ; preds = %loop, %entry
+ %v3 = phi i32 [ 0, %entry ], [ %v11, %loop ], !dbg !9
+ %v4 = phi i32 [ 0, %entry ], [ %v12, %loop ], !dbg !10
+ %v5 = uitofp i32 %v4 to double, !dbg !11
+ %v6 = fdiv fast double %v5, %v, !dbg !12
+ %v7 = fptoui double %v6 to i64, !dbg !13
+ %v8 = and i64 %v7, 1, !dbg !14
+ %v9 = xor i64 %v8, 1, !dbg !15
+ %v10 = trunc i64 %v9 to i32, !dbg !16
+ %v11 = add i32 %v10, %v3, !dbg !17
+ %v12 = add nuw i32 %v4, 1, !dbg !18
+ %v13 = icmp eq i32 %v12, -1, !dbg !19
+ br i1 %v13, label %end, label %loop, !dbg !20
+
+end: ; preds = %loop
+ %v15 = phi i32 [ %v11, %loop ], !dbg !21
+ %v16 = icmp ne i32 %v15, 0, !dbg !22
+ ret i1 %v16, !dbg !23
+}
+
+!llvm.dbg.cu = !{!0}
+!llvm.debugify = !{!2, !3}
+!llvm.module.flags = !{!4}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C, file: !1, producer: "debugify", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug)
+!1 = !DIFile(filename: "test.ll", directory: "/")
+!2 = !{i32 16}
+!3 = !{i32 0}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = distinct !DISubprogram(name: "invariant_denom", linkageName: "invariant_denom", scope: null, file: !1, line: 1, type: !6, scopeLine: 1, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0)
+!6 = !DISubroutineType(types: !7)
+!7 = !{}
+!8 = !DILocation(line: 1, column: 1, scope: !5)
+!9 = !DILocation(line: 2, column: 1, scope: !5)
+!10 = !DILocation(line: 3, column: 1, scope: !5)
+!11 = !DILocation(line: 4, column: 1, scope: !5)
+!12 = !DILocation(line: 5, column: 1, scope: !5)
+!13 = !DILocation(line: 6, column: 1, scope: !5)
+!14 = !DILocation(line: 7, column: 1, scope: !5)
+!15 = !DILocation(line: 8, column: 1, scope: !5)
+!16 = !DILocation(line: 9, column: 1, scope: !5)
+!17 = !DILocation(line: 10, column: 1, scope: !5)
+!18 = !DILocation(line: 11, column: 1, scope: !5)
+!19 = !DILocation(line: 12, column: 1, scope: !5)
+!20 = !DILocation(line: 13, column: 1, scope: !5)
+!21 = !DILocation(line: 14, column: 1, scope: !5)
+!22 = !DILocation(line: 15, column: 1, scope: !5)
+!23 = !DILocation(line: 16, column: 1, scope: !5)
diff --git a/llvm/test/Transforms/LICM/preversing-debugloc-fmul.ll b/llvm/test/Transforms/LICM/preversing-debugloc-fmul.ll
deleted file mode 100644
index a43eb83d8f3a4..0000000000000
--- a/llvm/test/Transforms/LICM/preversing-debugloc-fmul.ll
+++ /dev/null
@@ -1,78 +0,0 @@
-; RUN: opt -passes=licm -verify-memoryssa -S < %s | FileCheck %s
-
-; Test that LICM's hoistRegin()
-
-define zeroext i1 @invariant_denom(double %v) !dbg !5 {
-; CHECK: loop:
-; CHECK: [[TMP1:%.*]] = fmul fast double {{.*}}, !dbg [[DBG29:![0-9]+]]
-; CHECK: [[DBG29]] = !DILocation(line: 5,
-;
-entry:
- br label %loop, !dbg !25
-
-loop: ; preds = %loop, %entry
- %v3 = phi i32 [ 0, %entry ], [ %v11, %loop ], !dbg !26
- %v4 = phi i32 [ 0, %entry ], [ %v12, %loop ], !dbg !27
- %v5 = uitofp i32 %v4 to double, !dbg !28
- %v6 = fdiv fast double %v5, %v, !dbg !29
- %v7 = fptoui double %v6 to i64, !dbg !30
- %v8 = and i64 %v7, 1, !dbg !31
- %v9 = xor i64 %v8, 1, !dbg !32
- %v10 = trunc i64 %v9 to i32, !dbg !33
- %v11 = add i32 %v10, %v3, !dbg !34
- %v12 = add nuw i32 %v4, 1, !dbg !35
- %v13 = icmp eq i32 %v12, -1, !dbg !36
- br i1 %v13, label %end, label %loop, !dbg !37
-
-end: ; preds = %loop
- %v15 = phi i32 [ %v11, %loop ], !dbg !38
- %v16 = icmp ne i32 %v15, 0, !dbg !39
- ret i1 %v16, !dbg !40
-}
-
-
-!llvm.dbg.cu = !{!0}
-!llvm.debugify = !{!2, !3}
-!llvm.module.flags = !{!4}
-
-!0 = distinct !DICompileUnit(language: DW_LANG_C, file: !1, producer: "debugify", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug)
-!1 = !DIFile(filename: "preserving-debugloc.ll", directory: "/")
-!2 = !{i32 16}
-!3 = !{i32 13}
-!4 = !{i32 2, !"Debug Info Version", i32 3}
-!5 = distinct !DISubprogram(name: "invariant_denom", linkageName: "invariant_denom", scope: null, file: !1, line: 1, type: !6, scopeLine: 1, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !8)
-!6 = !DISubroutineType(types: !7)
-!7 = !{}
-!8 = !{!9, !11, !12, !14, !15, !16, !17, !18, !19, !20, !21, !23, !24}
-!9 = !DILocalVariable(name: "1", scope: !5, file: !1, line: 2, type: !10)
-!10 = !DIBasicType(name: "ty32", size: 32, encoding: DW_ATE_unsigned)
-!11 = !DILocalVariable(name: "2", scope: !5, file: !1, line: 3, type: !10)
-!12 = !DILocalVariable(name: "3", scope: !5, file: !1, line: 4, type: !13)
-!13 = !DIBasicType(name: "ty64", size: 64, encoding: DW_ATE_unsigned)
-!14 = !DILocalVariable(name: "4", scope: !5, file: !1, line: 5, type: !13)
-!15 = !DILocalVariable(name: "5", scope: !5, file: !1, line: 6, type: !13)
-!16 = !DILocalVariable(name: "6", scope: !5, file: !1, line: 7, type: !13)
-!17 = !DILocalVariable(name: "7", scope: !5, file: !1, line: 8, type: !13)
-!18 = !DILocalVariable(name: "8", scope: !5, file: !1, line: 9, type: !10)
-!19 = !DILocalVariable(name: "9", scope: !5, file: !1, line: 10, type: !10)
-!20 = !DILocalVariable(name: "10", scope: !5, file: !1, line: 11, type: !10)
-!21 = !DILocalVariable(name: "11", scope: !5, file: !1, line: 12, type: !22)
-!22 = !DIBasicType(name: "ty8", size: 8, encoding: DW_ATE_unsigned)
-!23 = !DILocalVariable(name: "12", scope: !5, file: !1, line: 14, type: !10)
-!24 = !DILocalVariable(name: "13", scope: !5, file: !1, line: 15, type: !22)
-!25 = !DILocation(line: 1, column: 1, scope: !5)
-!26 = !DILocation(line: 2, column: 1, scope: !5)
-!27 = !DILocation(line: 3, column: 1, scope: !5)
-!28 = !DILocation(line: 4, column: 1, scope: !5)
-!29 = !DILocation(line: 5, column: 1, scope: !5)
-!30 = !DILocation(line: 6, column: 1, scope: !5)
-!31 = !DILocation(line: 7, column: 1, scope: !5)
-!32 = !DILocation(line: 8, column: 1, scope: !5)
-!33 = !DILocation(line: 9, column: 1, scope: !5)
-!34 = !DILocation(line: 10, column: 1, scope: !5)
-!35 = !DILocation(line: 11, column: 1, scope: !5)
-!36 = !DILocation(line: 12, column: 1, scope: !5)
-!37 = !DILocation(line: 13, column: 1, scope: !5)
-!38 = !DILocation(line: 14, column: 1, scope: !5)
-!39 = !DILocation(line: 15, column: 1, scope: !5)
-!40 = !DILocation(line: 16, column: 1, scope: !5)
More information about the llvm-commits
mailing list