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

Merge changes I255fcbb8,I3ed4ce03 into main

Browse source 
* changes:
  Disable more of AFDO for host modules
  Add more AFDO tests
This commit is contained in:
Colin Cross 2024-02-09 19:30:29 +00:00 committed by Gerrit Code Review
commit 545ebf0c40
2 changed files with 155 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cc/afdo.go
View file

@ -68,6 +68,10 @@ func (afdo *afdo) afdoEnabled() bool {
}
func (afdo *afdo) flags(ctx ModuleContext, flags Flags) Flags {
if ctx.Host() {
return flags
}
if afdo.Properties.Afdo {
// We use `-funique-internal-linkage-names` to associate profiles to the right internal
// functions. This option should be used before generating a profile. Because a profile
@ -147,6 +151,10 @@ var _ FdoProfileMutatorInterface = (*Module)(nil)
// Propagate afdo requirements down from binaries and shared libraries
func afdoDepsMutator(mctx android.TopDownMutatorContext) {
if mctx.Host() {
return
}
if m, ok := mctx.Module().(*Module); ok && m.afdo.afdoEnabled() {
path := m.afdo.Properties.FdoProfilePath
mctx.WalkDeps(func(dep android.Module, parent android.Module) bool {
@ -181,6 +189,10 @@ func afdoDepsMutator(mctx android.TopDownMutatorContext) {
// Create afdo variants for modules that need them
func afdoMutator(mctx android.BottomUpMutatorContext) {
if mctx.Host() {
return
}
if m, ok := mctx.Module().(*Module); ok && m.afdo != nil {
if !m.static() && m.afdo.Properties.Afdo {
mctx.SetDependencyVariation(encodeTarget(m.Name()))

157
cc/afdo_test.go
View file

@ -42,19 +42,25 @@ func TestAfdoDeps(t *testing.T) {
bp := `
cc_library_shared {
name: "libTest",
host_supported: true,
srcs: ["test.c"],
static_libs: ["libFoo"],
afdo: true,
lto: {
thin: true,
},
}
cc_library_static {
name: "libFoo",
host_supported: true,
srcs: ["foo.c"],
static_libs: ["libBar"],
}
cc_library_static {
name: "libBar",
host_supported: true,
srcs: ["bar.c"],
}
`
@ -72,13 +78,20 @@ func TestAfdoDeps(t *testing.T) {
"afdo_profiles_package/Android.bp": []byte(`
fdo_profile {
name: "libTest_afdo",
profile: "libTest.afdo",
arch: {
arm64: {
profile: "libTest.afdo",
},
},
}
`),
}.AddToFixture(),
).RunTestWithBp(t, bp)
expectedCFlag := "-fprofile-sample-use=afdo_profiles_package/libTest.afdo"
profileSampleCFlag := "-fprofile-sample-use=afdo_profiles_package/libTest.afdo"
uniqueInternalLinkageNamesCFlag := "-funique-internal-linkage-names"
afdoLtoLdFlag := "-Wl,-plugin-opt,-import-instr-limit=40"
noAfdoLtoLdFlag := "-Wl,-plugin-opt,-import-instr-limit=5"
libTest := result.ModuleForTests("libTest", "android_arm64_armv8-a_shared")
libFooAfdoVariant := result.ModuleForTests("libFoo", "android_arm64_armv8-a_static_afdo-libTest")
@ -86,18 +99,32 @@ func TestAfdoDeps(t *testing.T) {
// Check cFlags of afdo-enabled module and the afdo-variant of its static deps
cFlags := libTest.Rule("cc").Args["cFlags"]
if !strings.Contains(cFlags, expectedCFlag) {
t.Errorf("Expected 'libTest' to enable afdo, but did not find %q in cflags %q", expectedCFlag, cFlags)
if !strings.Contains(cFlags, profileSampleCFlag) {
t.Errorf("Expected 'libTest' to enable afdo profile, but did not find %q in cflags %q", profileSampleCFlag, cFlags)
}
if !strings.Contains(cFlags, uniqueInternalLinkageNamesCFlag) {
t.Errorf("Expected 'libTest' to enable afdo, but did not find %q in cflags %q", profileSampleCFlag, cFlags)
}
ldFlags := libTest.Rule("ld").Args["ldFlags"]
if !strings.Contains(ldFlags, afdoLtoLdFlag) {
t.Errorf("Expected 'libTest' to enable afdo, but did not find %q in ldflags %q", afdoLtoLdFlag, ldFlags)
}
cFlags = libFooAfdoVariant.Rule("cc").Args["cFlags"]
if !strings.Contains(cFlags, expectedCFlag) {
t.Errorf("Expected 'libFooAfdoVariant' to enable afdo, but did not find %q in cflags %q", expectedCFlag, cFlags)
if !strings.Contains(cFlags, profileSampleCFlag) {
t.Errorf("Expected 'libFooAfdoVariant' to enable afdo profile, but did not find %q in cflags %q", profileSampleCFlag, cFlags)
}
if !strings.Contains(cFlags, uniqueInternalLinkageNamesCFlag) {
t.Errorf("Expected 'libFooAfdoVariant' to enable afdo, but did not find %q in cflags %q", profileSampleCFlag, cFlags)
}
cFlags = libBarAfdoVariant.Rule("cc").Args["cFlags"]
if !strings.Contains(cFlags, expectedCFlag) {
t.Errorf("Expected 'libBarAfdoVariant' to enable afdo, but did not find %q in cflags %q", expectedCFlag, cFlags)
if !strings.Contains(cFlags, profileSampleCFlag) {
t.Errorf("Expected 'libBarAfdoVariant' to enable afdo profile, but did not find %q in cflags %q", profileSampleCFlag, cFlags)
}
if !strings.Contains(cFlags, uniqueInternalLinkageNamesCFlag) {
t.Errorf("Expected 'libBarAfdoVariant' to enable afdo, but did not find %q in cflags %q", profileSampleCFlag, cFlags)
}
// Check dependency edge from afdo-enabled module to static deps
@ -114,12 +141,18 @@ func TestAfdoDeps(t *testing.T) {
libBar := result.ModuleForTests("libBar", "android_arm64_armv8-a_static")
cFlags = libFoo.Rule("cc").Args["cFlags"]
if strings.Contains(cFlags, expectedCFlag) {
t.Errorf("Expected 'libFoo' to not enable afdo, but found %q in cflags %q", expectedCFlag, cFlags)
if strings.Contains(cFlags, profileSampleCFlag) {
t.Errorf("Expected 'libFoo' to not enable afdo profile, but found %q in cflags %q", profileSampleCFlag, cFlags)
}
if strings.Contains(cFlags, uniqueInternalLinkageNamesCFlag) {
t.Errorf("Expected 'libFoo' to not enable afdo, but found %q in cflags %q", profileSampleCFlag, cFlags)
}
cFlags = libBar.Rule("cc").Args["cFlags"]
if strings.Contains(cFlags, expectedCFlag) {
t.Errorf("Expected 'libBar' to not enable afdo, but found %q in cflags %q", expectedCFlag, cFlags)
if strings.Contains(cFlags, profileSampleCFlag) {
t.Errorf("Expected 'libBar' to not enable afdo profile, but found %q in cflags %q", profileSampleCFlag, cFlags)
}
if strings.Contains(cFlags, uniqueInternalLinkageNamesCFlag) {
t.Errorf("Expected 'libBar' to not enable afdo, but found %q in cflags %q", profileSampleCFlag, cFlags)
}
// Check dependency edges of static deps
@ -130,6 +163,102 @@ func TestAfdoDeps(t *testing.T) {
if !hasDirectDep(result, libFoo.Module(), libBar.Module()) {
t.Errorf("libFoo missing dependency on non-afdo variant of libBar")
}
// Verify that the arm variant does not have FDO since the fdo_profile module only has a profile for arm64
libTest32 := result.ModuleForTests("libTest", "android_arm_armv7-a-neon_shared")
libFooAfdoVariant32 := result.ModuleForTests("libFoo", "android_arm_armv7-a-neon_static_afdo-libTest_lto-thin")
libBarAfdoVariant32 := result.ModuleForTests("libBar", "android_arm_armv7-a-neon_static_afdo-libTest_lto-thin")
cFlags = libTest32.Rule("cc").Args["cFlags"]
if strings.Contains(cFlags, profileSampleCFlag) {
t.Errorf("Expected arm32 'libTest' not to enable afdo, but found %q in cflags %q", profileSampleCFlag, cFlags)
}
// TODO(b/324141705): when the fdo_profile module doesn't provide a source file the dependencies don't get
// -funique-internal-linkage-names but the module does.
if !strings.Contains(cFlags, uniqueInternalLinkageNamesCFlag) {
t.Errorf("Expected arm32 'libTest' to enable -funique-internal-linkage-names but did not find %q in cflags %q",
uniqueInternalLinkageNamesCFlag, cFlags)
}
ldFlags = libTest32.Rule("ld").Args["ldFlags"]
if !strings.Contains(ldFlags, noAfdoLtoLdFlag) {
t.Errorf("Expected arm32 'libTest' to not enable afdo, but did not find %q in ldflags %q", noAfdoLtoLdFlag, ldFlags)
}
if strings.Contains(ldFlags, afdoLtoLdFlag) {
t.Errorf("Expected arm32 'libTest' to not enable afdo, but found %q in ldflags %q", afdoLtoLdFlag, ldFlags)
}
// Check dependency edge from afdo-enabled module to static deps
if !hasDirectDep(result, libTest32.Module(), libFooAfdoVariant32.Module()) {
t.Errorf("arm32 libTest missing dependency on afdo variant of libFoo")
}
if !hasDirectDep(result, libFooAfdoVariant32.Module(), libBarAfdoVariant32.Module()) {
t.Errorf("arm32 libTest missing dependency on afdo variant of libBar")
}
cFlags = libFooAfdoVariant32.Rule("cc").Args["cFlags"]
if strings.Contains(cFlags, profileSampleCFlag) {
t.Errorf("Expected arm32 'libFoo' to not enable afdo profile, but found %q in cflags %q", uniqueInternalLinkageNamesCFlag, cFlags)
}
if !strings.Contains(cFlags, uniqueInternalLinkageNamesCFlag) {
t.Errorf("Expected arm32 'libFoo' to enable afdo, but did not find %q in cflags %q", uniqueInternalLinkageNamesCFlag, cFlags)
}
cFlags = libBarAfdoVariant32.Rule("cc").Args["cFlags"]
if strings.Contains(cFlags, profileSampleCFlag) {
t.Errorf("Expected arm32 'libBar' to not enable afdo profile, but found %q in cflags %q", uniqueInternalLinkageNamesCFlag, cFlags)
}
if !strings.Contains(cFlags, uniqueInternalLinkageNamesCFlag) {
t.Errorf("Expected arm32 'libBar' to enable afdo, but did not find %q in cflags %q", uniqueInternalLinkageNamesCFlag, cFlags)
}
// Verify that the host variants don't enable afdo
libTestHost := result.ModuleForTests("libTest", result.Config.BuildOSTarget.String()+"_shared")
libFooHost := result.ModuleForTests("libFoo", result.Config.BuildOSTarget.String()+"_static_lto-thin")
libBarHost := result.ModuleForTests("libBar", result.Config.BuildOSTarget.String()+"_static_lto-thin")
cFlags = libTestHost.Rule("cc").Args["cFlags"]
if strings.Contains(cFlags, profileSampleCFlag) {
t.Errorf("Expected host 'libTest' to not enable afdo profile, but found %q in cflags %q", profileSampleCFlag, cFlags)
}
if strings.Contains(cFlags, uniqueInternalLinkageNamesCFlag) {
t.Errorf("Expected host 'libTest' to not enable afdo but found %q in cflags %q",
uniqueInternalLinkageNamesCFlag, cFlags)
}
ldFlags = libTestHost.Rule("ld").Args["ldFlags"]
if !strings.Contains(ldFlags, noAfdoLtoLdFlag) {
t.Errorf("Expected host 'libTest' to not enable afdo, but did not find %q in ldflags %q", noAfdoLtoLdFlag, ldFlags)
}
if strings.Contains(ldFlags, afdoLtoLdFlag) {
t.Errorf("Expected host 'libTest' to not enable afdo, but found %q in ldflags %q", afdoLtoLdFlag, ldFlags)
}
// Check dependency edge from afdo-enabled module to static deps
if !hasDirectDep(result, libTestHost.Module(), libFooHost.Module()) {
t.Errorf("host libTest missing dependency on non-afdo variant of libFoo")
}
if !hasDirectDep(result, libFooHost.Module(), libBarHost.Module()) {
t.Errorf("host libTest missing dependency on non-afdo variant of libBar")
}
cFlags = libFooHost.Rule("cc").Args["cFlags"]
if strings.Contains(cFlags, profileSampleCFlag) {
t.Errorf("Expected host 'libFoo' to not enable afdo profile, but found %q in cflags %q", uniqueInternalLinkageNamesCFlag, cFlags)
}
if strings.Contains(cFlags, uniqueInternalLinkageNamesCFlag) {
t.Errorf("Expected host 'libFoo' to not enable afdo, but found %q in cflags %q", uniqueInternalLinkageNamesCFlag, cFlags)
}
cFlags = libBarHost.Rule("cc").Args["cFlags"]
if strings.Contains(cFlags, profileSampleCFlag) {
t.Errorf("Expected host 'libBar' to not enable afdo profile, but found %q in cflags %q", uniqueInternalLinkageNamesCFlag, cFlags)
}
if strings.Contains(cFlags, uniqueInternalLinkageNamesCFlag) {
t.Errorf("Expected host 'libBar' to not enable afdo, but found %q in cflags %q", uniqueInternalLinkageNamesCFlag, cFlags)
}
}
func TestAfdoEnabledOnStaticDepNoAfdo(t *testing.T) {
@ -174,11 +303,11 @@ func TestAfdoEnabledOnStaticDepNoAfdo(t *testing.T) {
libBar := result.ModuleForTests("libBar", "android_arm64_armv8-a_static").Module()
if !hasDirectDep(result, libTest, libFoo.Module()) {
t.Errorf("libTest missing dependency on afdo variant of libFoo")
t.Errorf("libTest missing dependency on non-afdo variant of libFoo")
}
if !hasDirectDep(result, libFoo.Module(), libBar) {
t.Errorf("libFoo missing dependency on afdo variant of libBar")
t.Errorf("libFoo missing dependency on non-afdo variant of libBar")
}
fooVariants := result.ModuleVariantsForTests("foo")