summaryrefslogtreecommitdiff
path: root/runtime/jit/jit.cc
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2020-08-05 16:47:26 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-08-05 16:47:26 +0000
commita26b2586ba85b3982a04839ff36e6e1bf2ae0623 (patch)
tree3fc0c44044e05e23beee712189f6deff8759753e /runtime/jit/jit.cc
parentef78aa262af911af98c6ba171640f9584aa0caa0 (diff)
parentb96d6f3846103659249ad58fc905fc5a14dafc47 (diff)
Remove tiered jit option. am: b96d6f3846
Original change: https://android-review.googlesource.com/c/platform/art/+/1391217 Change-Id: I0f3ebc8b3a57f011b5b3e9da60859b905c027fa7
Diffstat (limited to 'runtime/jit/jit.cc')
-rw-r--r--runtime/jit/jit.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/runtime/jit/jit.cc b/runtime/jit/jit.cc
index 8899fa4db6..4921a99991 100644
--- a/runtime/jit/jit.cc
+++ b/runtime/jit/jit.cc
@@ -90,8 +90,6 @@ JitCompilerInterface* (*Jit::jit_load_)(void) = nullptr;
JitOptions* JitOptions::CreateFromRuntimeArguments(const RuntimeArgumentMap& options) {
auto* jit_options = new JitOptions;
jit_options->use_jit_compilation_ = options.GetOrDefault(RuntimeArgumentMap::UseJitCompilation);
- jit_options->use_tiered_jit_compilation_ =
- options.GetOrDefault(RuntimeArgumentMap::UseTieredJitCompilation);
jit_options->code_cache_initial_capacity_ =
options.GetOrDefault(RuntimeArgumentMap::JITCodeCacheInitialCapacity);
@@ -1565,9 +1563,9 @@ void Jit::EnqueueOptimizedCompilation(ArtMethod* method, Thread* self) {
return;
}
// We arrive here after a baseline compiled code has reached its baseline
- // hotness threshold. If tiered compilation is enabled, enqueue a compilation
+ // hotness threshold. If we're not only using the baseline compiler, enqueue a compilation
// task that will compile optimize the method.
- if (options_->UseTieredJitCompilation()) {
+ if (!options_->UseBaselineCompiler()) {
thread_pool_->AddTask(
self,
new JitCompileTask(method,