OSDN Git Service
Vladimir Marko [Wed, 16 Dec 2015 11:03:29 +0000 (11:03 +0000)]
Merge "ART: Compile run-tests with Java 7." am:
6b75bc08e8
am:
5783c2ec79
* commit '
5783c2ec79548c161fe886fbcc12fa7889d79be0':
ART: Compile run-tests with Java 7.
Vladimir Marko [Wed, 16 Dec 2015 11:00:00 +0000 (11:00 +0000)]
Merge "ART: Compile run-tests with Java 7."
am:
6b75bc08e8
* commit '
6b75bc08e8e2e5516a23350418bacef2cf982bd9':
ART: Compile run-tests with Java 7.
Vladimir Marko [Wed, 16 Dec 2015 10:50:52 +0000 (10:50 +0000)]
Merge "ART: Compile run-tests with Java 7."
Vladimir Marko [Tue, 15 Dec 2015 16:36:24 +0000 (16:36 +0000)]
ART: Compile run-tests with Java 7.
This fixes run-tests with EXPERIMENTAL_USE_JAVA8=true.
Change-Id: I269664fc65a1d6c244c3f6191e332eb2751b5c0e
Nicolas Geoffray [Wed, 16 Dec 2015 09:46:22 +0000 (09:46 +0000)]
Merge "Revert "ART: Set RTI of Arm64IntermediateAddress"" am:
96f721dd41
am:
c9f66d5d31
* commit '
c9f66d5d31c9d9bb3750b89fd5d7919e4c771b52':
Revert "ART: Set RTI of Arm64IntermediateAddress"
Nicolas Geoffray [Wed, 16 Dec 2015 09:42:47 +0000 (09:42 +0000)]
Merge "Revert "ART: Set RTI of Arm64IntermediateAddress""
am:
96f721dd41
* commit '
96f721dd41f81c967b187d81b6f3e1bcc2a9243c':
Revert "ART: Set RTI of Arm64IntermediateAddress"
Nicolas Geoffray [Wed, 16 Dec 2015 09:34:39 +0000 (09:34 +0000)]
Merge "Revert "ART: Set RTI of Arm64IntermediateAddress""
Nicolas Geoffray [Wed, 16 Dec 2015 09:34:21 +0000 (09:34 +0000)]
Revert "ART: Set RTI of Arm64IntermediateAddress"
This reverts commit
e36ae9435da21542891ceeebb3328f5066c8301e.
Change-Id: If675b02db04bee78cc95da4ed58e545da5085da1
Nicolas Geoffray [Wed, 16 Dec 2015 08:48:39 +0000 (08:48 +0000)]
Merge "Revert "ART: Refactor SsaBuilder for more precise typing info"" am:
b059c8a044
am:
13cd5cad6e
* commit '
13cd5cad6e51f52d7e2ef38c9415d6d03fd994e3':
Revert "ART: Refactor SsaBuilder for more precise typing info"
Nicolas Geoffray [Wed, 16 Dec 2015 08:45:07 +0000 (08:45 +0000)]
Merge "Revert "ART: Refactor SsaBuilder for more precise typing info""
am:
b059c8a044
* commit '
b059c8a044ed3ede1a0eea4b1e92008ced90c013':
Revert "ART: Refactor SsaBuilder for more precise typing info"
Nicolas Geoffray [Wed, 16 Dec 2015 08:35:46 +0000 (08:35 +0000)]
Merge "Revert "ART: Refactor SsaBuilder for more precise typing info""
Alex Light [Wed, 16 Dec 2015 01:53:10 +0000 (01:53 +0000)]
Merge "Revert "Combine direct_methods_ and virtual_methods_ fields of mirror::Class"" am:
bc90a0538e
am:
6e4753f0bc -s ours
* commit '
6e4753f0bc55655e2e178cb16d6a232ebd055543':
Revert "Combine direct_methods_ and virtual_methods_ fields of mirror::Class"
Alex Light [Wed, 16 Dec 2015 01:30:30 +0000 (17:30 -0800)]
Revert "ART: Refactor SsaBuilder for more precise typing info"
This reverts commit
d9510dfc32349eeb4f2145c801f7ba1d5bccfb12.
Bug:
26208284
Bug:
24252151
Bug:
24252100
Bug:
22538329
Bug:
25786318
Change-Id: I5f491becdf076ff51d437d490405ec4e1586c010
Aart Bik [Wed, 16 Dec 2015 01:32:59 +0000 (01:32 +0000)]
Merge "Various induction/range analysis improvements." am:
0bbc1727c4
am:
ec85f7d2a1
* commit '
ec85f7d2a189b176422e82aa03e16c76db48e7be':
Various induction/range analysis improvements.
Alex Light [Wed, 16 Dec 2015 01:30:30 +0000 (01:30 +0000)]
Merge "Revert "Combine direct_methods_ and virtual_methods_ fields of mirror::Class""
am:
bc90a0538e
* commit '
bc90a0538e56f98b8e138cb622e6b9d834244ad9':
Revert "Combine direct_methods_ and virtual_methods_ fields of mirror::Class"
Alex Light [Tue, 15 Dec 2015 22:17:21 +0000 (22:17 +0000)]
Merge "Revert "Combine direct_methods_ and virtual_methods_ fields of mirror::Class""
Alex Light [Tue, 15 Dec 2015 22:16:25 +0000 (22:16 +0000)]
Merge "Revert "Combine direct_methods_ and virtual_methods_ fields of mirror::Class""
Alex Light [Tue, 15 Dec 2015 22:15:34 +0000 (22:15 +0000)]
Revert "Combine direct_methods_ and virtual_methods_ fields of mirror::Class"
This reverts commit
9539150b85142c18e9e8c2264b5b6100942667c3.
Change-Id: I596876cd643ec0ad524a56621efb6b89e8886230
Alex Light [Tue, 15 Dec 2015 22:15:26 +0000 (22:15 +0000)]
Revert "Combine direct_methods_ and virtual_methods_ fields of mirror::Class"
This reverts commit
6286a97bea0f584342803a215550038852b24776.
Change-Id: I5b00f6d1350e9c587acd4b185367dc815ea707de
Alex Light [Tue, 15 Dec 2015 21:10:49 +0000 (13:10 -0800)]
Merge "Combine direct_methods_ and virtual_methods_ fields of mirror::Class" am:
7d5a577c1f
am:
20aeec4a7a -s ours
* commit '
20aeec4a7aeb1d249e07db8e5067a4c62ab7956d':
Combine direct_methods_ and virtual_methods_ fields of mirror::Class
Aart Bik [Tue, 15 Dec 2015 21:10:45 +0000 (21:10 +0000)]
Merge "Various induction/range analysis improvements."
am:
0bbc1727c4
* commit '
0bbc1727c446ee5f4cc3c28e68127164ef379594':
Various induction/range analysis improvements.
Aart Bik [Tue, 15 Dec 2015 20:50:49 +0000 (20:50 +0000)]
Merge "Various induction/range analysis improvements."
Aart Bik [Wed, 9 Dec 2015 22:39:48 +0000 (14:39 -0800)]
Various induction/range analysis improvements.
Rationale: this change list improves analysis of triangular loops
both by changing loop order for induction analysis
(enabling range analysis in inner loops) and by
some symbolic improvements during range analysis;
also, a mul/div bug has been fixed (with pass/fail
unit tests); lastly this change list prepares some
follow up optimizations.
Change-Id: I84a03e848405009541c3fa8e3d3c2f430e100087
Alex Light [Tue, 15 Dec 2015 18:53:58 +0000 (18:53 +0000)]
Merge "Combine direct_methods_ and virtual_methods_ fields of mirror::Class"
Alex Light [Tue, 15 Dec 2015 18:32:46 +0000 (18:32 +0000)]
Merge "Combine direct_methods_ and virtual_methods_ fields of mirror::Class"
am:
7d5a577c1f
* commit '
7d5a577c1f256a7703361afb071dcd4ecc7d275f':
Combine direct_methods_ and virtual_methods_ fields of mirror::Class
Alex Light [Tue, 15 Dec 2015 18:11:08 +0000 (18:11 +0000)]
Merge "Combine direct_methods_ and virtual_methods_ fields of mirror::Class"
Nicolas Geoffray [Tue, 15 Dec 2015 17:44:03 +0000 (17:44 +0000)]
Merge "Remove reference of deleted file." am:
ad94d64719
am:
0211b099a0
* commit '
0211b099a0590b2ce23a43714ff1398f96825fe2':
Remove reference of deleted file.
Nicolas Geoffray [Tue, 15 Dec 2015 17:40:36 +0000 (17:40 +0000)]
Merge "Remove test given its flakiness." am:
3e2d20636f
am:
f6eb61f310
* commit '
f6eb61f3100882f8c8ab2fc93eee7df45c65a679':
Remove test given its flakiness.
Nicolas Geoffray [Tue, 15 Dec 2015 17:40:24 +0000 (17:40 +0000)]
Merge "Remove reference of deleted file."
am:
ad94d64719
* commit '
ad94d64719c2a82cdd312b318b8e50d80e2956c5':
Remove reference of deleted file.
Nicolas Geoffray [Tue, 15 Dec 2015 17:36:23 +0000 (17:36 +0000)]
Merge "Remove test given its flakiness."
am:
3e2d20636f
* commit '
3e2d20636f9eaee1226074b99017d759c6f3b7a0':
Remove test given its flakiness.
Nicolas Geoffray [Tue, 15 Dec 2015 17:04:50 +0000 (17:04 +0000)]
Merge "Remove reference of deleted file."
Nicolas Geoffray [Tue, 15 Dec 2015 17:04:05 +0000 (17:04 +0000)]
Remove reference of deleted file.
Change-Id: Ib6d03a8c57a746e738fc849deee800d28da82485
Nicolas Geoffray [Tue, 15 Dec 2015 16:45:34 +0000 (16:45 +0000)]
Merge "Remove test given its flakiness."
David Srbecky [Tue, 15 Dec 2015 16:19:06 +0000 (08:19 -0800)]
Merge "Refactor DexFile::DecodeDebugInfo." am:
96c9de9510
am:
2b1db0743f
* commit '
2b1db0743f7af28785b92e30436cce20143872be':
Refactor DexFile::DecodeDebugInfo.
Roland Levillain [Tue, 15 Dec 2015 16:18:51 +0000 (08:18 -0800)]
Merge "x86-64 Baker\'s read barrier fast path implementation." am:
74768fb830
am:
292a1abf62
* commit '
292a1abf627ded795a6e4f6362260a6ff39b2033':
x86-64 Baker's read barrier fast path implementation.
Roland Levillain [Tue, 15 Dec 2015 16:18:43 +0000 (08:18 -0800)]
Merge "x86 Baker\'s read barrier fast path implementation." am:
089ff4886a
am:
12c3fd4dd9
* commit '
12c3fd4dd9cdf45df583d6c9ab406af2187b1e1f':
x86 Baker's read barrier fast path implementation.
Calin Juravle [Tue, 15 Dec 2015 16:18:34 +0000 (08:18 -0800)]
Merge "Lower jitthreshold for jit profile test." am:
bd00c8226e
am:
338e3c7003
* commit '
338e3c7003fd4c5448f597d84f1657f9ec4f61a7':
Lower jitthreshold for jit profile test.
Nicolas Geoffray [Tue, 15 Dec 2015 16:18:26 +0000 (08:18 -0800)]
Merge "Fix --inline-max-code-units option." am:
bf14c65108
am:
57222d44bc
* commit '
57222d44bc4b02e258eb3958b5ad18ff36b28978':
Fix --inline-max-code-units option.
Nicolas Geoffray [Tue, 15 Dec 2015 16:18:16 +0000 (08:18 -0800)]
Merge "Revert "Make the JIT the default in ART."" am:
3b0ec01718
am:
22c13e1205
* commit '
22c13e1205af06724725f182bd737a9cac4118da':
Revert "Make the JIT the default in ART."
Nicolas Geoffray [Tue, 15 Dec 2015 16:18:03 +0000 (08:18 -0800)]
Merge "Make the JIT the default in ART." am:
7cd230c8f7
am:
561f76bc05
* commit '
561f76bc0526bdedd311738a6fa42bc763252476':
Make the JIT the default in ART.
Shinichiro Hamaji [Tue, 15 Dec 2015 16:17:41 +0000 (08:17 -0800)]
Merge "Get DCHECK back to EncodedStaticFieldValueIterator" am:
37fcf39935
am:
1e3b6338fa
* commit '
1e3b6338fa9aa10d74e08753ab523111105d5979':
Get DCHECK back to EncodedStaticFieldValueIterator
David Srbecky [Tue, 15 Dec 2015 16:06:18 +0000 (16:06 +0000)]
Merge "Refactor DexFile::DecodeDebugInfo."
am:
96c9de9510
* commit '
96c9de9510b33e2c8def669c4dfcb65db729e7d2':
Refactor DexFile::DecodeDebugInfo.
Roland Levillain [Tue, 15 Dec 2015 16:06:00 +0000 (16:06 +0000)]
Merge "x86-64 Baker\'s read barrier fast path implementation."
am:
74768fb830
* commit '
74768fb83073a2ae84c9173d4fc53654e3092b24':
x86-64 Baker's read barrier fast path implementation.
Roland Levillain [Tue, 15 Dec 2015 16:05:51 +0000 (16:05 +0000)]
Merge "x86 Baker\'s read barrier fast path implementation."
am:
089ff4886a
* commit '
089ff4886aa9b5e7cec04d2ef5cdeb9d68e5dc43':
x86 Baker's read barrier fast path implementation.
Calin Juravle [Tue, 15 Dec 2015 16:05:44 +0000 (16:05 +0000)]
Merge "Lower jitthreshold for jit profile test."
am:
bd00c8226e
* commit '
bd00c8226ebc28d2745ac4d0408b11c156771773':
Lower jitthreshold for jit profile test.
Nicolas Geoffray [Tue, 15 Dec 2015 16:05:37 +0000 (16:05 +0000)]
Merge "Fix --inline-max-code-units option."
am:
bf14c65108
* commit '
bf14c651080c31ae923ae1a75dbb82ace5adeee1':
Fix --inline-max-code-units option.
Nicolas Geoffray [Tue, 15 Dec 2015 16:05:30 +0000 (16:05 +0000)]
Merge "Revert "Make the JIT the default in ART.""
am:
3b0ec01718
* commit '
3b0ec017185a6d694f5041e79cc7a85d51943cff':
Revert "Make the JIT the default in ART."
Nicolas Geoffray [Tue, 15 Dec 2015 16:05:17 +0000 (16:05 +0000)]
Merge "Make the JIT the default in ART."
am:
7cd230c8f7
* commit '
7cd230c8f74a227ea04f1dd93c8d855aa81fc1fe':
Make the JIT the default in ART.
Shinichiro Hamaji [Tue, 15 Dec 2015 16:04:40 +0000 (16:04 +0000)]
Merge "Get DCHECK back to EncodedStaticFieldValueIterator"
am:
37fcf39935
* commit '
37fcf39935f24c1699cd6dacce47bbef70ca3b46':
Get DCHECK back to EncodedStaticFieldValueIterator
Nicolas Geoffray [Tue, 15 Dec 2015 16:03:48 +0000 (16:03 +0000)]
Remove test given its flakiness.
Change-Id: I7b746bd93cfd3f7eca71f1a7b9dcc799d30dd971
David Srbecky [Tue, 15 Dec 2015 15:29:17 +0000 (15:29 +0000)]
Merge "Refactor DexFile::DecodeDebugInfo."
David Srbecky [Thu, 10 Dec 2015 13:15:00 +0000 (13:15 +0000)]
Refactor DexFile::DecodeDebugInfo.
Split the method into two - one for locals and one for positions.
All uses of the method request only one of the two and it makes the
code slightly cleaner. The position variant requires fewer parameters.
Expose additional line table information which was previously ignored
by the decode method (prologue, epilogue, source file).
Change-Id: Idf8ba98fa58ea0d2103932b5cc0af81365885107
Roland Levillain [Tue, 15 Dec 2015 13:55:13 +0000 (13:55 +0000)]
Merge "x86-64 Baker's read barrier fast path implementation."
Roland Levillain [Tue, 15 Dec 2015 12:39:34 +0000 (12:39 +0000)]
Merge "x86 Baker's read barrier fast path implementation."
Calin Juravle [Tue, 15 Dec 2015 12:20:13 +0000 (12:20 +0000)]
Merge "Lower jitthreshold for jit profile test."
Nicolas Geoffray [Tue, 15 Dec 2015 12:14:14 +0000 (12:14 +0000)]
Merge "Fix --inline-max-code-units option."
Nicolas Geoffray [Tue, 15 Dec 2015 12:09:43 +0000 (12:09 +0000)]
Fix --inline-max-code-units option.
Change-Id: I73d99904a9eed69eb89efb6fb764db4a5d199f20
Calin Juravle [Tue, 15 Dec 2015 12:02:50 +0000 (12:02 +0000)]
Lower jitthreshold for jit profile test.
The test still proves to be flacky on the build bots. Lowering the
threshold will trigger compilation earlier.
Change-Id: Iacabf88d9fbd2a15fd3456f817402c9aaf3ec766
Nicolas Geoffray [Tue, 15 Dec 2015 11:51:51 +0000 (11:51 +0000)]
Merge "Revert "Make the JIT the default in ART.""
Nicolas Geoffray [Tue, 15 Dec 2015 11:51:37 +0000 (11:51 +0000)]
Revert "Make the JIT the default in ART."
Few tests failing: oat_file_assistant_test and jit run tests.
This reverts commit
0a9b6826bc6e71d799eb3fe8829981597b890dee.
Change-Id: Ibbf73c191d244ebb9517b6ae97971dd9a9d37d7c
Roland Levillain [Tue, 15 Dec 2015 10:54:19 +0000 (10:54 +0000)]
x86-64 Baker's read barrier fast path implementation.
Introduce an x86-64 fast path implementation in Optimizing
for Baker's read barriers (for both heap reference loads and
GC root loads). The marking phase of the read barrier is
performed by a slow path, invoking the runtime entry point
artReadBarrierMark.
Other read barrier algorithms continue to use the original
slow path based implementation, which has been renamed as
GenerateReadBarrierSlow/GenerateReadBarrierForRootSlow.
Bug:
12687968
Change-Id: I9329293ddca7f9bcb512132bde6675aa202b98b2
Roland Levillain [Tue, 15 Dec 2015 10:55:36 +0000 (10:55 +0000)]
x86 Baker's read barrier fast path implementation.
Introduce an x86 fast path implementation in Optimizing for
Baker's read barriers (for both heap reference loads and GC
root loads). The marking phase of the read barrier is
performed by a slow path, invoking a new runtime entry point
(artReadBarrierMark).
Other read barrier algorithms continue to use the original
slow path based implementation, which has been renamed as
GenerateReadBarrierSlow/GenerateReadBarrierForRootSlow.
Bug:
12687968
Change-Id: Ie610c4befc19ff22378a8cba38b422dcacb54320
Nicolas Geoffray [Tue, 15 Dec 2015 09:38:55 +0000 (09:38 +0000)]
Merge "Make the JIT the default in ART."
Shinichiro Hamaji [Tue, 15 Dec 2015 04:42:20 +0000 (04:42 +0000)]
Merge "Get DCHECK back to EncodedStaticFieldValueIterator"
Alex Light [Fri, 4 Dec 2015 01:38:56 +0000 (17:38 -0800)]
Combine direct_methods_ and virtual_methods_ fields of mirror::Class
Manual cherry-pick of
6286a97 to master
This makes several parts of the overall runtime simpler and reduces
the size of a class object by 32-bits.
Bug:
24618811
Change-Id: I36129b52189e26898ea56fa2b7b45652e06af236
Alex Light [Fri, 4 Dec 2015 01:38:56 +0000 (17:38 -0800)]
Combine direct_methods_ and virtual_methods_ fields of mirror::Class
This makes several parts of the overall runtime simpler and reduces
the size of a class object by 32-bits.
Bug:
24618811
Change-Id: I36129b52189e26898ea56fa2b7b45652e06af236
Dimitry Ivanov [Mon, 14 Dec 2015 21:37:54 +0000 (13:37 -0800)]
Merge "Temporary disable linker-namespaces" am:
a8be6ae6fc
am:
861e58d1c5
* commit '
861e58d1c5eeac5bfa97765c93f20649f916bde8':
Temporary disable linker-namespaces
Calin Juravle [Mon, 14 Dec 2015 21:37:42 +0000 (13:37 -0800)]
Merge "Increase the sleep time in 554-jit-profile-file" am:
395125122a
am:
afe3a9e296
* commit '
afe3a9e296b66efbea4b969d54834e4a4a2a0e9f':
Increase the sleep time in 554-jit-profile-file
Dimitry Ivanov [Mon, 14 Dec 2015 18:11:23 +0000 (10:11 -0800)]
Merge "Temporary disable linker-namespaces"
am:
a8be6ae6fc
* commit '
a8be6ae6fcf1c58c0c2067739352e16b92972c41':
Temporary disable linker-namespaces
Calin Juravle [Mon, 14 Dec 2015 18:11:15 +0000 (10:11 -0800)]
Merge "Increase the sleep time in 554-jit-profile-file"
am:
395125122a
* commit '
395125122a57dd042a507fcf1520e123561d2043':
Increase the sleep time in 554-jit-profile-file
Dimitry Ivanov [Mon, 14 Dec 2015 18:04:02 +0000 (18:04 +0000)]
Merge "Temporary disable linker-namespaces"
Calin Juravle [Mon, 14 Dec 2015 18:03:55 +0000 (18:03 +0000)]
Merge "Increase the sleep time in 554-jit-profile-file"
Calin Juravle [Mon, 14 Dec 2015 18:01:21 +0000 (18:01 +0000)]
Increase the sleep time in 554-jit-profile-file
The previous sleep time wasn't enough. Some tests failed because not
all the methods managed to be compiled in time.
Change-Id: I4d63b6c3602c72dfa608f62c55e0f484bbfcf900
Dimitry Ivanov [Mon, 14 Dec 2015 17:57:56 +0000 (09:57 -0800)]
Temporary disable linker-namespaces
Bug: http://b/
26178910
Bug: http://b/
26165097
Change-Id: I858c70dc72ec164ea7a79ad625ddda91367dae06
Calin Juravle [Mon, 14 Dec 2015 17:30:28 +0000 (09:30 -0800)]
Merge "Disable 554-jit-profile-file for the READ_BARRIER mode." am:
377cb3ba2e
am:
1089186cc6
* commit '
1089186cc6d71dfb921d566b68cb0620a3b4bb25':
Disable 554-jit-profile-file for the READ_BARRIER mode.
Calin Juravle [Mon, 14 Dec 2015 17:15:11 +0000 (09:15 -0800)]
Merge "Disable 554-jit-profile-file for the READ_BARRIER mode."
am:
377cb3ba2e
* commit '
377cb3ba2e1cfe51967e5292268a9aae71ceca8c':
Disable 554-jit-profile-file for the READ_BARRIER mode.
Calin Juravle [Mon, 14 Dec 2015 16:48:10 +0000 (16:48 +0000)]
Merge "Disable 554-jit-profile-file for the READ_BARRIER mode."
Calin Juravle [Mon, 14 Dec 2015 16:29:06 +0000 (16:29 +0000)]
Disable 554-jit-profile-file for the READ_BARRIER mode.
Change-Id: I98f5c0aeb0d68b42a587b1f7261d3fe998ca7f8b
Calin Juravle [Mon, 14 Dec 2015 15:22:31 +0000 (07:22 -0800)]
Merge "Print more info on why the code_cache test fails in 115-native-bridge." am:
b9d6996ed1
am:
0d02b9266a
* commit '
0d02b9266ac5a300b2b2b9877680bc970c15f0e3':
Print more info on why the code_cache test fails in 115-native-bridge.
Calin Juravle [Mon, 14 Dec 2015 15:20:04 +0000 (07:20 -0800)]
Merge "Print more info on why the code_cache test fails in 115-native-bridge."
am:
b9d6996ed1
* commit '
b9d6996ed1efcfaa9582e9a217053aa53e8d1733':
Print more info on why the code_cache test fails in 115-native-bridge.
Calin Juravle [Mon, 14 Dec 2015 15:15:08 +0000 (15:15 +0000)]
Merge "Print more info on why the code_cache test fails in 115-native-bridge."
Calin Juravle [Mon, 14 Dec 2015 14:46:08 +0000 (06:46 -0800)]
Merge "Revert "Revert "Enable profiled guided compilation in dex2oat""" am:
8cf97d7295
am:
b38da83736
* commit '
b38da83736ff325719f18424177022d68e283964':
Revert "Revert "Enable profiled guided compilation in dex2oat""
Calin Juravle [Mon, 14 Dec 2015 14:43:46 +0000 (06:43 -0800)]
Merge "Revert "Revert "Enable profiled guided compilation in dex2oat"""
am:
8cf97d7295
* commit '
8cf97d729592774afa495717626ac4e4525a499f':
Revert "Revert "Enable profiled guided compilation in dex2oat""
David Brazdil [Mon, 14 Dec 2015 14:38:46 +0000 (06:38 -0800)]
Merge "ART: Set RTI of Arm64IntermediateAddress" am:
84c3d48a6c
am:
b9637a7083
* commit '
b9637a7083516fbb14352aac6aef87c17951c257':
ART: Set RTI of Arm64IntermediateAddress
Calin Juravle [Mon, 14 Dec 2015 14:38:38 +0000 (14:38 +0000)]
Merge "Revert "Revert "Enable profiled guided compilation in dex2oat"""
Calin Juravle [Mon, 14 Dec 2015 14:35:17 +0000 (14:35 +0000)]
Print more info on why the code_cache test fails in 115-native-bridge.
Change-Id: Ib30893e53a5ed616ae4f6b6bc4d657b0fca846c8
David Brazdil [Mon, 14 Dec 2015 14:34:55 +0000 (06:34 -0800)]
Merge "ART: Set RTI of Arm64IntermediateAddress"
am:
84c3d48a6c
* commit '
84c3d48a6ce4d2c9396364973b3d7f43893ab468':
ART: Set RTI of Arm64IntermediateAddress
David Brazdil [Mon, 14 Dec 2015 14:28:32 +0000 (14:28 +0000)]
Merge "ART: Set RTI of Arm64IntermediateAddress"
David Brazdil [Mon, 14 Dec 2015 14:25:44 +0000 (14:25 +0000)]
ART: Set RTI of Arm64IntermediateAddress
Fixes the arm64 build after I7a3aee1ff66c82d64b4846611c547af17e91d260.
Change-Id: Ic2c72df59e0ddbdf2edc8519a6954d078a5ef596
David Brazdil [Mon, 14 Dec 2015 13:47:32 +0000 (05:47 -0800)]
Merge "ART: Refactor SsaBuilder for more precise typing info" am:
795accfff0
am:
c57108d49e
* commit '
c57108d49e99f5da452b8356d491222a0fe539c8':
ART: Refactor SsaBuilder for more precise typing info
David Brazdil [Mon, 14 Dec 2015 13:45:01 +0000 (05:45 -0800)]
Merge "ART: Refactor SsaBuilder for more precise typing info"
am:
795accfff0
* commit '
795accfff05abfb69f54003ee3f096ef3ff6f1e4':
ART: Refactor SsaBuilder for more precise typing info
David Brazdil [Mon, 14 Dec 2015 13:38:20 +0000 (13:38 +0000)]
Merge "ART: Refactor SsaBuilder for more precise typing info"
Nicolas Geoffray [Mon, 14 Dec 2015 13:04:04 +0000 (13:04 +0000)]
Merge "Special case system_server to not create the JIT code cache."
David Brazdil [Wed, 4 Nov 2015 23:30:22 +0000 (23:30 +0000)]
ART: Refactor SsaBuilder for more precise typing info
This patch refactors the SsaBuilder to do the following:
1) All phis are constructed live and marked dead if not used or proved
to be conflicting.
2) Primitive type propagation, now not a separate pass, identifies
conflicting types and marks corresponding phis dead.
3) When compiling --debuggable, DeadPhiHandling used to revive phis
which had only environmental uses but did not attempt to resolve
conflicts. This pass was removed as obsolete and is now superseded
by primitive type propagation (identifying conflicting phis) and
SsaDeadPhiEliminiation (keeping phis live if debuggable + env use).
4) Resolving conflicts requires correct primitive type information
on all instructions. This was not the case for ArrayGet instructions
which can have ambiguous types in the bytecode. To this end,
SsaBuilder now runs reference type propagation and types ArrayGets
from the type of the input array.
5) With RTP being run inside the SsaBuilder, it is not necessary to
run it as a separate optimization pass. Optimizations can now assume
that all instructions of type kPrimNot have reference type info after
SsaBuilder (with the exception of NullConstant).
6) Graph now contains a reference type to be assigned to NullConstant.
All reference type instructions therefore have RTI, as now enforced
by the SsaChecker.
Bug:
24252151
Bug:
24252100
Bug:
22538329
Bug:
25786318
Change-Id: I7a3aee1ff66c82d64b4846611c547af17e91d260
Vladimir Marko [Mon, 14 Dec 2015 12:02:30 +0000 (04:02 -0800)]
Merge "ART: Rename ROR test to a shorter name." am:
ceec5a3c81
am:
d3523f2b46
* commit '
d3523f2b461a0051e511a22c731bfb388135a836':
ART: Rename ROR test to a shorter name.
Vladimir Marko [Mon, 14 Dec 2015 12:02:21 +0000 (04:02 -0800)]
Merge "Optimizing: Clean up after HRor." am:
70c1a8fade
am:
5105c18527
* commit '
5105c185274bf09edaba8ce0bd5d8c1d3c203152':
Optimizing: Clean up after HRor.
Vladimir Marko [Mon, 14 Dec 2015 11:59:54 +0000 (03:59 -0800)]
Merge "ART: Rename ROR test to a shorter name."
am:
ceec5a3c81
* commit '
ceec5a3c81925cf80a18954b2e585316450c575c':
ART: Rename ROR test to a shorter name.
Vladimir Marko [Mon, 14 Dec 2015 11:54:45 +0000 (11:54 +0000)]
Merge "ART: Rename ROR test to a shorter name."
Vladimir Marko [Mon, 14 Dec 2015 10:29:35 +0000 (10:29 +0000)]
ART: Rename ROR test to a shorter name.
Keeps the file names of test files within limits.
The new name is exactly as long as the next longest name.
Change-Id: I4bbfd4cf2aa402a436ba9a5bc9589aa8710b9c15
Vladimir Marko [Mon, 14 Dec 2015 10:28:41 +0000 (02:28 -0800)]
Merge "Optimizing: Clean up after HRor."
am:
70c1a8fade
* commit '
70c1a8fade2967453663d0ffed0f137f06555fff':
Optimizing: Clean up after HRor.