Skip to content

Commit 7b20e68

Browse files
author
git apple-llvm automerger
committed
Merge commit 'be38d4f80e93' from apple/stable/20210107 into swift/main
2 parents 19ec3d8 + be38d4f commit 7b20e68

File tree

2 files changed

+120
-20
lines changed

2 files changed

+120
-20
lines changed

‎llvm/lib/Transforms/Utils/SimplifyCFG.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1394,11 +1394,15 @@ bool SimplifyCFGOpt::HoistThenElseCodeToIf(BranchInst *BI,
13941394
// Check if only hoisting terminators is allowed. This does not add new
13951395
// instructions to the hoist location.
13961396
if (EqTermsOnly) {
1397-
if (!I1->isIdenticalToWhenDefined(I2))
1397+
// Skip any debug intrinsics, as they are free to hoist.
1398+
auto *I1NonDbg = &*skipDebugIntrinsics(I1->getIterator());
1399+
auto *I2NonDbg = &*skipDebugIntrinsics(I2->getIterator());
1400+
if (!I1NonDbg->isIdenticalToWhenDefined(I2NonDbg))
13981401
return false;
1399-
if (!I1->isTerminator())
1402+
if (!I1NonDbg->isTerminator())
14001403
return false;
1401-
goto HoistTerminator;
1404+
// Now we know that we only need to hoist debug instrinsics and the
1405+
// terminator. Let the loop below handle those 2 cases.
14021406
}
14031407

14041408
do {

‎llvm/test/Transforms/SimplifyCFG/hoist-dbgvalue.ll

Lines changed: 113 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,114 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
12
; RUN: opt -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -S < %s | FileCheck %s
23

34
define i32 @foo(i32 %i) nounwind ssp !dbg !0 {
5+
; CHECK-LABEL: @foo(
6+
; CHECK-NEXT: entry:
7+
; CHECK-NEXT: call void @llvm.dbg.value(metadata i32 [[I:%.*]], metadata [[META7:![0-9]+]], metadata !DIExpression()), !dbg [[DBG8:![0-9]+]]
8+
; CHECK-NEXT: call void @llvm.dbg.value(metadata i32 0, metadata [[META9:![0-9]+]], metadata !DIExpression()), !dbg [[DBG11:![0-9]+]]
9+
; CHECK-NEXT: [[COND:%.*]] = icmp ne i32 [[I]], 0, !dbg [[DBG12:![0-9]+]]
10+
; CHECK-NEXT: br i1 [[COND]], label [[THEN:%.*]], label [[ELSE:%.*]], !dbg [[DBG12]]
11+
; CHECK: then:
12+
; CHECK-NEXT: [[CALL_1:%.*]] = call i32 (...) @bar(), !dbg [[DBG13:![0-9]+]]
13+
; CHECK-NEXT: call void @llvm.dbg.value(metadata i32 [[CALL_1]], metadata [[META9]], metadata !DIExpression()), !dbg [[DBG13]]
14+
; CHECK-NEXT: br label [[EXIT:%.*]], !dbg [[DBG15:![0-9]+]]
15+
; CHECK: else:
16+
; CHECK-NEXT: [[CALL_2:%.*]] = call i32 (...) @bar(), !dbg [[DBG16:![0-9]+]]
17+
; CHECK-NEXT: call void @llvm.dbg.value(metadata i32 [[CALL_2]], metadata [[META9]], metadata !DIExpression()), !dbg [[DBG16]]
18+
; CHECK-NEXT: br label [[EXIT]], !dbg [[DBG18:![0-9]+]]
19+
; CHECK: exit:
20+
; CHECK-NEXT: [[K_0:%.*]] = phi i32 [ [[CALL_1]], [[THEN]] ], [ [[CALL_2]], [[ELSE]] ]
21+
; CHECK-NEXT: ret i32 [[K_0]], !dbg [[DBG19:![0-9]+]]
22+
;
23+
entry:
424
call void @llvm.dbg.value(metadata i32 %i, metadata !6, metadata !DIExpression()), !dbg !7
525
call void @llvm.dbg.value(metadata i32 0, metadata !9, metadata !DIExpression()), !dbg !11
6-
%1 = icmp ne i32 %i, 0, !dbg !12
7-
;CHECK: call i32 (...) @bar()
8-
;CHECK-NEXT: llvm.dbg.value
9-
br i1 %1, label %2, label %4, !dbg !12
10-
11-
; <label>:2 ; preds = %0
12-
%3 = call i32 (...) @bar(), !dbg !13
13-
call void @llvm.dbg.value(metadata i32 %3, metadata !9, metadata !DIExpression()), !dbg !13
14-
br label %6, !dbg !15
15-
16-
; <label>:4 ; preds = %0
17-
%5 = call i32 (...) @bar(), !dbg !16
18-
call void @llvm.dbg.value(metadata i32 %5, metadata !9, metadata !DIExpression()), !dbg !16
19-
br label %6, !dbg !18
20-
21-
; <label>:6 ; preds = %4, %2
22-
%k.0 = phi i32 [ %3, %2 ], [ %5, %4 ]
26+
%cond = icmp ne i32 %i, 0, !dbg !12
27+
br i1 %cond, label %then, label %else, !dbg !12
28+
29+
then:
30+
%call.1 = call i32 (...) @bar(), !dbg !13
31+
call void @llvm.dbg.value(metadata i32 %call.1, metadata !9, metadata !DIExpression()), !dbg !13
32+
br label %exit, !dbg !15
33+
34+
else:
35+
%call.2 = call i32 (...) @bar(), !dbg !16
36+
call void @llvm.dbg.value(metadata i32 %call.2, metadata !9, metadata !DIExpression()), !dbg !16
37+
br label %exit, !dbg !18
38+
39+
exit:
40+
%k.0 = phi i32 [ %call.1, %then ], [ %call.2, %else ]
2341
ret i32 %k.0, !dbg !19
2442
}
2543

44+
define i1 @hoist_with_debug2(i32 %x) !dbg !22 {
45+
; CHECK-LABEL: @hoist_with_debug2(
46+
; CHECK-NEXT: entry:
47+
; CHECK-NEXT: [[TOBOOL_NOT:%.*]] = icmp ugt i32 [[X:%.*]], 2
48+
; CHECK-NEXT: call void @llvm.dbg.value(metadata i32 [[X]], metadata [[META21:![0-9]+]], metadata !DIExpression()), !dbg [[DBG23:![0-9]+]]
49+
; CHECK-NEXT: call void @llvm.dbg.value(metadata i32 [[X]], metadata [[META21]], metadata !DIExpression()), !dbg [[DBG23]]
50+
; CHECK-NEXT: [[DOT:%.*]] = select i1 [[TOBOOL_NOT]], i1 false, i1 true
51+
; CHECK-NEXT: ret i1 [[DOT]]
52+
;
53+
entry:
54+
%tobool.not = icmp ugt i32 %x, 2
55+
br i1 %tobool.not, label %cond.end.thread, label %cond.end.thread19
56+
57+
cond.end.thread19: ; preds = %land.lhs.true
58+
call void @llvm.dbg.value(metadata i32 %x, metadata !24, metadata !DIExpression()), !dbg !25
59+
br label %exit
60+
61+
cond.end.thread: ; preds = %land.lhs.true
62+
call void @llvm.dbg.value(metadata i32 %x, metadata !24, metadata !DIExpression()), !dbg !25
63+
br label %exit
64+
65+
exit:
66+
%p = phi i1 [ true, %cond.end.thread19 ], [ false, %cond.end.thread ]
67+
ret i1 %p
68+
}
69+
70+
; Test case for PR49982.
71+
define i16 @hoist_with_debug3_pr49982(i32 %x, i1 %c.2) !dbg !26 {
72+
; CHECK-LABEL: @hoist_with_debug3_pr49982(
73+
; CHECK-NEXT: entry:
74+
; CHECK-NEXT: br label [[FOR_COND:%.*]]
75+
; CHECK: for.cond:
76+
; CHECK-NEXT: [[C_0:%.*]] = icmp sgt i32 [[X:%.*]], 0
77+
; CHECK-NEXT: [[BRMERGE:%.*]] = or i1 [[C_0]], [[C_2:%.*]]
78+
; CHECK-NEXT: [[DOTMUX:%.*]] = select i1 [[C_0]], i16 0, i16 20
79+
; CHECK-NEXT: br i1 [[BRMERGE]], label [[EXIT_1:%.*]], label [[FOR_COND]]
80+
; CHECK: exit.1:
81+
; CHECK-NEXT: ret i16 [[DOTMUX]]
82+
;
83+
entry:
84+
br label %for.cond
85+
86+
for.cond:
87+
%c.0 = icmp sgt i32 %x, 0
88+
br i1 %c.0, label %check, label %latch
89+
90+
check:
91+
%c.1 = icmp ugt i32 %x, 2
92+
br i1 %c.1, label %then, label %else
93+
94+
then:
95+
call void @llvm.dbg.value(metadata i32 %x, metadata !28, metadata !DIExpression()), !dbg !29
96+
br label %exit.2
97+
98+
else:
99+
call void @llvm.dbg.value(metadata i32 %x, metadata !28, metadata !DIExpression()), !dbg !29
100+
br label %exit.2
101+
102+
latch:
103+
br i1 %c.2, label %exit.1, label %for.cond
104+
105+
exit.1:
106+
ret i16 20
107+
108+
exit.2:
109+
ret i16 0
110+
}
111+
26112
declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone
27113

28114
declare i32 @bar(...)
@@ -53,3 +139,13 @@ declare void @llvm.dbg.value(metadata, metadata, metadata) nounwind readnone
53139
!19 = !DILocation(line: 9, column: 3, scope: !10)
54140
!20 = !DIFile(filename: "b.c", directory: "/private/tmp")
55141
!21 = !{i32 1, !"Debug Info Version", i32 3}
142+
143+
!22 = distinct !DISubprogram(name: "bar", line: 20, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, unit: !2, file: !20, scope: !1, type: !3)
144+
!23 = distinct !DILexicalBlock(line: 21, column: 33, file: !20, scope: !22)
145+
!24 = !DILocalVariable(name: "y", line: 21, scope: !23, file: !1, type: !5)
146+
!25 = !DILocation(line: 23, column: 3, scope: !23)
147+
148+
!26 = distinct !DISubprogram(name: "zar", line: 20, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, unit: !2, file: !20, scope: !1, type: !3)
149+
!27 = distinct !DILexicalBlock(line: 31, column: 33, file: !20, scope: !26)
150+
!28 = !DILocalVariable(name: "y", line: 21, scope: !27, file: !1, type: !5)
151+
!29 = !DILocation(line: 33, column: 3, scope: !27)

0 commit comments

Comments
 (0)