[llvm] r341245 - [NFC] Pre-calculate function IR counts in size remarks.
Jessica Paquette via llvm-commits
llvm-commits at lists.llvm.org
Fri Aug 31 13:19:41 PDT 2018
Author: paquette
Date: Fri Aug 31 13:19:41 2018
New Revision: 341245
URL: http://llvm.org/viewvc/llvm-project?rev=341245&view=rev
Log:
[NFC] Pre-calculate function IR counts in size remarks.
Size remarks are slow due to lots of recalculation of the module.
Pre-calculate the module size and initial function size for a remark. Use
deltas calculated using the less-expensive function IR count to update the
module counts for Function passes.
1/6
Modified:
llvm/trunk/lib/IR/LegacyPassManager.cpp
Modified: llvm/trunk/lib/IR/LegacyPassManager.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/LegacyPassManager.cpp?rev=341245&r1=341244&r2=341245&view=diff
==============================================================================
--- llvm/trunk/lib/IR/LegacyPassManager.cpp (original)
+++ llvm/trunk/lib/IR/LegacyPassManager.cpp Fri Aug 31 13:19:41 2018
@@ -1510,8 +1510,14 @@ bool FPPassManager::runOnFunction(Functi
// Collect inherited analysis from Module level pass manager.
populateInheritedAnalysis(TPM->activeStack);
- unsigned InstrCount = 0;
+ unsigned InstrCount, FunctionSize = 0;
bool EmitICRemark = M.shouldEmitInstrCountChangedRemark();
+ // Collect the initial size of the module.
+ if (EmitICRemark) {
+ InstrCount = initSizeRemarkInfo(M);
+ FunctionSize = F.getInstructionCount();
+ }
+
for (unsigned Index = 0; Index < getNumContainedPasses(); ++Index) {
FunctionPass *FP = getContainedPass(Index);
bool LocalChanged = false;
@@ -1524,11 +1530,20 @@ bool FPPassManager::runOnFunction(Functi
{
PassManagerPrettyStackEntry X(FP, F);
TimeRegion PassTimer(getPassTimer(FP));
- if (EmitICRemark)
- InstrCount = initSizeRemarkInfo(M);
LocalChanged |= FP->runOnFunction(F);
- if (EmitICRemark)
- emitInstrCountChangedRemark(FP, M, InstrCount);
+ if (EmitICRemark) {
+ unsigned NewSize = F.getInstructionCount();
+
+ // Update the size of the function, emit a remark, and update the size
+ // of the module.
+ if (NewSize != FunctionSize) {
+ emitInstrCountChangedRemark(FP, M, InstrCount);
+ int64_t Delta = static_cast<int64_t>(NewSize) -
+ static_cast<int64_t>(FunctionSize);
+ InstrCount = static_cast<int64_t>(InstrCount) + Delta;
+ FunctionSize = NewSize;
+ }
+ }
}
Changed |= LocalChanged;
More information about the llvm-commits
mailing list