Merge "x86 Baker's read barrier fast path implementation."
diff --git a/compiler/driver/compiler_options.cc b/compiler/driver/compiler_options.cc
index a24c8a3..4d2d924 100644
--- a/compiler/driver/compiler_options.cc
+++ b/compiler/driver/compiler_options.cc
@@ -117,7 +117,7 @@
}
void CompilerOptions::ParseInlineMaxCodeUnits(const StringPiece& option, UsageFn Usage) {
- ParseUintOption(option, "--inline-max-code-units=", &inline_max_code_units_, Usage);
+ ParseUintOption(option, "--inline-max-code-units", &inline_max_code_units_, Usage);
}
void CompilerOptions::ParseDisablePasses(const StringPiece& option,
diff --git a/runtime/oat_file_manager.cc b/runtime/oat_file_manager.cc
index f26d431..ea6d3ff 100644
--- a/runtime/oat_file_manager.cc
+++ b/runtime/oat_file_manager.cc
@@ -298,12 +298,10 @@
const OatFile* source_oat_file = nullptr;
- if (Runtime::Current()->IsDex2OatEnabled()) {
- // Update the oat file on disk if we can. This may fail, but that's okay.
- // Best effort is all that matters here.
- if (!oat_file_assistant.MakeUpToDate(/*out*/&error_msg)) {
- LOG(WARNING) << error_msg;
- }
+ // Update the oat file on disk if we can. This may fail, but that's okay.
+ // Best effort is all that matters here.
+ if (!oat_file_assistant.MakeUpToDate(/*out*/&error_msg)) {
+ LOG(WARNING) << error_msg;
}
// Get the oat file on disk.
diff --git a/runtime/parsed_options.cc b/runtime/parsed_options.cc
index 65efca6..5b10610 100644
--- a/runtime/parsed_options.cc
+++ b/runtime/parsed_options.cc
@@ -577,9 +577,6 @@
<< "Do not attempt to write shipping code against these opcodes.";
}
- // If -Xdex2oat is not passed, make it dependent on whether the JIT is enabled.
- args.SetIfMissing(M::Dex2Oat, !args.GetOrDefault(M::UseJIT));
-
*runtime_options = std::move(args);
return true;
}
diff --git a/runtime/runtime_options.def b/runtime/runtime_options.def
index cced31c..5624285 100644
--- a/runtime/runtime_options.def
+++ b/runtime/runtime_options.def
@@ -66,7 +66,7 @@
RUNTIME_OPTIONS_KEY (Unit, LowMemoryMode)
RUNTIME_OPTIONS_KEY (bool, UseTLAB, (kUseTlab || kUseReadBarrier))
RUNTIME_OPTIONS_KEY (bool, EnableHSpaceCompactForOOM, true)
-RUNTIME_OPTIONS_KEY (bool, UseJIT, true)
+RUNTIME_OPTIONS_KEY (bool, UseJIT, false)
RUNTIME_OPTIONS_KEY (unsigned int, JITCompileThreshold, jit::Jit::kDefaultCompileThreshold)
RUNTIME_OPTIONS_KEY (unsigned int, JITWarmupThreshold, jit::Jit::kDefaultWarmupThreshold)
RUNTIME_OPTIONS_KEY (MemoryKiB, JITCodeCacheInitialCapacity, jit::JitCodeCache::kInitialCapacity)
@@ -80,7 +80,7 @@
RUNTIME_OPTIONS_KEY (std::string, JniTrace)
RUNTIME_OPTIONS_KEY (std::string, PatchOat)
RUNTIME_OPTIONS_KEY (bool, Relocate, kDefaultMustRelocate)
-RUNTIME_OPTIONS_KEY (bool, Dex2Oat, false)
+RUNTIME_OPTIONS_KEY (bool, Dex2Oat, true)
RUNTIME_OPTIONS_KEY (bool, ImageDex2Oat, true)
RUNTIME_OPTIONS_KEY (bool, Interpret, false) // -Xint
// Disable the compiler for CC (for now).
diff --git a/test/554-jit-profile-file/run b/test/554-jit-profile-file/run
index 52908c7..f93b32f 100644
--- a/test/554-jit-profile-file/run
+++ b/test/554-jit-profile-file/run
@@ -18,6 +18,6 @@
-Xcompiler-option --compiler-filter=interpret-only \
--runtime-option -Xjitsaveprofilinginfo \
--runtime-option -Xusejit:true \
- --runtime-option -Xjitwarmupthreshold:10 \
- --runtime-option -Xjitthreshold:100 \
+ --runtime-option -Xjitwarmupthreshold:2 \
+ --runtime-option -Xjitthreshold:4 \
"${@}"
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index 8d9db49..3efa6ff 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -305,7 +305,7 @@
fi
if [ "$INTERPRETER" = "y" ]; then
- INT_OPTS="$INT_OPTS -Xint"
+ INT_OPTS="-Xint"
if [ "$VERIFY" = "y" ] ; then
COMPILE_FLAGS="${COMPILE_FLAGS} --compiler-filter=interpret-only"
elif [ "$VERIFY" = "s" ]; then
@@ -318,15 +318,13 @@
fi
if [ "$JIT" = "y" ]; then
- INT_OPTS="$INT_OPTS -Xusejit:true"
+ INT_OPTS="-Xusejit:true"
if [ "$VERIFY" = "y" ] ; then
COMPILE_FLAGS="${COMPILE_FLAGS} --compiler-filter=verify-at-runtime"
else
COMPILE_FLAGS="${COMPILE_FLAGS} --compiler-filter=verify-none"
DEX_VERIFY="${DEX_VERIFY} -Xverify:none"
fi
-else
- INT_OPTS="$INT_OPTS -Xusejit:false"
fi
JNI_OPTS="-Xjnigreflimit:512 -Xcheck:jni"
