maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Use ProfileSummary:getProfileCount to get ScaledCount for ModuleSummary 

Summary: ModuleSummary should use the standard interface of ProfileSummary::getProfileCount.

Reviewers: eraman, tejohnson

Reviewed By: tejohnson

Subscribers: tejohnson, mehdi_amini, llvm-commits

Differential Revision: https://reviews.llvm.org/D31154

llvm-svn: 298404
This commit is contained in:
Dehao Chen 2017-03-21 17:22:35 +00:00
parent ca7818ebca
commit 190f17cae7
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/lib/Analysis/ModuleSummaryAnalysis.cpp
View File

@ -231,7 +231,7 @@ computeFunctionSummary(ModuleSummaryIndex &Index, const Module &M,
} }
// We should have named any anonymous globals // We should have named any anonymous globals
assert(CalledFunction->hasName()); assert(CalledFunction->hasName());
auto ScaledCount = BFI ? BFI->getBlockProfileCount(&BB) : None; auto ScaledCount = ProfileSummaryInfo::getProfileCount(&I, BFI);
auto Hotness = ScaledCount ? getHotness(ScaledCount.getValue(), PSI) auto Hotness = ScaledCount ? getHotness(ScaledCount.getValue(), PSI)
: CalleeInfo::HotnessType::Unknown; : CalleeInfo::HotnessType::Unknown;

6
llvm/test/Bitcode/thinlto-function-summary-callgraph-profile-summary.ll
View File

@ -10,7 +10,7 @@
; CHECK-NEXT: <VERSION ; CHECK-NEXT: <VERSION
; See if the call to func is registered, using the expected callsite count ; See if the call to func is registered, using the expected callsite count
; and profile count, with value id matching the subsequent value symbol table. ; and profile count, with value id matching the subsequent value symbol table.
; CHECK-NEXT: <PERMODULE_PROFILE {{.*}} op4=[[HOT1:.*]] op5=3 op6=[[COLD:.*]] op7=1 op8=[[HOT2:.*]] op9=3 op10=[[NONE1:.*]] op11=2 op12=[[HOT3:.*]] op13=3 op14=[[NONE2:.*]] op15=2 op16=[[NONE3:.*]] op17=2 op18=[[LEGACY:.*]] op19=3/> ; CHECK-NEXT: <PERMODULE_PROFILE {{.*}} op4=[[HOT1:.*]] op5=3 op6=[[COLD:.*]] op7=1 op8=[[HOT2:.*]] op9=3 op10=[[HOT4:.*]] op11=3 op12=[[NONE1:.*]] op13=2 op14=[[HOT3:.*]] op15=3 op16=[[NONE2:.*]] op17=2 op18=[[NONE3:.*]] op19=2 op20=[[LEGACY:.*]] op21=3/>
; CHECK-NEXT: </GLOBALVAL_SUMMARY_BLOCK> ; CHECK-NEXT: </GLOBALVAL_SUMMARY_BLOCK>
; CHECK-LABEL: <VALUE_SYMTAB ; CHECK-LABEL: <VALUE_SYMTAB
; CHECK-NEXT: <FNENTRY {{.*}} record string = 'hot_function ; CHECK-NEXT: <FNENTRY {{.*}} record string = 'hot_function
@ -21,6 +21,7 @@
; CHECK-DAG: <ENTRY abbrevid=6 op0=[[HOT1]] {{.*}} record string = 'hot1' ; CHECK-DAG: <ENTRY abbrevid=6 op0=[[HOT1]] {{.*}} record string = 'hot1'
; CHECK-DAG: <ENTRY abbrevid=6 op0=[[HOT2]] {{.*}} record string = 'hot2' ; CHECK-DAG: <ENTRY abbrevid=6 op0=[[HOT2]] {{.*}} record string = 'hot2'
; CHECK-DAG: <ENTRY abbrevid=6 op0=[[HOT3]] {{.*}} record string = 'hot3' ; CHECK-DAG: <ENTRY abbrevid=6 op0=[[HOT3]] {{.*}} record string = 'hot3'
; CHECK-DAG: <ENTRY abbrevid=6 op0=[[HOT4]] {{.*}} record string = 'hot4'
; CHECK-DAG: <COMBINED_ENTRY abbrevid=11 op0=[[LEGACY]] op1=123/> ; CHECK-DAG: <COMBINED_ENTRY abbrevid=11 op0=[[LEGACY]] op1=123/>
; CHECK-LABEL: </VALUE_SYMTAB> ; CHECK-LABEL: </VALUE_SYMTAB>
@ -49,6 +50,7 @@ entry:
Cold: ; 1/1000 goes here Cold: ; 1/1000 goes here
call void @cold() call void @cold()
call void @hot2() call void @hot2()
call void @hot4(), !prof !15
call void @none1() call void @none1()
br label %exit br label %exit
Hot: ; 999/1000 goes here Hot: ; 999/1000 goes here
@ -69,6 +71,7 @@ exit:
declare void @hot1() #1 declare void @hot1() #1
declare void @hot2() #1 declare void @hot2() #1
declare void @hot3() #1 declare void @hot3() #1
declare void @hot4() #1
declare void @cold() #1 declare void @cold() #1
declare void @none1() #1 declare void @none1() #1
declare void @none2() #1 declare void @none2() #1
@ -97,3 +100,4 @@ declare void @none3() #1
!12 = !{i32 10000, i64 100, i32 1} !12 = !{i32 10000, i64 100, i32 1}
!13 = !{i32 999000, i64 100, i32 1} !13 = !{i32 999000, i64 100, i32 1}
!14 = !{i32 999999, i64 1, i32 2} !14 = !{i32 999999, i64 1, i32 2}
!15 = !{!"branch_weights", i32 100}