Merge "Enable profile guided compilation on the framework side" (7bdf3cff) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -4723,6 +4723,9 @@ public final class ActivityThread {
		}

		private static void setupJitProfileSupport(LoadedApk loadedApk, File cacheDir) {
		if (!SystemProperties.getBoolean("dalvik.vm.usejitprofiles", false)) {
		return;
		}
		final ApplicationInfo appInfo = loadedApk.getApplicationInfo();
		if (isSharingRuntime(appInfo)) {
		// If sharing is enabled we do not have a unique application

core/java/com/android/internal/os/InstallerConnection.java

+16 −5

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.net.LocalSocketAddress;
		import android.os.SystemClock;
		import android.text.TextUtils;
		import android.util.Slog;
		import android.text.TextUtils;

		import com.android.internal.util.Preconditions;

		@@ -139,14 +140,24 @@ public class InstallerConnection {
		}

		public void dexopt(String apkPath, int uid, String instructionSet, int dexoptNeeded,
		int dexFlags) throws InstallerException {
		dexopt(apkPath, uid, "", instructionSet, dexoptNeeded, null / outputPath */, dexFlags);
		int dexFlags, String volumeUuid, boolean useProfiles) throws InstallerException {
		dexopt(apkPath, uid, "*", instructionSet, dexoptNeeded,
		null /outputPath/, dexFlags, volumeUuid, useProfiles);
		}

		public void dexopt(String apkPath, int uid, String pkgName, String instructionSet,
		int dexoptNeeded, String outputPath, int dexFlags) throws InstallerException {
		execute("dexopt", apkPath, uid, pkgName, instructionSet, dexoptNeeded, outputPath,
		dexFlags);
		int dexoptNeeded, String outputPath, int dexFlags, String volumeUuid,
		boolean useProfiles) throws InstallerException {
		execute("dexopt",
		apkPath,
		uid,
		pkgName,
		instructionSet,
		dexoptNeeded,
		outputPath,
		dexFlags,
		volumeUuid,
		useProfiles ? '1' : '0');
		}

		private boolean connect() {

core/java/com/android/internal/os/ZygoteInit.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -500,8 +500,11 @@ public class ZygoteInit {
		final int dexoptNeeded = DexFile.getDexOptNeeded(
		classPathElement, "", instructionSet, false / defer */);
		if (dexoptNeeded != DexFile.NO_DEXOPT_NEEDED) {
		// System server is fully AOTed and never profiled
		// for profile guided compilation.
		installer.dexopt(classPathElement, Process.SYSTEM_UID, instructionSet,
		dexoptNeeded, 0 /dexFlags/);
		dexoptNeeded, 0 /dexFlags/, null /volumeUuid/,
		false /useProfiles/);
		}
		}
		} catch (IOException \| InstallerException e) {

core/jni/AndroidRuntime.cpp

+5 −0

Original line number	Diff line number	Diff line
		@@ -586,6 +586,7 @@ int AndroidRuntime::startVm(JavaVM pJavaVM, JNIEnv pEnv, bool zygote)
		char jitmaxsizeOptsBuf[sizeof("-Xjitmaxsize:")-1 + PROPERTY_VALUE_MAX];
		char jitinitialsizeOptsBuf[sizeof("-Xjitinitialsize:")-1 + PROPERTY_VALUE_MAX];
		char jitthresholdOptsBuf[sizeof("-Xjitthreshold:")-1 + PROPERTY_VALUE_MAX];
		char useJitProfilesOptsBuf[sizeof("-Xjitsaveprofilinginfo:")-1 + PROPERTY_VALUE_MAX];
		char gctypeOptsBuf[sizeof("-Xgc:")-1 + PROPERTY_VALUE_MAX];
		char backgroundgcOptsBuf[sizeof("-XX:BackgroundGC=")-1 + PROPERTY_VALUE_MAX];
		char heaptargetutilizationOptsBuf[sizeof("-XX:HeapTargetUtilization=")-1 + PROPERTY_VALUE_MAX];
		@@ -691,6 +692,10 @@ int AndroidRuntime::startVm(JavaVM pJavaVM, JNIEnv pEnv, bool zygote)
		parseRuntimeOption("dalvik.vm.jitmaxsize", jitmaxsizeOptsBuf, "-Xjitmaxsize:");
		parseRuntimeOption("dalvik.vm.jitinitialsize", jitinitialsizeOptsBuf, "-Xjitinitialsize:");
		parseRuntimeOption("dalvik.vm.jitthreshold", jitthresholdOptsBuf, "-Xjitthreshold:");
		property_get("dalvik.vm.usejitprofiles", useJitProfilesOptsBuf, "");
		if (strcmp(useJitProfilesOptsBuf, "true") == 0) {
		addOption("-Xjitsaveprofilinginfo");
		}

		property_get("ro.config.low_ram", propBuf, "");
		if (strcmp(propBuf, "true") == 0) {

services/core/java/com/android/server/pm/BackgroundDexOptService.java

+11 −9

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.app.job.JobService;
		import android.content.ComponentName;
		import android.content.Context;
		import android.os.ServiceManager;
		import android.os.SystemProperties;
		import android.util.ArraySet;
		import android.util.Log;

		@@ -50,12 +51,13 @@ public class BackgroundDexOptService extends JobService {

		final AtomicBoolean mIdleTime = new AtomicBoolean(false);

		public static void schedule(Context context, long minLatency) {
		private boolean useJitProfiles = SystemProperties.getBoolean("dalvik.vm.usejitprofiles", false);

		public static void schedule(Context context) {
		JobScheduler js = (JobScheduler) context.getSystemService(Context.JOB_SCHEDULER_SERVICE);
		JobInfo job = new JobInfo.Builder(BACKGROUND_DEXOPT_JOB, sDexoptServiceName)
		.setRequiresDeviceIdle(true)
		.setRequiresCharging(true)
		.setMinimumLatency(minLatency)
		.setPeriodic(TimeUnit.DAYS.toMillis(1))
		.build();
		js.schedule(job);
		@@ -63,16 +65,17 @@ public class BackgroundDexOptService extends JobService {

		@Override
		public boolean onStartJob(JobParameters params) {
		Log.i(TAG, "onIdleStart");
		Log.i(TAG, "onStartJob");
		final PackageManagerService pm =
		(PackageManagerService)ServiceManager.getService("package");

		if (pm.isStorageLow()) {
		schedule(BackgroundDexOptService.this, RETRY_LATENCY);
		Log.i(TAG, "Low storage, skipping this run");
		return false;
		}
		final ArraySet<String> pkgs = pm.getPackagesThatNeedDexOpt();
		if (pkgs == null) {
		final ArraySet<String> pkgs = pm.getOptimizablePackages();
		if (pkgs == null \|\| pkgs.isEmpty()) {
		Log.i(TAG, "No packages to optimize");
		return false;
		}

		@@ -83,15 +86,14 @@ public class BackgroundDexOptService extends JobService {
		public void run() {
		for (String pkg : pkgs) {
		if (!mIdleTime.get()) {
		// stopped while still working, so we need to reschedule
		schedule(BackgroundDexOptService.this, 0);
		// Out of the idle state. Stop the compilation.
		return;
		}
		if (sFailedPackageNames.contains(pkg)) {
		// skip previously failing package
		continue;
		}
		if (!pm.performDexOpt(pkg, null /* instruction set */)) {
		if (!pm.performDexOpt(pkg, /* instruction set */ null, useJitProfiles)) {
		// there was a problem running dexopt,
		// remember this so we do not keep retrying.
		sFailedPackageNames.add(pkg);