OSDN Git Service

android-x86/art.git
8 years agoMerge "Clean up use of GetDalvikCache." am: 882c0e4899 am: 77501abe6f
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

8 years agoMerge "Clean up use of GetDalvikCache." am: 882c0e4899
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

8 years agoMerge "Clean up use of GetDalvikCache."
Richard Uhler [Mon, 15 Aug 2016 17:18:10 +0000 (17:18 +0000)]
Merge "Clean up use of GetDalvikCache."
am: 882c0e4899

Change-Id: Ifac13144494305120408b7981f8fbe7a5ada9314

8 years agoMerge "Clean up use of GetDalvikCache."
Treehugger Robot [Mon, 15 Aug 2016 17:12:02 +0000 (17:12 +0000)]
Merge "Clean up use of GetDalvikCache."

8 years agoMerge "Improve READ_BARRIER_MARK_REG for arm32" am: 9e0d58b20c am: 8324ab368f
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

8 years agoMerge "Improve READ_BARRIER_MARK_REG for arm32" am: 9e0d58b20c
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

8 years agoMerge "Improve READ_BARRIER_MARK_REG for arm32"
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

8 years agoMerge "Improve READ_BARRIER_MARK_REG for arm32"
Mathieu Chartier [Mon, 15 Aug 2016 16:50:11 +0000 (16:50 +0000)]
Merge "Improve READ_BARRIER_MARK_REG for arm32"

8 years agoMerge "Revert "Enable IntermediateAddress for primitive arrays with read barriers...
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

8 years agoMerge "Revert "Enable IntermediateAddress for primitive arrays with read barriers...
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

8 years agoMerge "Revert "Enable IntermediateAddress for primitive arrays with read barriers.""
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

8 years agoMerge "Revert "Enable IntermediateAddress for primitive arrays with read barriers.""
Treehugger Robot [Mon, 15 Aug 2016 14:35:48 +0000 (14:35 +0000)]
Merge "Revert "Enable IntermediateAddress for primitive arrays with read barriers.""

8 years agoRevert "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

8 years agoMerge "ARM64: VIXL: Support a newer version of VIXL." am: fe74ba9ea6 am: f13e9b37dc
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

8 years agoMerge "ARM64: VIXL: Support a newer version of VIXL." am: fe74ba9ea6
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

8 years agoMerge "ARM64: VIXL: Support a newer version of VIXL."
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

8 years agoMerge "ARM64: VIXL: Support a newer version of VIXL."
Roland Levillain [Mon, 15 Aug 2016 10:03:32 +0000 (10:03 +0000)]
Merge "ARM64: VIXL: Support a newer version of VIXL."

8 years agoMerge "Fix heap poisoning" am: 85b1811f0d am: 18b4a7bba4
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

8 years agoMerge "Fix heap poisoning" am: 85b1811f0d
Mathieu Chartier [Sat, 13 Aug 2016 00:18:58 +0000 (00:18 +0000)]
Merge "Fix heap poisoning" am: 85b1811f0d
am: 18b4a7bba4

Change-Id: I15d27cab255a3f91940cee39852b064d6be33bc9

8 years agoMerge "Fix heap poisoning"
Mathieu Chartier [Sat, 13 Aug 2016 00:15:30 +0000 (00:15 +0000)]
Merge "Fix heap poisoning"
am: 85b1811f0d

Change-Id: Icaa40d52acfe3899e16da0b0713c97fa0e1e288e

8 years agoImprove READ_BARRIER_MARK_REG for arm32
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

8 years agoMerge "Fix heap poisoning"
Mathieu Chartier [Sat, 13 Aug 2016 00:06:30 +0000 (00:06 +0000)]
Merge "Fix heap poisoning"

8 years agoMerge "Make test work when running ndebug." am: 3469575a63 am: 30f56fc576
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

8 years agoMerge "Make test work when running ndebug." am: 3469575a63
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

8 years agoMerge "Make test work when running ndebug."
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

8 years agoMerge "Make test work when running ndebug."
Treehugger Robot [Fri, 12 Aug 2016 23:16:45 +0000 (23:16 +0000)]
Merge "Make test work when running ndebug."

8 years agoFix heap poisoning
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

8 years agoMerge "Revert "Revert "Iterative move coalescing for gc regalloc""" am: 912cc4aad3...
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

8 years agoMerge "Revert "Revert "Iterative move coalescing for gc regalloc""" am: 912cc4aad3
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

