From 9fdb129b90c9a985f606f9d95627b4852171dc11 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Wed, 2 Dec 2015 22:44:52 +0000 Subject: Revert "Enable profiled guided compilation in dex2oat" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Test has flakes: +art F 30865 30865 art/runtime/java_vm_ext.cc:466] JNI DETECTED ERROR IN APPLICATION: input is not valid Modified UTF-8: illegal start byte 0x80 +art F 30865 30865 art/runtime/java_vm_ext.cc:466] string: '��gy�' +art F 30865 30865 art/runtime/java_vm_ext.cc:466] input: '<0x80> 0xd8 0x67 0x79 0x8e 0x7f' +art F 30865 30865 art/runtime/java_vm_ext.cc:466] in call to NewStringUTF +art F 30865 30865 art/runtime/java_vm_ext.cc:466] from java.lang.String Main.getProfileInfoDump(java.lang.String, java.lang.Class, java.lang.Class) This reverts commit 27e17fd81cc30e16e86c9c15498cae7f920c9dfe. Change-Id: Id224b5970c3620c4c71fc0d39ed4a2e4755e5f29 --- compiler/driver/compiler_driver.h | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'compiler/driver/compiler_driver.h') diff --git a/compiler/driver/compiler_driver.h b/compiler/driver/compiler_driver.h index a351f6d5df..1347b37fa0 100644 --- a/compiler/driver/compiler_driver.h +++ b/compiler/driver/compiler_driver.h @@ -31,11 +31,11 @@ #include "compiler.h" #include "dex_file.h" #include "driver/compiled_method_storage.h" -#include "jit/offline_profiling_info.h" #include "invoke_type.h" #include "method_reference.h" #include "mirror/class.h" // For mirror::Class::Status. #include "os.h" +#include "profiler.h" #include "runtime.h" #include "safe_map.h" #include "thread_pool.h" @@ -147,6 +147,10 @@ class CompilerDriver { return compiler_.get(); } + bool ProfilePresent() const { + return profile_present_; + } + // Are we compiling and creating an image file? bool IsBootImage() const { return boot_image_; @@ -441,10 +445,6 @@ class CompilerDriver { // Checks whether the provided method should be compiled, i.e., is in method_to_compile_. bool IsMethodToCompile(const MethodReference& method_ref) const; - // Checks whether profile guided compilation is enabled and if the method should be compiled - // according to the profile file. - bool ShouldCompileBasedOnProfile(const MethodReference& method_ref) const; - void RecordClassStatus(ClassReference ref, mirror::Class::Status status) REQUIRES(!compiled_classes_lock_); @@ -454,6 +454,9 @@ class CompilerDriver { uint16_t class_def_idx, const DexFile& dex_file) const; + // Should the compiler run on this method given profile information? + bool SkipCompilation(const std::string& method_name); + // Get memory usage during compilation. std::string GetMemoryUsageString(bool extended) const; @@ -592,6 +595,9 @@ class CompilerDriver { ThreadPool* thread_pool, TimingLogger* timings) REQUIRES(!Locks::mutator_lock_); + ProfileFile profile_file_; + bool profile_present_; + const CompilerOptions* const compiler_options_; VerificationResults* const verification_results_; DexFileToMethodInlinerMap* const method_inliner_map_; @@ -641,9 +647,6 @@ class CompilerDriver { // This option may be restricted to the boot image, depending on a flag in the implementation. std::unique_ptr> methods_to_compile_; - // Info for profile guided compilation. - std::unique_ptr profile_compilation_info_; - bool had_hard_verifier_failure_; size_t thread_count_; -- cgit v1.2.3-59-g8ed1b