OSDN Git Service

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

7 years agoRevert "Revert "ARM64 asm for region space array allocation""
Mathieu Chartier [Mon, 8 Aug 2016 16:41:04 +0000 (09:41 -0700)]
Revert "Revert "ARM64 asm for region space array allocation""

Also added missing large object check. No regression from the check
N6P CC EAAC time at 1313 for 10 samples vs 1314 before reverts.

Bug: 30162165
Bug: 12687968

Test: test-art-target with CC + heap poisoning

This reverts commit 6ae7f3a4541e70f04243a6fe469aa3bd51e16d79.

Change-Id: Ie28f652f619898d7d37eeebf3f31a88af8fac949

7 years agoMerge "Clean up VLOG(oat) in OatFileAssistant."
Richard Uhler [Tue, 9 Aug 2016 16:22:37 +0000 (16:22 +0000)]
Merge "Clean up VLOG(oat) in OatFileAssistant."
am: 3f3201a89e

Change-Id: Iff3cd700f34ec55d3162746d213bcf5f914d441c

7 years agoMerge "MIPS64: Properly preserve $gp in art_quick_test_suspend"
Vladimir Marko [Tue, 9 Aug 2016 16:20:09 +0000 (16:20 +0000)]
Merge "MIPS64: Properly preserve $gp in art_quick_test_suspend"
am: c1f9241b98

Change-Id: Ibba332862ae5c625cc647884161cf2d5d52b9bee

7 years agoMerge "Clean up VLOG(oat) in OatFileAssistant."
Treehugger Robot [Tue, 9 Aug 2016 16:17:30 +0000 (16:17 +0000)]
Merge "Clean up VLOG(oat) in OatFileAssistant."

7 years agoMerge "MIPS64: Properly preserve $gp in art_quick_test_suspend"
Vladimir Marko [Tue, 9 Aug 2016 16:10:22 +0000 (16:10 +0000)]
Merge "MIPS64: Properly preserve $gp in art_quick_test_suspend"

7 years agoJDWP: fix method argument count
Sebastien Hertz [Mon, 8 Aug 2016 08:20:28 +0000 (10:20 +0200)]
JDWP: fix method argument count

The arguments count must include 'this' for instance method.

Bug: 30673627
Test: make test-art-host
Test: art/tools/run-jdwp-tests.sh --mode=host --variant=X64
Change-Id: Ie582e3bb3e27a2572ce5d3c66990f02650eee61b

7 years agoMerge "Fix setting FdFile::ReadOnlyMode() flag"
David Brazdil [Tue, 9 Aug 2016 14:39:00 +0000 (14:39 +0000)]
Merge "Fix setting FdFile::ReadOnlyMode() flag"
am: d59b196d6d

Change-Id: Ibf16a9bfd0d4070a1658edabf5cfd1db3e3bb173

7 years agoMerge "Fix setting FdFile::ReadOnlyMode() flag"
Treehugger Robot [Tue, 9 Aug 2016 14:31:56 +0000 (14:31 +0000)]
Merge "Fix setting FdFile::ReadOnlyMode() flag"

7 years agoMIPS64: Properly preserve $gp in art_quick_test_suspend
Goran Jakovljevic [Tue, 9 Aug 2016 13:15:39 +0000 (15:15 +0200)]
MIPS64: Properly preserve $gp in art_quick_test_suspend

$gp register was restored in RESTORE_SAVE_EVERYTHING_CALLEE_SAVE_FRAME
with value from $t8, but $t8 has been clobbered in the meantime.

Calculation of $gp is done as a part of the macro
SETUP_SAVE_EVERYTHING_CALLEE_SAVE_FRAME. This allows us to use version
of .cpsetup where $gp is preserved on the stack, instead in another
register.

This fixes over 60 ART tests.

Additionally this suppresses assembler warnings for MIPS32 and MIPS64:
    Warning: used $at without ".set noat"

Test: mma test-art-target-run-test on QEMU

Change-Id: Ic92680c3cb2a4405353b3640c836e92c0231bd15

7 years agoFix setting FdFile::ReadOnlyMode() flag
David Brazdil [Tue, 9 Aug 2016 11:10:56 +0000 (12:10 +0100)]
Fix setting FdFile::ReadOnlyMode() flag

The Unix flag O_RDONLY is defined as zero and hence its presence
cannot be tested with '(flags & O_RDONLY) != 0'. This used to be
broken in FdFlag when setting its internal `read_only_mode_` flag.

Test: m test-art-host-gtest-fd_file_test
Change-Id: Ib48abfc908c7032f031450a1574130e06f6c3bab