8 years agoMerge "Revert "Revert "Iterative move coalescing for gc regalloc"""
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

8 years agoMerge "ART: Remove zygote OTA code" am: ef1a3209ab am: a421078d3b
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

8 years agoMerge "ART: Remove zygote OTA code" am: ef1a3209ab
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

8 years agoMerge "Revert "Revert "Iterative move coalescing for gc regalloc"""
Treehugger Robot [Fri, 12 Aug 2016 22:07:41 +0000 (22:07 +0000)]
Merge "Revert "Revert "Iterative move coalescing for gc regalloc"""

8 years agoMerge "ART: Remove zygote OTA code"
Andreas Gampe [Fri, 12 Aug 2016 22:04:52 +0000 (22:04 +0000)]
Merge "ART: Remove zygote OTA code"
am: ef1a3209ab

Change-Id: I7f52590e1818b3deb8e188b7c4ad13e1d613c8f6

8 years agoMerge "ART: Remove zygote OTA code"
Treehugger Robot [Fri, 12 Aug 2016 21:58:25 +0000 (21:58 +0000)]
Merge "ART: Remove zygote OTA code"

8 years agoMake test work when running ndebug.
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

8 years agoMerge "Use TestCodeGeneratorX86 in codegen unit tests" am: ba1642dec6 am: f3a2327d9c
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

8 years agoMerge "Use TestCodeGeneratorX86 in codegen unit tests" am: ba1642dec6
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

8 years agoMerge "Use TestCodeGeneratorX86 in codegen unit tests"
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

8 years agoMerge "Use TestCodeGeneratorX86 in codegen unit tests"
Treehugger Robot [Fri, 12 Aug 2016 20:54:05 +0000 (20:54 +0000)]
Merge "Use TestCodeGeneratorX86 in codegen unit tests"

8 years agoRevert "Revert "Iterative move coalescing for gc regalloc""
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

8 years agoART: Remove zygote OTA code
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)

8 years agoClean up use of GetDalvikCache.
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

8 years agoMerge "ART: Reduce stack frame size limit on host" am: 82d33b295f am: 45d1085f45
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

8 years agoMerge "ART: Reduce stack frame size limit on host" am: 82d33b295f
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

8 years agoMerge "ART: Reduce stack frame size limit on host"
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

8 years agoMerge "ART: Reduce stack frame size limit on host"
Treehugger Robot [Fri, 12 Aug 2016 18:19:54 +0000 (18:19 +0000)]
Merge "ART: Reduce stack frame size limit on host"

8 years agoMerge "Optimize x86_64 TLAB allocation speed" am: 29daeb62da am: 99cd5e5010
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

8 years agoMerge changes I852b4daf,Id648eaed am: 346285b558 am: 4610ec68b5
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

8 years agoMerge "Optimize x86_64 TLAB allocation speed" am: 29daeb62da
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

8 years agoMerge changes I852b4daf,Id648eaed am: 346285b558
Alex Light [Fri, 12 Aug 2016 17:45:31 +0000 (17:45 +0000)]
Merge changes I852b4daf,Id648eaed am: 346285b558
am: 4610ec68b5

Change-Id: I4d3419ec5ee63648607d2d82a8b223c0f7899906

8 years agoMerge "Optimize x86_64 TLAB allocation speed"
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

8 years agoMerge changes I852b4daf,Id648eaed
Alex Light [Fri, 12 Aug 2016 17:42:32 +0000 (17:42 +0000)]
Merge changes I852b4daf,Id648eaed
am: 346285b558

Change-Id: Id1c7bc956e0c64620a030edd72a3a8bb3831a712

8 years agoMerge "Optimize x86_64 TLAB allocation speed"
Mathieu Chartier [Fri, 12 Aug 2016 17:34:56 +0000 (17:34 +0000)]
Merge "Optimize x86_64 TLAB allocation speed"

8 years agoMerge changes I852b4daf,Id648eaed
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.

8 years agoMerge "ART: Configure stack guard size in the Makefile" am: 635ba0cbce am: d8452dbf57
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

8 years agoMerge "ART: Configure stack guard size in the Makefile" am: 635ba0cbce
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

8 years agoMerge "ART: Configure stack guard size in the Makefile"
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

8 years agoMerge "ART: Configure stack guard size in the Makefile"
Treehugger Robot [Fri, 12 Aug 2016 17:11:01 +0000 (17:11 +0000)]
Merge "ART: Configure stack guard size in the Makefile"

