diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/jit/jit_compiler.cc | 4 | ||||
| -rw-r--r-- | compiler/jit/jit_compiler.h | 16 |
2 files changed, 5 insertions, 15 deletions
diff --git a/compiler/jit/jit_compiler.cc b/compiler/jit/jit_compiler.cc index 79a6d38fc6..6ff1e2e95e 100644 --- a/compiler/jit/jit_compiler.cc +++ b/compiler/jit/jit_compiler.cc @@ -85,7 +85,7 @@ NO_RETURN static void Usage(const char* fmt, ...) { exit(EXIT_FAILURE); } -JitCompiler::JitCompiler() : total_time_(0) { +JitCompiler::JitCompiler() { compiler_options_.reset(new CompilerOptions( CompilerOptions::kDefaultCompilerFilter, CompilerOptions::kDefaultHugeMethodThreshold, @@ -195,7 +195,6 @@ JitCompiler::~JitCompiler() { bool JitCompiler::CompileMethod(Thread* self, ArtMethod* method, bool osr) { DCHECK(!method->IsProxyMethod()); TimingLogger logger("JIT compiler timing logger", true, VLOG_IS_ON(jit)); - const uint64_t start_time = NanoTime(); StackHandleScope<2> hs(self); self->AssertNoPendingException(); Runtime* runtime = Runtime::Current(); @@ -236,7 +235,6 @@ bool JitCompiler::CompileMethod(Thread* self, ArtMethod* method, bool osr) { runtime->GetJitArenaPool()->TrimMaps(); } - total_time_ += NanoTime() - start_time; runtime->GetJit()->AddTimingLogger(logger); return success; } diff --git a/compiler/jit/jit_compiler.h b/compiler/jit/jit_compiler.h index 5294d0ee35..bc134fe27b 100644 --- a/compiler/jit/jit_compiler.h +++ b/compiler/jit/jit_compiler.h @@ -18,13 +18,10 @@ #define ART_COMPILER_JIT_JIT_COMPILER_H_ #include "base/mutex.h" -#include "compiler_callbacks.h" #include "compiled_method.h" -#include "dex/verification_results.h" #include "dex/quick/dex_file_to_method_inliner_map.h" #include "driver/compiler_driver.h" #include "driver/compiler_options.h" -#include "oat_file.h" namespace art { @@ -37,23 +34,19 @@ class JitCompiler { public: static JitCompiler* Create(); virtual ~JitCompiler(); + + // Compilation entrypoint. Returns whether the compilation succeeded. bool CompileMethod(Thread* self, ArtMethod* method, bool osr) SHARED_REQUIRES(Locks::mutator_lock_); - CompilerCallbacks* GetCompilerCallbacks() const; - size_t GetTotalCompileTime() const { - return total_time_; - } + CompilerOptions* GetCompilerOptions() const { return compiler_options_.get(); } private: - uint64_t total_time_; std::unique_ptr<CompilerOptions> compiler_options_; std::unique_ptr<CumulativeLogger> cumulative_logger_; - std::unique_ptr<VerificationResults> verification_results_; std::unique_ptr<DexFileToMethodInlinerMap> method_inliner_map_; - std::unique_ptr<CompilerCallbacks> callbacks_; std::unique_ptr<CompilerDriver> compiler_driver_; std::unique_ptr<const InstructionSetFeatures> instruction_set_features_; std::unique_ptr<File> perf_file_; @@ -62,8 +55,7 @@ class JitCompiler { // This is in the compiler since the runtime doesn't have access to the compiled method // structures. - bool AddToCodeCache(ArtMethod* method, - const CompiledMethod* compiled_method) + bool AddToCodeCache(ArtMethod* method, const CompiledMethod* compiled_method) SHARED_REQUIRES(Locks::mutator_lock_); DISALLOW_COPY_AND_ASSIGN(JitCompiler); |