7 years agoRevert experimental lambda feature.
Narayan Kamath [Fri, 5 Aug 2016 10:44:32 +0000 (11:44 +0100)]
Revert experimental lambda feature.

This is a revert of the following changes :

30c475a2046951a81769c2db0b2dad66cd71e189.
lambda: Minor capture-variable/liberate-variable clean-up after post-merge reviews.

6918bf13eb855b3aa8ccdddda2d27ae8c60cec56.
lambda: Experimental support for capture-variable and liberate-variable

fc1ccd740b7c8e96dfac675cfc580122cd1b40a6.
lambda: Infrastructure to support capture/liberate-variable dex opcodes

e2facc5b18cd756a8b5500fb3d90da69c9ee0fb7.
runtime: Add lambda box/unbox object equality

2ee54e249ad21c74f29a161e248bebe7d22fddf1.
runtime: Partially implement box-lambda and unbox-lambda experimental opcodes

158f35c98e2ec0d40d2c032b8cdce5fb60944a7f.
interpreter: Add experimental lambda opcodes for invoke/create-lambda

a3bb72036f5454e410467f7151dc89f725ae1151.
Added format 25x to dexdump(2).

Plus surrounding cleanups.

Test: make test-art
Change-Id: Ic6f999ad17385ef933f763641049cf721510b202

7 years agoMerge "Use Thread.dispatchUncaughtException() rather than duplicating logic."
Tobias Thierer [Tue, 9 Aug 2016 09:01:46 +0000 (09:01 +0000)]
Merge "Use Thread.dispatchUncaughtException() rather than duplicating logic."
am: c8ba678762

Change-Id: Ifdd9c4b4e8ee45eb36bb763703f3e73de25262c1

7 years agoMerge "Use Thread.dispatchUncaughtException() rather than duplicating logic."
Tobias Thierer [Tue, 9 Aug 2016 08:55:34 +0000 (08:55 +0000)]
Merge "Use Thread.dispatchUncaughtException() rather than duplicating logic."

7 years agoART: Extract JNI macro assembler for arm64
Andreas Gampe [Mon, 8 Aug 2016 23:06:34 +0000 (16:06 -0700)]
ART: Extract JNI macro assembler for arm64

Extract the JNI assembler parts from the regular assembler.

Change-Id: I0b0ad32e18f585b75e9da0237afe082c25a1d291
Test: m test-art-target (N9)

7 years agoMerge "Fix missing spaces in checker tests"
Wojciech Staszkiewicz [Mon, 8 Aug 2016 23:10:36 +0000 (23:10 +0000)]
Merge "Fix missing spaces in checker tests"
am: 5c6233c00f

Change-Id: I7c2b7c776a8a400286f17c92ea561f470d93f00c

7 years agoClean up VLOG(oat) in OatFileAssistant.
Richard Uhler [Fri, 5 Aug 2016 23:32:55 +0000 (16:32 -0700)]
Clean up VLOG(oat) in OatFileAssistant.

Refactor GetOatDexFile to have an error message out parameter.

Change-Id: I6b933f1fcfc9726c051a9d9678d92587cc02501e
Test: OatFileAssistantTest with and without -verbose:oat logging turned on.
Test: m test-art-host

7 years agoMerge "Fix missing spaces in checker tests"
Treehugger Robot [Mon, 8 Aug 2016 22:54:28 +0000 (22:54 +0000)]
Merge "Fix missing spaces in checker tests"

7 years agoMerge "ART: Improve addr2line"
Andreas Gampe [Mon, 8 Aug 2016 21:39:59 +0000 (21:39 +0000)]
Merge "ART: Improve addr2line"
am: 7ab52cd6c0

Change-Id: I7813a75eb3ef4f0cf080e7f773d8c7b711ae2044

7 years agoFix missing spaces in checker tests
Wojciech Staszkiewicz [Mon, 8 Aug 2016 21:35:30 +0000 (14:35 -0700)]
Fix missing spaces in checker tests

This fixes missing spaces in few checker tests.

Change-Id: Id2e7ee4da0077dfd6676526cbd203a98e2bfd7ee

7 years agoMerge "ART: Improve addr2line"
Treehugger Robot [Mon, 8 Aug 2016 21:35:04 +0000 (21:35 +0000)]
Merge "ART: Improve addr2line"

7 years agoMerge "ART: Extract JNI macro assembler for x86"
Andreas Gampe [Mon, 8 Aug 2016 19:44:51 +0000 (19:44 +0000)]
Merge "ART: Extract JNI macro assembler for x86"
am: c0362b5f93

Change-Id: Iea4afe81d5a52315c968947d5081973b80424e1c