8 years agoMerge "Fix duplicate checks in JNI macro assemblers." am: 2af1aa066e am: ad1b62a8d1
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

8 years agoMerge "Fix duplicate checks in JNI macro assemblers." am: 2af1aa066e
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

8 years agoMerge "Fix duplicate checks in JNI macro assemblers."
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

8 years agoMerge "Fix duplicate checks in JNI macro assemblers."
Treehugger Robot [Fri, 12 Aug 2016 15:14:44 +0000 (15:14 +0000)]
Merge "Fix duplicate checks in JNI macro assemblers."

8 years agoMerge "Adjust spacing before NOLINT comments in ART." am: c17d21d442 am: 512ee1d788
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

8 years agoMerge "Adjust spacing before NOLINT comments in ART." am: c17d21d442
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

8 years agoMerge "Adjust spacing before NOLINT comments in ART."
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

8 years agoMerge "Adjust spacing before NOLINT comments in ART."
Roland Levillain [Fri, 12 Aug 2016 13:45:57 +0000 (13:45 +0000)]
Merge "Adjust spacing before NOLINT comments in ART."

8 years agoFix duplicate checks in JNI macro assemblers.
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

8 years agoARM64: VIXL: Support a newer version of VIXL.
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

8 years agoAdjust spacing before NOLINT comments in ART.
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

8 years agoMerge "ARM: Add vldm/vstm assembler support." am: dce74be0c4 am: 63c395397d
Vladimir Marko [Fri, 12 Aug 2016 11:37:37 +0000 (11:37 +0000)]
Merge "ARM: Add vldm/vstm assembler support." am: dce74be0c4 am: 63c395397d
am: 98f7bee0f7

Change-Id: Icc854c488fd2ff531d9c4957360415d7c3ab71dd

8 years agoMerge "ARM: Add vldm/vstm assembler support." am: dce74be0c4
Vladimir Marko [Fri, 12 Aug 2016 11:34:08 +0000 (11:34 +0000)]
Merge "ARM: Add vldm/vstm assembler support." am: dce74be0c4
am: 63c395397d

Change-Id: Ie60bf90a6df7cb0eef6e4900970bb86760240b56

8 years agoMerge "ARM: Add vldm/vstm assembler support."
Vladimir Marko [Fri, 12 Aug 2016 11:30:40 +0000 (11:30 +0000)]
Merge "ARM: Add vldm/vstm assembler support."
am: dce74be0c4

Change-Id: Ibb492f8477f8552b30967ab89f0b633b29b52959

8 years agoMerge "ARM: Add vldm/vstm assembler support."
Vladimir Marko [Fri, 12 Aug 2016 11:23:40 +0000 (11:23 +0000)]
Merge "ARM: Add vldm/vstm assembler support."

8 years agoMerge "Initialize Heap's collector pointers to null." am: 3d1d18d74d am: e309ea5013
Vladimir Marko [Fri, 12 Aug 2016 10:37:05 +0000 (10:37 +0000)]
Merge "Initialize Heap's collector pointers to null." am: 3d1d18d74d am: e309ea5013
am: 63bf505b87

Change-Id: I3a80a6d220a7f165253ff26737095758aec3672e

8 years agoMerge "Initialize Heap's collector pointers to null." am: 3d1d18d74d
Vladimir Marko [Fri, 12 Aug 2016 10:33:34 +0000 (10:33 +0000)]
Merge "Initialize Heap's collector pointers to null." am: 3d1d18d74d
am: e309ea5013

Change-Id: Iee98c89847020cb3c6d0bb8dd549870a9d667d60

8 years agoMerge "Initialize Heap's collector pointers to null."
Vladimir Marko [Fri, 12 Aug 2016 10:30:06 +0000 (10:30 +0000)]
Merge "Initialize Heap's collector pointers to null."
am: 3d1d18d74d

Change-Id: I043cf61f87dc57402e836433340084b3fec03058

8 years agoMerge "Initialize Heap's collector pointers to null."
Treehugger Robot [Fri, 12 Aug 2016 10:22:57 +0000 (10:22 +0000)]
Merge "Initialize Heap's collector pointers to null."

8 years agoMerge "Revert "Iterative move coalescing for gc regalloc"" am: 0c283627c0 am: 54d3bcee82
Andreas Gampe [Fri, 12 Aug 2016 08:15:25 +0000 (08:15 +0000)]
Merge "Revert "Iterative move coalescing for gc regalloc"" am: 0c283627c0 am: 54d3bcee82
am: a54fca94e4

