Skip to content

Commit 9bc06df

Browse files
ApochensApochens
committed
Fix #136532: salvage debug values in the distributed loops
1 parent 0975c09 commit 9bc06df

File tree

2 files changed

+158
-0
lines changed

2 files changed

+158
-0
lines changed

‎llvm/lib/Transforms/Scalar/LoopDistribute.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
#include "llvm/Support/raw_ostream.h"
5959
#include "llvm/Transforms/Utils/BasicBlockUtils.h"
6060
#include "llvm/Transforms/Utils/Cloning.h"
61+
#include "llvm/Transforms/Utils/Local.h"
6162
#include "llvm/Transforms/Utils/LoopUtils.h"
6263
#include "llvm/Transforms/Utils/LoopVersioning.h"
6364
#include "llvm/Transforms/Utils/ValueMapper.h"
@@ -224,6 +225,7 @@ class InstPartition {
224225
// Delete the instructions backwards, as it has a reduced likelihood of
225226
// having to update as many def-use and use-def chains.
226227
for (auto *Inst : reverse(Unused)) {
228+
salvageDebugInfo(*Inst);
227229
if (!Inst->use_empty())
228230
Inst->replaceAllUsesWith(PoisonValue::get(Inst->getType()));
229231
Inst->eraseFromParent();

‎llvm/test/Transforms/LoopDistribute/salvage-dbg-values-in-distributed-loops.ll‎

Lines changed: 156 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,156 @@
1+
; RUN: opt -passes=loop-distribute -enable-loop-distribute -S < %s | FileCheck %s
2+
3+
define void @f(ptr noalias %a, ptr noalias %b, ptr noalias %c, ptr noalias %d, ptr noalias %e) !dbg !5 {
4+
; CHECK-LABEL: define void @f(
5+
; CHECK-SAME: ptr noalias [[A:%.*]], ptr noalias [[B:%.*]], ptr noalias [[C:%.*]], ptr noalias [[D:%.*]], ptr noalias [[E:%.*]])
6+
7+
; CHECK: for.body.ldist1:
8+
; CHECK-NEXT: [[IND_LDIST1:%.*]] = phi i64 [ 0, %[[ENTRY_SPLIT_LDIST1:.*]] ], [ [[ADD_LDIST1:%.*]], %for.body.ldist1 ], !dbg [[DBG28:![0-9]+]]
9+
10+
; CHECK: store i32
11+
; CHECK-NEXT: #dbg_value(!DIArgList(ptr [[D]], i64 [[IND_LDIST1]]), [[META19:![0-9]+]], !DIExpression(DW_OP_LLVM_arg, 0, DW_OP_LLVM_arg, 1, DW_OP_constu, 4, DW_OP_mul, DW_OP_plus, DW_OP_stack_value), [[META37:![0-9]+]])
12+
; CHECK-NEXT: #dbg_value(i32 poison, [[META20:![0-9]+]], !DIExpression(), [[META38:![0-9]+]])
13+
; CHECK-NEXT: #dbg_value(!DIArgList(ptr [[E]], i64 [[IND_LDIST1]]), [[META21:![0-9]+]], !DIExpression(DW_OP_LLVM_arg, 0, DW_OP_LLVM_arg, 1, DW_OP_constu, 4, DW_OP_mul, DW_OP_plus, DW_OP_stack_value), [[META39:![0-9]+]])
14+
; CHECK-NEXT: #dbg_value(i32 poison, [[META22:![0-9]+]], !DIExpression(), [[META40:![0-9]+]])
15+
; CHECK-NEXT: #dbg_value(!DIArgList(i32 poison, i32 poison), [[META23:![0-9]+]], !DIExpression(DW_OP_LLVM_arg, 0, DW_OP_LLVM_arg, 1, DW_OP_mul, DW_OP_stack_value), [[META41:![0-9]+]])
16+
; CHECK-NEXT: #dbg_value(!DIArgList(ptr [[C]], i64 [[IND_LDIST1]]), [[META24:![0-9]+]], !DIExpression(DW_OP_LLVM_arg, 0, DW_OP_LLVM_arg, 1, DW_OP_constu, 4, DW_OP_mul, DW_OP_plus, DW_OP_stack_value), [[META42:![0-9]+]])
17+
; CHECK-NEXT: [[EXITCOND_LDIST1:%.*]] = icmp eq i64 [[ADD_LDIST1]], 20, !dbg [[DBG43:![0-9]+]]
18+
; CHECK-NEXT: #dbg_value(i1 [[EXITCOND_LDIST1]], [[META25:![0-9]+]], !DIExpression(), [[DBG43]])
19+
; CHECK-NEXT: br i1 [[EXITCOND_LDIST1]], label %[[ENTRY_SPLIT:.*]], label %for.body.ldist1, !dbg [[DBG44:![0-9]+]]
20+
21+
; CHECK: for.body:
22+
; CHECK-NEXT: [[IND:%.*]] = phi i64 [ 0, %[[ENTRY_SPLIT:.*]] ], [ [[ADD:%.*]], %for.body ], !dbg [[DBG28]]
23+
; CHECK-NEXT: #dbg_value(i64 [[IND]], [[META9:![0-9]+]], !DIExpression(), [[DBG28]])
24+
; CHECK-NEXT: #dbg_value(!DIArgList(ptr [[A]], i64 [[IND]]), [[META11:![0-9]+]], !DIExpression(DW_OP_LLVM_arg, 0, DW_OP_LLVM_arg, 1, DW_OP_constu, 4, DW_OP_mul, DW_OP_plus, DW_OP_stack_value), [[DBG29:![0-9]+]])
25+
; CHECK-NEXT: #dbg_value(i32 poison, [[META12:![0-9]+]], !DIExpression(), [[DBG30:![0-9]+]])
26+
; CHECK-NEXT: #dbg_value(!DIArgList(ptr [[B]], i64 [[IND]]), [[META14:![0-9]+]], !DIExpression(DW_OP_LLVM_arg, 0, DW_OP_LLVM_arg, 1, DW_OP_constu, 4, DW_OP_mul, DW_OP_plus, DW_OP_stack_value), [[DBG31:![0-9]+]])
27+
; CHECK-NEXT: #dbg_value(i32 poison, [[META15:![0-9]+]], !DIExpression(), [[DBG32:![0-9]+]])
28+
; CHECK-NEXT: #dbg_value(!DIArgList(i32 poison, i32 poison), [[META16:![0-9]+]], !DIExpression(DW_OP_LLVM_arg, 0, DW_OP_LLVM_arg, 1, DW_OP_mul, DW_OP_stack_value), [[DBG33:![0-9]+]])
29+
; CHECK-NEXT: [[ADD]] = add nuw nsw i64 [[IND]], 1, !dbg [[DBG34:![0-9]+]]
30+
; CHECK-NEXT: #dbg_value(i64 [[ADD]], [[META17:![0-9]+]], !DIExpression(), [[DBG34]])
31+
; CHECK-NEXT: #dbg_value(!DIArgList(ptr [[A]], i64 [[ADD]]), [[META18:![0-9]+]], !DIExpression(DW_OP_LLVM_arg, 0, DW_OP_LLVM_arg, 1, DW_OP_constu, 4, DW_OP_mul, DW_OP_plus, DW_OP_stack_value), [[DBG35:![0-9]+]])
32+
;
33+
entry:
34+
br label %for.body, !dbg !27
35+
36+
for.body: ; preds = %for.body, %entry
37+
%ind = phi i64 [ 0, %entry ], [ %add, %for.body ], !dbg !28
38+
#dbg_value(i64 %ind, !9, !DIExpression(), !28)
39+
%arrayidxA = getelementptr inbounds i32, ptr %a, i64 %ind, !dbg !29
40+
#dbg_value(ptr %arrayidxA, !11, !DIExpression(), !29)
41+
%loadA = load i32, ptr %arrayidxA, align 4, !dbg !30
42+
#dbg_value(i32 %loadA, !12, !DIExpression(), !30)
43+
%arrayidxB = getelementptr inbounds i32, ptr %b, i64 %ind, !dbg !31
44+
#dbg_value(ptr %arrayidxB, !14, !DIExpression(), !31)
45+
%loadB = load i32, ptr %arrayidxB, align 4, !dbg !32
46+
#dbg_value(i32 %loadB, !15, !DIExpression(), !32)
47+
%mulA = mul i32 %loadB, %loadA, !dbg !33
48+
#dbg_value(i32 %mulA, !16, !DIExpression(), !33)
49+
%add = add nuw nsw i64 %ind, 1, !dbg !34
50+
#dbg_value(i64 %add, !17, !DIExpression(), !34)
51+
%arrayidxA_plus_4 = getelementptr inbounds i32, ptr %a, i64 %add, !dbg !35
52+
#dbg_value(ptr %arrayidxA_plus_4, !18, !DIExpression(), !35)
53+
store i32 %mulA, ptr %arrayidxA_plus_4, align 4, !dbg !36
54+
%arrayidxD = getelementptr inbounds i32, ptr %d, i64 %ind, !dbg !37
55+
#dbg_value(ptr %arrayidxD, !19, !DIExpression(), !37)
56+
%loadD = load i32, ptr %arrayidxD, align 4, !dbg !38
57+
#dbg_value(i32 %loadD, !20, !DIExpression(), !38)
58+
%arrayidxE = getelementptr inbounds i32, ptr %e, i64 %ind, !dbg !39
59+
#dbg_value(ptr %arrayidxE, !21, !DIExpression(), !39)
60+
%loadE = load i32, ptr %arrayidxE, align 4, !dbg !40
61+
#dbg_value(i32 %loadE, !22, !DIExpression(), !40)
62+
%mulC = mul i32 %loadD, %loadE, !dbg !41
63+
#dbg_value(i32 %mulC, !23, !DIExpression(), !41)
64+
%arrayidxC = getelementptr inbounds i32, ptr %c, i64 %ind, !dbg !42
65+
#dbg_value(ptr %arrayidxC, !24, !DIExpression(), !42)
66+
store i32 %mulC, ptr %arrayidxC, align 4, !dbg !43
67+
%exitcond = icmp eq i64 %add, 20, !dbg !44
68+
#dbg_value(i1 %exitcond, !25, !DIExpression(), !44)
69+
br i1 %exitcond, label %for.end, label %for.body, !dbg !45
70+
71+
for.end: ; preds = %for.body
72+
ret void, !dbg !46
73+
}
74+
75+
!llvm.dbg.cu = !{!0}
76+
!llvm.debugify = !{!2, !3}
77+
!llvm.module.flags = !{!4}
78+
79+
!0 = distinct !DICompileUnit(language: DW_LANG_C, file: !1, producer: "debugify", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug)
80+
!1 = !DIFile(filename: "/app/example.ll", directory: "/")
81+
!2 = !{i32 20}
82+
!3 = !{i32 15}
83+
!4 = !{i32 2, !"Debug Info Version", i32 3}
84+
!5 = distinct !DISubprogram(name: "f", linkageName: "f", scope: null, file: !1, line: 1, type: !6, scopeLine: 1, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !8)
85+
!6 = !DISubroutineType(types: !7)
86+
!7 = !{}
87+
!8 = !{!9, !11, !12, !14, !15, !16, !17, !18, !19, !20, !21, !22, !23, !24, !25}
88+
!9 = !DILocalVariable(name: "1", scope: !5, file: !1, line: 2, type: !10)
89+
!10 = !DIBasicType(name: "ty64", size: 64, encoding: DW_ATE_unsigned)
90+
!11 = !DILocalVariable(name: "2", scope: !5, file: !1, line: 3, type: !10)
91+
!12 = !DILocalVariable(name: "3", scope: !5, file: !1, line: 4, type: !13)
92+
!13 = !DIBasicType(name: "ty32", size: 32, encoding: DW_ATE_unsigned)
93+
!14 = !DILocalVariable(name: "4", scope: !5, file: !1, line: 5, type: !10)
94+
!15 = !DILocalVariable(name: "5", scope: !5, file: !1, line: 6, type: !13)
95+
!16 = !DILocalVariable(name: "6", scope: !5, file: !1, line: 7, type: !13)
96+
!17 = !DILocalVariable(name: "7", scope: !5, file: !1, line: 8, type: !10)
97+
!18 = !DILocalVariable(name: "8", scope: !5, file: !1, line: 9, type: !10)
98+
!19 = !DILocalVariable(name: "9", scope: !5, file: !1, line: 11, type: !10)
99+
!20 = !DILocalVariable(name: "10", scope: !5, file: !1, line: 12, type: !13)
100+
!21 = !DILocalVariable(name: "11", scope: !5, file: !1, line: 13, type: !10)
101+
!22 = !DILocalVariable(name: "12", scope: !5, file: !1, line: 14, type: !13)
102+
!23 = !DILocalVariable(name: "13", scope: !5, file: !1, line: 15, type: !13)
103+
!24 = !DILocalVariable(name: "14", scope: !5, file: !1, line: 16, type: !10)
104+
!25 = !DILocalVariable(name: "15", scope: !5, file: !1, line: 18, type: !26)
105+
!26 = !DIBasicType(name: "ty8", size: 8, encoding: DW_ATE_unsigned)
106+
!27 = !DILocation(line: 1, column: 1, scope: !5)
107+
!28 = !DILocation(line: 2, column: 1, scope: !5)
108+
!29 = !DILocation(line: 3, column: 1, scope: !5)
109+
!30 = !DILocation(line: 4, column: 1, scope: !5)
110+
!31 = !DILocation(line: 5, column: 1, scope: !5)
111+
!32 = !DILocation(line: 6, column: 1, scope: !5)
112+
!33 = !DILocation(line: 7, column: 1, scope: !5)
113+
!34 = !DILocation(line: 8, column: 1, scope: !5)
114+
!35 = !DILocation(line: 9, column: 1, scope: !5)
115+
!36 = !DILocation(line: 10, column: 1, scope: !5)
116+
!37 = !DILocation(line: 11, column: 1, scope: !5)
117+
!38 = !DILocation(line: 12, column: 1, scope: !5)
118+
!39 = !DILocation(line: 13, column: 1, scope: !5)
119+
!40 = !DILocation(line: 14, column: 1, scope: !5)
120+
!41 = !DILocation(line: 15, column: 1, scope: !5)
121+
!42 = !DILocation(line: 16, column: 1, scope: !5)
122+
!43 = !DILocation(line: 17, column: 1, scope: !5)
123+
!44 = !DILocation(line: 18, column: 1, scope: !5)
124+
!45 = !DILocation(line: 19, column: 1, scope: !5)
125+
!46 = !DILocation(line: 20, column: 1, scope: !5)
126+
;.
127+
; CHECK: [[META9]] = !DILocalVariable(name: "1",
128+
; CHECK: [[META11]] = !DILocalVariable(name: "2",
129+
; CHECK: [[META12]] = !DILocalVariable(name: "3",
130+
; CHECK: [[META14]] = !DILocalVariable(name: "4",
131+
; CHECK: [[META15]] = !DILocalVariable(name: "5",
132+
; CHECK: [[META16]] = !DILocalVariable(name: "6",
133+
; CHECK: [[META17]] = !DILocalVariable(name: "7",
134+
; CHECK: [[META18]] = !DILocalVariable(name: "8",
135+
; CHECK: [[META19]] = !DILocalVariable(name: "9",
136+
; CHECK: [[META20]] = !DILocalVariable(name: "10",
137+
; CHECK: [[META21]] = !DILocalVariable(name: "11",
138+
; CHECK: [[META22]] = !DILocalVariable(name: "12",
139+
; CHECK: [[META23]] = !DILocalVariable(name: "13",
140+
; CHECK: [[META24]] = !DILocalVariable(name: "14",
141+
; CHECK: [[META25]] = !DILocalVariable(name: "15",
142+
; CHECK: [[DBG28]] = !DILocation(line: 2, column: 1,
143+
; CHECK: [[DBG29]] = !DILocation(line: 3, column: 1,
144+
; CHECK: [[DBG30]] = !DILocation(line: 4, column: 1,
145+
; CHECK: [[DBG31]] = !DILocation(line: 5, column: 1,
146+
; CHECK: [[DBG33]] = !DILocation(line: 7, column: 1,
147+
; CHECK: [[DBG34]] = !DILocation(line: 8, column: 1,
148+
; CHECK: [[DBG35]] = !DILocation(line: 9, column: 1,
149+
; CHECK: [[META37]] = !DILocation(line: 11, column: 1,
150+
; CHECK: [[META39]] = !DILocation(line: 13, column: 1,
151+
; CHECK: [[META40]] = !DILocation(line: 14, column: 1,
152+
; CHECK: [[META41]] = !DILocation(line: 15, column: 1,
153+
; CHECK: [[META42]] = !DILocation(line: 16, column: 1,
154+
; CHECK: [[DBG43]] = !DILocation(line: 18, column: 1,
155+
; CHECK: [[DBG44]] = !DILocation(line: 19, column: 1,
156+
;.

0 commit comments

Comments
 (0)