OSDN Git Service
Calin Juravle [Wed, 30 Mar 2016 16:06:47 +0000 (16:06 +0000)]
Merge "Take into account the change in classes when analysing profiles" into nyc-dev am:
c736384
am:
86d57b8
* commit '
86d57b8972c40efdb3a744cf02a055801f689430':
Take into account the change in classes when analysing profiles
Change-Id: Ie70ea4c0ca9eea39d9401e7fe7b5bd96a665d71f
Mark Mendell [Wed, 30 Mar 2016 16:06:46 +0000 (16:06 +0000)]
Merge "X86_64: Replace x86_64 xchg instruction use" am:
a1eff4f am:
01098af
am:
540d0a1
* commit '
540d0a16691b8c5c296c55f301438452d6ed2113':
X86_64: Replace x86_64 xchg instruction use
Change-Id: I2a42d461bcbe2ee2a2750f30bcc69d4f70d96beb
David Brazdil [Wed, 30 Mar 2016 16:06:45 +0000 (16:06 +0000)]
Merge "ART: Flush ostream less frequently in GraphVisualizer" am:
15a605e am:
9049d07
am:
3c3a933
* commit '
3c3a93307f98b91c1abda266b79bc093deef043a':
ART: Flush ostream less frequently in GraphVisualizer
Change-Id: I26dae4e2e6f2f4d4487d59ca5cec18f5f62dd34d
Calin Juravle [Wed, 30 Mar 2016 12:42:49 +0000 (12:42 +0000)]
Merge "Take into account the change in classes when analysing profiles" into nyc-dev
am:
c736384
* commit '
c736384b7e6f92d479c90811939f7619a97bf3fc':
Take into account the change in classes when analysing profiles
Change-Id: I2c06df94b5973756cf9c743ae7a81fa6a3226f9a
Calin Juravle [Wed, 30 Mar 2016 12:32:15 +0000 (12:32 +0000)]
Merge "Take into account the change in classes when analysing profiles" into nyc-dev
Mark Mendell [Wed, 30 Mar 2016 10:12:21 +0000 (10:12 +0000)]
Merge "X86_64: Replace x86_64 xchg instruction use" am:
a1eff4f
am:
01098af
* commit '
01098af7a530ca65dcf5a40b3799c5147e49bd64':
X86_64: Replace x86_64 xchg instruction use
Change-Id: Ifbc573d474fe34e6892ee323d53fc93c95c53dba
Mark Mendell [Wed, 30 Mar 2016 10:08:25 +0000 (10:08 +0000)]
Merge "X86_64: Replace x86_64 xchg instruction use"
am:
a1eff4f
* commit '
a1eff4f279253bbc90d2697d7c15390bcab65d1e':
X86_64: Replace x86_64 xchg instruction use
Change-Id: I3a95d8b662a424f0f218acf31894fdf86b4bbca2
David Brazdil [Wed, 30 Mar 2016 10:00:28 +0000 (10:00 +0000)]
Merge "ART: Flush ostream less frequently in GraphVisualizer" am:
15a605e
am:
9049d07
* commit '
9049d072d9d815c8056d80d700cffa4b97971ecd':
ART: Flush ostream less frequently in GraphVisualizer
Change-Id: Ib0a084edf89452e9ec52002b905bcd2997b71135
Vladimir Marko [Wed, 30 Mar 2016 09:58:54 +0000 (09:58 +0000)]
Merge "X86_64: Replace x86_64 xchg instruction use"
David Brazdil [Wed, 30 Mar 2016 09:56:32 +0000 (09:56 +0000)]
Merge "ART: Flush ostream less frequently in GraphVisualizer"
am:
15a605e
* commit '
15a605e8fba716297cef70b8396ffe011c420f94':
ART: Flush ostream less frequently in GraphVisualizer
Change-Id: Iae7e60ede55207aab504de596170a0bf7615e787
David Brazdil [Wed, 30 Mar 2016 09:46:14 +0000 (09:46 +0000)]
Merge "ART: Flush ostream less frequently in GraphVisualizer"
David Brazdil [Wed, 30 Mar 2016 08:41:02 +0000 (09:41 +0100)]
ART: Flush ostream less frequently in GraphVisualizer
We have seen Checker tests timing out on debug-GC configurations after
having switched to Optimizing because its GraphVisualizer makes too
many syscalls which the configuration keeps track of.
This patch replaces std::endl with "\n" across GraphVisualizer so as
to not flush the stream after every line of output.
Bug:
27826765
Change-Id: I5e3f1e92f8a84f36d324d56945e2d420b2d36a5d
Andreas Gampe [Wed, 30 Mar 2016 01:08:26 +0000 (01:08 +0000)]
Merge "ART: Postpone interface-related dex failure to version 37" am:
a923025 am:
94eae20
am:
d95cc47
* commit '
d95cc47afd21d2c22fc93583981b9853d91dced2':
ART: Postpone interface-related dex failure to version 37
Change-Id: If075e3b5eba2fa868bd284b55a0af512f6ddb4f8
Andreas Gampe [Wed, 30 Mar 2016 01:00:37 +0000 (01:00 +0000)]
Merge "ART: Postpone interface-related dex failure to version 37" am:
a923025
am:
94eae20
* commit '
94eae2002dd31d1b4a828120dc724cdcb3fe68a0':
ART: Postpone interface-related dex failure to version 37
Change-Id: I051fb6b72f3c8650e5af51fcce65aa8a21512886
Andreas Gampe [Wed, 30 Mar 2016 00:56:54 +0000 (00:56 +0000)]
Merge "ART: Postpone interface-related dex failure to version 37"
am:
a923025
* commit '
a923025e08e61fd2ff26e3d60c26e9db29637736':
ART: Postpone interface-related dex failure to version 37
Change-Id: Ifa0aa5b79843957efd2c17a298bb052ac1c13800
Andreas Gampe [Wed, 30 Mar 2016 00:47:15 +0000 (00:47 +0000)]
Merge "ART: Postpone interface-related dex failure to version 37"
Andreas Gampe [Tue, 29 Mar 2016 01:31:29 +0000 (18:31 -0700)]
ART: Postpone interface-related dex failure to version 37
For app compat, at least for now make the check for public-final-static
of interface members not fail on dex file versions less than 37. This
may be changed in future releases.
Bug:
27831184
Change-Id: If8ee50321298b951d4a78062c8eb583fec27394f
Andreas Gampe [Tue, 29 Mar 2016 21:39:21 +0000 (21:39 +0000)]
Merge "ART: Update DexFile for compiler-filter pass-down" am:
8a31b7d am:
e54865f
am:
c32a498
* commit '
c32a498731b9f0c0a5f79ef7871cb7f3993022e4':
ART: Update DexFile for compiler-filter pass-down
Change-Id: Ic44ddf35ffe09d91e26366c1d60ad218f5d7efd0
Andreas Gampe [Tue, 29 Mar 2016 21:36:27 +0000 (21:36 +0000)]
Merge "ART: Update DexFile for compiler-filter pass-down" am:
8a31b7d
am:
e54865f
* commit '
e54865fd15676d5241c2f17c8b67518d808ac731':
ART: Update DexFile for compiler-filter pass-down
Change-Id: Ib40e7841f66836212cbc94e9e9559c9ddfb6ee55
Andreas Gampe [Tue, 29 Mar 2016 21:30:03 +0000 (21:30 +0000)]
Merge "ART: Update DexFile for compiler-filter pass-down"
am:
8a31b7d
* commit '
8a31b7d44a13b1d7e71852dc3c992598698d351d':
ART: Update DexFile for compiler-filter pass-down
Change-Id: Ib809573c3d6de424461584639d69baedb38bcdc9
Andreas Gampe [Tue, 29 Mar 2016 21:24:18 +0000 (21:24 +0000)]
Merge "ART: Update DexFile for compiler-filter pass-down"
Calin Juravle [Tue, 29 Mar 2016 19:33:33 +0000 (20:33 +0100)]
Take into account the change in classes when analysing profiles
Bug:
27894914
Change-Id: I8a060bedf133823c283b2ec23f56f2b3f0f208ee
Vladimir Marko [Tue, 29 Mar 2016 19:11:25 +0000 (19:11 +0000)]
Merge "Disable oatdump_test on mips due to timeouts." am:
335b8fb am:
2f943e6
am:
ba8d029
* commit '
ba8d029bfb2ed1dc404a993df0d0bb7150b7ba8b':
Disable oatdump_test on mips due to timeouts.
Change-Id: I7f3f1469ca59325f5bd4a7795b913cf087656751
Vladimir Marko [Tue, 29 Mar 2016 19:08:29 +0000 (19:08 +0000)]
Merge "Disable oatdump_test on mips due to timeouts." am:
335b8fb
am:
2f943e6
* commit '
2f943e67403ae10c513b5c3db8183998d7a08b33':
Disable oatdump_test on mips due to timeouts.
Change-Id: I76b9e33db4b5ce1a6b7405d5553cd78dee7d0006
Vladimir Marko [Tue, 29 Mar 2016 19:05:36 +0000 (19:05 +0000)]
Merge "Disable oatdump_test on mips due to timeouts."
am:
335b8fb
* commit '
335b8fb64d29a201b4012cadae7acc85842d13fd':
Disable oatdump_test on mips due to timeouts.
Change-Id: Idb02e23f7c699fdc445ba91dca70cdcc5fc2cf41
Vladimir Marko [Tue, 29 Mar 2016 18:58:43 +0000 (18:58 +0000)]
Merge "Disable oatdump_test on mips due to timeouts."
Andreas Gampe [Wed, 23 Mar 2016 22:03:46 +0000 (15:03 -0700)]
ART: Update DexFile for compiler-filter pass-down
Update getDexOptNeeded. Add implementations for isValidCompilerFilter
and isProfileGuidedCompilerFilter.
Bug:
27689078
(cherry picked from commit
1d23d43e29e41adb3d504332c8833acaacb49e50)
Change-Id: I06b9d75f58c59cb07ef5170f784ea6745168efaa
Vladimir Marko [Tue, 29 Mar 2016 17:42:21 +0000 (18:42 +0100)]
Disable oatdump_test on mips due to timeouts.
Bug:
27824283
Change-Id: I8014471385fdfe0e98760af04507cd81338f9952
Nicolas Geoffray [Tue, 29 Mar 2016 17:39:47 +0000 (17:39 +0000)]
Fix dex2oat/oatdump cross-compilation. am:
e930027
am:
339a8a8
* commit '
339a8a8880f1b2637bd321a313bde0999e223b1c':
Fix dex2oat/oatdump cross-compilation.
Change-Id: I555fcfc5baf45bd2b7ea0b5e71707b3101c9239b
Nicolas Geoffray [Tue, 29 Mar 2016 17:36:53 +0000 (17:36 +0000)]
Fix dex2oat/oatdump cross-compilation.
am:
e930027
* commit '
e9300271556e47639cade1ec5fdf8f66b3724d03':
Fix dex2oat/oatdump cross-compilation.
Change-Id: I9e7bda8f5771931f8d8941be3b02879962bc836a
Nicolas Geoffray [Wed, 23 Mar 2016 16:35:51 +0000 (16:35 +0000)]
Fix dex2oat/oatdump cross-compilation.
Only set the ImtConflictTable when not in AOT, to not mess up
with the image.
(cherry picked from commit
40c68c690546e8c15dcb2de6137e72c74f573a75)
Change-Id: I7bff3a18cc06184ed9d7d63ab433f286884f19e7
Calin Juravle [Tue, 29 Mar 2016 13:14:31 +0000 (13:14 +0000)]
Merge "Fix debug leftover in profman" into nyc-dev am:
a54e05a
am:
4eb3201
* commit '
4eb32011d078d9fb80692f23f0c3a1f0807556ea':
Fix debug leftover in profman
Change-Id: I76845856707be8e8c49166e53349b1e7630b27a6
Calin Juravle [Tue, 29 Mar 2016 13:11:42 +0000 (13:11 +0000)]
Merge "Fix debug leftover in profman" into nyc-dev
am:
a54e05a
* commit '
a54e05aa8d2c4dca042ea924558738adb23ac730':
Fix debug leftover in profman
Change-Id: I4dc49d786576d46b2bdef8cbd97546d1dccfe3fa
Calin Juravle [Tue, 29 Mar 2016 13:05:05 +0000 (13:05 +0000)]
Merge "Fix debug leftover in profman" into nyc-dev
Calin Juravle [Tue, 29 Mar 2016 13:03:10 +0000 (14:03 +0100)]
Fix debug leftover in profman
Bug:
27600652
Change-Id: I32466623379928cdaad839303e6ea3a39d673cd4
Vladimir Marko [Tue, 29 Mar 2016 09:06:36 +0000 (09:06 +0000)]
Merge "Optimizing: Reduce arena memory used by GraphChecker." am:
6f51d77 am:
80ec300
am:
ad72c5f
* commit '
ad72c5fd73d2f6194d5abdfee3dc3f51b3d331d2':
Optimizing: Reduce arena memory used by GraphChecker.
Change-Id: I1bb8190b4af810bf68ba8a8e694b82b03f69a861
Vladimir Marko [Tue, 29 Mar 2016 09:03:48 +0000 (09:03 +0000)]
Merge "Optimizing: Reduce arena memory used by GraphChecker." am:
6f51d77
am:
80ec300
* commit '
80ec300c68d58180ad68169930f56b86d0a3eaa7':
Optimizing: Reduce arena memory used by GraphChecker.
Change-Id: I778fe511e30d7c57582fba273c8f1d857b509fe0
Vladimir Marko [Tue, 29 Mar 2016 09:01:03 +0000 (09:01 +0000)]
Merge "Optimizing: Reduce arena memory used by GraphChecker."
am:
6f51d77
* commit '
6f51d7756a9c66007fe7666b19399e1f60ff6092':
Optimizing: Reduce arena memory used by GraphChecker.
Change-Id: Ibed1731665038d681998b8d31d1cd218e074f5ff
Vladimir Marko [Tue, 29 Mar 2016 08:56:19 +0000 (08:56 +0000)]
Merge "Optimizing: Reduce arena memory used by GraphChecker."
Andreas Gampe [Tue, 29 Mar 2016 02:42:00 +0000 (02:42 +0000)]
Merge "ART: Make verifier fail log level adjustable" am:
fedcd0a am:
226f52d
am:
c84b28e
* commit '
c84b28e31085d560d8aa4335580e341acbcd7ddc':
ART: Make verifier fail log level adjustable
Change-Id: Ie83435dbfb8272953f1bbd41426b2c27741be0dc
Andreas Gampe [Tue, 29 Mar 2016 02:39:14 +0000 (02:39 +0000)]
Merge "ART: Make verifier fail log level adjustable" am:
fedcd0a
am:
226f52d
* commit '
226f52d3c487ce56aa11565966b1e96ffffe86c6':
ART: Make verifier fail log level adjustable
Change-Id: I2c70e3fa252951d1dde9ca5aff49c5cb6dbd6eb3
Andreas Gampe [Tue, 29 Mar 2016 02:36:24 +0000 (02:36 +0000)]
Merge "ART: Make verifier fail log level adjustable"
am:
fedcd0a
* commit '
fedcd0a6870cf4d940d231f6725ca95c590d04bd':
ART: Make verifier fail log level adjustable
Change-Id: Ia860a719def57f0ff1a914a93947d11b6fd58f49
Andreas Gampe [Tue, 29 Mar 2016 02:31:16 +0000 (02:31 +0000)]
Merge "ART: Make verifier fail log level adjustable"
Andreas Gampe [Tue, 29 Mar 2016 01:51:31 +0000 (01:51 +0000)]
Merge "ART: Clean up verifier" am:
ef94b54 am:
361aa38
am:
a5f4720
* commit '
a5f47209d35ba8d57d850fe771343ba34d5b73f3':
ART: Clean up verifier
Change-Id: I14cbc8942b4694b56e5b31e885428c6dbd265934
Andreas Gampe [Tue, 29 Mar 2016 01:48:44 +0000 (01:48 +0000)]
Merge "ART: Clean up verifier" am:
ef94b54
am:
361aa38
* commit '
361aa3820e18657f5aca9da7a662497d22343168':
ART: Clean up verifier
Change-Id: I934d1c10c93e589beafa15c865b386dbb7a30b4f
Andreas Gampe [Tue, 29 Mar 2016 01:46:28 +0000 (01:46 +0000)]
Merge "ART: Clean up verifier"
am:
ef94b54
* commit '
ef94b5484a75902404e975cba55a7e825941b2fa':
ART: Clean up verifier
Change-Id: I975423bbf31948bacee17a077d54001b60f23870
Andreas Gampe [Tue, 29 Mar 2016 01:38:19 +0000 (01:38 +0000)]
Merge "ART: Clean up verifier"
Andreas Gampe [Fri, 25 Mar 2016 23:58:00 +0000 (16:58 -0700)]
ART: Make verifier fail log level adjustable
To help for build failures.
Change-Id: I6c94dfb50177daa7d89902d78715ccec31bf0e45
Alex Light [Mon, 28 Mar 2016 23:10:33 +0000 (23:10 +0000)]
Add support for Dex version 37 in Runtime. am:
2190d92
am:
05c0da2
* commit '
05c0da209cd73f2ed388a16cc92f3aea6fa585d5':
Add support for Dex version 37 in Runtime.
Alex Light [Mon, 28 Mar 2016 23:06:10 +0000 (23:06 +0000)]
Add support for Dex version 37 in Runtime.
am:
2190d92
* commit '
2190d929695c31ad7195e2c366f4102836a7d827':
Add support for Dex version 37 in Runtime.
Andreas Gampe [Fri, 25 Mar 2016 23:58:00 +0000 (16:58 -0700)]
ART: Clean up verifier
Clean up verifier post-Quick.
Change-Id: I0b05e10dd06edd228fe2068c8afffc4b7d7fdffa
Alex Light [Mon, 28 Mar 2016 21:48:23 +0000 (21:48 +0000)]
Merge "Add support for Dex version 37 in Runtime." am:
ec89839
am:
ab39974
* commit '
ab39974303b75b0c78c169b34d99108aeec7561c':
Add support for Dex version 37 in Runtime.
Alex Light [Mon, 28 Mar 2016 21:44:31 +0000 (21:44 +0000)]
Merge "Add support for Dex version 37 in Runtime."
am:
ec89839
* commit '
ec898396658bc6a36e2b3c32569fbcb034d60e22':
Add support for Dex version 37 in Runtime.
Alex Light [Wed, 23 Mar 2016 17:20:41 +0000 (10:20 -0700)]
Add support for Dex version 37 in Runtime.
We are skipping version 36 of the dex file format due to a bug in
Dalvik dating back to ICS where dex files marked version 036 would
erroneously be accepted.
Bug:
27538761
Bug:
27809626
(cherry picked from commit
c49618160d5fa64ca4883d2e09fa34b83491c8ea)
Change-Id: Ic053f7e25f5a8c3df83ff34b6656528824b2df12
Alex Light [Mon, 28 Mar 2016 21:26:05 +0000 (21:26 +0000)]
Merge "Add support for Dex version 37 in Runtime."
Calin Juravle [Mon, 28 Mar 2016 10:39:03 +0000 (10:39 +0000)]
Do not profile fully compiled oat files. am:
6044fa7
am:
3efd84f
* commit '
3efd84f7db8224e8a4d56c570db46ef117065a57':
Do not profile fully compiled oat files.
Calin Juravle [Mon, 28 Mar 2016 10:34:42 +0000 (10:34 +0000)]
Do not profile fully compiled oat files.
am:
6044fa7
* commit '
6044fa747867413912d0de3049dc570c769d3cf8':
Do not profile fully compiled oat files.
Aart Bik [Sat, 26 Mar 2016 00:56:56 +0000 (00:56 +0000)]
Merge "Fix bug not accounting for type in induction comparison. Extended unit tests." am:
e28ad4b
am:
2be31af
* commit '
2be31af52188b58a84582c5cd406a1b09f4e1402':
Fix bug not accounting for type in induction comparison. Extended unit tests.
Aart Bik [Sat, 26 Mar 2016 00:53:49 +0000 (00:53 +0000)]
Merge "Fix bug not accounting for type in induction comparison. Extended unit tests."
am:
e28ad4b
* commit '
e28ad4b91591c226ed404a2b01104bb99bfeb28f':
Fix bug not accounting for type in induction comparison. Extended unit tests.
Aart Bik [Sat, 26 Mar 2016 00:44:53 +0000 (00:44 +0000)]
Merge "Fix bug not accounting for type in induction comparison. Extended unit tests."
Andreas Gampe [Sat, 26 Mar 2016 00:02:53 +0000 (00:02 +0000)]
Merge "ART: Relax verifier checks" am:
782d046
am:
793a505
* commit '
793a505e270db9dba317e71d38257299b91a075e':
ART: Relax verifier checks
Andreas Gampe [Sat, 26 Mar 2016 00:00:15 +0000 (00:00 +0000)]
Merge "ART: Relax verifier checks"
am:
782d046
* commit '
782d0464ddc92fd5d55a330068d2d255336c16ba':
ART: Relax verifier checks
Andreas Gampe [Fri, 25 Mar 2016 23:53:20 +0000 (23:53 +0000)]
Merge "ART: Relax verifier checks"
Andreas Gampe [Fri, 25 Mar 2016 23:24:20 +0000 (16:24 -0700)]
ART: Relax verifier checks
Only bail for unresolved merge types in a couple of cases. Follow-up
to
bb18a03c44d99b3cae232d445d56e80d8388cca9.
Bug:
27799205
Change-Id: If448e14036bc5e245677e0cd8cdddee02b320525
Aart Bik [Fri, 25 Mar 2016 20:14:53 +0000 (13:14 -0700)]
Fix bug not accounting for type in induction comparison.
Extended unit tests.
Rationale:
Now that inductions are typed, comparisons should take
the type into account as well.
Change-Id: Ie533bb728d2006390646657573fa743e6fc37ff2
Ying Wang [Fri, 25 Mar 2016 21:53:52 +0000 (21:53 +0000)]
Merge "Allow x86+arm multilib build." am:
91ac272
am:
837e418
* commit '
837e4189088103255a2e220b06d1a62e5842e5af':
Allow x86+arm multilib build.
Ying Wang [Fri, 25 Mar 2016 21:51:10 +0000 (21:51 +0000)]
Merge "Allow x86+arm multilib build."
am:
91ac272
* commit '
91ac272c11775630735dde3190de9f2da8f3f3eb':
Allow x86+arm multilib build.
Ying Wang [Fri, 25 Mar 2016 21:41:41 +0000 (21:41 +0000)]
Merge "Allow x86+arm multilib build."
Ying Wang [Thu, 17 Mar 2016 02:40:00 +0000 (19:40 -0700)]
Allow x86+arm multilib build.
The explicit dependency of dex2oat on installed file of libart-compiler
isn't necessary: the build sets up the dependency automatically when
dex2oat links liblibart-compiler.
Also the way of the explicit dependency is incorrect if multilib is
involved: a 64-bit dex2oat may depend on 32-bit libart-compiler.
Bug:
27526885
Change-Id: I4a9d72b49f5712695ff5a32b88df5eab9df7c1e4
(cherry-pick from commit
5eec66ea27a2fa5bfa1b4f9bd203c76e2990d7a2)
Aart Bik [Fri, 25 Mar 2016 19:22:33 +0000 (19:22 +0000)]
Merge "Avoid removing new-instance instruction twice. Includes a fail-before/pass-after regression test." am:
b0b3859
am:
37645e3
* commit '
37645e35154ec9d93b60e49f79ab2b7be414fff0':
Avoid removing new-instance instruction twice. Includes a fail-before/pass-after regression test.
Andreas Gampe [Fri, 25 Mar 2016 19:22:32 +0000 (19:22 +0000)]
Merge "ART: Allow array-ness for unresolved merge types" am:
0a4d6b9
am:
2900387
* commit '
290038734d721c8dab27530f2125890de3b2874b':
ART: Allow array-ness for unresolved merge types
Aart Bik [Fri, 25 Mar 2016 18:47:53 +0000 (18:47 +0000)]
Merge "Avoid removing new-instance instruction twice. Includes a fail-before/pass-after regression test."
am:
b0b3859
* commit '
b0b38596a4f28725b71f17e13c7b544d926f0d3e':
Avoid removing new-instance instruction twice. Includes a fail-before/pass-after regression test.
Andreas Gampe [Fri, 25 Mar 2016 18:47:52 +0000 (18:47 +0000)]
Merge "ART: Allow array-ness for unresolved merge types"
am:
0a4d6b9
* commit '
0a4d6b9faaaa2652c42679df2a72c78485ed9c64':
ART: Allow array-ness for unresolved merge types
Aart Bik [Fri, 25 Mar 2016 18:04:18 +0000 (18:04 +0000)]
Merge "Avoid removing new-instance instruction twice. Includes a fail-before/pass-after regression test."
Calin Juravle [Fri, 25 Mar 2016 17:17:09 +0000 (17:17 +0000)]
Do not profile fully compiled oat files.
- don't waste a thread if we're not gonna use the profiles.
- don't put foreign dex use markers since they will be ignored.
Bug:
26080105
Change-Id: I68a8aee32e7ef40457a621cfa3f5800208c5e086
Andreas Gampe [Fri, 25 Mar 2016 17:45:31 +0000 (17:45 +0000)]
Merge "ART: Allow array-ness for unresolved merge types"
Andreas Gampe [Wed, 23 Mar 2016 03:34:25 +0000 (20:34 -0700)]
ART: Allow array-ness for unresolved merge types
In case component types aren't resolvable, array types won't be
either. They then may be merged. The merge is still potentially
an array type.
Ensure that merging an unresolved array type with a primitive
array type or a non-array type will be resolved to java.lang.Object.
Added tests.
Bug:
27799205
Change-Id: I9beff75318814dddd842abd64ef9a5d2644d801e
Aart Bik [Thu, 24 Mar 2016 22:38:56 +0000 (15:38 -0700)]
Avoid removing new-instance instruction twice.
Includes a fail-before/pass-after regression test.
Rationale:
In some corner cases, one new instance reached more than one
java.lang.String.<init> method call. As a result, the new
instance instruction appeared multiple times in the vector
uninitialized_strings_. A second removal crashes the compiler.
This change list avoid the crash by simply skipping instructions
that are already removed.
BUG=
27847265
Change-Id: I7f8a4f84ea3c184e1529ec3e90bd6749c83c445b
Vladimir Marko [Fri, 25 Mar 2016 15:31:35 +0000 (15:31 +0000)]
Optimizing: Reduce arena memory used by GraphChecker.
Use member variables to reuse the storage instead of
repeatedly allocating new storage for local variables.
Bug:
27690481
Change-Id: I614db9b8614d585653cfbff62e9cf7d7f0c58810
Calin Juravle [Fri, 25 Mar 2016 14:24:14 +0000 (14:24 +0000)]
Merge "Discard corrupted or out of date profiles" into nyc-dev am:
197a6a9
am:
41a7ba0
* commit '
41a7ba0e7183fc37a59a19a317f2b3535e0ee34a':
Discard corrupted or out of date profiles
Calin Juravle [Fri, 25 Mar 2016 14:20:23 +0000 (14:20 +0000)]
Merge "Discard corrupted or out of date profiles" into nyc-dev
am:
197a6a9
* commit '
197a6a9a58b2e01aa89fba7741e9a01c2f4b7992':
Discard corrupted or out of date profiles
Calin Juravle [Fri, 25 Mar 2016 14:09:55 +0000 (14:09 +0000)]
Merge "Discard corrupted or out of date profiles" into nyc-dev
Calin Juravle [Thu, 24 Mar 2016 20:33:22 +0000 (20:33 +0000)]
Discard corrupted or out of date profiles
Until now we bailed out if the previous profile contained invalid data.
This CLs forces the save and clears any data in a profile that has the
wrong version or contains bad data.
Bug:
27081617
Change-Id: I0424025e37c7b4b817da791996436dd4a932c2cd
Calin Juravle [Fri, 25 Mar 2016 11:42:13 +0000 (11:42 +0000)]
Merge "Revert "ART: Improve JitProfile perf in arm/arm64 mterp"" am:
5d87b29
am:
57dc428
* commit '
57dc42860ec6cc0d4e1400299b850a2f6af839d8':
Revert "ART: Improve JitProfile perf in arm/arm64 mterp"
Calin Juravle [Fri, 25 Mar 2016 11:42:12 +0000 (11:42 +0000)]
Merge "Revert "ART: Ignore hotness updates if jit inactive"" am:
38be6ba
am:
afc41b5
* commit '
afc41b5b954bd3c78901a0e685b25037e226b557':
Revert "ART: Ignore hotness updates if jit inactive"
Calin Juravle [Fri, 25 Mar 2016 11:39:29 +0000 (11:39 +0000)]
Merge "Revert "ART: Improve JitProfile perf in arm/arm64 mterp""
am:
5d87b29
* commit '
5d87b29339c5301bea0bf2c3f47e520e3d7b0d16':
Revert "ART: Improve JitProfile perf in arm/arm64 mterp"
Calin Juravle [Fri, 25 Mar 2016 11:39:28 +0000 (11:39 +0000)]
Merge "Revert "ART: Ignore hotness updates if jit inactive""
am:
38be6ba
* commit '
38be6bad7a9015b1633751608e833b40dc7a0012':
Revert "ART: Ignore hotness updates if jit inactive"
Calin Juravle [Fri, 25 Mar 2016 11:30:27 +0000 (11:30 +0000)]
Merge "Revert "ART: Improve JitProfile perf in arm/arm64 mterp""
Calin Juravle [Fri, 25 Mar 2016 11:29:55 +0000 (11:29 +0000)]
Merge "Revert "ART: Ignore hotness updates if jit inactive""
Calin Juravle [Fri, 25 Mar 2016 11:27:48 +0000 (11:27 +0000)]
Revert "ART: Improve JitProfile perf in arm/arm64 mterp"
This reverts commit
c1d6b341eed646e5adafc6c4fd4e3748f0292368.
Calin Juravle [Fri, 25 Mar 2016 11:27:40 +0000 (11:27 +0000)]
Revert "ART: Ignore hotness updates if jit inactive"
This reverts commit
17bda200dc7e36ba4178501274f10df4c82bea11.
Mathieu Chartier [Fri, 25 Mar 2016 01:59:16 +0000 (01:59 +0000)]
Merge "Only call jit_load after the zygote fork" am:
2295f2e
am:
8761a7a
* commit '
8761a7afa2dff8482ed690acecaab28545c6c615':
Only call jit_load after the zygote fork
Mathieu Chartier [Fri, 25 Mar 2016 01:56:42 +0000 (01:56 +0000)]
Merge "Only call jit_load after the zygote fork"
am:
2295f2e
* commit '
2295f2eff470ebb38317d1496b17439e6db8a10a':
Only call jit_load after the zygote fork
Mathieu Chartier [Fri, 25 Mar 2016 01:48:22 +0000 (01:48 +0000)]
Merge "Only call jit_load after the zygote fork"
Mathieu Chartier [Fri, 25 Mar 2016 00:22:52 +0000 (17:22 -0700)]
Only call jit_load after the zygote fork
Otherwise we always get that enable_debug_features is false since
that flag passed as a compiler option post zygote fork.
No significant change to libart-compiler PSS on calculator.
Bug:
27810774
(cherry picked from commit
b10cef442594dd0d6c5f1a5784643931a25cc431)
Change-Id: Ie50668ba05ad07a5cf046497959f6d27e09f8fe2
Mathieu Chartier [Fri, 25 Mar 2016 01:40:44 +0000 (01:40 +0000)]
Only call jit_load after the zygote fork am:
b10cef4
am:
8ed6e5c
* commit '
8ed6e5c69b4d36454adb82cfd8bf38c913bce0d5':
Only call jit_load after the zygote fork
Mathieu Chartier [Fri, 25 Mar 2016 01:38:07 +0000 (01:38 +0000)]
Only call jit_load after the zygote fork
am:
b10cef4
* commit '
b10cef442594dd0d6c5f1a5784643931a25cc431':
Only call jit_load after the zygote fork
Mathieu Chartier [Fri, 25 Mar 2016 00:22:52 +0000 (17:22 -0700)]
Only call jit_load after the zygote fork
Otherwise we always get that enable_debug_features is false since
that flag passed as a compiler option post zygote fork.
No significant change to libart-compiler PSS on calculator.
Bug:
27810774
Change-Id: I9854716902c79e16bdfd64754cc1ed05e852a5de
Ying Wang [Fri, 25 Mar 2016 00:01:05 +0000 (00:01 +0000)]
Merge "Allow x86+arm multilib build."
buzbee [Thu, 24 Mar 2016 22:42:30 +0000 (22:42 +0000)]
Merge "ART: Ignore hotness updates if jit inactive"
am:
af8e71d
* commit '
af8e71d59b0ab5e79f53a608b62b3618e36e6a98':
ART: Ignore hotness updates if jit inactive
OSDN Git Service