7 years agoMerge "ART: Extract JNI macro assembler for x86-64"
Andreas Gampe [Mon, 8 Aug 2016 19:42:21 +0000 (19:42 +0000)]
Merge "ART: Extract JNI macro assembler for x86-64"
am: af2962caff

Change-Id: I447c33ff5875c04735074685ad7e7e57e90a3ccd

7 years agoMerge "ART: Extract JNI macro assembler for x86"
Treehugger Robot [Mon, 8 Aug 2016 19:39:51 +0000 (19:39 +0000)]
Merge "ART: Extract JNI macro assembler for x86"

7 years agoMerge "ART: Extract JNI macro assembler for x86-64"
Treehugger Robot [Mon, 8 Aug 2016 19:38:53 +0000 (19:38 +0000)]
Merge "ART: Extract JNI macro assembler for x86-64"

7 years agoMerge "Implement running user defined list of passes"
Wojciech Staszkiewicz [Mon, 8 Aug 2016 19:29:21 +0000 (19:29 +0000)]
Merge "Implement running user defined list of passes"
am: 2f8d19f299

Change-Id: I6e5a30f02e077d52955d595acfb720126e0572c7

7 years agoMerge "Implement running user defined list of passes"
Treehugger Robot [Mon, 8 Aug 2016 19:23:30 +0000 (19:23 +0000)]
Merge "Implement running user defined list of passes"

7 years agoART: Extract JNI macro assembler for x86-64
Andreas Gampe [Fri, 5 Aug 2016 16:01:50 +0000 (09:01 -0700)]
ART: Extract JNI macro assembler for x86-64

Extract the JNI assembler parts from the regular assembler.

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

7 years agoART: Extract JNI macro assembler for x86
Andreas Gampe [Sat, 6 Aug 2016 03:34:39 +0000 (20:34 -0700)]
ART: Extract JNI macro assembler for x86

Extract the JNI assembler parts from the regular assembler.

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

7 years agoMerge "ARM/ARM64: Improve Mterp */lit8 assembly."
Vladimir Marko [Mon, 8 Aug 2016 18:25:16 +0000 (18:25 +0000)]
Merge "ARM/ARM64: Improve Mterp */lit8 assembly."
am: 61cd79bdea

Change-Id: I40e98474597ead6c5f7aa641a82b0787290ba1fb

7 years agoImplement running user defined list of passes
Wojciech Staszkiewicz [Tue, 2 Aug 2016 00:48:59 +0000 (17:48 -0700)]
Implement running user defined list of passes

This change introduces new dex2oat switch --run-passes=. This switch
accepts path to a text file with names of passes to run.
Compiler will run optimization passes specified in the file rather
then the default ones.

There is no verification implemented on the compiler side. It is user's
responsibility to provide a list of passes that leads to successful
generation of correct code. Care should be taken to prepare a list
that satisfies all dependencies between optimizations.

We only take control of the optional optimizations. Codegen (builder),
and all passes required for register allocation will run unaffected
by this mechanism.

Change-Id: Ic3694e53515fefcc5ce6f28d9371776b5afcbb4f

7 years agoMerge "ARM/ARM64: Improve Mterp */lit8 assembly."
Vladimir Marko [Mon, 8 Aug 2016 18:17:16 +0000 (18:17 +0000)]
Merge "ARM/ARM64: Improve Mterp */lit8 assembly."

7 years agoMerge "ahat: Target Java 1.7."
Richard Uhler [Mon, 8 Aug 2016 16:25:24 +0000 (16:25 +0000)]
Merge "ahat: Target Java 1.7."
am: 9cff32df75

Change-Id: I982e0b6bd686d0327ed8c8b49c9c8d1c8b3cd45d

7 years agoMerge "ahat: Target Java 1.7."
Treehugger Robot [Mon, 8 Aug 2016 16:17:11 +0000 (16:17 +0000)]
Merge "ahat: Target Java 1.7."

7 years agoMerge "Revert "ARM64 asm for region space array allocation""
Roland Levillain [Mon, 8 Aug 2016 15:38:52 +0000 (15:38 +0000)]
Merge "Revert "ARM64 asm for region space array allocation""
am: 61d4850eba

Change-Id: I168b85fde8f11ae143429f7f76bdebc211ff1b04

7 years agoMerge "Revert "ARM64 asm for region space array allocation""
Treehugger Robot [Mon, 8 Aug 2016 15:31:00 +0000 (15:31 +0000)]
Merge "Revert "ARM64 asm for region space array allocation""

