OSDN Git Service
Mathieu Chartier [Thu, 3 Mar 2016 21:42:24 +0000 (21:42 +0000)]
Merge "Add systrace to VerifyClass"
am:
4a01be2b1a
* commit '
4a01be2b1a7de5ce68cb5a453eb7cb4fc6c6658b':
Add systrace to VerifyClass
Alex Light [Thu, 3 Mar 2016 21:42:14 +0000 (21:42 +0000)]
Merge "Move some default-methods tests to Java from Smali."
am:
66bdb9e03e
* commit '
66bdb9e03efa2055b6bfbe0a07ee873afe673fae':
Move some default-methods tests to Java from Smali.
Mathieu Chartier [Thu, 3 Mar 2016 21:38:41 +0000 (21:38 +0000)]
Merge "Add systrace to VerifyClass"
Mathieu Chartier [Thu, 3 Mar 2016 03:23:17 +0000 (19:23 -0800)]
Add systrace to VerifyClass
Useful to see if verifier is preempting anything.
(cherry picked from commit
7f459f5859e5f01c92c3711e7d63c062f510b416)
Change-Id: I594cbdc5c2f8934fc6c4fc7ee47fc4ccfc3c627d
Alex Light [Thu, 3 Mar 2016 20:35:36 +0000 (20:35 +0000)]
Merge "Move some default-methods tests to Java from Smali."
Alex Light [Tue, 1 Mar 2016 22:33:51 +0000 (14:33 -0800)]
Move some default-methods tests to Java from Smali.
Move all smali tests for default method behavior in
non-source-incompatible contexts to java. Also move some of the
simpler tests for source and binary incompatibilities into java as
well when possible.
Bug:
27310767
Change-Id: I753196f19849494825953c1bf06f15b7132f459b
Mingyao Yang [Thu, 3 Mar 2016 18:25:48 +0000 (18:25 +0000)]
Merge "change image in run-jdwp-tests.sh"
am:
93504f2f89
* commit '
93504f2f891959c1606bd033a86310613e60cb1b':
change image in run-jdwp-tests.sh
Mingyao Yang [Thu, 3 Mar 2016 18:25:38 +0000 (18:25 +0000)]
Merge "Add a PassScope for PrepareForRegisterAllocation"
am:
b204d9444d
* commit '
b204d9444d7c8bc6bc5e60d791060525b91b520c':
Add a PassScope for PrepareForRegisterAllocation
Mingyao Yang [Thu, 3 Mar 2016 18:19:46 +0000 (18:19 +0000)]
Merge "change image in run-jdwp-tests.sh"
Mingyao Yang [Thu, 3 Mar 2016 18:19:13 +0000 (18:19 +0000)]
Merge "Add a PassScope for PrepareForRegisterAllocation"
Dimitry Ivanov [Thu, 3 Mar 2016 17:11:58 +0000 (17:11 +0000)]
Merge "Simplify LoadNativeLibrary()"
am:
9bab082adb
* commit '
9bab082adb251327b806d537d6710c16b9897de9':
Simplify LoadNativeLibrary()
Dimitry Ivanov [Thu, 3 Mar 2016 17:05:15 +0000 (17:05 +0000)]
Merge "Simplify LoadNativeLibrary()"
Serguei Katkov [Thu, 3 Mar 2016 11:45:49 +0000 (11:45 +0000)]
Merge "ART: cleanup exit_block_ in graph if exit block is removed"
am:
19a133b2e2
* commit '
19a133b2e26770b900119aaac25e3e73bd287e3f':
ART: cleanup exit_block_ in graph if exit block is removed
David Brazdil [Thu, 3 Mar 2016 11:40:15 +0000 (11:40 +0000)]
Merge "ART: cleanup exit_block_ in graph if exit block is removed"
Roland Levillain [Thu, 3 Mar 2016 11:33:59 +0000 (11:33 +0000)]
Merge "Ignore 145-alloc-tracking-stress run-test failures with CC."
am:
982a1ac93d
* commit '
982a1ac93d03379fc82f4f5b1a1b13eeea035d5b':
Ignore 145-alloc-tracking-stress run-test failures with CC.
Roland Levillain [Thu, 3 Mar 2016 11:28:41 +0000 (11:28 +0000)]
Merge "Ignore 145-alloc-tracking-stress run-test failures with CC."
Serguei Katkov [Wed, 2 Mar 2016 10:25:36 +0000 (16:25 +0600)]
ART: cleanup exit_block_ in graph if exit block is removed
If we remove the exit block from the graph (for example method
contains infinite loop) we should also clean the field exit_block_
in graph. At least inliner expects it.
Change-Id: Icda668da2233cdd6cd673635a1949f5ed34cf270
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
Roland Levillain [Thu, 3 Mar 2016 10:43:21 +0000 (10:43 +0000)]
Ignore 145-alloc-tracking-stress run-test failures with CC.
This run-test sometimes fails with a timeout on ART
Builbot's x86-64 concurrent collector configuration. Disable
it to make the build turn green again, while we investigate
the failure.
Bug:
27467554
Change-Id: I0bac307ec85f197afb8763ca41a6ee50567c4d5f
Nicolas Geoffray [Thu, 3 Mar 2016 09:38:49 +0000 (09:38 +0000)]
Merge "Do a TryLock when allocating a ProfilingInfo from the interpreter."
am:
e283588e56
* commit '
e283588e56df7eebabd795b98264003105b20ece':
Do a TryLock when allocating a ProfilingInfo from the interpreter.
Nicolas Geoffray [Thu, 3 Mar 2016 09:26:46 +0000 (09:26 +0000)]
Merge "Do a TryLock when allocating a ProfilingInfo from the interpreter."
Mingyao Yang [Wed, 2 Mar 2016 22:59:32 +0000 (14:59 -0800)]
Add a PassScope for PrepareForRegisterAllocation
This pass does transform the graph so make it part of cfg-dumping.
Change-Id: I42e361382c85c97b974faad8bb0fcf2cb0750355
Mathieu Chartier [Wed, 2 Mar 2016 22:35:23 +0000 (22:35 +0000)]
Merge "Delete alloc tracking map outside of critical section"
am:
e4cec517fa
* commit '
e4cec517faf1c74d6895e0e5b512a6e2f83a0e06':
Delete alloc tracking map outside of critical section
Mathieu Chartier [Wed, 2 Mar 2016 22:01:28 +0000 (22:01 +0000)]
Merge "Delete alloc tracking map outside of critical section"
Mathieu Chartier [Wed, 2 Mar 2016 20:52:37 +0000 (12:52 -0800)]
Delete alloc tracking map outside of critical section
There can be lock order violations otherwise due to runtime shutdown
lock that may get acquired in the condition variable destructor.
Change-Id: I23cb2dfe241f5cc6c42bf6766e89042cf06069b6
Andreas Gampe [Wed, 2 Mar 2016 21:33:43 +0000 (21:33 +0000)]
Merge "Revert "Disable test after libunwind change.""
am:
0b136ac861
* commit '
0b136ac861fbf9e8b97ded8a7a3ae316f46078e4':
Revert "Disable test after libunwind change."
Hiroshi Yamauchi [Wed, 2 Mar 2016 21:33:27 +0000 (21:33 +0000)]
Merge "Disable 577-profile-foreign-dex temporarily."
am:
b93457153d
* commit '
b93457153d3ee0ba51d45819aa8ac34953ac5d1f':
Disable 577-profile-foreign-dex temporarily.
Mingyao Yang [Tue, 1 Mar 2016 22:51:52 +0000 (14:51 -0800)]
change image in run-jdwp-tests.sh
Change-Id: I305fdd5b8b33c446529fe99f872af4fb8685bd7c
Andreas Gampe [Wed, 2 Mar 2016 20:57:25 +0000 (20:57 +0000)]
Merge "Revert "Disable test after libunwind change.""
Andreas Gampe [Wed, 2 Mar 2016 16:51:21 +0000 (08:51 -0800)]
Revert "Disable test after libunwind change."
This reverts commit
18047e4cd06387958d315d4de6d9c1753a08ee9e.
Moving the in-process lzma disable to libunwind allows to unwind not-zipped debug-info, again.
Bug:
27391690
Change-Id: I8c24dd0e73bc9d57ce83c6f5a8272d8252e5b809
Hiroshi Yamauchi [Wed, 2 Mar 2016 20:53:18 +0000 (20:53 +0000)]
Merge "Disable 577-profile-foreign-dex temporarily."
Alexey Frunze [Wed, 2 Mar 2016 20:35:44 +0000 (20:35 +0000)]
Merge "Fast ART MIPS64 interpreter"
am:
b5e8ade3b6
* commit '
b5e8ade3b6bf2162a885133f2ac728c578c3c2b0':
Fast ART MIPS64 interpreter
Bill Buzbee [Wed, 2 Mar 2016 20:17:51 +0000 (20:17 +0000)]
Merge "Fast ART MIPS64 interpreter"
Hiroshi Yamauchi [Wed, 2 Mar 2016 20:12:54 +0000 (12:12 -0800)]
Disable 577-profile-foreign-dex temporarily.
Until a fix arrives.
Bug:
27454772
Change-Id: Ieec219792c507ad85561a4188ec873d2f18e4604
Nicolas Geoffray [Wed, 2 Mar 2016 19:53:03 +0000 (19:53 +0000)]
Merge "Clear inline caches if a ProfilingInfo gets revived."
am:
0344f4e1bd
* commit '
0344f4e1bd62eb092d77840ec7d9cb48adb48a15':
Clear inline caches if a ProfilingInfo gets revived.
Mathieu Chartier [Wed, 2 Mar 2016 19:52:52 +0000 (19:52 +0000)]
Merge "Fix potential linear alloc memory leak"
am:
6ba1d6834c
* commit '
6ba1d6834c7457cccf00e2a8faf4846b23a05094':
Fix potential linear alloc memory leak
Nicolas Geoffray [Wed, 2 Mar 2016 19:47:54 +0000 (19:47 +0000)]
Merge "Clear inline caches if a ProfilingInfo gets revived."
Mathieu Chartier [Wed, 2 Mar 2016 19:44:29 +0000 (19:44 +0000)]
Merge "Fix potential linear alloc memory leak"
Aart Bik [Wed, 2 Mar 2016 19:10:04 +0000 (19:10 +0000)]
Merge "Simplified intrinsic macro mechanism."
am:
e0d1855149
* commit '
e0d18551491619dba0d9846d9f8312c6d1e07bde':
Simplified intrinsic macro mechanism.
Aart Bik [Wed, 2 Mar 2016 18:53:45 +0000 (18:53 +0000)]
Merge "Simplified intrinsic macro mechanism."
Mathieu Chartier [Wed, 2 Mar 2016 18:30:23 +0000 (10:30 -0800)]
Fix potential linear alloc memory leak
Previously, if we created a linear alloc for a class loader but
never created the class table, the linear alloc would never get
freed since it would have no corresponding ClassLoaderData.
Fixes valgrind-test-art-host-gtest-oat_test
Bug:
27384882
Change-Id: Ic8f35b58c3117127a39521b6b9d25ef12c72040c
Dan Willemsen [Wed, 2 Mar 2016 18:24:00 +0000 (18:24 +0000)]
Merge "Remove references to "
am:
a71ec6419d
* commit '
a71ec6419d9e80b354de721003c8b7929d224a49':
Remove references to $(ACP)
Dan Willemsen [Wed, 2 Mar 2016 18:12:06 +0000 (18:12 +0000)]
Merge "Remove references to $(ACP)"
Nicolas Geoffray [Wed, 2 Mar 2016 17:09:35 +0000 (17:09 +0000)]
Clear inline caches if a ProfilingInfo gets revived.
This avoids stalled class references.
Bug:
27398183
Bug:
23128949
Bug:
26846185
Change-Id: I9539215241708e26fef887e02201ce1feabc2d1a
Aart Bik [Tue, 1 Mar 2016 23:16:54 +0000 (15:16 -0800)]
Simplified intrinsic macro mechanism.
Rationale:
Reduces boiler-plate code in all intrinsics code generators.
Also, the newly introduced "unreachable" macro provides a
static verifier that we do not have unreachable and thus
redundant code in the generators. In fact, this change
exposes that the MIPS32 and MIPS64 rotation intrinsics
(IntegerRotateRight, LongRotateRight, IntegerRotateLeft,
LongRotateLeft) are unreachable, since they are handled
as HIR constructs for all architectures. Thus the code
can be removed.
Change-Id: I0309799a0db580232137ded72bb8a7bbd45440a8
David Brazdil [Wed, 2 Mar 2016 16:43:41 +0000 (16:43 +0000)]
Merge "Improve Checker error messages"
am:
785eeae66e
* commit '
785eeae66ebeb68d05878add2777df855846a1e2':
Improve Checker error messages
Nicolas Geoffray [Wed, 2 Mar 2016 16:43:29 +0000 (16:43 +0000)]
Merge "Revert "Revert "Use the interpreter as a heartbeat for the JIT."""
am:
52d6810e59
* commit '
52d6810e592aad55e411d9af7e645d7abd02fe36':
Revert "Revert "Use the interpreter as a heartbeat for the JIT.""
David Brazdil [Wed, 2 Mar 2016 16:41:33 +0000 (16:41 +0000)]
Merge "Improve Checker error messages"
Nicolas Geoffray [Wed, 2 Mar 2016 16:39:08 +0000 (16:39 +0000)]
Merge "Revert "Revert "Use the interpreter as a heartbeat for the JIT."""
Nicolas Geoffray [Wed, 2 Mar 2016 12:05:30 +0000 (12:05 +0000)]
Revert "Revert "Use the interpreter as a heartbeat for the JIT.""
Bug:
27398183
Bug:
23128949
Bug:
26846185
This reverts commit
a96917a6983a5abbe973255a3846fda549fb1657.
Change-Id: I5c4f0d87d3293a6a7ab56a33396670704b66a347
David Brazdil [Wed, 2 Mar 2016 16:09:46 +0000 (16:09 +0000)]
Improve Checker error messages
Now prints the offending Checker line and variable values.
Change-Id: Id4395083de6ddddbd69f66cb7ba38c943146799a
Serguei Katkov [Wed, 2 Mar 2016 16:17:40 +0000 (16:17 +0000)]
Merge "ART: Enable JitProfiling for x86_64 Mterp"
am:
00e94fb884
* commit '
00e94fb884eb0c58e75a623b0fd26330a9327f1e':
ART: Enable JitProfiling for x86_64 Mterp
Alexey Frunze [Wed, 3 Feb 2016 04:25:45 +0000 (20:25 -0800)]
Fast ART MIPS64 interpreter
Change-Id: I5dda522df0acf9f9df626fe4f5ecfe6c4df600d3
Bill Buzbee [Wed, 2 Mar 2016 15:53:46 +0000 (15:53 +0000)]
Merge "ART: Enable JitProfiling for x86_64 Mterp"
David Brazdil [Wed, 2 Mar 2016 15:52:30 +0000 (15:52 +0000)]
Merge "oatdump: Add option to print just the header"
am:
15427ae9ca
* commit '
15427ae9ca187b6513cb72caab07c09f517a982a':
oatdump: Add option to print just the header
David Brazdil [Wed, 2 Mar 2016 15:44:34 +0000 (15:44 +0000)]
Merge "oatdump: Add option to print just the header"
David Brazdil [Wed, 2 Mar 2016 12:18:03 +0000 (12:18 +0000)]
oatdump: Add option to print just the header
Sometimes that's all one needs.
Change-Id: I0c442ed32f1662ad0b37dc2fccedd964ed1b1466
David Brazdil [Wed, 2 Mar 2016 13:38:44 +0000 (13:38 +0000)]
Merge "Fix one more Checker test after switch to Jack"
am:
8c55011b89
* commit '
8c55011b897817ecf3d85d3f50a387e509653073':
Fix one more Checker test after switch to Jack
David Brazdil [Wed, 2 Mar 2016 13:27:06 +0000 (13:27 +0000)]
Merge "Fix one more Checker test after switch to Jack"
David Brazdil [Wed, 2 Mar 2016 13:25:57 +0000 (13:25 +0000)]
Fix one more Checker test after switch to Jack
Bug:
25635944
Change-Id: I61780b3505104f2b8a62bc2dee889b8cd444c696
David Brazdil [Wed, 2 Mar 2016 12:00:12 +0000 (12:00 +0000)]
Merge "ART: Switch Checker run-tests to Jack"
am:
f9f3c5b0eb
* commit '
f9f3c5b0ebacbfed59af9c5c81fe9752e6b1258c':
ART: Switch Checker run-tests to Jack
David Brazdil [Wed, 2 Mar 2016 11:41:54 +0000 (11:41 +0000)]
Merge "ART: Switch Checker run-tests to Jack"
David Brazdil [Mon, 29 Feb 2016 09:14:51 +0000 (09:14 +0000)]
ART: Switch Checker run-tests to Jack
Bug:
25635944
Change-Id: Ic6774028025b51f54589e9625003e8f69cf39dea
Nicolas Geoffray [Wed, 2 Mar 2016 10:36:30 +0000 (10:36 +0000)]
Merge "Revert "ART: Allow unwinding unattached threads""
am:
3d4770c457
* commit '
3d4770c4577107caab23ba40547124c993e21c38':
Revert "ART: Allow unwinding unattached threads"
Nicolas Geoffray [Wed, 2 Mar 2016 10:27:22 +0000 (10:27 +0000)]
Merge "Revert "ART: Allow unwinding unattached threads""
Nicolas Geoffray [Wed, 2 Mar 2016 10:27:01 +0000 (10:27 +0000)]
Revert "ART: Allow unwinding unattached threads"
This reverts commit
f7286721a51c772b2abb42fef5bc0d2548df2372.
Change-Id: I6c96ece063041e94d40a96bdd054f89cd7875ade
Nicolas Geoffray [Wed, 2 Mar 2016 09:43:29 +0000 (09:43 +0000)]
Merge "Give the JIT its own arena pool to avoid lock contentions."
am:
8d468e351e
* commit '
8d468e351e42e8424f93746d9ee183f8cff01ec2':
Give the JIT its own arena pool to avoid lock contentions.
Nicolas Geoffray [Wed, 2 Mar 2016 09:39:06 +0000 (09:39 +0000)]
Merge "Give the JIT its own arena pool to avoid lock contentions."
Sebastien Hertz [Wed, 2 Mar 2016 09:23:23 +0000 (09:23 +0000)]
Merge "More run-test with Jack"
am:
e33785cd73
* commit '
e33785cd73b8af1e0ce3a46caf731711cac454ce':
More run-test with Jack
Sebastien Hertz [Wed, 2 Mar 2016 09:19:03 +0000 (09:19 +0000)]
Merge "More run-test with Jack"
Nicolas Geoffray [Wed, 2 Mar 2016 08:45:29 +0000 (08:45 +0000)]
Merge "Disable test after libunwind change."
am:
6cb0a0228e
* commit '
6cb0a0228e8237e2fad4b10864c9b934e804b538':
Disable test after libunwind change.
Nicolas Geoffray [Wed, 2 Mar 2016 08:33:33 +0000 (08:33 +0000)]
Merge "Disable test after libunwind change."
Nicolas Geoffray [Wed, 2 Mar 2016 08:30:44 +0000 (08:30 +0000)]
Disable test after libunwind change.
Change that broke it:
https://android-review.googlesource.com/205606
bug:
27391690
Change-Id: I73c545619a6a1bb03e49120466ac91686363230f
Serguei Katkov [Fri, 26 Feb 2016 07:00:40 +0000 (13:00 +0600)]
ART: Enable JitProfiling for x86_64 Mterp
Adds branch profiling and enables for x86_64.
Support interpreter switching in x86_64 mterp.
Change-Id: I0cb9fcf3e2a01e411d84efc78449e86c10e6bcac
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
Andreas Gampe [Wed, 2 Mar 2016 05:05:19 +0000 (05:05 +0000)]
Merge "ART: Allow unwinding unattached threads"
am:
f484954757
* commit '
f4849547579504fc660fe601687f7c60242473bb':
ART: Allow unwinding unattached threads
Dan Willemsen [Tue, 1 Mar 2016 05:09:08 +0000 (21:09 -0800)]
Remove references to $(ACP)
We're changing the implementation of these macros to not use acp.
Instead of having to keep this in sync, move to using a standard
prebuilt module. The build system has been updated to explicitly add the
executable bit to prebuilt modules in the EXECUTABLES class.
Change-Id: I29cf4d48619e022b7da65ef2df05a92bed08a456
Andreas Gampe [Wed, 2 Mar 2016 05:00:05 +0000 (05:00 +0000)]
Merge "ART: Allow unwinding unattached threads"
Mathieu Chartier [Wed, 2 Mar 2016 02:44:15 +0000 (02:44 +0000)]
Merge "Revert "Disable flaky 130-hprof test.""
am:
c3fe420c57
* commit '
c3fe420c57689e613e80e5b4033649d19f800e21':
Revert "Disable flaky 130-hprof test."
Mathieu Chartier [Wed, 2 Mar 2016 02:39:49 +0000 (02:39 +0000)]
Merge "Revert "Disable flaky 130-hprof test.""
Mathieu Chartier [Wed, 2 Mar 2016 01:40:55 +0000 (17:40 -0800)]
Revert "Disable flaky 130-hprof test."
Bug:
27337759
This reverts commit
2f0d3bc12f9ade80f4d3c21b7c4aad2cfe10f19e.
Mathieu Chartier [Wed, 2 Mar 2016 01:48:06 +0000 (01:48 +0000)]
Merge "Fix allocation tracking race"
am:
78fb377733
* commit '
78fb377733796e4a203bc3530ef7dfc6df104245':
Fix allocation tracking race
Mathieu Chartier [Wed, 2 Mar 2016 01:40:52 +0000 (01:40 +0000)]
Merge "Fix allocation tracking race"
Mathieu Chartier [Tue, 1 Mar 2016 02:13:38 +0000 (18:13 -0800)]
Fix allocation tracking race
Check if changed from uninstrumented to instrumented during GC for
alloc. If we changed, retry the allocation with kInstrumented = true.
Added stress test.
Bug:
27337759
Change-Id: Iaad7977693c9ed927f779a66b29cd58341a837da
Andreas Gampe [Tue, 1 Mar 2016 23:33:39 +0000 (23:33 +0000)]
Merge "Lower JIT thread priority"
am:
bbc300c4c5
* commit '
bbc300c4c59ebf9541f04c67bdff0c257c43805d':
Lower JIT thread priority
Andreas Gampe [Tue, 1 Mar 2016 23:30:10 +0000 (23:30 +0000)]
Merge "Lower JIT thread priority"
David Brazdil [Tue, 1 Mar 2016 22:56:32 +0000 (22:56 +0000)]
Merge "ART: Fix overlapping instruction IDs in inliner"
am:
31b743106d
* commit '
31b743106d8654bcdf39e4f638f4591eb5d7fb78':
ART: Fix overlapping instruction IDs in inliner
David Brazdil [Tue, 1 Mar 2016 22:55:18 +0000 (22:55 +0000)]
Merge "ART: Fix overlapping instruction IDs in inliner"
David Brazdil [Mon, 29 Feb 2016 16:53:33 +0000 (16:53 +0000)]
ART: Fix overlapping instruction IDs in inliner
Inliner creates the inner graph so that it generates instruction IDs
higher than the outer graph. This was broken because the inliner
would create instructions in the outer graph before the inner graph
is inlined.
The bug cannot be triggered because the offending instruction would
share the same ID as the first inner HLocal, which is removed before
the inner graph is inlined. The added DCHECKs reveal the hidden problem
and make it safe for HLocals to be removed in the future.
Change-Id: I486eb0f3987e20c50cbec0fb06332229e07fbae9
Andreas Gampe [Tue, 1 Mar 2016 04:49:38 +0000 (20:49 -0800)]
Lower JIT thread priority
Modify the JIT thread to run at a lower priority in order to allow
UI-critical threads to get enough CPU time.
Bug:
27417985
(cherry picked from commit
e701f088f8fe3a2c1f16e2895402f26283f4bcc7)
Change-Id: I5b962a7970ae81dac9e01a8011128c538cd78e40
Andreas Gampe [Tue, 1 Mar 2016 22:38:37 +0000 (14:38 -0800)]
ART: Allow unwinding unattached threads
Partial revert of commit
ed8b723c5f3989d2593ec21c65c96d6d8bf25579.
Make it (constexpr) configurable whether we allow unwinding native
stacks of unattached threads.
Change-Id: Ibb1fd0956fb796583f78ec9c3a74521f6fbe96d9
Nicolas Geoffray [Tue, 1 Mar 2016 22:19:22 +0000 (22:19 +0000)]
Merge "Revert "Use the interpreter as a heartbeat for the JIT.""
am:
73e31f8ae8
* commit '
73e31f8ae826be5b9b0c3c216abb904cbfa71077':
Revert "Use the interpreter as a heartbeat for the JIT."
Nicolas Geoffray [Tue, 1 Mar 2016 22:19:13 +0000 (22:19 +0000)]
Merge "Revert "Fix bogus interaction between code cache and instrumentation.""
am:
a8fde8e67d
* commit '
a8fde8e67dc8d15a436db16c7bbe201dbb249290':
Revert "Fix bogus interaction between code cache and instrumentation."
Aart Bik [Tue, 1 Mar 2016 22:19:03 +0000 (22:19 +0000)]
Merge "Standby list for dyn bce in potentially infinite loops."
am:
06d1115174
* commit '
06d111517419aabb9835f5f003352497ff16dfb9':
Standby list for dyn bce in potentially infinite loops.
Nicolas Geoffray [Tue, 1 Mar 2016 22:18:18 +0000 (22:18 +0000)]
Merge "Revert "Use the interpreter as a heartbeat for the JIT.""
Nicolas Geoffray [Tue, 1 Mar 2016 22:18:02 +0000 (22:18 +0000)]
Revert "Use the interpreter as a heartbeat for the JIT."
Hits a DCHECK testing libcore.
art F 11973 12675 art/runtime/jit/jit_code_cache.cc:644] Check failed: it.second->GetProfilingInfo(sizeof(void*)) != nullptr
Bug:
27398183
Bug:
23128949
Bug:
26846185
This reverts commit
7273a5d045d3ceb3ff011ad65765356b69b155e8.
Change-Id: I6614a82e775ea71aa16f041313f67546db41eac8
Nicolas Geoffray [Tue, 1 Mar 2016 22:16:55 +0000 (22:16 +0000)]
Merge "Revert "Fix bogus interaction between code cache and instrumentation.""
Nicolas Geoffray [Tue, 1 Mar 2016 22:16:35 +0000 (22:16 +0000)]
Revert "Fix bogus interaction between code cache and instrumentation."
hits a DCHECK when testing libcore:
art F 11973 12675 art/runtime/jit/jit_code_cache.cc:644] Check failed: it.second->GetProfilingInfo(sizeof(void*)) != nullptr
This reverts commit
e9924b7d4fcafe7261233d2c16ebb73d7bb5e8e8.
Change-Id: I37d05991b9506a53a7c76738a7e4a6def1010958
Aart Bik [Tue, 1 Mar 2016 22:10:46 +0000 (22:10 +0000)]
Merge "Standby list for dyn bce in potentially infinite loops."
Aart Bik [Tue, 1 Mar 2016 18:39:25 +0000 (10:39 -0800)]
Standby list for dyn bce in potentially infinite loops.
Rationale:
The old code relied on "luck" to revisit basic blocks
after dynamic bce and incorporate all bounds checks
in potentially infinite loops that were "made" finite.
Now that revisiting has been removed completely, keeping
a standby list ensures all candidates are considered.
Change-Id: Ida3cf63be1307be6c2b0258d3e64b163f12be235
Nicolas Geoffray [Tue, 1 Mar 2016 18:52:26 +0000 (18:52 +0000)]
Merge "Fix bogus interaction between code cache and instrumentation."
am:
d0ea91213c
* commit '
d0ea91213cd821302237f620caa03d3dcfe52e4f':
Fix bogus interaction between code cache and instrumentation.
Nicolas Geoffray [Tue, 1 Mar 2016 18:51:27 +0000 (18:51 +0000)]
Merge "Fix bogus interaction between code cache and instrumentation."