OSDN Git Service
Colin Cross [Thu, 18 Aug 2016 01:39:29 +0000 (01:39 +0000)]
Merge "Remove ART_DEFAULT_INSTRUCTION_SET_FEATURES" am:
1106d769f4 am:
c0be7413bd
am:
7b7f546f7b
Change-Id: I1fda482278fdb4c335c42933dc2f35426401ee1f
Colin Cross [Thu, 18 Aug 2016 01:36:29 +0000 (01:36 +0000)]
Merge "Remove ART_DEFAULT_INSTRUCTION_SET_FEATURES" am:
1106d769f4
am:
c0be7413bd
Change-Id: I33f7bd2b60f33993dc258cc46616bb8deae80037
Colin Cross [Thu, 18 Aug 2016 01:32:08 +0000 (01:32 +0000)]
Merge "Remove ART_DEFAULT_INSTRUCTION_SET_FEATURES"
am:
1106d769f4
Change-Id: I6d357ea0daa86c3ec1efd620ac9d1fccdd87b120
Treehugger Robot [Thu, 18 Aug 2016 01:24:31 +0000 (01:24 +0000)]
Merge "Remove ART_DEFAULT_INSTRUCTION_SET_FEATURES"
Mathieu Chartier [Thu, 18 Aug 2016 00:17:53 +0000 (00:17 +0000)]
Merge "Revert "Logging improvements for C++ / Java structure issues"" am:
c6efcaa173 am:
9233274bea
am:
8bf2150f37
Change-Id: Iecc925821bf3ea33d394b5ed1e253e64913e341a
Mathieu Chartier [Thu, 18 Aug 2016 00:14:53 +0000 (00:14 +0000)]
Merge "Revert "Logging improvements for C++ / Java structure issues"" am:
c6efcaa173
am:
9233274bea
Change-Id: Ia184a61d8677e44f883777e8898d198b8eb5d7b6
Mathieu Chartier [Thu, 18 Aug 2016 00:11:54 +0000 (00:11 +0000)]
Merge "Revert "Logging improvements for C++ / Java structure issues""
am:
c6efcaa173
Change-Id: I7b7bb49c7332ba50d147cbcbe29074b98e3edf56
Colin Cross [Wed, 17 Aug 2016 23:52:08 +0000 (16:52 -0700)]
Remove ART_DEFAULT_INSTRUCTION_SET_FEATURES
It is never used.
Test: mmma -j art
Change-Id: I014a8ab11d3a3241c075503bc2674279130cb86f
Treehugger Robot [Wed, 17 Aug 2016 23:58:47 +0000 (23:58 +0000)]
Merge "Revert "Logging improvements for C++ / Java structure issues""
Mathieu Chartier [Wed, 17 Aug 2016 22:54:17 +0000 (22:54 +0000)]
Merge "Add newline for INTERNAL_FATAL automatically" am:
d99565069c am:
4efe1e24f8
am:
849f4c09be
Change-Id: I56bb9d4e0bea64a0482047fb02d1494c405392ac
Mathieu Chartier [Wed, 17 Aug 2016 22:51:16 +0000 (22:51 +0000)]
Merge "Add newline for INTERNAL_FATAL automatically" am:
d99565069c
am:
4efe1e24f8
Change-Id: I4c3356dd93ccf52f5c7d43590940407625ed1125
Mathieu Chartier [Wed, 17 Aug 2016 22:48:22 +0000 (22:48 +0000)]
Merge "Add newline for INTERNAL_FATAL automatically"
am:
d99565069c
Change-Id: I8b64721bcb3d9e0f8693fef2e0baedf3c53b3bd2
Mathieu Chartier [Wed, 17 Aug 2016 22:43:52 +0000 (22:43 +0000)]
Revert "Logging improvements for C++ / Java structure issues"
Bug:
30913672
This reverts commit
d833525cfe3ac2086e3156a8b3193c05974d6316.
Change-Id: I4e51591b49d54b8bb3e920fbc221c21aca0084fb
Mathieu Chartier [Wed, 17 Aug 2016 22:43:17 +0000 (22:43 +0000)]
Merge "Add newline for INTERNAL_FATAL automatically"
Mathieu Chartier [Wed, 17 Aug 2016 20:37:37 +0000 (20:37 +0000)]
Merge "Track cumulative objects and bytes copied for CC" am:
e70b9243ba am:
6feb697636
am:
187b67cf1a
Change-Id: I87c1304dd05cbf768ac83ebe85a9b5ec3025f492
Mathieu Chartier [Wed, 17 Aug 2016 20:34:37 +0000 (20:34 +0000)]
Merge "Track cumulative objects and bytes copied for CC" am:
e70b9243ba
am:
6feb697636
Change-Id: Ib839bcea1b2d36ec206fb458b3037b4b04673741
Mathieu Chartier [Wed, 17 Aug 2016 20:30:15 +0000 (20:30 +0000)]
Merge "Track cumulative objects and bytes copied for CC"
am:
e70b9243ba
Change-Id: Ie6414078cb883c45e813aed84f160b7bdbb9b48e
Mathieu Chartier [Wed, 17 Aug 2016 20:22:24 +0000 (20:22 +0000)]
Merge "Track cumulative objects and bytes copied for CC"
Mathieu Chartier [Wed, 17 Aug 2016 17:28:48 +0000 (10:28 -0700)]
Add newline for INTERNAL_FATAL automatically
Before, the behavior was different compared to other log levels
that automatically added newlines.
Bug:
30913672
Test: test-art-host
Change-Id: I02147d8ac7ea38f3e93450ef5290cdfed7b5a2eb
Alex Light [Wed, 17 Aug 2016 19:30:32 +0000 (19:30 +0000)]
Merge "Add skeleton of a jvmti plugin for art." am:
fec0190ab6 am:
fbc2b1b724
am:
7e73b40993
Change-Id: Id02f1e85a7360b21f66694beabb45ad9db059eeb
Alex Light [Wed, 17 Aug 2016 19:27:32 +0000 (19:27 +0000)]
Merge "Add skeleton of a jvmti plugin for art." am:
fec0190ab6
am:
fbc2b1b724
Change-Id: Ia347165a533a43a3abf524a5424e8d271d14ba22
Alex Light [Wed, 17 Aug 2016 19:24:04 +0000 (19:24 +0000)]
Merge "Add skeleton of a jvmti plugin for art."
am:
fec0190ab6
Change-Id: If442ad2a2d304375bb06f431bd1a77e22799bdc3
Treehugger Robot [Wed, 17 Aug 2016 19:15:54 +0000 (19:15 +0000)]
Merge "Add skeleton of a jvmti plugin for art."
Narayan Kamath [Wed, 17 Aug 2016 19:13:32 +0000 (19:13 +0000)]
Merge "Blacklist failing libcore tests." am:
4dcb0fa798 am:
334a5a6f01
am:
39da1c2103
Change-Id: Ic45e9d6e5390b8a4163ac07fd6ac1ff96a2e6d7a
Narayan Kamath [Wed, 17 Aug 2016 19:10:31 +0000 (19:10 +0000)]
Merge "Blacklist failing libcore tests." am:
4dcb0fa798
am:
334a5a6f01
Change-Id: Ie02fa9d22691907b413d9d03b76e86673d0202aa
Narayan Kamath [Wed, 17 Aug 2016 19:06:19 +0000 (19:06 +0000)]
Merge "Blacklist failing libcore tests."
am:
4dcb0fa798
Change-Id: Icfdf66da1430688546ed97ce7a767643e232b336
Narayan Kamath [Wed, 17 Aug 2016 18:50:12 +0000 (18:50 +0000)]
Merge "Blacklist failing libcore tests."
Narayan Kamath [Wed, 17 Aug 2016 18:14:01 +0000 (19:14 +0100)]
Blacklist failing libcore tests.
bug:
30917411
test: art/tools/buildbot_build.sh && art/tools/run-libcore-tests.sh
Change-Id: Ib5e9adb6e9222d607b6d79f0f7eebf3d313272d2
Alex Light [Thu, 11 Aug 2016 22:35:28 +0000 (15:35 -0700)]
Add skeleton of a jvmti plugin for art.
Test: mma test-art-host-run-test-901-hello-ti-agent
Change-Id: If6807b6238d57471e4ba0dd75c717721246443f6
Mathieu Chartier [Wed, 17 Aug 2016 17:07:29 +0000 (10:07 -0700)]
Track cumulative objects and bytes copied for CC
Also print out these values when dumping GC performance info.
Bug:
12687968
Test: Test that values are reasonable after running EAAC.
Change-Id: Id04fadeaf52511560fd4b261f5287ea0a5dae9d4
Neil Fuller [Wed, 17 Aug 2016 17:06:10 +0000 (17:06 +0000)]
Merge "Logging improvements for C++ / Java structure issues" am:
d127255351 am:
26ec29a675
am:
8fb9a7c54a
Change-Id: Ibb3ff4f3fcd42be96a1b55750a353e0b4f9164d9
Neil Fuller [Wed, 17 Aug 2016 17:06:09 +0000 (17:06 +0000)]
Merge "Adjustments for changes made to java.lang.Class" am:
1d36e2c312 am:
2efcd26e0d
am:
441d9d7487
Change-Id: I0c8a908d77f38fb139bd220abe777f374bfc130c
Mathieu Chartier [Wed, 17 Aug 2016 17:05:28 +0000 (17:05 +0000)]
Merge "Always mark zygote large objects for CC" am:
8f7e75ac4c am:
ce509da23f
am:
222c2def8d
Change-Id: I2c2d04c860955205a70d80b91f3cec3114b84f53
Igor Murashkin [Wed, 17 Aug 2016 17:05:27 +0000 (17:05 +0000)]
Merge "jni: Fast path for @FastNative annotated java methods" am:
3cc35c324b am:
1d806364e8
am:
46730b4fd0
Change-Id: Ic26161ff88eca5b62c6fbf1b17688b29306224fc
Richard Uhler [Wed, 17 Aug 2016 17:05:26 +0000 (17:05 +0000)]
Merge "Update ahat README and manifest for release 0.7." am:
3f410202b1 am:
5d676ae1ca
am:
278e2a93dd
Change-Id: Id87773f3f4416cb247f32467968e2ea348628012
Richard Uhler [Wed, 17 Aug 2016 17:05:26 +0000 (17:05 +0000)]
Merge "Remove unused GetDalvikCacheFilenameOrDie." am:
95afcbcc25 am:
37678f1080
am:
b34da9776a
Change-Id: Ib3df930d287e714d1abe6ae3745f07db19cb89e2
Aart Bik [Wed, 17 Aug 2016 17:05:25 +0000 (17:05 +0000)]
Merge "Welcome to JavaFuzz as our latest A[a]rt tools team member!" am:
088debe40a am:
e00f500b64
am:
b67fac6dd9
Change-Id: I53eabf0dc255c22c3432469d52e4283bcc430df8
Neil Fuller [Wed, 17 Aug 2016 17:00:39 +0000 (17:00 +0000)]
Merge "Logging improvements for C++ / Java structure issues" am:
d127255351
am:
26ec29a675
Change-Id: I8cfc5054a90a49e01b268bd9530c81258b8a92da
Neil Fuller [Wed, 17 Aug 2016 17:00:38 +0000 (17:00 +0000)]
Merge "Adjustments for changes made to java.lang.Class" am:
1d36e2c312
am:
2efcd26e0d
Change-Id: If991b29fecaceef70cb69ec6d6e606ccf59f13a1
Mathieu Chartier [Wed, 17 Aug 2016 16:59:57 +0000 (16:59 +0000)]
Merge "Always mark zygote large objects for CC" am:
8f7e75ac4c
am:
ce509da23f
Change-Id: I245aa7d1e94d386e5c65fbdc17cbe421da6f0fd2
Igor Murashkin [Wed, 17 Aug 2016 16:59:56 +0000 (16:59 +0000)]
Merge "jni: Fast path for @FastNative annotated java methods" am:
3cc35c324b
am:
1d806364e8
Change-Id: I769dda9c926d14aa9d77ea6a3fcdb29e48b945bf
Richard Uhler [Wed, 17 Aug 2016 16:59:56 +0000 (16:59 +0000)]
Merge "Update ahat README and manifest for release 0.7." am:
3f410202b1
am:
5d676ae1ca
Change-Id: Ieb5e991e12a364d9ac88390dc6253374c05f05e2
Richard Uhler [Wed, 17 Aug 2016 16:59:55 +0000 (16:59 +0000)]
Merge "Remove unused GetDalvikCacheFilenameOrDie." am:
95afcbcc25
am:
37678f1080
Change-Id: I46c7eb45f1a054552cd6fe1bf6ebe9d41725c0c3
Aart Bik [Wed, 17 Aug 2016 16:59:55 +0000 (16:59 +0000)]
Merge "Welcome to JavaFuzz as our latest A[a]rt tools team member!" am:
088debe40a
am:
e00f500b64
Change-Id: Ibb7c07dedc5c13aea57075bc1df2c23f5219cf53
Neil Fuller [Wed, 17 Aug 2016 16:57:48 +0000 (16:57 +0000)]
Merge "Logging improvements for C++ / Java structure issues"
am:
d127255351
Change-Id: I4a22c81581064af95631c9f4c6cc689cf4cb6027
Neil Fuller [Wed, 17 Aug 2016 16:57:35 +0000 (16:57 +0000)]
Merge "Adjustments for changes made to java.lang.Class"
am:
1d36e2c312
Change-Id: Ib5bed6b807fdabd3573044e0bc613006d1e2d6c5
Mathieu Chartier [Wed, 17 Aug 2016 16:56:52 +0000 (16:56 +0000)]
Merge "Always mark zygote large objects for CC"
am:
8f7e75ac4c
Change-Id: Ib59726a69f9dff1bc0ce6fc4972eee5e131fb5f0
Igor Murashkin [Wed, 17 Aug 2016 16:56:50 +0000 (16:56 +0000)]
Merge "jni: Fast path for @FastNative annotated java methods"
am:
3cc35c324b
Change-Id: I9947ab55cbb1ed18c4918eb2feaa99d023c7332d
Richard Uhler [Wed, 17 Aug 2016 16:56:49 +0000 (16:56 +0000)]
Merge "Update ahat README and manifest for release 0.7."
am:
3f410202b1
Change-Id: Ieabaac82590b3c0aad5cb55d5034bb0c8b7603f4
Richard Uhler [Wed, 17 Aug 2016 16:56:47 +0000 (16:56 +0000)]
Merge "Remove unused GetDalvikCacheFilenameOrDie."
am:
95afcbcc25
Change-Id: I717d0c4d7a482c1544d934b7ed80f7c8f7493e6b
Aart Bik [Wed, 17 Aug 2016 16:56:44 +0000 (16:56 +0000)]
Merge "Welcome to JavaFuzz as our latest A[a]rt tools team member!"
am:
088debe40a
Change-Id: Ie7f9a0a568fbf196f80ecde88f3d9a95ea4df13f
Neil Fuller [Wed, 17 Aug 2016 13:19:28 +0000 (13:19 +0000)]
Merge "Logging improvements for C++ / Java structure issues"
Neil Fuller [Wed, 17 Aug 2016 12:17:06 +0000 (12:17 +0000)]
Merge "Adjustments for changes made to java.lang.Class"
Neil Fuller [Wed, 17 Aug 2016 10:39:26 +0000 (11:39 +0100)]
Logging improvements for C++ / Java structure issues
When C++ and Java structures are different sizes or arranged
differently some log statements are useful but are hard to
pick out because they merge with other log lines. Adding
"\n" to the end of them makes it easier to read.
Change-Id: Ia6d78e0832c7814bf1fef42bb3d8c056f83766bd
Test: make build-art-host
Neil Fuller [Tue, 16 Aug 2016 18:53:07 +0000 (19:53 +0100)]
Adjustments for changes made to java.lang.Class
Fix up the runtime after removal of the annotationType field
from java.lang.Class.
Test: make test-art-host / boot a device
Change-Id: I5f37567d2b5ec381b35e66fef29287abe307b840
Treehugger Robot [Wed, 17 Aug 2016 03:18:36 +0000 (03:18 +0000)]
Merge "Always mark zygote large objects for CC"
Mathieu Chartier [Tue, 16 Aug 2016 19:15:59 +0000 (12:15 -0700)]
Always mark zygote large objects for CC
Prevent needing to gray holders of zygote large objects.
System wide zygote space PSS after boot:
12644 kB -> 5571 kB for CC.
Also PSS reduction in zygote large objects themselves since their
gray bit would have been set each GC.
Overall LOS savings hard to measure, could be up to 316 * 4KB per
app since there are 316 zygote large objects.
Also clear mod-union tables for image spaces to prevent dirty
image pages if any of the image spaces point to zygote large objects.
System wide .art mmap: 37432 kB -> 34372 kB
System server before (N6P):
LOS shared dirty: 12888 kB
Zygote space shared dirty: 700 kB
Zygote space private dirty: 868 kB
.art private dirty: 1696 kB
After:
LOS shared dirty 13672 kB
Zygote space shared dirty: 1072 kB
Zygote space private dirty: 496 kB
.art private dirty: 1432 kB
Bug:
29516968
Test: test-art-host with baker CC, debug N6P phone booting
Change-Id: Ia37ce2c11217cf56885bd1d1dc084332fcbb7843
Treehugger Robot [Tue, 16 Aug 2016 21:51:02 +0000 (21:51 +0000)]
Merge "jni: Fast path for @FastNative annotated java methods"
Igor Murashkin [Fri, 29 Jul 2016 16:51:58 +0000 (09:51 -0700)]
jni: Fast path for @FastNative annotated java methods
Adds a faster path for java methods annotated with
dalvik.annotation.optimization.FastNative .
Intended to replace usage of fast JNI (registering with "!(FOO)BAR" descriptors).
Performance Microbenchmark Results (Angler):
* Regular JNI cost in nanoseconds: 115
* Fast JNI cost in nanoseconds: 60
* @FastNative cost in nanoseconds: 36
Summary: Up to 67% faster (vs fast jni) JNI transition cost
Change-Id: Ic23823ae0f232270c068ec999fd89aa993894b0e
Treehugger Robot [Tue, 16 Aug 2016 19:53:15 +0000 (19:53 +0000)]
Merge "Update ahat README and manifest for release 0.7."
Treehugger Robot [Tue, 16 Aug 2016 17:59:51 +0000 (17:59 +0000)]
Merge "Remove unused GetDalvikCacheFilenameOrDie."
Treehugger Robot [Tue, 16 Aug 2016 16:34:36 +0000 (16:34 +0000)]
Merge "Welcome to JavaFuzz as our latest A[a]rt tools team member!"
Aart Bik [Tue, 9 Aug 2016 17:49:54 +0000 (10:49 -0700)]
Welcome to JavaFuzz as our latest A[a]rt tools team member!
Rationale:
JavaFuzz is tool for generating random Java programs with
the objective of fuzz testing the ART infrastructure. Each
randomly generated Java program can be run under various
modes of execution, such as using the interpreter, using
the optimizing compiler, using an external reference
implementation, or using various target architectures.
Any difference between the outputs (a divergence) may
indicate a bug in one of the execution modes.
Test: tbd
Bug=
30610121
Change-Id: I92dcac35f5229996936d01a0ba7f5acf6dc7b433
Richard Uhler [Mon, 15 Aug 2016 23:12:57 +0000 (16:12 -0700)]
Remove unused GetDalvikCacheFilenameOrDie.
Change-Id: I8987fa488a89865d4a5fb56dd00cc396ee33bcce
Test: m test-art-host-gtest-utils_test32
Test: m build-art-host-tests
Test: m build-art-target-tests
Mathieu Chartier [Mon, 15 Aug 2016 22:47:28 +0000 (22:47 +0000)]
Merge "Change gcstress runtest option" am:
36bf3a2d28 am:
939587df2e
am:
eb1a77a9d3
Change-Id: Ibe1df0e679f2dc1f3ee11ade70eb8462d8e18479
Mathieu Chartier [Mon, 15 Aug 2016 22:41:57 +0000 (22:41 +0000)]
Merge "Change gcstress runtest option" am:
36bf3a2d28
am:
939587df2e
Change-Id: I90ba0504b4190520d74925266c7d9f2140cc5eec
Mathieu Chartier [Mon, 15 Aug 2016 22:37:59 +0000 (22:37 +0000)]
Merge "Change gcstress runtest option"
am:
36bf3a2d28
Change-Id: I5e76005cbbfbeb659d5bc8455fd260131c5fffcd
Mathieu Chartier [Mon, 15 Aug 2016 22:28:19 +0000 (22:28 +0000)]
Merge "Change gcstress runtest option"
Andreas Gampe [Mon, 15 Aug 2016 21:49:54 +0000 (21:49 +0000)]
Merge "ART: Refactor ImageSpace loading" am:
b23e3b2156 am:
8501d9a9a2
am:
7ab65c0845
Change-Id: I476e6d6a3471abab84faf329ab1fa2723d50dd73
Andreas Gampe [Mon, 15 Aug 2016 21:45:24 +0000 (21:45 +0000)]
Merge "ART: Refactor ImageSpace loading" am:
b23e3b2156
am:
8501d9a9a2
Change-Id: I6fe8cdcb3d0d23ba26afbb7008b40a694612c86a
Andreas Gampe [Mon, 15 Aug 2016 21:41:26 +0000 (21:41 +0000)]
Merge "ART: Refactor ImageSpace loading"
am:
b23e3b2156
Change-Id: I38e37a7f88ffc79705fe4acc6e6a27ec48e48a38
Treehugger Robot [Mon, 15 Aug 2016 21:32:30 +0000 (21:32 +0000)]
Merge "ART: Refactor ImageSpace loading"
Richard Uhler [Mon, 15 Aug 2016 18:01:01 +0000 (11:01 -0700)]
Update ahat README and manifest for release 0.7.
Change-Id: Iccc5db7112cb92e24e9e294273a3ce2b0d4b7aba
Test: Launch ahat and verify it reports 0.7 as the version.
Andreas Gampe [Sat, 13 Aug 2016 04:53:32 +0000 (21:53 -0700)]
ART: Refactor ImageSpace loading
Make the code more straightforward so it is easier to reason
about and extend.
Also change return types to unique pointers so it's clear that
it is the caller's responsibility to free those when necessary.
Bug:
30832951
Test: m test-art-host
Test: device booting
Change-Id: I3216eb702e45357a48af5158dacbe40e79bd1ae9
Richard Uhler [Mon, 15 Aug 2016 17:27:36 +0000 (17:27 +0000)]
Merge "Clean up use of GetDalvikCache." am:
882c0e4899 am:
77501abe6f
am:
395076591b
Change-Id: Ia98f0feab38f665dbe1ecfc764e1318dff50e225
Richard Uhler [Mon, 15 Aug 2016 17:22:06 +0000 (17:22 +0000)]
Merge "Clean up use of GetDalvikCache." am:
882c0e4899
am:
77501abe6f
Change-Id: I37ca675b32912840d9e8fd5d6cee5591e428f084
Richard Uhler [Mon, 15 Aug 2016 17:18:10 +0000 (17:18 +0000)]
Merge "Clean up use of GetDalvikCache."
am:
882c0e4899
Change-Id: Ifac13144494305120408b7981f8fbe7a5ada9314
Treehugger Robot [Mon, 15 Aug 2016 17:12:02 +0000 (17:12 +0000)]
Merge "Clean up use of GetDalvikCache."
Mathieu Chartier [Mon, 15 Aug 2016 17:06:05 +0000 (17:06 +0000)]
Merge "Improve READ_BARRIER_MARK_REG for arm32" am:
9e0d58b20c am:
8324ab368f
am:
2e4656049e
Change-Id: I11da5e50202a869de7fc3536af9f823bc6b47ee8
Mathieu Chartier [Mon, 15 Aug 2016 17:02:33 +0000 (17:02 +0000)]
Merge "Improve READ_BARRIER_MARK_REG for arm32" am:
9e0d58b20c
am:
8324ab368f
Change-Id: Ife4ea61bc66dd94b74c5df9e9a68e1f182d1e1fd
Mathieu Chartier [Mon, 15 Aug 2016 16:58:36 +0000 (16:58 +0000)]
Merge "Improve READ_BARRIER_MARK_REG for arm32"
am:
9e0d58b20c
Change-Id: I745d271177e260a487e3eac5dd3d92f0ec7168a5
Mathieu Chartier [Mon, 15 Aug 2016 16:50:11 +0000 (16:50 +0000)]
Merge "Improve READ_BARRIER_MARK_REG for arm32"
Roland Levillain [Mon, 15 Aug 2016 14:52:27 +0000 (14:52 +0000)]
Merge "Revert "Enable IntermediateAddress for primitive arrays with read barriers."" am:
554b6fb875 am:
c753c44fa9
am:
28c9cfaf75
Change-Id: I550fb4206ad9d9fd8bb3b6a8417249049d1e920b
Roland Levillain [Mon, 15 Aug 2016 14:48:27 +0000 (14:48 +0000)]
Merge "Revert "Enable IntermediateAddress for primitive arrays with read barriers."" am:
554b6fb875
am:
c753c44fa9
Change-Id: I0be89231f0fb7d4318d1e107488aebaf5c9fecfd
Roland Levillain [Mon, 15 Aug 2016 14:44:29 +0000 (14:44 +0000)]
Merge "Revert "Enable IntermediateAddress for primitive arrays with read barriers.""
am:
554b6fb875
Change-Id: Iebee937e50aa7943afc7fcfc3acbc3f2414c666d
Treehugger Robot [Mon, 15 Aug 2016 14:35:48 +0000 (14:35 +0000)]
Merge "Revert "Enable IntermediateAddress for primitive arrays with read barriers.""
Roland Levillain [Mon, 15 Aug 2016 13:17:06 +0000 (13:17 +0000)]
Revert "Enable IntermediateAddress for primitive arrays with read barriers."
This CL breaks the angler-userdebug build with
`ART_USE_READ_BARRIER=true`.
Test: Build angler-userdebug with `ART_USE_READ_BARRIER=true`.
Bug:
30762467
Bug:
26601270
Bug:
12687968
This reverts commit
12ecf0800d465acdaa3deccd383ff8ed3428a183.
Change-Id: Ia2069ac9436d2336311dd8d0f183c02e587586ae
Roland Levillain [Mon, 15 Aug 2016 10:17:12 +0000 (10:17 +0000)]
Merge "ARM64: VIXL: Support a newer version of VIXL." am:
fe74ba9ea6 am:
f13e9b37dc
am:
cc1bc87a38
Change-Id: I76351bc1c14451e7d7f1624e74132c321c8bc065
Roland Levillain [Mon, 15 Aug 2016 10:13:11 +0000 (10:13 +0000)]
Merge "ARM64: VIXL: Support a newer version of VIXL." am:
fe74ba9ea6
am:
f13e9b37dc
Change-Id: If736bd3fe27be66e7450b4bdaa20d2a17c5c94f0
Roland Levillain [Mon, 15 Aug 2016 10:08:44 +0000 (10:08 +0000)]
Merge "ARM64: VIXL: Support a newer version of VIXL."
am:
fe74ba9ea6
Change-Id: I5ff0142506107668ea9010a34c4e21f1b0e0533d
Roland Levillain [Mon, 15 Aug 2016 10:03:32 +0000 (10:03 +0000)]
Merge "ARM64: VIXL: Support a newer version of VIXL."
Mathieu Chartier [Fri, 12 Aug 2016 23:11:24 +0000 (16:11 -0700)]
Change gcstress runtest option
No longer passes down SS as the collector. Motivation is to allow
running gcstress with concurrent copying.
New usage is for SS:
mm test-art-host ART_TEST_GC_STRESS=true ART_DEFAULT_GC_TYPE=SS
Bug:
30807718
Test: mm test-art-host ART_TEST_GC_STRESS=true ART_DEFAULT_GC_TYPE=SS
Change-Id: I4416c1ca9ead027536acc9d24b1ec80d5a68c6a1
Mathieu Chartier [Sat, 13 Aug 2016 00:23:28 +0000 (00:23 +0000)]
Merge "Fix heap poisoning" am:
85b1811f0d am:
18b4a7bba4
am:
db370419a2
Change-Id: I79f81b6efe99b949eb3ae5f3d68f3209f06e54e4
Mathieu Chartier [Sat, 13 Aug 2016 00:18:58 +0000 (00:18 +0000)]
Merge "Fix heap poisoning" am:
85b1811f0d
am:
18b4a7bba4
Change-Id: I15d27cab255a3f91940cee39852b064d6be33bc9
Mathieu Chartier [Sat, 13 Aug 2016 00:15:30 +0000 (00:15 +0000)]
Merge "Fix heap poisoning"
am:
85b1811f0d
Change-Id: Icaa40d52acfe3899e16da0b0713c97fa0e1e288e
Mathieu Chartier [Fri, 12 Aug 2016 20:19:44 +0000 (13:19 -0700)]
Improve READ_BARRIER_MARK_REG for arm32
Use blocked register IP as scratch, avoid pushing in fast path.
Clean up slow path to not have simpler logic and one less memory
write.
Add simple fast path handling for region space TLAB object
allocation.
Test: test-art-target, N6P booting with CC baker
Bug:
30162165
Change-Id: I6594e42d3d6277ffe7bb79df09df8be6bee85eb5
Mathieu Chartier [Sat, 13 Aug 2016 00:06:30 +0000 (00:06 +0000)]
Merge "Fix heap poisoning"
Alex Light [Fri, 12 Aug 2016 23:33:25 +0000 (23:33 +0000)]
Merge "Make test work when running ndebug." am:
3469575a63 am:
30f56fc576
am:
e24587590e
Change-Id: I03a1c0b35d6deeba6eef65730f24e2d0fb52a90a
Alex Light [Fri, 12 Aug 2016 23:29:55 +0000 (23:29 +0000)]
Merge "Make test work when running ndebug." am:
3469575a63
am:
30f56fc576
Change-Id: Idd8f21195d1f3e930894a7a0fac9352cab59c3da
Alex Light [Fri, 12 Aug 2016 23:26:26 +0000 (23:26 +0000)]
Merge "Make test work when running ndebug."
am:
3469575a63
Change-Id: I7280780d2580ad9a3dc1ca78e5399a26730263ec