Change-Id: I3e8df35b2d3d4147f7642b3d784d7f72ff4d8b04

8 years agoMerge "Revert "Iterative move coalescing for gc regalloc"" am: 0c283627c0
Andreas Gampe [Fri, 12 Aug 2016 08:12:25 +0000 (08:12 +0000)]
Merge "Revert "Iterative move coalescing for gc regalloc"" am: 0c283627c0
am: 54d3bcee82

Change-Id: Ia3c3c5fe9ee9f473434a8a052f6cddf123d24beb

8 years agoMerge "Revert "Iterative move coalescing for gc regalloc""
Andreas Gampe [Fri, 12 Aug 2016 08:08:57 +0000 (08:08 +0000)]
Merge "Revert "Iterative move coalescing for gc regalloc""
am: 0c283627c0

Change-Id: I25700c95e5c7e35325636192bb8a494d6d425830

8 years agoMerge "Revert "Iterative move coalescing for gc regalloc""
Treehugger Robot [Fri, 12 Aug 2016 08:01:43 +0000 (08:01 +0000)]
Merge "Revert "Iterative move coalescing for gc regalloc""

8 years agoMerge "Remove kRestrictCompilationFiltersToImage" am: eef560e257 am: c83e315346
Wojciech Staszkiewicz [Fri, 12 Aug 2016 06:39:20 +0000 (06:39 +0000)]
Merge "Remove kRestrictCompilationFiltersToImage" am: eef560e257 am: c83e315346
am: 5563e5010a

Change-Id: I23fbf9d51801a25518fb1c0a645c1b0404af845c

8 years agoMerge "Remove kRestrictCompilationFiltersToImage" am: eef560e257
Wojciech Staszkiewicz [Fri, 12 Aug 2016 06:36:20 +0000 (06:36 +0000)]
Merge "Remove kRestrictCompilationFiltersToImage" am: eef560e257
am: c83e315346

Change-Id: I4693f22487dff863bdc70453c5dae68182dfc951

8 years agoRevert "Iterative move coalescing for gc regalloc"
Andreas Gampe [Fri, 12 Aug 2016 06:33:15 +0000 (06:33 +0000)]
Revert "Iterative move coalescing for gc regalloc"

There are lifetime issues with allocators and coloring
iterations that got flagged by valgrind.

This reverts commit 465ed699e810868fe5bb39730e6d149a4734372d.

Change-Id: I9e08172321af61d109c116a4f0742fa809e8094b
Test: m test-art-host

8 years agoMerge "Remove kRestrictCompilationFiltersToImage"
Wojciech Staszkiewicz [Fri, 12 Aug 2016 06:32:53 +0000 (06:32 +0000)]
Merge "Remove kRestrictCompilationFiltersToImage"
am: eef560e257

Change-Id: Ib645687b2f18dc58a8f9a0891baeff8a653acb45

8 years agoMerge "Enable compiled-methods= dex2oat switch" am: 8be74495ac am: 32204583eb
Wojciech Staszkiewicz [Fri, 12 Aug 2016 06:29:20 +0000 (06:29 +0000)]
Merge "Enable compiled-methods= dex2oat switch" am: 8be74495ac am: 32204583eb
am: cc73c1a4a5

Change-Id: I53e482110d88d235a8f4430d97afd1b78cb94272

8 years agoMerge "Remove kRestrictCompilationFiltersToImage"
Treehugger Robot [Fri, 12 Aug 2016 06:28:56 +0000 (06:28 +0000)]
Merge "Remove kRestrictCompilationFiltersToImage"

8 years agoMerge "Enable compiled-methods= dex2oat switch" am: 8be74495ac
Wojciech Staszkiewicz [Fri, 12 Aug 2016 06:26:20 +0000 (06:26 +0000)]
Merge "Enable compiled-methods= dex2oat switch" am: 8be74495ac
am: 32204583eb

Change-Id: I3fbee7dcce8ca963417188a5a0ceafb2d0ed1e66

8 years agoMerge "Enable compiled-methods= dex2oat switch"
Wojciech Staszkiewicz [Fri, 12 Aug 2016 06:22:51 +0000 (06:22 +0000)]
Merge "Enable compiled-methods= dex2oat switch"
am: 8be74495ac

Change-Id: I64c6fb97997642108337463054428c48ff9a4d28

