dcfa78a4cc
Allow InvokeInst to have the second optional prof branch weight for
its unwind branch. InvokeInst is a terminator with two successors.
It might have its unwind branch taken many times. If so
the BranchProbabilityInfo unwind branch heuristic can be inaccurate.
This patch allows a higher accuracy calculated with both branch
weights set.
Changes:
- A new section about InvokeInst is added to
the BranchWeightMetadata page. It states the old information that
missed in the doc and adds new about the second branch weight.
- Verifier is changed to allow either 1 or 2 branch weights
for InvokeInst.
- A new test is written for BranchProbabilityInfo to demonstrate
the main improvement of the simple fix in calcMetadataWeights().
- Several new testcases are created for Inliner. Those check that
both weights are accounted for invoke instruction weight
calculation.
- PGOUseFunc::setBranchWeights() is fixed to be applicable to
InvokeInst.
Reviewers: davidxl, reames, xur, yamauchi
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D80618
122 lines
3.4 KiB
LLVM
122 lines
3.4 KiB
LLVM
; This tests that a hot callsite gets the (higher) inlinehint-threshold even without
|
|
; without inline hints and gets inlined because the cost is less than
|
|
; inlinehint-threshold. A cold callee with identical body does not get inlined because
|
|
; cost exceeds the inline-threshold
|
|
|
|
; RUN: opt < %s -inline -inline-threshold=0 -hot-callsite-threshold=100 -S | FileCheck %s
|
|
; RUN: opt < %s -passes='require<profile-summary>,cgscc(inline)' -inline-threshold=0 -hot-callsite-threshold=100 -S | FileCheck %s
|
|
|
|
; Run this with the default O2 pipeline to test that profile summary analysis
|
|
; is available during inlining.
|
|
; RUN: opt < %s -passes='default<O2>' -inline-threshold=0 -hot-callsite-threshold=100 -S | FileCheck %s
|
|
|
|
define i32 @callee1(i32 %x) {
|
|
%x1 = add i32 %x, 1
|
|
%x2 = add i32 %x1, 1
|
|
%x3 = add i32 %x2, 1
|
|
call void @extern()
|
|
call void @extern()
|
|
ret i32 %x3
|
|
}
|
|
|
|
define i32 @callee2(i32 %x) {
|
|
; CHECK-LABEL: @callee2(
|
|
%x1 = add i32 %x, 1
|
|
%x2 = add i32 %x1, 1
|
|
%x3 = add i32 %x2, 1
|
|
call void @extern()
|
|
call void @extern()
|
|
ret i32 %x3
|
|
}
|
|
|
|
define i32 @caller2(i32 %y1) {
|
|
; CHECK-LABEL: @caller2(
|
|
; CHECK: call i32 @callee2
|
|
; CHECK-NOT: call i32 @callee1
|
|
; CHECK: ret i32 %x3.i
|
|
%y2 = call i32 @callee2(i32 %y1), !prof !22
|
|
%y3 = call i32 @callee1(i32 %y2), !prof !21
|
|
ret i32 %y3
|
|
}
|
|
|
|
declare i32 @__gxx_personality_v0(...)
|
|
|
|
define i32 @invoker2(i32 %y1) personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
|
|
; CHECK-LABEL: @invoker2(
|
|
; CHECK: invoke i32 @callee2
|
|
; CHECK-NOT: invoke i32 @callee1
|
|
; CHECK: ret i32
|
|
%y2 = invoke i32 @callee2(i32 %y1) to label %next unwind label %lpad, !prof !22
|
|
|
|
next:
|
|
%y3 = invoke i32 @callee1(i32 %y2) to label %exit unwind label %lpad, !prof !21
|
|
|
|
exit:
|
|
ret i32 1
|
|
|
|
lpad:
|
|
%ll = landingpad { i8*, i32 } cleanup
|
|
ret i32 1
|
|
}
|
|
|
|
define i32 @invoker3(i32 %y1) personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
|
|
; CHECK-LABEL: @invoker3(
|
|
; CHECK: invoke i32 @callee2
|
|
; CHECK-NOT: invoke i32 @callee1
|
|
; CHECK: ret i32
|
|
%y2 = invoke i32 @callee2(i32 %y1) to label %next unwind label %lpad,
|
|
!prof !{!"branch_weights", i64 1, i64 0}
|
|
|
|
next:
|
|
%y3 = invoke i32 @callee1(i32 %y2) to label %exit unwind label %lpad,
|
|
!prof !{!"branch_weights", i64 300, i64 1}
|
|
|
|
exit:
|
|
ret i32 1
|
|
|
|
lpad:
|
|
%ll = landingpad { i8*, i32 } cleanup
|
|
ret i32 1
|
|
}
|
|
|
|
define i32 @invoker4(i32 %y1) personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
|
|
; CHECK-LABEL: @invoker4(
|
|
; CHECK: invoke i32 @callee2
|
|
; CHECK-NOT: invoke i32 @callee1
|
|
; CHECK: ret i32
|
|
%y2 = invoke i32 @callee2(i32 %y1) to label %next unwind label %lpad,
|
|
!prof !{!"branch_weights", i64 1, i64 0}
|
|
|
|
next:
|
|
%y3 = invoke i32 @callee1(i32 %y2) to label %exit unwind label %lpad,
|
|
!prof !{!"branch_weights", i64 0, i64 300}
|
|
|
|
exit:
|
|
ret i32 1
|
|
|
|
lpad:
|
|
%ll = landingpad { i8*, i32 } cleanup
|
|
ret i32 1
|
|
}
|
|
|
|
declare void @extern()
|
|
|
|
!llvm.module.flags = !{!1}
|
|
!21 = !{!"branch_weights", i64 300}
|
|
!22 = !{!"branch_weights", i64 1}
|
|
|
|
!1 = !{i32 1, !"ProfileSummary", !2}
|
|
!2 = !{!3, !4, !5, !6, !7, !8, !9, !10}
|
|
!3 = !{!"ProfileFormat", !"SampleProfile"}
|
|
!4 = !{!"TotalCount", i64 10000}
|
|
!5 = !{!"MaxCount", i64 1000}
|
|
!6 = !{!"MaxInternalCount", i64 1}
|
|
!7 = !{!"MaxFunctionCount", i64 1000}
|
|
!8 = !{!"NumCounts", i64 3}
|
|
!9 = !{!"NumFunctions", i64 3}
|
|
!10 = !{!"DetailedSummary", !11}
|
|
!11 = !{!12, !13, !14}
|
|
!12 = !{i32 10000, i64 100, i32 1}
|
|
!13 = !{i32 999000, i64 100, i32 1}
|
|
!14 = !{i32 999999, i64 1, i32 2}
|