StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor methods to be on PgoProperties struct

Browse Source 
These methods only need the 'PgoProperties' struct.  Avoid the extra
indirection by directly using this struct.

Test: Build modules with PGO property.
Change-Id: I1923ebde4b0d546810de8e696514d218b3a4f54b
This commit is contained in:
Pirama Arumuga Nainar
2017-10-10 10:47:41 -07:00
parent 89479facb9
commit 3f5bb9c89b
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cc/pgo.go
View File

@@ -63,33 +63,33 @@ func (pgo *pgo) props() []interface{} {
return []interface{}{&pgo.Properties}
}
func (pgo *pgo) addProfileGatherFlags(ctx ModuleContext, flags Flags) Flags {
if pgo.Properties.isInstrumentation() {
func (props *PgoProperties) addProfileGatherFlags(ctx ModuleContext, flags Flags) Flags {
if props.isInstrumentation() {
flags.CFlags = append(flags.CFlags, profileInstrumentFlag)
// The profile runtime is added below in deps(). Add the below
// flag, which is the only other link-time action performed by
// the Clang driver during link.
flags.LdFlags = append(flags.LdFlags, "-u__llvm_profile_runtime")
}
if pgo.Properties.isSampling() {
if props.isSampling() {
flags.CFlags = append(flags.CFlags, profileSamplingFlag)
flags.LdFlags = append(flags.LdFlags, profileSamplingFlag)
}
return flags
}
func (pgo *pgo) profileUseFlag(ctx ModuleContext, file string) string {
if pgo.Properties.isInstrumentation() {
func (props *PgoProperties) profileUseFlag(ctx ModuleContext, file string) string {
if props.isInstrumentation() {
return fmt.Sprintf(profileUseInstrumentFormat, file)
}
if pgo.Properties.isSampling() {
if props.isSampling() {
return fmt.Sprintf(profileUseSamplingFormat, file)
}
return ""
}
func (pgo *pgo) profileUseFlags(ctx ModuleContext, file string) []string {
flags := []string{pgo.profileUseFlag(ctx, file)}
func (props *PgoProperties) profileUseFlags(ctx ModuleContext, file string) []string {
flags := []string{props.profileUseFlag(ctx, file)}
flags = append(flags, profileUseOtherFlags...)
return flags
}
@@ -188,14 +188,14 @@ func (pgo *pgo) flags(ctx ModuleContext, flags Flags) Flags {
// Add flags to profile this module based on its profile_kind
if props.ShouldProfileModule {
return pgo.addProfileGatherFlags(ctx, flags)
return props.addProfileGatherFlags(ctx, flags)
}
// If the PGO profiles project is found, and this module has PGO
// enabled, add flags to use the profile
if profilesDir := getPgoProfilesDir(ctx); props.PgoPresent && profilesDir.Valid() {
profileFile := android.PathForSource(ctx, profilesDir.String(), *(props.Pgo.Profile_file))
profileUseFlags := pgo.profileUseFlags(ctx, profileFile.String())
profileUseFlags := props.profileUseFlags(ctx, profileFile.String())
flags.CFlags = append(flags.CFlags, profileUseFlags...)
flags.LdFlags = append(flags.LdFlags, profileUseFlags...)