8 years agoMerge "Enable compiled-methods= dex2oat switch"
Treehugger Robot [Fri, 12 Aug 2016 06:16:40 +0000 (06:16 +0000)]
Merge "Enable compiled-methods= dex2oat switch"

8 years agoART: Reduce stack frame size limit on host
Andreas Gampe [Fri, 12 Aug 2016 04:11:59 +0000 (21:11 -0700)]
ART: Reduce stack frame size limit on host

Clang isn't that bad anymore.

Change-Id: Id9f3e3e34a743b43c6b535d2757be7869a8cf7ea

8 years agoART: Configure stack guard size in the Makefile
Andreas Gampe [Fri, 12 Aug 2016 01:35:58 +0000 (18:35 -0700)]
ART: Configure stack guard size in the Makefile

Configure the stack guard reserved size through defines set in
the Makefile. This can be used to increase the gap depending on
the configuration, which may be required to safely support Java
stack overflows in instrumented builds.

Bug: 30766843
Change-Id: Icdd3209e3a261ea8383ef8eab38153255339b04a
Test: m test-art-host

8 years agoMerge "Iterative move coalescing for gc regalloc" am: 592c9bd2ad am: ff72c79f93
Andreas Gampe [Fri, 12 Aug 2016 01:55:34 +0000 (01:55 +0000)]
Merge "Iterative move coalescing for gc regalloc" am: 592c9bd2ad am: ff72c79f93
am: f12eb51f39

Change-Id: I229bbf6381bc7247869e905cae4f592902ba0140

8 years agoMerge "Iterative move coalescing for gc regalloc" am: 592c9bd2ad
Andreas Gampe [Fri, 12 Aug 2016 01:52:03 +0000 (01:52 +0000)]
Merge "Iterative move coalescing for gc regalloc" am: 592c9bd2ad
am: ff72c79f93

Change-Id: I5a98c894bb3433d6f9825f970159b0804c770e8d

8 years agoMerge "Iterative move coalescing for gc regalloc"
Andreas Gampe [Fri, 12 Aug 2016 01:48:36 +0000 (01:48 +0000)]
Merge "Iterative move coalescing for gc regalloc"
am: 592c9bd2ad

Change-Id: I0001020989745ff605d82a712bc57da88c0295b0

8 years agoMerge "Iterative move coalescing for gc regalloc"
Andreas Gampe [Fri, 12 Aug 2016 01:43:26 +0000 (01:43 +0000)]
Merge "Iterative move coalescing for gc regalloc"

8 years agoOptimize x86_64 TLAB allocation speed
Mathieu Chartier [Wed, 10 Aug 2016 01:37:09 +0000 (18:37 -0700)]
Optimize x86_64 TLAB allocation speed

Added assembly fast path code for resolved and initialized object
region TLAB allocations. Removed 3 instructions from TLAB fast path.

Added assembly fast path for array TLAB region allocators.

Should have more speedups for read barrier fast paths during
resolved and initialized alloc entrypoints.

Bug: 30162165

Test: test-art-host CC baker

Change-Id: I64dd06be5f18c8d6a5de0f15f0e2e7d488e99f18

8 years agoUse TestCodeGeneratorX86 in codegen unit tests
Matthew Gharrity [Fri, 12 Aug 2016 00:20:05 +0000 (17:20 -0700)]
Use TestCodeGeneratorX86 in codegen unit tests

The codegen unit tests are supposed to use special "test" code
generators when targeting ARM and x86 (due to differing calling
conventions between the C++ source code and the generated code),
yet TestCodeGeneratorX86 was not being used. This fixes that.

(The tests were only succeeding because the register allocator happened
to not assign the EBX register.)

Test: m test-art-host-gtest-codegen_test

Change-Id: Ia3dd6998c38e9ff27b8c2734457f86b3fed44ab4

8 years agoAdd basic runtime-plugins support.
Alex Light [Thu, 11 Aug 2016 17:48:03 +0000 (10:48 -0700)]
Add basic runtime-plugins support.

This allows one to pass shared-libraries on the command line that the
runtime will load as plugins. They have access to runtime code and can
install hooks to add functionality. Currently the only hook they can
touch is JavaVMExt::AddEnvironmentHook to register a callback for
GetEnv(). More hooks might be added in the future.

Test: ./test/run-test 900
Change-Id: I852b4daf5a3fa71e9888722bc07794632c0e5010