From da1ebedeea4314d92e6688da36f0e6ea66eb3dd6 Mon Sep 17 00:00:00 2001 From: Bob Wilson Date: Thu, 6 Mar 2014 04:55:41 +0000 Subject: PGO: Use the main file name to help distinguish functions with local linkage. In addition, for all functions, use the name from the llvm::Function to identify the function in the profile data. Compute that "function name", including the file name for local functions, once when assigning the PGO counters and store it in the CodeGenPGO class. Move the code to add InlineHint and Cold attributes out of StartFunction(), because the "function name" string isn't available at that point. llvm-svn: 203075 --- clang/lib/CodeGen/CodeGenFunction.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'clang/lib/CodeGen/CodeGenFunction.cpp') diff --git a/clang/lib/CodeGen/CodeGenFunction.cpp b/clang/lib/CodeGen/CodeGenFunction.cpp index d0f1cb6..975ae6c 100644 --- a/clang/lib/CodeGen/CodeGenFunction.cpp +++ b/clang/lib/CodeGen/CodeGenFunction.cpp @@ -589,15 +589,6 @@ void CodeGenFunction::StartFunction(GlobalDecl GD, if (CGM.getCodeGenOpts().InstrumentForProfiling) EmitMCountInstrumentation(); - if (CGM.getPGOData() && D) { - // Turn on InlineHint attribute for hot functions. - if (CGM.getPGOData()->isHotFunction(CGM.getMangledName(GD))) - Fn->addFnAttr(llvm::Attribute::InlineHint); - // Turn on Cold attribute for cold functions. - else if (CGM.getPGOData()->isColdFunction(CGM.getMangledName(GD))) - Fn->addFnAttr(llvm::Attribute::Cold); - } - if (RetTy->isVoidType()) { // Void type; nothing to return. ReturnValue = 0; @@ -770,7 +761,7 @@ void CodeGenFunction::GenerateCode(GlobalDecl GD, llvm::Function *Fn, StartFunction(GD, ResTy, Fn, FnInfo, Args, BodyRange.getBegin()); // Generate the body of the function. - PGO.assignRegionCounters(GD.getDecl(), CGM.getMangledName(GD)); + PGO.assignRegionCounters(GD.getDecl(), CurFn); if (isa(FD)) EmitDestructorBody(Args); else if (isa(FD)) @@ -831,7 +822,7 @@ void CodeGenFunction::GenerateCode(GlobalDecl GD, llvm::Function *Fn, if (!CurFn->doesNotThrow()) TryMarkNoThrow(CurFn); - PGO.emitWriteoutFunction(CGM.getMangledName(CurGD)); + PGO.emitWriteoutFunction(); PGO.destroyRegionCounters(); } -- cgit v1.1