Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4bc8f4da authored by Calin Juravle's avatar Calin Juravle
Browse files

Pass the compilation reason to dexopt 

Record the compilation reason in the oat files to enable better
performance monitoring.

Test: DexoptOptionsTest
      manual
Bug: 73102540

Change-Id: Ifa487d4bc33dcd06f12af6bdd1d9a9c5f4562f4b
parent 2120b23f

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

+2 −1
Original line number Diff line number Diff line
@@ -576,7 +576,8 @@ public class ZygoteInit { 
                    installd.dexopt(classPathElement, Process.SYSTEM_UID, packageName,

                            instructionSet, dexoptNeeded, outputPath, dexFlags, compilerFilter,

                            uuid, classLoaderContext, seInfo, false /* downgrade */,

                            targetSdkVersion, /*profileName*/ null, /*dexMetadataPath*/ null);

                            targetSdkVersion, /*profileName*/ null, /*dexMetadataPath*/ null,

                            "server-dexopt");

                } catch (RemoteException | ServiceSpecificException e) {

                    // Ignore (but log), we need this on the classpath for fallback mode.

                    Log.w(TAG, "Failed compiling classpath element for system server: "

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

+3 −3
Original line number Diff line number Diff line
@@ -289,14 +289,14 @@ public class Installer extends SystemService { 
            int dexoptNeeded, @Nullable String outputPath, int dexFlags,

            String compilerFilter, @Nullable String volumeUuid, @Nullable String sharedLibraries,

            @Nullable String seInfo, boolean downgrade, int targetSdkVersion,

            @Nullable String profileName, @Nullable String dexMetadataPath)

            throws InstallerException {

            @Nullable String profileName, @Nullable String dexMetadataPath,

            @Nullable String compilationReason) throws InstallerException {

        assertValidInstructionSet(instructionSet);

        if (!checkBeforeRemote()) return;

        try {

            mInstalld.dexopt(apkPath, uid, pkgName, instructionSet, dexoptNeeded, outputPath,

                    dexFlags, compilerFilter, volumeUuid, sharedLibraries, seInfo, downgrade,

                    targetSdkVersion, profileName, dexMetadataPath);

                    targetSdkVersion, profileName, dexMetadataPath, compilationReason);

        } catch (Exception e) {

            throw InstallerException.from(e);

        }

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

+5 −3
Original line number Diff line number Diff line
@@ -262,11 +262,12 @@ public class OtaDexoptService extends IOtaDexopt.Stub { 
                    int dexFlags, String compilerFilter, @Nullable String volumeUuid,

                    @Nullable String sharedLibraries, @Nullable String seInfo, boolean downgrade,

                    int targetSdkVersion, @Nullable String profileName,

                    @Nullable String dexMetadataPath) throws InstallerException {

                    @Nullable String dexMetadataPath, @Nullable String dexoptCompilationReason)

                    throws InstallerException {

                final StringBuilder builder = new StringBuilder();



                // The version. Right now it's 6.

                builder.append("6 ");

                // The version. Right now it's 7.

                builder.append("7 ");



                builder.append("dexopt");
@@ -285,6 +286,7 @@ public class OtaDexoptService extends IOtaDexopt.Stub { 
                encodeParameter(builder, targetSdkVersion);

                encodeParameter(builder, profileName);

                encodeParameter(builder, dexMetadataPath);

                encodeParameter(builder, dexoptCompilationReason);



                commands.add(builder.toString());

            }

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

+8 −7
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import android.util.Slog; 
import com.android.internal.annotations.GuardedBy;

import com.android.internal.util.IndentingPrintWriter;

import com.android.server.pm.Installer.InstallerException;

import com.android.server.pm.dex.DexManager;

import com.android.server.pm.dex.DexoptOptions;

import com.android.server.pm.dex.DexoptUtils;

import com.android.server.pm.dex.PackageDexUsage;
@@ -63,7 +62,8 @@ import static com.android.server.pm.InstructionSets.getDexCodeInstructionSets; 


import static com.android.server.pm.PackageManagerService.WATCHDOG_TIMEOUT;



import static dalvik.system.DexFile.getNonProfileGuidedCompilerFilter;

import static com.android.server.pm.PackageManagerServiceCompilerMapping.getReasonName;



import static dalvik.system.DexFile.getSafeModeCompilerFilter;

import static dalvik.system.DexFile.isProfileGuidedCompilerFilter;
@@ -231,7 +231,8 @@ public class PackageDexOptimizer { 
            for (String dexCodeIsa : dexCodeInstructionSets) {

                int newResult = dexOptPath(pkg, path, dexCodeIsa, compilerFilter,

                        profileUpdated, classLoaderContexts[i], dexoptFlags, sharedGid,

                        packageStats, options.isDowngrade(), profileName, dexMetadataPath);

                        packageStats, options.isDowngrade(), profileName, dexMetadataPath,

                        options.getCompilationReason());

                // The end result is:

                //  - FAILED if any path failed,

                //  - PERFORMED if at least one path needed compilation,
@@ -256,7 +257,7 @@ public class PackageDexOptimizer { 
    private int dexOptPath(PackageParser.Package pkg, String path, String isa,

            String compilerFilter, boolean profileUpdated, String classLoaderContext,

            int dexoptFlags, int uid, CompilerStats.PackageStats packageStats, boolean downgrade,

            String profileName, String dexMetadataPath) {

            String profileName, String dexMetadataPath, int compilationReason) {

        int dexoptNeeded = getDexoptNeeded(path, isa, compilerFilter, classLoaderContext,

                profileUpdated, downgrade);

        if (Math.abs(dexoptNeeded) == DexFile.NO_DEXOPT_NEEDED) {
@@ -283,7 +284,7 @@ public class PackageDexOptimizer { 
            mInstaller.dexopt(path, uid, pkg.packageName, isa, dexoptNeeded, oatDir, dexoptFlags,

                    compilerFilter, pkg.volumeUuid, classLoaderContext, pkg.applicationInfo.seInfo,

                    false /* downgrade*/, pkg.applicationInfo.targetSdkVersion,

                    profileName, dexMetadataPath);

                    profileName, dexMetadataPath, getReasonName(compilationReason));



            if (packageStats != null) {

                long endTime = System.currentTimeMillis();
@@ -394,7 +395,7 @@ public class PackageDexOptimizer { 
        // Note this trades correctness for performance since the resulting slow down is

        // unacceptable in some cases until b/64530081 is fixed.

        String classLoaderContext = SKIP_SHARED_LIBRARY_CHECK;



        int reason = options.getCompilationReason();

        try {

            for (String isa : dexUseInfo.getLoaderIsas()) {

                // Reuse the same dexopt path as for the primary apks. We don't need all the
@@ -405,7 +406,7 @@ public class PackageDexOptimizer { 
                        /*oatDir*/ null, dexoptFlags,

                        compilerFilter, info.volumeUuid, classLoaderContext, info.seInfoUser,

                        options.isDowngrade(), info.targetSdkVersion, /*profileName*/ null,

                        /*dexMetadataPath*/ null);

                        /*dexMetadataPath*/ null, getReasonName(reason));

            }



            return DEX_OPT_PERFORMED;

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

+10 −10
Original line number Diff line number Diff line
@@ -598,6 +598,7 @@ public class PackageManagerService extends IPackageManager.Stub 
    }















    // Compilation reasons.













    public static final int REASON_UNKNOWN = -1;















    public static final int REASON_FIRST_BOOT = 0;















    public static final int REASON_BOOT = 1;















    public static final int REASON_INSTALL = 2;










@@ -8836,7 +8837,7 @@ public class PackageManagerService extends IPackageManager.Stub



























        final long startTime = System.nanoTime();















        final int[] stats = performDexOptUpgrade(pkgs, mIsPreNUpgrade /* showDialog */,













                    getCompilerFilterForReason(causeFirstBoot ? REASON_FIRST_BOOT : REASON_BOOT),













                    causeFirstBoot ? REASON_FIRST_BOOT : REASON_BOOT,















                    false /* bootComplete */);





























        final int elapsedTimeSeconds =









@@ -8863,7 +8864,7 @@ public class PackageManagerService extends IPackageManager.Stub













     * and {@code numberOfPackagesFailed}.















     */















    private int[] performDexOptUpgrade(List<PackageParser.Package> pkgs, boolean showDialog,













            final String compilerFilter, boolean bootComplete) {













            final int compilationReason, boolean bootComplete) {





























        int numberOfPackagesVisited = 0;















        int numberOfPackagesOptimized = 0;










@@ -8963,13 +8964,11 @@ public class PackageManagerService extends IPackageManager.Stub













                }















            }



























            String pkgCompilerFilter = compilerFilter;













            int pkgCompilationReason = compilationReason;















            if (useProfileForDexopt) {















                // Use background dexopt mode to try and use the profile. Note that this does not















                // guarantee usage of the profile.













                pkgCompilerFilter =













                        PackageManagerServiceCompilerMapping.getCompilerFilterForReason(













                                PackageManagerService.REASON_BACKGROUND_DEXOPT);













                pkgCompilationReason = PackageManagerService.REASON_BACKGROUND_DEXOPT;















            }





























            // checkProfiles is false to avoid merging profiles during boot which









@@ -8980,7 +8979,7 @@ public class PackageManagerService extends IPackageManager.Stub













            int dexoptFlags = bootComplete ? DexoptOptions.DEXOPT_BOOT_COMPLETE : 0;















            int primaryDexOptStaus = performDexOptTraced(new DexoptOptions(















                    pkg.packageName,













                    pkgCompilerFilter,













                    pkgCompilationReason,















                    dexoptFlags));





























            switch (primaryDexOptStaus) {










@@ -9081,8 +9080,8 @@ public class PackageManagerService extends IPackageManager.Stub













        int flags = (checkProfiles ? DexoptOptions.DEXOPT_CHECK_FOR_PROFILES_UPDATES : 0) |















                (force ? DexoptOptions.DEXOPT_FORCE : 0) |















                (bootComplete ? DexoptOptions.DEXOPT_BOOT_COMPLETE : 0);













        return performDexOpt(new DexoptOptions(packageName, targetCompilerFilter,













                splitName, flags));













        return performDexOpt(new DexoptOptions(packageName, REASON_UNKNOWN,













                targetCompilerFilter, splitName, flags));















    }





























    /**










@@ -9191,7 +9190,8 @@ public class PackageManagerService extends IPackageManager.Stub













        final String[] instructionSets = getAppDexInstructionSets(p.applicationInfo);















        if (!deps.isEmpty()) {















            DexoptOptions libraryOptions = new DexoptOptions(options.getPackageName(),













                    options.getCompilerFilter(), options.getSplitName(),













                    options.getCompilationReason(), options.getCompilerFilter(),













                    options.getSplitName(),















                    options.getFlags() | DexoptOptions.DEXOPT_AS_SHARED_LIBRARY);















            for (PackageParser.Package depPackage : deps) {















                // TODO: Analyze and investigate if we (should) profile libraries.