Skip to content

Commit 740ee00

Browse files
authored
PPCBranchCoalescing: Fix invalid branch weights (llvm#67211)
Re-normalize branch-weights after removing a block successor to avoid branch-weights not adding up to 100%. This changes MIR for the `test/CodeGen/PowerPC/branch_coalesce.ll` test like this: ```diff - successors: %bb.6(0x40000000); %bb.6(50.00%) + successors: %bb.6(0x80000000); %bb.6(100.00%) ``` This doesn't affect codegen on its own but fixing this helps with fluctuations I have with some of my upcoming changes.
1 parent ba94646 commit 740ee00

File tree

2 files changed

+105
-0
lines changed

2 files changed

+105
-0
lines changed

llvm/lib/Target/PowerPC/PPCBranchCoalescing.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -702,6 +702,7 @@ bool PPCBranchCoalescing::mergeCandidates(CoalescingCandidateInfo &SourceRegion,
702702
TargetRegion.FallThroughBlock->transferSuccessorsAndUpdatePHIs(
703703
SourceRegion.FallThroughBlock);
704704
TargetRegion.FallThroughBlock->removeSuccessor(SourceRegion.BranchBlock);
705+
TargetRegion.FallThroughBlock->normalizeSuccProbs();
705706

706707
// Remove the blocks from the function.
707708
assert(SourceRegion.BranchBlock->empty() &&
Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py UTC_ARGS: --version 3
2+
# RUN: llc -o - %s -run-pass=ppc-branch-coalescing | FileCheck %s
3+
--- |
4+
target triple = "powerpc64le-unknown-linux-gnu"
5+
6+
define double @testBranchCoal(double %a, double %b, double %c, i32 %x) {
7+
unreachable
8+
}
9+
...
10+
---
11+
name: testBranchCoal
12+
alignment: 16
13+
tracksRegLiveness: true
14+
liveins:
15+
- { reg: '$f1', virtual-reg: '%0' }
16+
- { reg: '$f2', virtual-reg: '%1' }
17+
- { reg: '$f3', virtual-reg: '%2' }
18+
- { reg: '$x6', virtual-reg: '%3' }
19+
frameInfo:
20+
maxAlignment: 1
21+
constants:
22+
- id: 0
23+
value: double 2.000000e-03
24+
alignment: 8
25+
- id: 1
26+
value: double 5.000000e-03
27+
alignment: 8
28+
machineFunctionInfo: {}
29+
body: |
30+
; CHECK-LABEL: name: testBranchCoal
31+
; CHECK: bb.0:
32+
; CHECK-NEXT: successors: %bb.1(0x1c71c71d), %bb.6(0x638e38e3)
33+
; CHECK-NEXT: liveins: $f1, $f2, $f3, $x2, $x6
34+
; CHECK-NEXT: {{ $}}
35+
; CHECK-NEXT: [[COPY:%[0-9]+]]:g8rc = COPY $x6
36+
; CHECK-NEXT: [[COPY1:%[0-9]+]]:f8rc = COPY $f3
37+
; CHECK-NEXT: [[COPY2:%[0-9]+]]:f8rc = COPY $f2
38+
; CHECK-NEXT: [[COPY3:%[0-9]+]]:f8rc = COPY $f1
39+
; CHECK-NEXT: [[COPY4:%[0-9]+]]:gprc = COPY [[COPY]].sub_32
40+
; CHECK-NEXT: [[COPY5:%[0-9]+]]:g8rc_and_g8rc_nox0 = COPY $x2
41+
; CHECK-NEXT: [[CMPLWI:%[0-9]+]]:crrc = CMPLWI killed [[COPY4]], 0
42+
; CHECK-NEXT: [[ADDIStocHA8_:%[0-9]+]]:g8rc_and_g8rc_nox0 = ADDIStocHA8 [[COPY5]], %const.0
43+
; CHECK-NEXT: [[LFD:%[0-9]+]]:f8rc = LFD target-flags(ppc-toc-lo) %const.0, killed [[ADDIStocHA8_]] :: (load (s64) from constant-pool)
44+
; CHECK-NEXT: [[XXLXORdpz:%[0-9]+]]:f8rc = XXLXORdpz
45+
; CHECK-NEXT: [[ADDIStocHA8_1:%[0-9]+]]:g8rc_and_g8rc_nox0 = ADDIStocHA8 [[COPY5]], %const.1
46+
; CHECK-NEXT: [[LFD1:%[0-9]+]]:f8rc = LFD target-flags(ppc-toc-lo) %const.1, killed [[ADDIStocHA8_1]] :: (load (s64) from constant-pool)
47+
; CHECK-NEXT: BCC 76, [[CMPLWI]], %bb.6
48+
; CHECK-NEXT: {{ $}}
49+
; CHECK-NEXT: bb.1:
50+
; CHECK-NEXT: successors: %bb.6(0x80000000)
51+
; CHECK-NEXT: {{ $}}
52+
; CHECK-NEXT: {{ $}}
53+
; CHECK-NEXT: bb.6:
54+
; CHECK-NEXT: [[PHI:%[0-9]+]]:f8rc = PHI [[LFD]], %bb.1, [[COPY3]], %bb.0
55+
; CHECK-NEXT: [[PHI1:%[0-9]+]]:f8rc = PHI [[XXLXORdpz]], %bb.1, [[COPY2]], %bb.0
56+
; CHECK-NEXT: [[PHI2:%[0-9]+]]:f8rc = PHI [[LFD1]], %bb.1, [[COPY1]], %bb.0
57+
; CHECK-NEXT: [[XSADDDP:%[0-9]+]]:vsfrc = nofpexcept XSADDDP killed [[PHI]], killed [[PHI1]], implicit $rm
58+
; CHECK-NEXT: [[XSADDDP1:%[0-9]+]]:vsfrc = nofpexcept XSADDDP killed [[XSADDDP]], killed [[PHI2]], implicit $rm
59+
; CHECK-NEXT: $f1 = COPY [[XSADDDP1]]
60+
; CHECK-NEXT: BLR8 implicit $lr8, implicit $rm, implicit $f1
61+
bb.0:
62+
successors: %bb.1, %bb.2
63+
liveins: $f1, $f2, $f3, $x2, $x6
64+
65+
%3:g8rc = COPY $x6
66+
%2:f8rc = COPY $f3
67+
%1:f8rc = COPY $f2
68+
%0:f8rc = COPY $f1
69+
%4:gprc = COPY %3.sub_32
70+
%16:g8rc_and_g8rc_nox0 = COPY $x2
71+
%5:crrc = CMPLWI killed %4, 0
72+
%6:g8rc_and_g8rc_nox0 = ADDIStocHA8 %16, %const.0
73+
%7:f8rc = LFD target-flags(ppc-toc-lo) %const.0, killed %6 :: (load (s64) from constant-pool)
74+
BCC 76, %5, %bb.2
75+
76+
bb.1:
77+
78+
bb.2:
79+
successors: %bb.3, %bb.4
80+
81+
%8:f8rc = PHI %7, %bb.1, %0, %bb.0
82+
%9:f8rc = XXLXORdpz
83+
BCC 76, %5, %bb.4
84+
85+
bb.3:
86+
87+
bb.4:
88+
successors: %bb.5, %bb.6
89+
90+
%10:f8rc = PHI %9, %bb.3, %1, %bb.2
91+
%11:g8rc_and_g8rc_nox0 = ADDIStocHA8 %16, %const.1
92+
%12:f8rc = LFD target-flags(ppc-toc-lo) %const.1, killed %11 :: (load (s64) from constant-pool)
93+
BCC 76, %5, %bb.6
94+
95+
bb.5:
96+
97+
bb.6:
98+
%13:f8rc = PHI %12, %bb.5, %2, %bb.4
99+
%14:vsfrc = nofpexcept XSADDDP killed %8, killed %10, implicit $rm
100+
%15:vsfrc = nofpexcept XSADDDP killed %14, killed %13, implicit $rm
101+
$f1 = COPY %15
102+
BLR8 implicit $lr8, implicit $rm, implicit $f1
103+
104+
...

0 commit comments

Comments
 (0)