diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-02-24 09:37:21 -0800 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2015-02-24 10:47:02 -0800 |
| commit | e5f13e57ff8fa36342beb33830b3ec5942a61cca (patch) | |
| tree | 02e370ecc4e0d955f28bfc71a41015f94fbb19b7 /cmdline | |
| parent | 354d58ba776866ea7b1c71f0d0848d5aaa013ae3 (diff) | |
| download | art-e5f13e57ff8fa36342beb33830b3ec5942a61cca.zip art-e5f13e57ff8fa36342beb33830b3ec5942a61cca.tar.gz art-e5f13e57ff8fa36342beb33830b3ec5942a61cca.tar.bz2 | |
Revert "Revert "Add JIT""
Added missing EntryPointToCodePointer.
This reverts commit a5ca888d715cd0c6c421313211caa1928be3e399.
Change-Id: Ia74df0ef3a7babbdcb0466fd24da28e304e3f5af
Diffstat (limited to 'cmdline')
| -rw-r--r-- | cmdline/cmdline_parser_test.cc | 25 | ||||
| -rw-r--r-- | cmdline/cmdline_types.h | 2 |
2 files changed, 24 insertions, 3 deletions
diff --git a/cmdline/cmdline_parser_test.cc b/cmdline/cmdline_parser_test.cc index b740b41..18d8c7a 100644 --- a/cmdline/cmdline_parser_test.cc +++ b/cmdline/cmdline_parser_test.cc @@ -411,6 +411,26 @@ TEST_F(CmdlineParserTest, TestCompilerOption) { } // TEST_F /* +* -Xjit, -Xnojit, -Xjitcodecachesize, Xjitcompilethreshold +*/ +TEST_F(CmdlineParserTest, TestJitOptions) { + /* + * Test successes + */ + { + EXPECT_SINGLE_PARSE_VALUE(true, "-Xjit", M::UseJIT); + EXPECT_SINGLE_PARSE_VALUE(false, "-Xnojit", M::UseJIT); + } + { + EXPECT_SINGLE_PARSE_VALUE(MemoryKiB(16 * KB), "-Xjitcodecachesize:16K", M::JITCodeCacheCapacity); + EXPECT_SINGLE_PARSE_VALUE(MemoryKiB(16 * MB), "-Xjitcodecachesize:16M", M::JITCodeCacheCapacity); + } + { + EXPECT_SINGLE_PARSE_VALUE(12345u, "-Xjitthreshold:12345", M::JITCompileThreshold); + } +} // TEST_F + +/* * -X-profile-* */ TEST_F(CmdlineParserTest, TestProfilerOptions) { @@ -495,9 +515,8 @@ TEST_F(CmdlineParserTest, TestIgnoredArguments) { "-dsa", "-enablesystemassertions", "-disablesystemassertions", "-Xrs", "-Xint:abdef", "-Xdexopt:foobar", "-Xnoquithandler", "-Xjnigreflimit:ixnay", "-Xgenregmap", "-Xnogenregmap", "-Xverifyopt:never", "-Xcheckdexsum", "-Xincludeselectedop", "-Xjitop:noop", - "-Xincludeselectedmethod", "-Xjitthreshold:123", "-Xjitcodecachesize:12345", - "-Xjitblocking", "-Xjitmethod:_", "-Xjitclass:nosuchluck", "-Xjitoffset:none", - "-Xjitconfig:yes", "-Xjitcheckcg", "-Xjitverbose", "-Xjitprofile", + "-Xincludeselectedmethod", "-Xjitblocking", "-Xjitmethod:_", "-Xjitclass:nosuchluck", + "-Xjitoffset:none", "-Xjitconfig:yes", "-Xjitcheckcg", "-Xjitverbose", "-Xjitprofile", "-Xjitdisableopt", "-Xjitsuspendpoll", "-XX:mainThreadStackSize=1337" }; diff --git a/cmdline/cmdline_types.h b/cmdline/cmdline_types.h index 180baec..04ea368 100644 --- a/cmdline/cmdline_types.h +++ b/cmdline/cmdline_types.h @@ -585,6 +585,8 @@ struct CmdlineType<LogVerbosity> : CmdlineTypeParser<LogVerbosity> { log_verbosity.heap = true; } else if (verbose_options[j] == "jdwp") { log_verbosity.jdwp = true; + } else if (verbose_options[j] == "jit") { + log_verbosity.jit = true; } else if (verbose_options[j] == "jni") { log_verbosity.jni = true; } else if (verbose_options[j] == "monitor") { |