From 57547452cf8139aa788f45b585420e2e9e99e2ee Mon Sep 17 00:00:00 2001 From: Ulya Trafimovich Date: Mon, 9 Dec 2019 15:40:17 +0000 Subject: [PATCH] Use boot image extension in the JIT-zygote experiment. Test: temporarily enable JIT-zygote configuration, build, boot the device and ensure that the JIT-zygote specific boot image apex-framework.art is mapped in the zygote address space: 1. enable Jit zygote in the product device config (in my case device/google/muskie/aosp_walleye.mk): +# System server should not contain compiled code. +PRODUCT_SYSTEM_SERVER_COMPILER_FILTER := verify + +# Use the apex image for preopting. +DEXPREOPT_USE_APEX_IMAGE := true + +# Have the runtime pick up the apex image. +PRODUCT_PROPERTY_OVERRIDES += \ + dalvik.vm.boot-image=/apex/com.android.art/javalib/apex.art:/system/framework/apex-framework.art 2. lunch aosp_walleye-userdebug \ && m \ && adb reboot bootloader \ && fastboot flashall -w 3. adb shell cat /proc/`adb shell ps | grep zygote64 | awk {'print $2'}`/maps | grep apex-framework.art 6fe44000-7025c000 rw-p 00000000 fc:02 1179718 /data/dalvik-cache/arm64/apex@com.android.art@javalib@apex-framework.art 70571000-70696000 rw-p 0072d000 fc:02 1179718 /data/dalvik-cache/arm64/apex@com.android.art@javalib@apex-framework.art 75a339f000-75a33ac000 r--p 00852000 fc:02 1179718 /data/dalvik-cache/arm64/apex@com.android.art@javalib@apex-framework.art Change-Id: I5493e575ebf90bad1d5ad2850004d54590bbc079 --- java/dexpreopt.go | 10 +++----- java/dexpreopt_bootjars.go | 3 ++- java/dexpreopt_config.go | 52 ++++++++++++++++++++++++++------------ 3 files changed, 41 insertions(+), 24 deletions(-) diff --git a/java/dexpreopt.go b/java/dexpreopt.go index 479dec60b..1631ab8e1 100644 --- a/java/dexpreopt.go +++ b/java/dexpreopt.go @@ -101,9 +101,8 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo global := dexpreoptGlobalConfig(ctx) bootImage := defaultBootImageConfig(ctx) - defaultBootImage := bootImage if global.UseApexImage { - bootImage = apexBootImageConfig(ctx) + bootImage = frameworkJZBootImageConfig(ctx) } var archs []android.ArchType @@ -174,11 +173,8 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo DexPreoptImagesDeps: imagesDeps, DexPreoptImageLocations: bootImage.imageLocations, - // We use the dex paths and dex locations of the default boot image, as it - // contains the full dexpreopt boot classpath. Other images may just contain a subset of - // the dexpreopt boot classpath. - PreoptBootClassPathDexFiles: defaultBootImage.dexPathsDeps.Paths(), - PreoptBootClassPathDexLocations: defaultBootImage.dexLocationsDeps, + PreoptBootClassPathDexFiles: bootImage.dexPathsDeps.Paths(), + PreoptBootClassPathDexLocations: bootImage.dexLocationsDeps, PreoptExtractedApk: false, diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go index fe5bed501..66840b503 100644 --- a/java/dexpreopt_bootjars.go +++ b/java/dexpreopt_bootjars.go @@ -220,7 +220,8 @@ func (d *dexpreoptBootJars) GenerateBuildActions(ctx android.SingletonContext) { d.otherImages = append(d.otherImages, buildBootImage(ctx, artBootImageConfig(ctx))) if global.GenerateApexImage { // Create boot images for the JIT-zygote experiment. - d.otherImages = append(d.otherImages, buildBootImage(ctx, apexBootImageConfig(ctx))) + d.otherImages = append(d.otherImages, buildBootImage(ctx, artJZBootImageConfig(ctx))) + d.otherImages = append(d.otherImages, buildBootImage(ctx, frameworkJZBootImageConfig(ctx))) } dumpOatRules(ctx, d.defaultBootImage) diff --git a/java/dexpreopt_config.go b/java/dexpreopt_config.go index 8749a7d57..3287ea6c1 100644 --- a/java/dexpreopt_config.go +++ b/java/dexpreopt_config.go @@ -121,10 +121,11 @@ func getJarsFromApexJarPairs(apexJarPairs []string) []string { } var ( - bootImageConfigKey = android.NewOnceKey("bootImageConfig") - artBootImageName = "art" - frameworkBootImageName = "boot" - apexBootImageName = "apex" + bootImageConfigKey = android.NewOnceKey("bootImageConfig") + artBootImageName = "art" + frameworkBootImageName = "boot" + artJZBootImageName = "jitzygote-art" + frameworkJZBootImageName = "jitzygote-boot" ) // Construct the global boot image configs. @@ -178,22 +179,33 @@ func genBootImageConfigs(ctx android.PathContext) map[string]*bootImageConfig { dexLocationsDeps: append(artLocations, frameworkLocations...), } - // Apex config for the boot image used in the JIT-zygote experiment. - // It includes both the Core libraries and framework. - apexCfg := bootImageConfig{ + // ART config for JIT-zygote boot image. + artJZCfg := bootImageConfig{ extension: false, - name: apexBootImageName, + name: artJZBootImageName, + stem: "apex", + installSubdir: artSubdir, + modules: artModules, + dexLocations: artLocations, + dexLocationsDeps: artLocations, + } + + // Framework config for JIT-zygote boot image extension. + frameworkJZCfg := bootImageConfig{ + extension: true, + name: frameworkJZBootImageName, stem: "apex", installSubdir: frameworkSubdir, - modules: concat(artModules, frameworkModules), - dexLocations: concat(artLocations, frameworkLocations), - dexLocationsDeps: concat(artLocations, frameworkLocations), + modules: frameworkModules, + dexLocations: frameworkLocations, + dexLocationsDeps: append(artLocations, frameworkLocations...), } configs := map[string]*bootImageConfig{ - artBootImageName: &artCfg, - frameworkBootImageName: &frameworkCfg, - apexBootImageName: &apexCfg, + artBootImageName: &artCfg, + frameworkBootImageName: &frameworkCfg, + artJZBootImageName: &artJZCfg, + frameworkJZBootImageName: &frameworkJZCfg, } // common to all configs @@ -235,6 +247,10 @@ func genBootImageConfigs(ctx android.PathContext) map[string]*bootImageConfig { frameworkCfg.dexPathsDeps = append(artCfg.dexPathsDeps, frameworkCfg.dexPathsDeps...) frameworkCfg.imageLocations = append(artCfg.imageLocations, frameworkCfg.imageLocations...) + // specific to the jitzygote-framework config + frameworkJZCfg.dexPathsDeps = append(artJZCfg.dexPathsDeps, frameworkJZCfg.dexPathsDeps...) + frameworkJZCfg.imageLocations = append(artJZCfg.imageLocations, frameworkJZCfg.imageLocations...) + return configs }).(map[string]*bootImageConfig) } @@ -247,8 +263,12 @@ func defaultBootImageConfig(ctx android.PathContext) bootImageConfig { return *genBootImageConfigs(ctx)[frameworkBootImageName] } -func apexBootImageConfig(ctx android.PathContext) bootImageConfig { - return *genBootImageConfigs(ctx)[apexBootImageName] +func artJZBootImageConfig(ctx android.PathContext) bootImageConfig { + return *genBootImageConfigs(ctx)[artJZBootImageName] +} + +func frameworkJZBootImageConfig(ctx android.PathContext) bootImageConfig { + return *genBootImageConfigs(ctx)[frameworkJZBootImageName] } func defaultBootclasspath(ctx android.PathContext) []string {