tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes Ib23bad52,I1923ebde

Browse source 
am: 3656beab20

Change-Id: I61c15978779b2cd175b07e4a3a47d8212791c12c
This commit is contained in:
Pirama Arumuga Nainar 2017-10-11 00:18:23 +00:00 committed by android-build-merger
commit c5a3ea48b5
1 changed files with 29 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
cc/pgo.go
View file

@ -63,37 +63,55 @@ 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
}
func (props *PgoProperties) addProfileUseFlags(ctx ModuleContext, flags Flags) 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 := props.profileUseFlags(ctx, profileFile.String())
flags.CFlags = append(flags.CFlags, profileUseFlags...)
flags.LdFlags = append(flags.LdFlags, profileUseFlags...)
// Update CFlagsDeps and LdFlagsDeps so the module is rebuilt
// if profileFile gets updated
flags.CFlagsDeps = append(flags.CFlagsDeps, profileFile)
flags.LdFlagsDeps = append(flags.LdFlagsDeps, profileFile)
}
return flags
}
func (props *PgoProperties) isPGO(ctx BaseModuleContext) bool {
isInstrumentation := props.isInstrumentation()
isSampling := props.isSampling()
@ -188,22 +206,11 @@ 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())
flags.CFlags = append(flags.CFlags, profileUseFlags...)
flags.LdFlags = append(flags.LdFlags, profileUseFlags...)
// Update CFlagsDeps and LdFlagsDeps so the module is rebuilt
// if profileFile gets updated
flags.CFlagsDeps = append(flags.CFlagsDeps, profileFile)
flags.LdFlagsDeps = append(flags.LdFlagsDeps, profileFile)
if !ctx.AConfig().IsEnvTrue("ANDROID_PGO_NO_PROFILE_USE") {
return props.addProfileUseFlags(ctx, flags)
}
return flags