OSDN Git Service
Dan Willemsen [Wed, 2 Mar 2016 18:47:42 +0000 (18:47 +0000)]
Merge "Remove references to " am:
a71ec6419d
am:
8591eb4794
* commit '
8591eb4794d61553857d613e74f4b58db9daf3ba':
Remove references to $(ACP)
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)"
David Brazdil [Wed, 2 Mar 2016 16:55:11 +0000 (16:55 +0000)]
Merge "Improve Checker error messages" am:
785eeae66e
am:
512bfea684
* commit '
512bfea68450b86255ffd1d3347271a434504960':
Improve Checker error messages
Nicolas Geoffray [Wed, 2 Mar 2016 16:54:52 +0000 (16:54 +0000)]
Merge "Revert "Revert "Use the interpreter as a heartbeat for the JIT.""" am:
52d6810e59
am:
04b7f88af7
* commit '
04b7f88af709e6ecb4ece338f956990571a13136':
Revert "Revert "Use the interpreter as a heartbeat for the JIT.""
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.""
Serguei Katkov [Wed, 2 Mar 2016 16:43:28 +0000 (16:43 +0000)]
Merge "ART: Enable JitProfiling for x86_64 Mterp" am:
00e94fb884
am:
6bd39c513e
* commit '
6bd39c513ef3a8210549f9d50a31fbb58592eb07':
ART: Enable JitProfiling for x86_64 Mterp
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
David Brazdil [Wed, 2 Mar 2016 16:05:08 +0000 (16:05 +0000)]
Merge "oatdump: Add option to print just the header" am:
15427ae9ca
am:
d0be7fef2f
* commit '
d0be7fef2f4fdf176107787891545b319b95c2f6':
oatdump: Add option to print just the header
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 13:50:39 +0000 (13:50 +0000)]
Merge "Fix one more Checker test after switch to Jack" am:
8c55011b89
am:
99ea1df992
* commit '
99ea1df992f6293fb9bf443139dbce7a9345702e':
Fix one more Checker test after switch to Jack
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:11:14 +0000 (12:11 +0000)]
Merge "ART: Switch Checker run-tests to Jack" am:
f9f3c5b0eb
am:
bbe295a16b
* commit '
bbe295a16b97a7e7b8d169349a9d47d52ec22b7e':
ART: Switch Checker run-tests to Jack
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:45:30 +0000 (10:45 +0000)]
Merge "Revert "ART: Allow unwinding unattached threads"" am:
3d4770c457
am:
b68d8a14d6
* commit '
b68d8a14d694e55909f6a70c35e46d9002dff1a2':
Revert "ART: Allow unwinding unattached threads"
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:54:00 +0000 (09:54 +0000)]
Merge "Give the JIT its own arena pool to avoid lock contentions." am:
8d468e351e
am:
6d2d664bbb
* commit '
6d2d664bbb2ead31d653f1b06b7aa7d38631163a':
Give the JIT its own arena pool to avoid lock contentions.
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:32:55 +0000 (09:32 +0000)]
Merge "More run-test with Jack" am:
e33785cd73
am:
0237e9c28f
* commit '
0237e9c28fe4cb51a47e93290e710ec5654dfd48':
More run-test with Jack
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:54:17 +0000 (08:54 +0000)]
Merge "Disable test after libunwind change." am:
6cb0a0228e
am:
d95824e87e
* commit '
d95824e87e6f973536ab9bd06eea350de542d3f9':
Disable test after libunwind change.
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:12:24 +0000 (05:12 +0000)]
Merge "ART: Allow unwinding unattached threads" am:
f484954757
am:
ba426018eb
* commit '
ba426018eb4b41dd260bd189043978fc1bfcd5ac':
ART: Allow unwinding unattached threads
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:52:55 +0000 (02:52 +0000)]
Fix allocation tracking race
am:
ab4058c14a
* commit '
ab4058c14ad800d20138a6c41b999029d342de2c':
Fix allocation tracking race
Mathieu Chartier [Wed, 2 Mar 2016 02:48:15 +0000 (02:48 +0000)]
Merge "Revert "Disable flaky 130-hprof test."" am:
c3fe420c57
am:
44cb122569
* commit '
44cb1225690097ff0d754ac2d3bb0e831b31c6a3':
Revert "Disable flaky 130-hprof test."
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 [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
(cherry picked from commit
eebc3af4453f5c1fb5fd80c710cfd49566080d28)
Change-Id: I8fa50975b558199fcf142c8555476053001ace50
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:55:57 +0000 (01:55 +0000)]
Merge "Fix allocation tracking race" am:
78fb377733
am:
d30d5cdf57
* commit '
d30d5cdf57af88d88ab395de432fdacdc7b749de':
Fix allocation tracking race
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
Andreas Gampe [Wed, 2 Mar 2016 01:47:35 +0000 (01:47 +0000)]
Merge "Lower JIT thread priority" am:
bbc300c4c5
am:
ed70198aca
* commit '
ed70198aca719e15c9f5c7a444a6d4e3bddd77f9':
Lower JIT thread priority
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 23:02:19 +0000 (23:02 +0000)]
Merge "ART: Fix overlapping instruction IDs in inliner" am:
31b743106d
am:
db22ffa327
* commit '
db22ffa327a7945b69ada317abd1f5f5222d7c1c':
ART: Fix overlapping instruction IDs in inliner
Andreas Gampe [Tue, 1 Mar 2016 22:57:06 +0000 (22:57 +0000)]
Lower JIT thread priority
am:
e701f088f8
* commit '
e701f088f8fe3a2c1f16e2895402f26283f4bcc7':
Lower JIT thread priority
Calin Juravle [Tue, 1 Mar 2016 22:56:52 +0000 (22:56 +0000)]
Merge "Record foreign dex files loaded by the app in the profile" into nyc-dev
am:
f009a314c2
* commit '
f009a314c25bda4cbaa723040ed398939bfdb770':
Record foreign dex files loaded by the app in the profile
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:24:43 +0000 (22:24 +0000)]
Merge "Revert "Use the interpreter as a heartbeat for the JIT."" am:
73e31f8ae8
am:
ab2c1915d6
* commit '
ab2c1915d6d9184661420a3d54bfc464e9a229bc':
Revert "Use the interpreter as a heartbeat for the JIT."
Nicolas Geoffray [Tue, 1 Mar 2016 22:24:22 +0000 (22:24 +0000)]
Merge "Revert "Fix bogus interaction between code cache and instrumentation."" am:
a8fde8e67d
am:
a931b7d34f
* commit '
a931b7d34f91ec7abeae3831b9e077af58cdfec0':
Revert "Fix bogus interaction between code cache and instrumentation."
Aart Bik [Tue, 1 Mar 2016 22:24:07 +0000 (22:24 +0000)]
Merge "Standby list for dyn bce in potentially infinite loops." am:
06d1115174
am:
f9f21e82a6
* commit '
f9f21e82a6431cf641c23d3051ffed6ab95df387':
Standby list for dyn bce in potentially infinite loops.
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."
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
Change-Id: I5b962a7970ae81dac9e01a8011128c538cd78e40
Nicolas Geoffray [Tue, 1 Mar 2016 19:53:29 +0000 (19:53 +0000)]
Merge "Fix bogus interaction between code cache and instrumentation." am:
d0ea91213c
am:
127103274e
* commit '
127103274e6ad6757b24d9e4c610cf7925b95442':
Fix bogus interaction between code cache and instrumentation.
Serguei Katkov [Tue, 1 Mar 2016 19:53:19 +0000 (19:53 +0000)]
Merge "Revert "Revert "Fast ART x86_64 interpretator""" am:
7191fddfe6
am:
5be37bb7ed
* commit '
5be37bb7ed005f20e1e4445e384495221ce5c6cb':
Revert "Revert "Fast ART x86_64 interpretator""
Aart Bik [Tue, 1 Mar 2016 19:53:05 +0000 (19:53 +0000)]
Merge "Fixed bug on incorrectly revisiting same block." am:
a2313aa470
am:
a38b4428f3
* commit '
a38b4428f3e5be4e54487a3b65d300a03fd8ca4f':
Fixed bug on incorrectly revisiting same block.
Serguei Katkov [Tue, 1 Mar 2016 19:52:55 +0000 (19:52 +0000)]
Merge "x86 Fast Interpreter: Fix CFI" am:
4626786291
am:
03e16bddad
* commit '
03e16bddadaba5d8374261a7503bc48a0aeff080':
x86 Fast Interpreter: Fix CFI
Nicolas Geoffray [Tue, 1 Mar 2016 19:52:42 +0000 (19:52 +0000)]
Merge "Use the interpreter as a heartbeat for the JIT." am:
01f4dae0b4
am:
9e0df6e069
* commit '
9e0df6e06917ad52a2292127fb0817b2ac1b3bc1':
Use the interpreter as a heartbeat for the JIT.
Roland Levillain [Tue, 1 Mar 2016 19:52:31 +0000 (19:52 +0000)]
Merge "Fix the signature of the IndexOf entry point." am:
4cb069fa2f
am:
8c630c7210
* commit '
8c630c721041e0ad9d6631b19538e5153b81599f':
Fix the signature of the IndexOf entry point.
Nicolas Geoffray [Tue, 1 Mar 2016 19:52:20 +0000 (19:52 +0000)]
Merge "Dump more information to diagnose problem." am:
411539c65c
am:
1e54407316
* commit '
1e54407316f15b54337a8a6d2fe29f36da76d94d':
Dump more information to diagnose problem.
Goran Jakovljevic [Tue, 1 Mar 2016 19:52:08 +0000 (19:52 +0000)]
Merge "Optimizing: Do not depend on sharpening in test 577" am:
09294dc760
am:
42b4251c1a
* commit '
42b4251c1abd4d302a712d005fb6f8b528e7c9db':
Optimizing: Do not depend on sharpening in test 577
Roland Levillain [Tue, 1 Mar 2016 19:51:56 +0000 (19:51 +0000)]
Merge "Improve documentation about StringFactory.newStringFromChars." am:
47bce25b3e
am:
ec92c8abf5
* commit '
ec92c8abf5e4da9d5291b58897dbc1e8b9cb43d0':
Improve documentation about StringFactory.newStringFromChars.
Nicolas Geoffray [Tue, 1 Mar 2016 19:51:46 +0000 (19:51 +0000)]
Merge "Revert "Disable symbolizing traces on volantis."" am:
757701fc80
am:
2a4a51705c
* commit '
2a4a51705c8cee0cfb52ea6b9f27d4b27f510bbe':
Revert "Disable symbolizing traces on volantis."
Nicolas Geoffray [Tue, 1 Mar 2016 19:51:32 +0000 (19:51 +0000)]
Merge "Disable flaky 130-hprof test." am:
eff87a33bf
am:
6628ec491a
* commit '
6628ec491a9f581567540c661934fc50745e8860':
Disable flaky 130-hprof test.
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."
Nicolas Geoffray [Tue, 1 Mar 2016 18:43:46 +0000 (18:43 +0000)]
Fix bogus interaction between code cache and instrumentation.
Change-Id: Icc314089ec1a05248b8994476d478a543e629e4d
Serguei Katkov [Tue, 1 Mar 2016 18:21:26 +0000 (18:21 +0000)]
Merge "Revert "Revert "Fast ART x86_64 interpretator"""
am:
7191fddfe6
* commit '
7191fddfe6c623976dc8a97f785e3ce848e46d39':
Revert "Revert "Fast ART x86_64 interpretator""
Bill Buzbee [Tue, 1 Mar 2016 18:19:42 +0000 (18:19 +0000)]
Merge "Revert "Revert "Fast ART x86_64 interpretator"""
Calin Juravle [Tue, 1 Mar 2016 17:59:18 +0000 (17:59 +0000)]
Merge "Record foreign dex files loaded by the app in the profile" into nyc-dev
Aart Bik [Tue, 1 Mar 2016 17:19:52 +0000 (17:19 +0000)]
Merge "Fixed bug on incorrectly revisiting same block."
am:
a2313aa470
* commit '
a2313aa47096ea59ffb661d5afc7ff792bab22d6':
Fixed bug on incorrectly revisiting same block.
Aart Bik [Tue, 1 Mar 2016 17:18:37 +0000 (17:18 +0000)]
Merge "Fixed bug on incorrectly revisiting same block."
Calin Juravle [Wed, 24 Feb 2016 10:13:09 +0000 (10:13 +0000)]
Record foreign dex files loaded by the app in the profile
A foreign dex file is a file which is not owned by the app
(it's not part of its code paths or its private data directory).
When such a dex file is loaded by the app, the runtime will record
a marker in a dedicated profile folder (foreing_dex_profile_path).
The marker is just a file named after the canonical location of the
dex file where '/' is replaced by '@'.
The markers will be used by the system server system server to
decide if the apk should be fully or profile guide compiled.
Bug:
27334750
Bug:
26080105
Change-Id: If4fa8208be4e2f6f0b748b8a5417c4ae9c2d5df6
Serguei Katkov [Tue, 1 Mar 2016 15:35:48 +0000 (15:35 +0000)]
Merge "x86 Fast Interpreter: Fix CFI"
am:
4626786291
* commit '
462678629165f16df563b31b232d3f4ff69a7c23':
x86 Fast Interpreter: Fix CFI