OSDN Git Service
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
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
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
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
Treehugger Robot [Fri, 12 Aug 2016 23:16:45 +0000 (23:16 +0000)]
Merge "Make test work when running ndebug."
Mathieu Chartier [Fri, 12 Aug 2016 22:44:44 +0000 (15:44 -0700)]
Fix heap poisoning
Was wrong register.
Test: test-art-host-run-test CC table lookup + poisoning.
Bug:
30162165
Change-Id: If347a40963bcc2fb9e21c54b5405c852bcd3af08
Matthew Gharrity [Fri, 12 Aug 2016 22:18:50 +0000 (22:18 +0000)]
Merge "Revert "Revert "Iterative move coalescing for gc regalloc""" am:
912cc4aad3 am:
958834b4f3
am:
844517a559
Change-Id: I043d604f54d36e3ccd847de7b2aa30d0d25b80bd
Matthew Gharrity [Fri, 12 Aug 2016 22:15:21 +0000 (22:15 +0000)]
Merge "Revert "Revert "Iterative move coalescing for gc regalloc""" am:
912cc4aad3
am:
958834b4f3
Change-Id: I90adf52539b3170a452e5e09bfeaad04b5f956bd
Matthew Gharrity [Fri, 12 Aug 2016 22:11:53 +0000 (22:11 +0000)]
Merge "Revert "Revert "Iterative move coalescing for gc regalloc"""
am:
912cc4aad3
Change-Id: Iccbd0bd4eea87a1682ec11a16f2c428d90887771
Andreas Gampe [Fri, 12 Aug 2016 22:11:50 +0000 (22:11 +0000)]
Merge "ART: Remove zygote OTA code" am:
ef1a3209ab am:
a421078d3b
am:
4ed5e4bb09
Change-Id: I3646e5fc93971245defe80c3aa3f460c86ec24e2
Andreas Gampe [Fri, 12 Aug 2016 22:08:21 +0000 (22:08 +0000)]
Merge "ART: Remove zygote OTA code" am:
ef1a3209ab
am:
a421078d3b
Change-Id: Ica36da629d673967b53524a8b3e134e039a276c3
Treehugger Robot [Fri, 12 Aug 2016 22:07:41 +0000 (22:07 +0000)]
Merge "Revert "Revert "Iterative move coalescing for gc regalloc"""
Andreas Gampe [Fri, 12 Aug 2016 22:04:52 +0000 (22:04 +0000)]
Merge "ART: Remove zygote OTA code"
am:
ef1a3209ab
Change-Id: I7f52590e1818b3deb8e188b7c4ad13e1d613c8f6
Treehugger Robot [Fri, 12 Aug 2016 21:58:25 +0000 (21:58 +0000)]
Merge "ART: Remove zygote OTA code"
Alex Light [Fri, 12 Aug 2016 21:43:48 +0000 (14:43 -0700)]
Make test work when running ndebug.
Change-Id: Iea58ccef51fddaeae4b1fb7084a7956400a81dfe
Test: ART_TEST_RUN_TEST_NDEBUG=true mma -j40 test-art-host-run-test-900-hello-plugin
Matthew Gharrity [Fri, 12 Aug 2016 21:14:48 +0000 (21:14 +0000)]
Merge "Use TestCodeGeneratorX86 in codegen unit tests" am:
ba1642dec6 am:
f3a2327d9c
am:
8e4d9fb2b1
Change-Id: I4b7fdcdf91d99d0852e152f9636ff31dd5655160
Matthew Gharrity [Fri, 12 Aug 2016 21:10:46 +0000 (21:10 +0000)]
Merge "Use TestCodeGeneratorX86 in codegen unit tests" am:
ba1642dec6
am:
f3a2327d9c
Change-Id: Ib81eaa4a94b704b4c85e0da74811a2165f5d2788
Matthew Gharrity [Fri, 12 Aug 2016 21:07:27 +0000 (21:07 +0000)]
Merge "Use TestCodeGeneratorX86 in codegen unit tests"
am:
ba1642dec6
Change-Id: I2bdb9b704f019e035593faa7a8c66498c947c491
Treehugger Robot [Fri, 12 Aug 2016 20:54:05 +0000 (20:54 +0000)]
Merge "Use TestCodeGeneratorX86 in codegen unit tests"
Matthew Gharrity [Fri, 12 Aug 2016 16:10:45 +0000 (16:10 +0000)]
Revert "Revert "Iterative move coalescing for gc regalloc""
This reverts commit
6f61ee5623a676ce983ccfa1aba9b2ae1237e163,
and fixes the arena allocator issues in the original CL.
Functionality from the original CL has not changed.
Test: m valgrind-test-art-host-gtest-register_allocator_test
Test: ART_TEST_OPTIMIZING_GRAPH_COLOR=true m test-art-host-run-test
Change-Id: Idd979f4e03f0c2800e0c07a0a7d392c8a4230aab
Andreas Gampe [Sat, 9 Jul 2016 17:51:12 +0000 (10:51 -0700)]
ART: Remove zygote OTA code
The renaming and relabeling of the A/B artifacts is now done in
a special-purpose script started by init, so as to not complicate
the logic here (e.g., name of the current slot).
Partially reverts commit
754479f7aa056602de8282f4f03718b42c20b89b.
Bug:
25612095
Bug:
28069686
Change-Id: I4d965361000fd448e199c9af059b6d18bfe928bb
(cherry picked from commit
ff2a8ef2ed6b3f21da26f85197170d7d2a9f5134)
Richard Uhler [Fri, 12 Aug 2016 16:05:13 +0000 (09:05 -0700)]
Clean up use of GetDalvikCache.
Switch the only caller of the non-void version of GetDalvikCache that set
create_if_absent true to use the void version of GetDalvikCache. Then no
callers of the non-void version of GetDalvikCache set create_if_absent to
true, so that argument is no longer needed. And without create_if_absent,
there is no case when the function will abort, so the 'OrDie" option is no
longer necessary.
Change-Id: I83f60dcc8a8f3b1f91fd2971e9028f6a7dd8384d
Test: m art-test-host
Test: m art-test-target
Andreas Gampe [Fri, 12 Aug 2016 18:34:07 +0000 (18:34 +0000)]
Merge "ART: Reduce stack frame size limit on host" am:
82d33b295f am:
45d1085f45
am:
7c015b3a96
Change-Id: Ib6cd1373e8200a91ad6b4140c24f940cbecf6352
Andreas Gampe [Fri, 12 Aug 2016 18:30:34 +0000 (18:30 +0000)]
Merge "ART: Reduce stack frame size limit on host" am:
82d33b295f
am:
45d1085f45
Change-Id: Ib9e43b6cee8d919f34fa8ae560729dc598c83e9e
Andreas Gampe [Fri, 12 Aug 2016 18:29:02 +0000 (18:29 +0000)]
Merge "ART: Reduce stack frame size limit on host"
am:
82d33b295f
Change-Id: I08214c2d5a737be9a64948d9cce500b6abf42b75
Treehugger Robot [Fri, 12 Aug 2016 18:19:54 +0000 (18:19 +0000)]
Merge "ART: Reduce stack frame size limit on host"
Mathieu Chartier [Fri, 12 Aug 2016 17:49:03 +0000 (17:49 +0000)]
Merge "Optimize x86_64 TLAB allocation speed" am:
29daeb62da am:
99cd5e5010
am:
a9adc6dde7
Change-Id: Ie847c78a5f8bedf31ddc38b5e3580d91b1e10464
Alex Light [Fri, 12 Aug 2016 17:49:02 +0000 (17:49 +0000)]
Merge changes I852b4daf,Id648eaed am:
346285b558 am:
4610ec68b5
am:
45c7d15543
Change-Id: I0c314d46e7343643915c0d10e824cb4bd21e241e
Mathieu Chartier [Fri, 12 Aug 2016 17:45:32 +0000 (17:45 +0000)]
Merge "Optimize x86_64 TLAB allocation speed" am:
29daeb62da
am:
99cd5e5010
Change-Id: I1a8ddb61b65e263d1f7b3457289b0d2e0659e10a
Alex Light [Fri, 12 Aug 2016 17:45:31 +0000 (17:45 +0000)]
Merge changes I852b4daf,Id648eaed am:
346285b558
am:
4610ec68b5
Change-Id: I4d3419ec5ee63648607d2d82a8b223c0f7899906
Mathieu Chartier [Fri, 12 Aug 2016 17:42:44 +0000 (17:42 +0000)]
Merge "Optimize x86_64 TLAB allocation speed"
am:
29daeb62da
Change-Id: I2bee7d069403c3a8a3a1756672b6bac6b0f82705
Alex Light [Fri, 12 Aug 2016 17:42:32 +0000 (17:42 +0000)]
Merge changes I852b4daf,Id648eaed
am:
346285b558
Change-Id: Id1c7bc956e0c64620a030edd72a3a8bb3831a712
Mathieu Chartier [Fri, 12 Aug 2016 17:34:56 +0000 (17:34 +0000)]
Merge "Optimize x86_64 TLAB allocation speed"
Treehugger Robot [Fri, 12 Aug 2016 17:33:34 +0000 (17:33 +0000)]
Merge changes I852b4daf,Id648eaed
* changes:
Add basic runtime-plugins support.
Create a basic agent loading framework.
Andreas Gampe [Fri, 12 Aug 2016 17:25:30 +0000 (17:25 +0000)]
Merge "ART: Configure stack guard size in the Makefile" am:
635ba0cbce am:
d8452dbf57
am:
e2b2447293
Change-Id: Id238ab3f66136e0ac7fddaef1dcdacd6b420ee33
Andreas Gampe [Fri, 12 Aug 2016 17:21:59 +0000 (17:21 +0000)]
Merge "ART: Configure stack guard size in the Makefile" am:
635ba0cbce
am:
d8452dbf57
Change-Id: If570f499b4391a542ff0599d74ccbeb1867ce70f
Andreas Gampe [Fri, 12 Aug 2016 17:18:31 +0000 (17:18 +0000)]
Merge "ART: Configure stack guard size in the Makefile"
am:
635ba0cbce
Change-Id: I7fff2a9146dd9b17624996e77fddaad2cb7e85cc
Treehugger Robot [Fri, 12 Aug 2016 17:11:01 +0000 (17:11 +0000)]
Merge "ART: Configure stack guard size in the Makefile"
Vladimir Marko [Fri, 12 Aug 2016 15:29:22 +0000 (15:29 +0000)]
Merge "Fix duplicate checks in JNI macro assemblers." am:
2af1aa066e am:
ad1b62a8d1
am:
d78c212248
Change-Id: Idce3fb5ac8c7d061c940a879b7cd8264584cd004
Vladimir Marko [Fri, 12 Aug 2016 15:26:22 +0000 (15:26 +0000)]
Merge "Fix duplicate checks in JNI macro assemblers." am:
2af1aa066e
am:
ad1b62a8d1
Change-Id: I82cb3710153ff60775b8c00dc9bdf5485df2b533
Vladimir Marko [Fri, 12 Aug 2016 15:22:54 +0000 (15:22 +0000)]
Merge "Fix duplicate checks in JNI macro assemblers."
am:
2af1aa066e
Change-Id: I658e24a12a0086257acfa5ec88ffb91d2d25f03d
Treehugger Robot [Fri, 12 Aug 2016 15:14:44 +0000 (15:14 +0000)]
Merge "Fix duplicate checks in JNI macro assemblers."
Roland Levillain [Fri, 12 Aug 2016 13:59:47 +0000 (13:59 +0000)]
Merge "Adjust spacing before NOLINT comments in ART." am:
c17d21d442 am:
512ee1d788
am:
7fe76c3742
Change-Id: I02a8127ff8d98b0246b3d020707e84d3b78cfcec
Roland Levillain [Fri, 12 Aug 2016 13:56:16 +0000 (13:56 +0000)]
Merge "Adjust spacing before NOLINT comments in ART." am:
c17d21d442
am:
512ee1d788
Change-Id: I88b169e012970709801ef16558d67989d4fbe27b
Roland Levillain [Fri, 12 Aug 2016 13:52:49 +0000 (13:52 +0000)]
Merge "Adjust spacing before NOLINT comments in ART."
am:
c17d21d442
Change-Id: Ic44e4396616b9f8e692b6c530553e9f98305e479
Roland Levillain [Fri, 12 Aug 2016 13:45:57 +0000 (13:45 +0000)]
Merge "Adjust spacing before NOLINT comments in ART."
Vladimir Marko [Fri, 12 Aug 2016 13:26:15 +0000 (14:26 +0100)]
Fix duplicate checks in JNI macro assemblers.
Instead of checking one register twice, check the other
register passed to the function.
Test: Run ART test suite on host and Nexus 5.
Bug:
30739460
Change-Id: If868ea14f5c192982488ed065b279a019b5b7cf4
Artem Serov [Mon, 8 Aug 2016 14:11:24 +0000 (15:11 +0100)]
ARM64: VIXL: Support a newer version of VIXL.
Please note that compiling VIXL with -Wshadow is a known VIXL issue.
This will be resolved in a later version of VIXL, when we can drop
the deprecated API for getters and setters.
For more info take a look at VIXL_DEPRECATED in the VIXL source code.
Change-Id: Iea30b1a7b065f9b16a92c6cc7ebdc50ef068b348
Roland Levillain [Thu, 11 Aug 2016 22:53:33 +0000 (23:53 +0100)]
Adjust spacing before NOLINT comments in ART.
Note that neither clang-tidy nor cpplint.py complain about
these style "issues", precisely because of the NOLINT
comments.
Test: WITH_TIDY=1 WITH_TIDY_CHECKS='-*,misc-macro-parentheses' mmma art
Change-Id: Id692fd394ffbd4fe208cbbe4407b4d5e208462bb