OSDN Git Service

android-x86/art.git
7 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

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

7 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

7 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."

7 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

7 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

7 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"""

7 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

7 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"

7 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

7 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

7 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"

7 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

7 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)

7 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

7 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"

7 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

7 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

7 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"

7 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.

7 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

7 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"

7 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

7 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."

7 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

7 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."

7 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

7 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

7 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

7 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."

7 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

7 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."

7 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

7 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""

7 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

7 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

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

7 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

7 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"

7 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

7 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

7 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

7 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"

7 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

7 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

7 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

7 years agoCreate a basic agent loading framework.
Alex Light [Thu, 28 Jul 2016 17:07:45 +0000 (10:07 -0700)]
Create a basic agent loading framework.

Currently we only allow agents to be loaded at runtime startup, though
this is expected to change soon.

Test: ./test/run-test --host 900
Change-Id: Id648eaed4bbbe6fdef41d64922d023a4db0bfa54

7 years agoIterative move coalescing for gc regalloc
Matthew Gharrity [Fri, 22 Jul 2016 15:52:13 +0000 (08:52 -0700)]
Iterative move coalescing for gc regalloc

Implement iterative move coalescing for graph coloring
register allocation. Based on Andrew Appel's implementation
in "Modern Compiler Implementation in Java", modified to
support constraints such as pair intervals.

Test: ART_TEST_OPTIMIZING_GRAPH_COLOR=true m test-art-host

Change-Id: I8642297d3bd798a4fc4de4b356ac3304098471a5

7 years agoInitialize Heap's collector pointers to null.
Vladimir Marko [Thu, 11 Aug 2016 17:25:53 +0000 (18:25 +0100)]
Initialize Heap's collector pointers to null.

Test: Run ART test suite on host.
Bug: 30807718
Change-Id: I9b83b44df250b00af48dc1aa653d78aea84d0874

7 years agoMerge "x86/x86-64: Shorter fast-path for read barrier field load."
Vladimir Marko [Thu, 11 Aug 2016 18:45:06 +0000 (18:45 +0000)]
Merge "x86/x86-64: Shorter fast-path for read barrier field load."
am: 9d32586b52

Change-Id: I817da2e93d1cc5e0198c1ed2edab7b21951227e8

7 years agoMerge "ARM64: Use libvixld when compiling for debug mode."
Alexandre Rames [Thu, 11 Aug 2016 18:42:10 +0000 (18:42 +0000)]
Merge "ARM64: Use libvixld when compiling for debug mode."
am: 0c7972c6c2

Change-Id: I8853f50c9c542104183ddbcf4bf36c2baa1d9e77

7 years agoMerge "x86/x86-64: Shorter fast-path for read barrier field load."
Treehugger Robot [Thu, 11 Aug 2016 18:41:55 +0000 (18:41 +0000)]
Merge "x86/x86-64: Shorter fast-path for read barrier field load."

7 years agoMerge "ARM64: Use libvixld when compiling for debug mode."
Treehugger Robot [Thu, 11 Aug 2016 18:37:50 +0000 (18:37 +0000)]
Merge "ARM64: Use libvixld when compiling for debug mode."

7 years agoMerge "Full enable new round implementation on x86/x86_64"
Aart Bik [Thu, 11 Aug 2016 18:32:07 +0000 (18:32 +0000)]
Merge "Full enable new round implementation on x86/x86_64"
am: c531c21794

Change-Id: I8f0c2115bf64d733a9d548060a21449dbf57d18f

7 years agoMerge "Full enable new round implementation on x86/x86_64"
Aart Bik [Thu, 11 Aug 2016 18:24:10 +0000 (18:24 +0000)]
Merge "Full enable new round implementation on x86/x86_64"

7 years agoARM: Add vldm/vstm assembler support.
Artem Serov [Fri, 15 Jul 2016 14:01:13 +0000 (15:01 +0100)]
ARM: Add vldm/vstm assembler support.

Change-Id: Id97417de8ebd07fc1fbee5d17e4b1c620a2c44cc

7 years agoARM64: Use libvixld when compiling for debug mode.
Alexandre Rames [Thu, 11 Aug 2016 16:04:14 +0000 (17:04 +0100)]
ARM64: Use libvixld when compiling for debug mode.

VIXL debug mode checks are valuable to catch dangerous code that can
lead to bugs.

This patch includes a couple of fixes for issues spotted by VIXL in debug mode.

Change-Id: I388ae1ffd9256ad74d0b6ce06f79cc7927a5f28a

7 years agox86/x86-64: Shorter fast-path for read barrier field load.
Vladimir Marko [Thu, 11 Aug 2016 13:16:57 +0000 (14:16 +0100)]
x86/x86-64: Shorter fast-path for read barrier field load.

Test: Tested with ART_USE_READ_BARRIER=true on host.
Bug: 29966877
Bug: 12687968
Change-Id: I73359495910dacb2cc28f1a21ef9e610bab5a476

7 years agoMerge "ARM/ARM64: Improve assembler macros for kSaveEverything frame."
Vladimir Marko [Thu, 11 Aug 2016 09:10:05 +0000 (09:10 +0000)]
Merge "ARM/ARM64: Improve assembler macros for kSaveEverything frame."
am: 33699c9529

Change-Id: Idf569faf84dd37c71b5a75622142e76f933b79df

7 years agoMerge "ARM/ARM64: Improve assembler macros for kSaveEverything frame."
Vladimir Marko [Thu, 11 Aug 2016 09:01:22 +0000 (09:01 +0000)]
Merge "ARM/ARM64: Improve assembler macros for kSaveEverything frame."

7 years agoMerge "ART: Check for more low-space situations in zygote"
Andreas Gampe [Thu, 11 Aug 2016 05:46:24 +0000 (05:46 +0000)]
Merge "ART: Check for more low-space situations in zygote"
am: 8cf44dbedd

Change-Id: I11ebd60a509a49034a44479f74f29d9d640ff0ca

7 years agoMerge "ART: Check for more low-space situations in zygote"
Treehugger Robot [Thu, 11 Aug 2016 05:38:00 +0000 (05:38 +0000)]
Merge "ART: Check for more low-space situations in zygote"

7 years agoART: Check for more low-space situations in zygote
Andreas Gampe [Wed, 10 Aug 2016 03:19:18 +0000 (20:19 -0700)]
ART: Check for more low-space situations in zygote

Even if a boot image exists and can be loaded, the rest of the
platform may not be able to boot. We previously only checked
after full image generation and missed this case.

Also prune the cache if there wasn't even space to put the boot
marker.

(cherry picked from commit f242f66cf7137ef681e44a494758976e11579260)

Bug: 30765660
Test: m test-art-host
Change-Id: Icd43746e681c62ce2e4e8745fb17bda65ca60372

7 years agoMerge "Fix pending exception failure for encoded statics"
Mathieu Chartier [Thu, 11 Aug 2016 00:48:05 +0000 (00:48 +0000)]
Merge "Fix pending exception failure for encoded statics"
am: 34110807ea

Change-Id: Ie0be2f627c540bd22888e3a8e327c8efc23c80f3

7 years agoMerge "Fix pending exception failure for encoded statics"
Treehugger Robot [Thu, 11 Aug 2016 00:37:21 +0000 (00:37 +0000)]
Merge "Fix pending exception failure for encoded statics"

7 years agoFix pending exception failure for encoded statics
Mathieu Chartier [Wed, 10 Aug 2016 20:57:39 +0000 (13:57 -0700)]
Fix pending exception failure for encoded statics

ReadValueToField may allocate a string and cause OOME, we were
not checking this each loop iteration. Throwing an exception
with a pending exception causes an abort.

Bug: 30690988

Test: test-art-host

Change-Id: I2c9751bf0544cf115d9d8e914e58ebccc81bcbf4

7 years agoFull enable new round implementation on x86/x86_64
Aart Bik [Wed, 10 Aug 2016 21:05:54 +0000 (14:05 -0700)]
Full enable new round implementation on x86/x86_64

Rationale:
Running JIT on Fugu does not always provide a constant area.
In such cases, we need to construct FP constants through stack.
This only applies to x86.

Test: 580-checker-round

BUG=26327751

Change-Id: I7e2c80dafbafbe647cfe9ecb039920bb534c666a

7 years agoARM/ARM64: Improve assembler macros for kSaveEverything frame.
Vladimir Marko [Wed, 10 Aug 2016 11:30:05 +0000 (12:30 +0100)]
ARM/ARM64: Improve assembler macros for kSaveEverything frame.

On ARM, use vpush/vpop {d0-d15} instead of {s0-s31}.
On ARM64, use 16-byte aligned stp/ldp for FP registers.

Test: Run ART test suite on Nexus 9.
Bug: 30212852
Change-Id: I36c04d3f1f7e03661c501977c3c9ffa7d2942d2f

7 years agoMerge "Fix negative array size checking"
Mathieu Chartier [Wed, 10 Aug 2016 19:15:43 +0000 (19:15 +0000)]
Merge "Fix negative array size checking"
am: 38dd0e8f0a

Change-Id: Icd6eba521a54f33d5c2c422aacca20923b8e0967

7 years agoMerge "Fix negative array size checking"
Treehugger Robot [Wed, 10 Aug 2016 19:06:01 +0000 (19:06 +0000)]
Merge "Fix negative array size checking"

7 years agoFix negative array size checking
Mathieu Chartier [Wed, 10 Aug 2016 17:08:58 +0000 (10:08 -0700)]
Fix negative array size checking

Mask out the alignment after the size check. Was broken in previous
CL.

Test: target test 412 --64 with CC + baker

Bug: 30162165
Change-Id: Ic4eb7229fb742490cd9193baf0faa2be6b454f38

7 years agoMerge "ART: Fix JIT profile saver"
Serguei Katkov [Wed, 10 Aug 2016 16:11:32 +0000 (16:11 +0000)]
Merge "ART: Fix JIT profile saver"
am: f2b1529b09

Change-Id: Iadbd6f1101de48515396b26cb0bafc2087dbd631

7 years agoMerge "ART: Fix JIT profile saver"
Treehugger Robot [Wed, 10 Aug 2016 16:06:07 +0000 (16:06 +0000)]
Merge "ART: Fix JIT profile saver"

7 years agoART: Fix JIT profile saver
Serguei Katkov [Mon, 1 Aug 2016 10:47:04 +0000 (17:47 +0700)]
ART: Fix JIT profile saver

We miss the case when jit activity notification count exceeds
the threshold. Fix it.

Bug: 30583550
Test: manual test in master

Change-Id: Ib10a34d3c2f5d3cf674b1c4d7a3c1204784865d3
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
7 years agoMerge "Rename callee save enumerators."
Vladimir Marko [Wed, 10 Aug 2016 14:32:27 +0000 (14:32 +0000)]
Merge "Rename callee save enumerators."
am: 066187de25

Change-Id: I3172a5e9dd37dc75746a0a63d4758558d0c00b7b

7 years agoMerge "Rename callee save enumerators."
Vladimir Marko [Wed, 10 Aug 2016 14:28:27 +0000 (14:28 +0000)]
Merge "Rename callee save enumerators."

7 years agoMerge "Instruction: Add new formats 45cc and 4rcc."
Narayan Kamath [Wed, 10 Aug 2016 14:22:26 +0000 (14:22 +0000)]
Merge "Instruction: Add new formats 45cc and 4rcc."
am: 3de6f3f9c9

Change-Id: Icae8eb59fd0b65477411b3da965a9b6fc2464203

7 years agoMerge "Instruction: Add new formats 45cc and 4rcc."
Narayan Kamath [Wed, 10 Aug 2016 14:15:28 +0000 (14:15 +0000)]
Merge "Instruction: Add new formats 45cc and 4rcc."

7 years agoMerge "ARM: Embed constants in add/sub-long."
Vladimir Marko [Wed, 10 Aug 2016 13:37:25 +0000 (13:37 +0000)]
Merge "ARM: Embed constants in add/sub-long."
am: 4997d14c8d

Change-Id: I0adf61fab5b5b17e29839542c6406d4e1fa5cc73

7 years agoMerge "ARM: Embed constants in add/sub-long."
Vladimir Marko [Wed, 10 Aug 2016 13:29:15 +0000 (13:29 +0000)]
Merge "ARM: Embed constants in add/sub-long."

7 years agoRename callee save enumerators.
Vladimir Marko [Wed, 3 Aug 2016 17:49:58 +0000 (18:49 +0100)]
Rename callee save enumerators.

And related image method enumerators, macros, etc.
Clean up some entrypoint assembly comments.

This is a follow-up to
    https://android-review.googlesource.com/252348

Test: Run ART test suite on host and Nexus 9.
Bug: 30212852
Change-Id: I2707342d4255c88c547655be83ed97a67e12ae9e

7 years agoInstruction: Add new formats 45cc and 4rcc.
Narayan Kamath [Wed, 3 Aug 2016 11:46:23 +0000 (12:46 +0100)]
Instruction: Add new formats 45cc and 4rcc.

These are new 4 byte formats with the following properties.

- The first three (16 bit) words of these instructions have the same
  format as 35c and 3rc respectively.
- The fourth 16 bit word encodes an additional constant index reference.

This change includes placeholder opcodes for invoke-polymorphic and
invoke-polymorphic/range which will be the first dex instructions that
use this new format. In addition to a method_idx that gives the invoked
method, these instructions also provide a proto_idx which gives the
(static) type signature of the call site.

The only reason these are included in this change is because we need
an instruction with a given format to write a unit_test using the Instruction
API.

bug: 30550796
test: make test-art-host

Change-Id: I02612ddee47169757175a8079d82f811f6545945

7 years agoMerge "Revert experimental lambda feature."
Narayan Kamath [Wed, 10 Aug 2016 10:26:44 +0000 (10:26 +0000)]
Merge "Revert experimental lambda feature."
am: c218427ab9

Change-Id: Id73fbf20e9f119552f1a0b623575d6caf8b414bf

7 years agoMerge "Revert experimental lambda feature."
Narayan Kamath [Wed, 10 Aug 2016 10:20:49 +0000 (10:20 +0000)]
Merge "Revert experimental lambda feature."

7 years agoMerge "JDWP: fix method argument count"
Sebastien Hertz [Wed, 10 Aug 2016 05:27:26 +0000 (05:27 +0000)]
Merge "JDWP: fix method argument count"
am: 45b1718769

Change-Id: Ifeaec3aced92c63c81eff1b795d19a3e58def03c

7 years agoMerge "JDWP: fix method argument count"
Sebastien Hertz [Wed, 10 Aug 2016 05:18:48 +0000 (05:18 +0000)]
Merge "JDWP: fix method argument count"

7 years agoMerge "Add a graph coloring art test option"
Matthew Gharrity [Wed, 10 Aug 2016 03:57:21 +0000 (03:57 +0000)]
Merge "Add a graph coloring art test option"
am: e4520c185d

Change-Id: Iaa861f3c5d314f28e54b9ca0a11bdaaf8bbb75c6

7 years agoMerge "Add a graph coloring art test option"
Treehugger Robot [Wed, 10 Aug 2016 03:52:13 +0000 (03:52 +0000)]
Merge "Add a graph coloring art test option"

7 years agoMerge "ART: Extract JNI macro assembler for arm"
Andreas Gampe [Wed, 10 Aug 2016 00:32:39 +0000 (00:32 +0000)]
Merge "ART: Extract JNI macro assembler for arm"
am: dfdf1e5343

Change-Id: Ide2cdde3c6b2ec58ee89710184f2369667bd728e

7 years agoMerge "ART: Extract JNI macro assembler for arm"
Treehugger Robot [Wed, 10 Aug 2016 00:20:25 +0000 (00:20 +0000)]
Merge "ART: Extract JNI macro assembler for arm"

7 years agoEnable compiled-methods= dex2oat switch
Wojciech Staszkiewicz [Tue, 9 Aug 2016 21:30:55 +0000 (14:30 -0700)]
Enable compiled-methods= dex2oat switch

Pass compiled_methods instead of nullptr from dex2oat to
compiler driver.

Test: Run dex2oat with compiled-methods and dump-passes
set. Look at the dump-passes output and verify that only
methods provided in compiled-methods are compiled.

Change-Id: Ic7249878f7bde5fdb18f9cc348b7ba82de486df8

7 years agoAdd a graph coloring art test option
Matthew Gharrity [Tue, 9 Aug 2016 01:03:46 +0000 (18:03 -0700)]
Add a graph coloring art test option

Test: ART_TEST_OPTIMIZING_GRAPH_COLOR=true m test-art-host

Change-Id: I1bd7c20cdd372ed227204c990484d123c67bdfa8

7 years agoMerge "ART: Extract JNI macro assembler for arm64"
Andreas Gampe [Tue, 9 Aug 2016 22:33:02 +0000 (22:33 +0000)]
Merge "ART: Extract JNI macro assembler for arm64"
am: c21f1c5b29

Change-Id: I1b943b3efd7ff12730d0bb4a20ec2083b1a9d064

7 years agoART: Extract JNI macro assembler for arm
Andreas Gampe [Tue, 9 Aug 2016 00:32:34 +0000 (17:32 -0700)]
ART: Extract JNI macro assembler for arm

Extract the JNI assembler parts from the regular assembler.

Change-Id: Ice39ffeb854f8651e93443dd69f4c9e0e802975c
Test: m test-art-target (N6)

7 years agoMerge "ART: Extract JNI macro assembler for arm64"
Treehugger Robot [Tue, 9 Aug 2016 22:23:24 +0000 (22:23 +0000)]
Merge "ART: Extract JNI macro assembler for arm64"

7 years agoMerge "Card mark holding class instead of declaring class"
Mathieu Chartier [Tue, 9 Aug 2016 19:38:55 +0000 (19:38 +0000)]
Merge "Card mark holding class instead of declaring class"
am: 0ed44f9595

Change-Id: I6b4eeb9b956a6b5def8b28366822af4b0d44c686

7 years agoMerge "Revert "Revert "ARM64 asm for region space array allocation"""
Mathieu Chartier [Tue, 9 Aug 2016 19:38:52 +0000 (19:38 +0000)]
Merge "Revert "Revert "ARM64 asm for region space array allocation"""
am: 4c3cc6ca2a

Change-Id: Ib650df895187d92141998106c7044720db7de4f7

7 years agoMerge "Card mark holding class instead of declaring class"
Mathieu Chartier [Tue, 9 Aug 2016 19:05:06 +0000 (19:05 +0000)]
Merge "Card mark holding class instead of declaring class"

7 years agoMerge "Revert "Revert "ARM64 asm for region space array allocation"""
Treehugger Robot [Tue, 9 Aug 2016 18:34:17 +0000 (18:34 +0000)]
Merge "Revert "Revert "ARM64 asm for region space array allocation"""

7 years agoCard mark holding class instead of declaring class
Mathieu Chartier [Fri, 5 Aug 2016 17:46:36 +0000 (10:46 -0700)]
Card mark holding class instead of declaring class

For profiling info, we need to mark the card of the holding class
instead of declaring class. This is required for GC correctness since
the GC relies on the card table to track cross space references.

Test: test-art-host ART_TEST_JIT=true

Bug: 30655270

Change-Id: Ia4690219ded0df38032b644440273e06bc303956