OSDN Git Service
Aart Bik [Mon, 3 Apr 2017 21:57:14 +0000 (21:57 +0000)]
Merge "MIPS64: Add ldi.df MSA instruction" am:
e2a2395609 am:
497e77e855
am:
6cd4589657
Change-Id: Ibe78df4d10caf8b8b37d993b129c1b9168fdbcec
Aart Bik [Mon, 3 Apr 2017 21:54:15 +0000 (21:54 +0000)]
Merge "MIPS64: Add ldi.df MSA instruction" am:
e2a2395609
am:
497e77e855
Change-Id: Ib2396a63d2a8b3668edc6aa59c815593c5dbca22
Aart Bik [Mon, 3 Apr 2017 21:50:14 +0000 (21:50 +0000)]
Merge "MIPS64: Add ldi.df MSA instruction"
am:
e2a2395609
Change-Id: Ie380252315099eb4b59eb9eb9e1e2ac6c2698ac2
Aart Bik [Mon, 3 Apr 2017 21:42:11 +0000 (21:42 +0000)]
Merge "MIPS64: Add ldi.df MSA instruction"
Alex Light [Mon, 3 Apr 2017 20:07:37 +0000 (20:07 +0000)]
Merge "Add a cpplint preupload hook." am:
432fccc4c0 am:
d1a465235f
am:
1431b7cf93
Change-Id: I03fdb0793ba4ea3df292f89cd989a875e8bb6a5a
Alex Light [Mon, 3 Apr 2017 20:03:37 +0000 (20:03 +0000)]
Merge "Add a cpplint preupload hook." am:
432fccc4c0
am:
d1a465235f
Change-Id: Id3b948f8274429c2d44e8430c433c3fb9885f8de
Alex Light [Mon, 3 Apr 2017 20:00:06 +0000 (20:00 +0000)]
Merge "Add a cpplint preupload hook."
am:
432fccc4c0
Change-Id: Ie3edcc46b0781d92e137dc7ceb0f13506aceb748
Treehugger Robot [Mon, 3 Apr 2017 19:52:18 +0000 (19:52 +0000)]
Merge "Add a cpplint preupload hook."
Andreas Gampe [Mon, 3 Apr 2017 18:03:29 +0000 (18:03 +0000)]
Merge "ART: TI Agent test library refactor" am:
1927f66beb am:
42fc455ab8
am:
2d8d508cbe
Change-Id: Icfee3a84ea6677730285fdcf56ef4ec0cca2b267
Andreas Gampe [Mon, 3 Apr 2017 18:00:30 +0000 (18:00 +0000)]
Merge "ART: TI Agent test library refactor" am:
1927f66beb
am:
42fc455ab8
Change-Id: I0491a61e2229ec76e81398774540d5a08d9d7215
Andreas Gampe [Mon, 3 Apr 2017 17:56:59 +0000 (17:56 +0000)]
Merge "ART: TI Agent test library refactor"
am:
1927f66beb
Change-Id: Ie14195b4dcd9063af20acb21e0877a2222c8a277
Treehugger Robot [Mon, 3 Apr 2017 17:52:12 +0000 (17:52 +0000)]
Merge "ART: TI Agent test library refactor"
Alex Light [Fri, 31 Mar 2017 16:20:02 +0000 (09:20 -0700)]
Add a cpplint preupload hook.
This runs cpplint.py over modified .cc and .h files before uploading
them to gerrit. This generally takes ~1-2 seconds based on my testing
and the longest one I've been able to find was ~10 seconds.
Test: PREUPLOAD_COMMIT=
d9911eeca ./tools/cpplint_presubmit.py
Test: PREUPLOAD_COMMIT=
405284789 ./tools/cpplint_presubmit.py
Test: PREUPLOAD_COMMIT=
9763f2eb7 ./tools/cpplint_presubmit.py
Test: Manual
Bug:
35810246
Bug:
36855589
Change-Id: Ie0ed9136bdde15d78f2aa40c73fef97e12d12dda
Aart Bik [Mon, 3 Apr 2017 17:19:26 +0000 (17:19 +0000)]
Merge "ART vectorizer." am:
08ae45625d am:
2f113f6355
am:
66bfee01db
Change-Id: Ia91f5e70a1e94df9f210f00ceefe8222d78dd524
Aart Bik [Mon, 3 Apr 2017 17:15:57 +0000 (17:15 +0000)]
Merge "ART vectorizer." am:
08ae45625d
am:
2f113f6355
Change-Id: Iea96f48428415da181049e9df8a6bb7e4c28a230
Aart Bik [Mon, 3 Apr 2017 17:12:27 +0000 (17:12 +0000)]
Merge "ART vectorizer."
am:
08ae45625d
Change-Id: I123a156aaf593762a0f21dde475ffb1d73929c20
Aart Bik [Mon, 3 Apr 2017 17:05:52 +0000 (17:05 +0000)]
Merge "ART vectorizer."
David Sehr [Mon, 3 Apr 2017 16:51:26 +0000 (16:51 +0000)]
Merge "Make GetSortedDexFileSections a utility" am:
2eaacede1e am:
b166e4f89f
am:
0b12bb2e91
Change-Id: Iab1e3f2e294249a839c762d1fe616ba24a3539eb
David Sehr [Mon, 3 Apr 2017 16:47:53 +0000 (16:47 +0000)]
Merge "Make GetSortedDexFileSections a utility" am:
2eaacede1e
am:
b166e4f89f
Change-Id: Ib09f51d98935581004585b71d5fd717f5b763cbe
David Sehr [Mon, 3 Apr 2017 16:44:26 +0000 (16:44 +0000)]
Merge "Make GetSortedDexFileSections a utility"
am:
2eaacede1e
Change-Id: Ida699a678f7edfab5778da4432d03eaf784b6d25
Treehugger Robot [Mon, 3 Apr 2017 16:36:01 +0000 (16:36 +0000)]
Merge "Make GetSortedDexFileSections a utility"
Aart Bik [Mon, 3 Apr 2017 16:12:56 +0000 (16:12 +0000)]
Merge "SIMD pavgb,w for x86/x86_64" am:
0d9ec0535c am:
0381ce6b05
am:
21cc096187
Change-Id: I123dd543942e8a9fc2f6308e6bc19c610ca24567
Aart Bik [Mon, 3 Apr 2017 16:09:22 +0000 (16:09 +0000)]
Merge "SIMD pavgb,w for x86/x86_64" am:
0d9ec0535c
am:
0381ce6b05
Change-Id: Ifa1a6a03d7e3deddb8d017b5977c5f2d25344b5c
Aart Bik [Mon, 3 Apr 2017 16:05:52 +0000 (16:05 +0000)]
Merge "SIMD pavgb,w for x86/x86_64"
am:
0d9ec0535c
Change-Id: Idcda1302f7aa7da99f7ddf6c7480cae2a9eeb9b0
Aart Bik [Mon, 3 Apr 2017 15:59:09 +0000 (15:59 +0000)]
Merge "SIMD pavgb,w for x86/x86_64"
Vladimir Marko [Mon, 3 Apr 2017 12:35:41 +0000 (12:35 +0000)]
Merge "ARM64: Faster forwarding address check in mark entrypoints." am:
fcab6513b5 am:
032ae16eab
am:
7fdb7361d0
Change-Id: Icde8d6a5c65b1f252ebc479ccb5ef4a09d6e97d7
Vladimir Marko [Mon, 3 Apr 2017 12:32:09 +0000 (12:32 +0000)]
Merge "ARM64: Faster forwarding address check in mark entrypoints." am:
fcab6513b5
am:
032ae16eab
Change-Id: Ia06caf7fd8f4797822b5e8736c1419f6df0225a5
Vladimir Marko [Mon, 3 Apr 2017 12:28:41 +0000 (12:28 +0000)]
Merge "ARM64: Faster forwarding address check in mark entrypoints."
am:
fcab6513b5
Change-Id: I4388e3939347c7b5c8269c58f10eae0e1ea143e3
Vladimir Marko [Mon, 3 Apr 2017 12:21:33 +0000 (12:21 +0000)]
Merge "ARM64: Faster forwarding address check in mark entrypoints."
Nicolas Geoffray [Mon, 3 Apr 2017 09:41:01 +0000 (09:41 +0000)]
Merge "Kill logd in buildbot-setup.sh." am:
589e13337d am:
318c0ba6e2
am:
ab145dfc17
Change-Id: Iccd90cd22769be5bc96bbc0897ab5d3d72a42f33
Nicolas Geoffray [Mon, 3 Apr 2017 09:37:30 +0000 (09:37 +0000)]
Merge "Kill logd in buildbot-setup.sh." am:
589e13337d
am:
318c0ba6e2
Change-Id: I98cb427e5632da9b1fa12302d5890937563b5d27
Nicolas Geoffray [Mon, 3 Apr 2017 09:34:00 +0000 (09:34 +0000)]
Merge "Kill logd in buildbot-setup.sh."
am:
589e13337d
Change-Id: I1f80d00b49f51f3438b208b6201120820a3cdc55
Nicolas Geoffray [Mon, 3 Apr 2017 09:26:57 +0000 (09:26 +0000)]
Merge "Kill logd in buildbot-setup.sh."
David Sehr [Fri, 31 Mar 2017 00:50:24 +0000 (17:50 -0700)]
Make GetSortedDexFileSections a utility
Make this method a utility in preparation for other users outside
dexlayout.
Bug:
35800981
Test: make -j 40 test-art-host
Change-Id: I054c1e1c82834a0c94be6b9ee63d1992fa9f52df
Nicolas Geoffray [Sun, 2 Apr 2017 20:03:33 +0000 (21:03 +0100)]
Kill logd in buildbot-setup.sh.
The daemon seems to leak on fugu with Android N.
Change-Id: I07202c0a6ce644e313c310e0592e3e0d58d158a0
Alex Light [Sat, 1 Apr 2017 03:41:00 +0000 (03:41 +0000)]
Merge "Clean up ArtClassDefinition" into oc-dev
am:
b4b2ea63b2
Change-Id: I5bbdb24dfff502825aa5e61aa78bd6d31905c336
TreeHugger Robot [Sat, 1 Apr 2017 03:34:45 +0000 (03:34 +0000)]
Merge "Clean up ArtClassDefinition" into oc-dev
Andreas Gampe [Fri, 31 Mar 2017 19:49:07 +0000 (12:49 -0700)]
ART: TI Agent test library refactor
More refactoring, lowering the reliance on ART-provided functionality
and adding a library that includes all the code that can run without
ART.
Bug:
32072923
Test: m test-art-host
Change-Id: I67d84056a6fd7722c58855fccbdea3f6869b2efb
Calin Juravle [Sat, 1 Apr 2017 01:42:36 +0000 (01:42 +0000)]
Merge changes from topic 'ic-2' into oc-dev
am:
c2705657db -s ours
Change-Id: Id46f783da0c07c0c12f7def398b70484830065dc
Calin Juravle [Sat, 1 Apr 2017 01:39:10 +0000 (01:39 +0000)]
Merge changes from topic 'ic-2' into oc-dev
* changes:
(Re)enable the use of inline caches in AOT
Update profile version
Mathieu Chartier [Sat, 1 Apr 2017 00:53:49 +0000 (00:53 +0000)]
Merge "Layout string data" into oc-dev
am:
eeeeb8b491 -s ours
Change-Id: I6b8976cd2ad5382ab502a67262702f0b5e5d769c
Mathieu Chartier [Sat, 1 Apr 2017 00:39:35 +0000 (00:39 +0000)]
Merge "Layout string data" into oc-dev
Aart Bik [Fri, 31 Mar 2017 22:11:53 +0000 (15:11 -0700)]
SIMD pavgb,w for x86/x86_64
Rationale:
Break-out CL of ART Vectorizer.
Enables fast halving add with rounding
Bug:
34083438
Test: assembler_x86[_64]_test
Change-Id: I09173376b803d671a6b05a33e630f45f778cea52
Alex Light [Fri, 31 Mar 2017 22:00:37 +0000 (22:00 +0000)]
Merge "Clean up ArtClassDefinition" am:
5b92c48f99 am:
43cb737d59
am:
ec58a2552d
Change-Id: Id03ed4634f67d890e6e7a8f2ba30399539e720a8
Alex Light [Fri, 31 Mar 2017 21:58:07 +0000 (21:58 +0000)]
Merge "Clean up ArtClassDefinition" am:
5b92c48f99
am:
43cb737d59
Change-Id: Iea3378977360bc5a74d29c3a3e0419d4026dd1e7
Alex Light [Fri, 31 Mar 2017 21:55:37 +0000 (21:55 +0000)]
Merge "Clean up ArtClassDefinition"
am:
5b92c48f99
Change-Id: I6a993f84a133c1157364a106f8736b0a10623435
Alex Light [Fri, 31 Mar 2017 21:50:14 +0000 (21:50 +0000)]
Merge "Clean up ArtClassDefinition"
Alex Light [Thu, 30 Mar 2017 22:17:01 +0000 (15:17 -0700)]
Clean up ArtClassDefinition
This struct was somewhat messy. Clean it up and consolidate functions
into it.
Bug:
31455788
Test: ./test.py --host -j40
Change-Id: Ia3abe92dcf3313677de5e200f673252f8e41d69e
(cherry picked from commit
b7354d5bc76ed3975af636f87aa953f8a4d308a9)
Mathieu Chartier [Mon, 27 Mar 2017 22:43:54 +0000 (15:43 -0700)]
Layout string data
Inspect dex code in class initializers and hot methods to find out
what const strings are likely to be resolved. Along with these,
look at static field accesses and group the field name and type with
other hot strings.
Group method shorties together.
Maps vdex PSS: 7478k -> 6900k
No change in odex PSS.
Changed dexlayout_test to use -v instead of comparing to a hex
output.
Bug:
36457259
Bug:
35800981
Test: test-art-host
(cherry picked from commit
fa0aa0953875427d7381ac44a6427bd5b1d5020a)
Change-Id: Iaa5de649c5b2b1d9f178525d2f42fe00e3fb879f
Aart Bik [Mon, 6 Feb 2017 23:35:29 +0000 (15:35 -0800)]
ART vectorizer.
Rationale:
Make SIMD great again with a retargetable and easily extendable vectorizer.
Provides a full x86/x86_64 and a proof-of-concept ARM implementation. Sample
improvement (without any perf tuning yet) for Linpack on x86 is about 20% to 50%.
Test: test-art-host, test-art-target (angler)
Bug:
34083438,
30933338
Change-Id: Ifb77a0f25f690a87cd65bf3d5e9f6be7ea71d6c1
Calin Juravle [Tue, 28 Mar 2017 22:31:44 +0000 (15:31 -0700)]
(Re)enable the use of inline caches in AOT
Test: m test-art-host (638-checker-inline-caches, 644-checker-deopt)
Bug:
36371709
(cherry picked from commit
8af70893e4f44367cc40837b0411d84a36c7ad7f)
Merged-In: I7ce4ac7363af1dbe558c496ed55132b393d55933
Change-Id: Ifa7e79992410b0b2d759bc4b1559fa33cbb8a599
Hiroshi Yamauchi [Fri, 31 Mar 2017 17:48:25 +0000 (17:48 +0000)]
Merge "Lower daemons priority to 124 (art)." am:
7298b1ae3e am:
2974fea1ea
am:
fa4a01e936
Change-Id: I40da88421df524c0c7cade0f2a12532838dfbcf7
Calin Juravle [Wed, 29 Mar 2017 23:50:25 +0000 (16:50 -0700)]
Update profile version
I forgot to do it in
cea9e9d26c32372ec8c75e6c89b1bfc08c5e1911. This will
force regeneration of possibly faulty profiles.
Test: m test-art-host
Bug:
36371709
(cherry picked from commit
16d7ec4bf7483bb1b3d2317c8c5f03cf3cc6d208)
Merged-In: I7ce4ac7363af1dbe558c496ed55132b393d55933
Change-Id: Ie7cb933743aa184c18b275840465fa91768c6a79
Hiroshi Yamauchi [Fri, 31 Mar 2017 17:46:24 +0000 (17:46 +0000)]
Merge "Lower daemons priority to 124 (art)." am:
7298b1ae3e
am:
2974fea1ea
Change-Id: I43e5389c1809613bccd027482bdba8bdc41a878d
Hiroshi Yamauchi [Fri, 31 Mar 2017 17:43:55 +0000 (17:43 +0000)]
Merge "Lower daemons priority to 124 (art)."
am:
7298b1ae3e
Change-Id: I91eb1be02b879939a3b2c1bf7dac25fd7b8da0cf
Hiroshi Yamauchi [Fri, 31 Mar 2017 17:37:51 +0000 (17:37 +0000)]
Merge "Lower daemons priority to 124 (art)."
Andreas Gampe [Fri, 31 Mar 2017 17:08:19 +0000 (17:08 +0000)]
Merge "ART: Refactor JVMTI run tests" am:
7201fe3b67 am:
4162514b64
am:
3aac719703
Change-Id: I00bb7c2fe0cefc572be3eeefd989c71ea224433d
Andreas Gampe [Fri, 31 Mar 2017 17:05:17 +0000 (17:05 +0000)]
Merge "ART: Refactor JVMTI run tests" am:
7201fe3b67
am:
4162514b64
Change-Id: If8dc86155b43bb984e5c09bb9cf056a6044b528e
Andreas Gampe [Fri, 31 Mar 2017 17:02:49 +0000 (17:02 +0000)]
Merge "ART: Refactor JVMTI run tests"
am:
7201fe3b67
Change-Id: I544cd644d15dbaecf841c2451a41c21c7907c4c3
Treehugger Robot [Fri, 31 Mar 2017 16:57:34 +0000 (16:57 +0000)]
Merge "ART: Refactor JVMTI run tests"
Alex Light [Thu, 30 Mar 2017 22:17:01 +0000 (15:17 -0700)]
Clean up ArtClassDefinition
This struct was somewhat messy. Clean it up and consolidate functions
into it.
Bug:
31455788
Test: ./test.py --host -j40
Change-Id: Ia3abe92dcf3313677de5e200f673252f8e41d69e
Goran Jakovljevic [Fri, 31 Mar 2017 12:38:20 +0000 (14:38 +0200)]
MIPS64: Add ldi.df MSA instruction
Also fixes RepeatTemplatedRegisterImmBits template.
Test: mma test-art-host-gtest
Change-Id: Ib23f8a65ba924623f8c3a2d75d4ec4491d18feb0
Vladimir Marko [Fri, 31 Mar 2017 09:55:41 +0000 (10:55 +0100)]
ARM64: Faster forwarding address check in mark entrypoints.
Bug:
12687968
Test: testrunner.py --target
Change-Id: I352971ddf8f574e600c054cf2b4c0a973d20f829
Andreas Gampe [Fri, 31 Mar 2017 03:37:03 +0000 (03:37 +0000)]
Merge "ART: Fix VISIT_OBJECTS and ABORT for FollowReferences" into oc-dev
am:
38ffd939f2
Change-Id: I064f8547c4db67aefa66105c613fcd566b54e5ef
Mathieu Chartier [Fri, 31 Mar 2017 03:34:31 +0000 (03:34 +0000)]
Merge "Change thread suspend timeout to be fatal for non-debug" am:
bb75449355 am:
f3c9cef773
am:
61eae09783
Change-Id: Ic2728edcbe89f7bdbd6f4f9feb517dc1a8149a66
Mathieu Chartier [Fri, 31 Mar 2017 03:30:34 +0000 (03:30 +0000)]
Merge "Change thread suspend timeout to be fatal for non-debug" am:
bb75449355
am:
f3c9cef773
Change-Id: I9324890fffa81e3c5e5eaf8f623291a8bb4c9262
TreeHugger Robot [Fri, 31 Mar 2017 03:30:19 +0000 (03:30 +0000)]
Merge "ART: Fix VISIT_OBJECTS and ABORT for FollowReferences" into oc-dev
Mathieu Chartier [Fri, 31 Mar 2017 03:26:32 +0000 (03:26 +0000)]
Merge "Change thread suspend timeout to be fatal for non-debug"
am:
bb75449355
Change-Id: I2699992871038089c2edf89cd938d6a4cda89678
Mathieu Chartier [Fri, 31 Mar 2017 03:17:06 +0000 (03:17 +0000)]
Merge "Change thread suspend timeout to be fatal for non-debug"
Alex Light [Fri, 31 Mar 2017 01:47:25 +0000 (01:47 +0000)]
Merge "Re-enable test 983 with speed-profile" am:
113ecfe9e7 am:
139515fa01
am:
2c8075ef34
Change-Id: I2520862ddb1ca6a564d7e5304c8b997768aa9b2e
Alex Light [Fri, 31 Mar 2017 01:45:24 +0000 (01:45 +0000)]
Merge "Re-enable test 983 with speed-profile" am:
113ecfe9e7
am:
139515fa01
Change-Id: I26396263ffba3eb1d9c23ad2bcb8f9409a66c571
Alex Light [Fri, 31 Mar 2017 01:43:54 +0000 (01:43 +0000)]
Merge "Re-enable test 983 with speed-profile"
am:
113ecfe9e7
Change-Id: Icfd4f04b675079f6f92da825253b02d07ef82e84
Treehugger Robot [Fri, 31 Mar 2017 01:38:38 +0000 (01:38 +0000)]
Merge "Re-enable test 983 with speed-profile"
Andreas Gampe [Thu, 30 Mar 2017 00:58:28 +0000 (17:58 -0700)]
ART: Fix VISIT_OBJECTS and ABORT for FollowReferences
If a root report does not set VISIT_OBJECTS, the referree should
not be added to the worklist.
Whenever an ABORT is requested, do not report the remaining roots.
(cherry picked from commit
c756f08bdc8bd3ea397b85531f397b2b29cd419b)
Bug:
36727422
Test: art/test.py --host -t 913
Change-Id: I942559f6ab356fe2573a3a9bb88b2662cd5b23d0
Andreas Gampe [Thu, 30 Mar 2017 17:26:59 +0000 (10:26 -0700)]
ART: Refactor JVMTI run tests
In preparation for code deduplication with CTS.
Bug:
32072923
Test: m
Change-Id: Ibbe005c94252bd29eae7f88aad301b0b20ddb80d
Calin Juravle [Thu, 30 Mar 2017 23:31:45 +0000 (23:31 +0000)]
Merge changes from topic 'prof-fix' into oc-dev
am:
e7a8452795
Change-Id: Ie2eca8358bf40630c67502aff836d12353c30418
Alex Light [Thu, 30 Mar 2017 23:31:19 +0000 (16:31 -0700)]
Re-enable test 983 with speed-profile
We make sure to fixup dex files in all situations before passing it to
JVMTI agents. This means that dexlayout won't break this test anymore.
Test: stress --cpu 60; \
while ./test/run-test --host --random-profile 983; do; done
Change-Id: I047ffcbbba51db4c7bf5c22e482bd5864bc8b6d1
Calin Juravle [Thu, 30 Mar 2017 23:26:48 +0000 (23:26 +0000)]
Merge changes from topic 'prof-fix' into oc-dev
* changes:
Gracefully handle bogus profiling info for inline caches.
Update deopt statements in 638-checker-inline-caches
Fix profile merges in profman
Calin Juravle [Thu, 30 Mar 2017 23:26:28 +0000 (23:26 +0000)]
Merge "(Re)enable the use of inline caches in AOT" am:
dac3f7d74d am:
6122612389
am:
c0aab93581
Change-Id: I9c4a568db2876aa2b95e9e08539f5da5c3c727e6
Calin Juravle [Thu, 30 Mar 2017 23:26:15 +0000 (23:26 +0000)]
Merge "Update profile version" am:
4f0250ca95 am:
fe9da66fc7
am:
5f3c241a75
Change-Id: If4bec0f32980e9f99414defef860da7a725eb3c9
Calin Juravle [Thu, 30 Mar 2017 23:24:26 +0000 (23:24 +0000)]
Merge "(Re)enable the use of inline caches in AOT" am:
dac3f7d74d
am:
6122612389
Change-Id: I0aaa769d7b38c6b737b7c2a2f0f76009df4ed229
Calin Juravle [Thu, 30 Mar 2017 23:24:14 +0000 (23:24 +0000)]
Merge "Update profile version" am:
4f0250ca95
am:
fe9da66fc7
Change-Id: I9dc05ab97736d8914508ad3a0505c56e72ca0032
Calin Juravle [Thu, 30 Mar 2017 23:22:30 +0000 (23:22 +0000)]
Merge "(Re)enable the use of inline caches in AOT"
am:
dac3f7d74d
Change-Id: Ic5bf0b119ac5624513e53cd8ad7ff9e85aebbb35
Calin Juravle [Thu, 30 Mar 2017 23:22:16 +0000 (23:22 +0000)]
Merge "Update profile version"
am:
4f0250ca95
Change-Id: I7ce4ac7363af1dbe558c496ed55132b393d55933
Calin Juravle [Thu, 30 Mar 2017 23:17:38 +0000 (23:17 +0000)]
Merge "(Re)enable the use of inline caches in AOT"
Calin Juravle [Thu, 30 Mar 2017 23:17:19 +0000 (23:17 +0000)]
Merge "Update profile version"
Andreas Gampe [Thu, 30 Mar 2017 22:31:13 +0000 (22:31 +0000)]
Merge "ART: Fix VISIT_OBJECTS and ABORT for FollowReferences" am:
f62940eab1 am:
d2c0759f1a
am:
88c16d3ab5
Change-Id: I9e2663863d311cd79a0a8b103fb64f9a72dde355
Andreas Gampe [Thu, 30 Mar 2017 22:28:41 +0000 (22:28 +0000)]
Merge "ART: Fix VISIT_OBJECTS and ABORT for FollowReferences" am:
f62940eab1
am:
d2c0759f1a
Change-Id: I18ded75c2832b1d1f6febf3a41682203e1a14a2e
Andreas Gampe [Thu, 30 Mar 2017 22:27:17 +0000 (22:27 +0000)]
Merge "ART: Fix VISIT_OBJECTS and ABORT for FollowReferences"
am:
f62940eab1
Change-Id: Ifecc04ef4212576771d15fd00dc876a568435145
Treehugger Robot [Thu, 30 Mar 2017 22:22:07 +0000 (22:22 +0000)]
Merge "ART: Fix VISIT_OBJECTS and ABORT for FollowReferences"
Nicolas Geoffray [Fri, 17 Mar 2017 13:08:26 +0000 (13:08 +0000)]
Gracefully handle bogus profiling info for inline caches.
Test: 643-checker-bogus-ic
Bug:
36371709
(cherry picked from commit
4c0b4bc2653be370c7ba9f34a39e29e60382dff1)
Change-Id: Ibe52c4091305d82c3a656b9d63fbad3792e41314
Calin Juravle [Wed, 29 Mar 2017 23:17:53 +0000 (16:17 -0700)]
Update deopt statements in 638-checker-inline-caches
Test: m test-art-host-638-checker-inline-caches after inline
caches have been activated
Bug:
36371709
(cherry picked from commit
f1e1c7e9b90662282615e165d6a1b06e05df8393)
Change-Id: I1cd008ab824860ad8cbdc76045132f773b1aadc8
Calin Juravle [Fri, 24 Mar 2017 02:04:59 +0000 (19:04 -0700)]
Fix profile merges in profman
profman used ProfileCompilationInfo::Load() which was not preserving the
correct order of the dex files (in a multidex profile).
The CL fixes profman to use ProfileCompilationInfo::MergeWith which
guarantees the right dex order and redesigns profile storage to avoid
such mistakes in the future. Instead of keeping data in a map indexed by
the profile key, store it in a vector whose index match profile_index.
This way, any iteration over profile info becomes deterministic with
respect to the profile index of the dex files.
Test: m test-art-host-gtest-profile_assistant_test
m test-art-host-gtest-profile_compilation_info_test
profile YouTube.apk and compile it based on the reference profile
(failing before)
Bug:
36371709
(cherry picked from commit
cea9e9d26c32372ec8c75e6c89b1bfc08c5e1911)
Change-Id: Id2026339737bbf922c6066ed7ff6003861244713
Calin Juravle [Wed, 29 Mar 2017 23:50:25 +0000 (16:50 -0700)]
Update profile version
I forgot to do it in
cea9e9d26c32372ec8c75e6c89b1bfc08c5e1911. This will
force regeneration of possibly faulty profiles.
Test: m test-art-host
Bug:
36371709
Change-Id: I476c97005b6c17a22c57117c06028a2371276326
Hiroshi Yamauchi [Wed, 29 Mar 2017 21:47:49 +0000 (14:47 -0700)]
Lower daemons priority to 124 (art).
To avoid jank.
(chery picked from commit
38a57ef702964b82836f89a1f996aff4d1453d94)
Bug:
36631902
Test: boot marlin oc-dev and check priorities.
Test: test-art-host
Change-Id: I8f809fbf5ac9605f656884fcf68643c87f22d154
Hiroshi Yamauchi [Thu, 30 Mar 2017 20:38:15 +0000 (20:38 +0000)]
Merge "Lower daemons priority to 124 (art)." into oc-dev
am:
743aa2120f
Change-Id: If4eb6a0dd092f70cd7adeebcdde56982ee96b4bd
Alex Light [Thu, 30 Mar 2017 20:36:41 +0000 (20:36 +0000)]
Dedup original dex file for classes transformed on first load.
am:
09c5d903f1
Change-Id: I220cd6eb2663dc47366c48dcddce2fb179cc4074
Hiroshi Yamauchi [Thu, 30 Mar 2017 20:34:08 +0000 (20:34 +0000)]
Merge "Lower daemons priority to 124 (art)." into oc-dev
Andreas Gampe [Thu, 30 Mar 2017 00:58:28 +0000 (17:58 -0700)]
ART: Fix VISIT_OBJECTS and ABORT for FollowReferences
If a root report does not set VISIT_OBJECTS, the referree should
not be added to the worklist.
Whenever an ABORT is requested, do not report the remaining roots.
Bug:
36727422
Test: art/test.py --host -t 913
Change-Id: I942559f6ab356fe2573a3a9bb88b2662cd5b23d0
Alex Light [Thu, 30 Mar 2017 00:18:00 +0000 (17:18 -0700)]
Dedup original dex file for classes transformed on first load.
We set the originalDexFile field to a native pointer to the
art::DexFile (as a boxed Long). In the case where there were no
non-can_retransform_classes agents this DexFile will be owned by the
transformed classes ClassLoader and is guaranteed to be valid for as
long as the Class is. This means we can simply keep track of that
pointer to hold onto the original Dex file.
Test: ./test.py --host -j40
Bug:
31455788
Change-Id: I0e5a74f20f86d32dc73babe64b81469b3155c4dd
(cherry picked from commit
6a6563116638e8db683bbe0a39a26dbed8992ada)