7 years agoMerge "Support Mockito in art buildbot tests"
Tobias Thierer [Mon, 8 Aug 2016 14:41:48 +0000 (14:41 +0000)]
Merge "Support Mockito in art buildbot tests"
am: 1f69674a36

Change-Id: If950283797508087df7306e0f6b87bf4d32c90a4

7 years agoRevert "ARM64 asm for region space array allocation"
Roland Levillain [Mon, 8 Aug 2016 14:41:32 +0000 (14:41 +0000)]
Revert "ARM64 asm for region space array allocation"

This change breaks many tests on the ARM64 concurrent
collector configuration.

Bug: 30162165
Bug: 12687968

This reverts commit f686c3feabe3519bedd1f3001e5dd598f46946ef.

Change-Id: I5d7ef5fa2ffb6a8d9a4d3adbcc14854efa257313

7 years agoMerge "Support Mockito in art buildbot tests"
Tobias Thierer [Mon, 8 Aug 2016 14:32:40 +0000 (14:32 +0000)]
Merge "Support Mockito in art buildbot tests"

7 years agoSupport Mockito in art buildbot tests
Tobias Thierer [Wed, 3 Aug 2016 15:13:04 +0000 (16:13 +0100)]
Support Mockito in art buildbot tests

Test: art/tools/buildbot-build.sh --host -j60 && \
art/tools/run-libcore-tests.sh --mode=host --variant=X32

Change-Id: Ifa32927251fa944df7bf9704f8164083aeb557a1

7 years agoMerge "Remove OldSystemTest#test_load from known failures."
Przemyslaw Szczepaniak [Mon, 8 Aug 2016 12:32:45 +0000 (12:32 +0000)]
Merge "Remove OldSystemTest#test_load from known failures."
am: 542c6df669

Change-Id: Ida34775a0032cd5342292c83bce46a9589eacb6e

7 years agoMerge "Remove OldSystemTest#test_load from known failures."
Przemyslaw Szczepaniak [Mon, 8 Aug 2016 12:23:26 +0000 (12:23 +0000)]
Merge "Remove OldSystemTest#test_load from known failures."

7 years agoARM/ARM64: Improve Mterp */lit8 assembly.
Vladimir Marko [Mon, 8 Aug 2016 11:08:06 +0000 (12:08 +0100)]
ARM/ARM64: Improve Mterp */lit8 assembly.

Embed shifts in operations when possible. Use UBFX for shift
distance extraction - for ARM this saves an instruction, for
ARM64 this just improves readability as the reader doesn't
need to know that the higher bits are unused by shifts.

Test: Run ART test suite on Nexus 9.
Change-Id: I5666f3eaded618d3f6cb754c4a431fd9548e746d

7 years agoRemove OldSystemTest#test_load from known failures.
Przemyslaw Szczepaniak [Mon, 8 Aug 2016 10:20:07 +0000 (11:20 +0100)]
Remove OldSystemTest#test_load from known failures.

Test: libcore.java.lang.OldSystemTest
Bug: 26326992
Change-Id: Ic77dab37c05044790278407867339a198e8be9a8

7 years agoMerge "Enable IntermediateAddress for primitive arrays with read barriers."
Roland Levillain [Mon, 8 Aug 2016 10:24:04 +0000 (10:24 +0000)]
Merge "Enable IntermediateAddress for primitive arrays with read barriers."
am: 51616fb233

Change-Id: I976378f1bf81740d651a89d983b82f184e3a3276

7 years agoMerge "Enable IntermediateAddress for primitive arrays with read barriers."
Roland Levillain [Mon, 8 Aug 2016 10:16:43 +0000 (10:16 +0000)]
Merge "Enable IntermediateAddress for primitive arrays with read barriers."

7 years agoEnable IntermediateAddress for primitive arrays with read barriers.
Roland Levillain [Mon, 8 Aug 2016 09:18:37 +0000 (10:18 +0100)]
Enable IntermediateAddress for primitive arrays with read barriers.

Test: ART host and target (ARM, ARM64) tests.
Bug: 26601270
Bug: 12687968
Change-Id: I6736ba7b1809bece1bf3cd82c69e4f42a0d3c4a7

7 years agoMerge "ART: Factor out native stack dumping"
Andreas Gampe [Sat, 6 Aug 2016 02:59:06 +0000 (02:59 +0000)]
Merge "ART: Factor out native stack dumping"
am: c10ad42302

Change-Id: I6d19b60d96f6a795f728f9ee2be20f8f459c4421

7 years agoMerge "ART: Factor out native stack dumping"
Treehugger Robot [Sat, 6 Aug 2016 02:56:01 +0000 (02:56 +0000)]
Merge "ART: Factor out native stack dumping"