[LTO][Pipelines] Add 0 hot-caller threshold for SamplePGO + FullLTO (#135152)
If a hot callsite function is not inlined in the 1st build, inlining the
hot callsite in pre-link stage of SPGO 2nd build may lead to Function
Sample not found in profile file in link stage. It will miss some
profile info.
ThinLTO has already considered and dealed with it by setting
HotCallSiteThreshold to 0 to stop the inline. This patch just adds the
same processing for FullLTO.
diff --git a/llvm/lib/Passes/PassBuilderPipelines.cpp b/llvm/lib/Passes/PassBuilderPipelines.cpp
index 300898b..f172271 100644
--- a/llvm/lib/Passes/PassBuilderPipelines.cpp
+++ b/llvm/lib/Passes/PassBuilderPipelines.cpp
@@ -926,14 +926,14 @@
IP = getInlineParamsFromOptLevel(Level);
else
IP = getInlineParams(PTO.InlinerThreshold);
- // For PreLinkThinLTO + SamplePGO, set hot-caller threshold to 0 to
- // disable hot callsite inline (as much as possible [1]) because it makes
+ // For PreLinkThinLTO + SamplePGO or PreLinkFullLTO + SamplePGO,
+ // set hot-caller threshold to 0 to disable hot
+ // callsite inline (as much as possible [1]) because it makes
// profile annotation in the backend inaccurate.
//
// [1] Note the cost of a function could be below zero due to erased
// prologue / epilogue.
- if (Phase == ThinOrFullLTOPhase::ThinLTOPreLink && PGOOpt &&
- PGOOpt->Action == PGOOptions::SampleUse)
+ if (isLTOPreLink(Phase) && PGOOpt && PGOOpt->Action == PGOOptions::SampleUse)
IP.HotCallSiteThreshold = 0;
if (PGOOpt)
@@ -1023,14 +1023,14 @@
ModulePassManager MPM;
InlineParams IP = getInlineParamsFromOptLevel(Level);
- // For PreLinkThinLTO + SamplePGO, set hot-caller threshold to 0 to
- // disable hot callsite inline (as much as possible [1]) because it makes
+ // For PreLinkThinLTO + SamplePGO or PreLinkFullLTO + SamplePGO,
+ // set hot-caller threshold to 0 to disable hot
+ // callsite inline (as much as possible [1]) because it makes
// profile annotation in the backend inaccurate.
//
// [1] Note the cost of a function could be below zero due to erased
// prologue / epilogue.
- if (Phase == ThinOrFullLTOPhase::ThinLTOPreLink && PGOOpt &&
- PGOOpt->Action == PGOOptions::SampleUse)
+ if (isLTOPreLink(Phase) && PGOOpt && PGOOpt->Action == PGOOptions::SampleUse)
IP.HotCallSiteThreshold = 0;
if (PGOOpt)
diff --git a/llvm/test/Other/new-pm-thinlto-prelink-samplepgo-inline-threshold.ll b/llvm/test/Other/new-pm-lto-prelink-samplepgo-inline-threshold.ll
similarity index 91%
rename from llvm/test/Other/new-pm-thinlto-prelink-samplepgo-inline-threshold.ll
rename to llvm/test/Other/new-pm-lto-prelink-samplepgo-inline-threshold.ll
index 9baedcb..67af5f1 100644
--- a/llvm/test/Other/new-pm-thinlto-prelink-samplepgo-inline-threshold.ll
+++ b/llvm/test/Other/new-pm-lto-prelink-samplepgo-inline-threshold.ll
@@ -1,4 +1,4 @@
-; Tests that hot callsite threshold is set to 0 artifically for thinlto-prelink pipeline.
+; Tests that hot callsite threshold is set to 0 artifically for thinlto-prelink and lto-pre-link pipeline.
;
; Function `sum` is annotated with inline cost -1 and function `sum1` is
; annotated with inline cost 0, by function attribute `function-inline-cost`.
@@ -12,6 +12,9 @@
; RUN: opt < %s -pass-remarks=inline -pass-remarks-missed=inline -passes='thinlto-pre-link<O2>' -pgo-kind=pgo-sample-use-pipeline -sample-profile-file=%S/Inputs/new-pm-thinlto-prelink-samplepgo-inline-threshold.prof -S 2>&1 | FileCheck %s -check-prefix=REMARK
+; RUN: opt < %s -pass-remarks=inline -pass-remarks-missed=inline -passes='lto-pre-link<O2>' -pgo-kind=pgo-sample-use-pipeline -sample-profile-file=%S/Inputs/new-pm-thinlto-prelink-samplepgo-inline-threshold.prof -S | FileCheck %s
+
+; RUN: opt < %s -pass-remarks=inline -pass-remarks-missed=inline -passes='lto-pre-link<O2>' -pgo-kind=pgo-sample-use-pipeline -sample-profile-file=%S/Inputs/new-pm-thinlto-prelink-samplepgo-inline-threshold.prof -S 2>&1 | FileCheck %s -check-prefix=REMARK
; Original C++ test case
;
; #include <stdio.h>
