Enable profiled guided compilation in dex2oat
- add parsing of the profile info saved during JIT
- don't compile methods which are not part of the profile info.
- delete old profile hooks
Change-Id: I45a13c3aeb36265d335e57cd160b9ea0fab3cbb5
diff --git a/test/554-jit-profile-file/expected.txt b/test/554-jit-profile-file/expected.txt
new file mode 100644
index 0000000..cde211e
--- /dev/null
+++ b/test/554-jit-profile-file/expected.txt
@@ -0,0 +1,7 @@
+JNI_OnLoad called
+ProfileInfo:
+:classes.dex
+ java.lang.String Main.hotMethod()
+ void Main.main(java.lang.String[])
+:classes2.dex
+ java.lang.String OtherDex.hotMethod()
diff --git a/test/554-jit-profile-file/info.txt b/test/554-jit-profile-file/info.txt
new file mode 100644
index 0000000..b1bfe81
--- /dev/null
+++ b/test/554-jit-profile-file/info.txt
@@ -0,0 +1 @@
+Check that saving and restoring profile files works correctly in a JIT environment.
diff --git a/test/554-jit-profile-file/offline_profile.cc b/test/554-jit-profile-file/offline_profile.cc
new file mode 100644
index 0000000..c63073d
--- /dev/null
+++ b/test/554-jit-profile-file/offline_profile.cc
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "dex_file.h"
+
+#include "jit/offline_profiling_info.h"
+#include "jni.h"
+#include "mirror/class-inl.h"
+#include "oat_file_assistant.h"
+#include "oat_file_manager.h"
+#include "scoped_thread_state_change.h"
+#include "thread.h"
+
+namespace art {
+namespace {
+
+extern "C" JNIEXPORT jstring JNICALL Java_Main_getProfileInfoDump(
+ JNIEnv* env, jclass, jstring filename, jclass cls_from_primary, jclass cls_from_secondary) {
+ // Note:
+ // Ideally we would get the dex list from the primary oat file.
+ // e.g.
+ // oat_file = Runtime::Current()->GetOatFileManager().GetPrimaryOatFile();
+ // dex_files = OatFileAssistant::LoadDexFiles(*oat_file, dex_location.c_str());
+ // However the ownership of the pointers is complicated since the primary file
+ // already exists and the test crashed sporadically because some data changes under
+ // our feet.
+ // To simplify things get the dex files from the classes passed as arguments.
+ const DexFile* dex_primary;
+ const DexFile* dex_secondary;
+ {
+ ScopedObjectAccess soa(Thread::Current());
+ dex_primary = soa.Decode<mirror::Class*>(cls_from_primary)->GetDexCache()->GetDexFile();
+ dex_secondary = soa.Decode<mirror::Class*>(cls_from_secondary)->GetDexCache()->GetDexFile();
+ }
+
+ std::vector<const DexFile*> dex_files;
+ dex_files.push_back(dex_primary);
+ dex_files.push_back(dex_secondary);
+
+ const char* filename_chars = env->GetStringUTFChars(filename, nullptr);
+ ProfileCompilationInfo info(filename_chars);
+ const char* result = info.Load(dex_files)
+ ? info.DumpInfo(/*print_full_dex_location*/false).c_str()
+ : nullptr;
+ env->ReleaseStringUTFChars(filename, filename_chars);
+ return env->NewStringUTF(result);
+}
+
+} // namespace
+} // namespace art
diff --git a/test/554-jit-profile-file/run b/test/554-jit-profile-file/run
new file mode 100644
index 0000000..08dcb38
--- /dev/null
+++ b/test/554-jit-profile-file/run
@@ -0,0 +1,22 @@
+#!/bin/bash
+#
+# Copyright 2015 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+exec ${RUN} \
+ -Xcompiler-option --compiler-filter=interpret-only \
+ --runtime-option -Xjitsaveprofilinginfo \
+ --runtime-option -Xusejit:true \
+ --runtime-option -Xjitthreshold:100 \
+ "${@}"
diff --git a/test/554-jit-profile-file/src-multidex/OtherDex.java b/test/554-jit-profile-file/src-multidex/OtherDex.java
new file mode 100644
index 0000000..51644db
--- /dev/null
+++ b/test/554-jit-profile-file/src-multidex/OtherDex.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.util.HashMap;
+
+public class OtherDex {
+ public void coldMethod() {
+ hotMethod();
+ }
+
+ public String hotMethod() {
+ HashMap<String, String> map = new HashMap<String, String>();
+ for (int i = 0; i < 10; i++) {
+ map.put("" + i, "" + i + 1);
+ }
+ return map.get("1");
+ }
+}
diff --git a/test/554-jit-profile-file/src/Main.java b/test/554-jit-profile-file/src/Main.java
new file mode 100644
index 0000000..ba613ae
--- /dev/null
+++ b/test/554-jit-profile-file/src/Main.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+
+public class Main {
+
+ public void coldMethod() {
+ hotMethod();
+ }
+
+ public String hotMethod() {
+ HashMap<String, String> map = new HashMap<String, String>();
+ for (int i = 0; i < 10; i++) {
+ map.put("" + i, "" + i + 1);
+ }
+ return map.get("1");
+ }
+
+ private static final String PKG_NAME = "test.package";
+ private static final String PROFILE_FILE = PKG_NAME + ".prof";
+ private static final String TEMP_FILE_NAME_PREFIX = "dummy";
+ private static final String TEMP_FILE_NAME_SUFFIX = ".file";
+ private static final int JIT_INVOCATION_COUNT = 101;
+
+ /* needs to match Runtime:: kProfileBackground */
+ private static final int PROFILE_BACKGROUND = 1;
+
+ public static void main(String[] args) throws Exception {
+ System.loadLibrary(args[0]);
+
+ File file = null;
+ File profileDir = null;
+ File profileFile = null;
+ try {
+ // We don't know where we have rights to create the code_cache. So create
+ // a dummy temporary file and get its parent directory. That will serve as
+ // the app directory.
+ file = createTempFile();
+ String appDir = file.getParent();
+ profileDir = new File(appDir, "code_cache");
+ profileDir.mkdir();
+
+ // Registering the app info will set the profile file name.
+ VMRuntime.registerAppInfo(PKG_NAME, appDir);
+
+ // Make sure the hot methods are jitted.
+ Main m = new Main();
+ OtherDex o = new OtherDex();
+ for (int i = 0; i < JIT_INVOCATION_COUNT; i++) {
+ m.hotMethod();
+ o.hotMethod();
+ }
+
+ // Updating the process state to BACKGROUND will trigger profile saving.
+ VMRuntime.updateProcessState(PROFILE_BACKGROUND);
+
+ // Check that the profile file exists.
+ profileFile = new File(profileDir, PROFILE_FILE);
+ if (!profileFile.exists()) {
+ throw new RuntimeException("No profile file found");
+ }
+ // Dump the profile file.
+ // We know what methods are hot and we compare with the golden `expected` output.
+ System.out.println(getProfileInfoDump(profileFile.getPath(), m.getClass(), o.getClass()));
+ } finally {
+ if (file != null) {
+ file.delete();
+ }
+ if (profileFile != null) {
+ profileFile.delete();
+ }
+ if (profileDir != null) {
+ profileDir.delete();
+ }
+ }
+ }
+
+ private static class VMRuntime {
+ private static final Method registerAppInfoMethod;
+ private static final Method updateProcessStateMethod;
+ private static final Method getRuntimeMethod;
+ static {
+ try {
+ Class c = Class.forName("dalvik.system.VMRuntime");
+ registerAppInfoMethod = c.getDeclaredMethod("registerAppInfo",
+ String.class, String.class, String.class);
+ updateProcessStateMethod = c.getDeclaredMethod("updateProcessState", Integer.TYPE);
+ getRuntimeMethod = c.getDeclaredMethod("getRuntime");
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public static void registerAppInfo(String pkgName, String appDir) throws Exception {
+ registerAppInfoMethod.invoke(null, pkgName, appDir, null);
+ }
+ public static void updateProcessState(int state) throws Exception {
+ Object runtime = getRuntimeMethod.invoke(null);
+ updateProcessStateMethod.invoke(runtime, state);
+ }
+ }
+
+ static native String getProfileInfoDump(
+ String filename, Class<?> clsFromPrimary, Class<?> clsFromSecondary);
+
+ private static File createTempFile() throws Exception {
+ try {
+ return File.createTempFile(TEMP_FILE_NAME_PREFIX, TEMP_FILE_NAME_SUFFIX);
+ } catch (IOException e) {
+ System.setProperty("java.io.tmpdir", "/data/local/tmp");
+ try {
+ return File.createTempFile(TEMP_FILE_NAME_PREFIX, TEMP_FILE_NAME_SUFFIX);
+ } catch (IOException e2) {
+ System.setProperty("java.io.tmpdir", "/sdcard");
+ return File.createTempFile(TEMP_FILE_NAME_PREFIX, TEMP_FILE_NAME_SUFFIX);
+ }
+ }
+ }
+}