OSDN Git Service

android-x86/art.git
7 years agoFix art::ArchTest::FinalizeSetup not being called.
Przemyslaw Szczepaniak [Mon, 25 Jul 2016 16:31:06 +0000 (17:31 +0100)]
Fix art::ArchTest::FinalizeSetup not being called.

CommonRuntimeTestImpl::SetUp() is calling FinalizeSetup. Since
CommonRuntimeTestImpl::FinalizeSetup is not virtual (it's virtual
one step higher in class hierarchy in CommonRuntimeTestBase), overridden
version in ArchTest was never used. This is causing ArchTest to
fail with openjdk8u60 version of java.lang.reflect (it's calling
Class#getDeclaredField in clinit, which fails on 32 bit
version because of different pointer sizes [arch_test forces
64-bit ISA])

Bug: 28666126
Test:  make -j 32 test-art-host-gtest
Change-Id: Ief370f5b18ef787575ac0f88ecbe17ebbf037542

7 years agoMerge "ART: Fix RegTypeCache for instance field declaring class"
David Brazdil [Mon, 1 Aug 2016 08:39:04 +0000 (08:39 +0000)]
Merge "ART: Fix RegTypeCache for instance field declaring class"

7 years agoMerge "Fix for interpreter crash on new instance of class"
Aart Bik [Sat, 30 Jul 2016 02:53:25 +0000 (02:53 +0000)]
Merge "Fix for interpreter crash on new instance of class"

7 years agoMerge "Revert "Revert "Use try lock to fix class resolution race"""
Treehugger Robot [Sat, 30 Jul 2016 02:10:00 +0000 (02:10 +0000)]
Merge "Revert "Revert "Use try lock to fix class resolution race"""

7 years agoRevert "Revert "Use try lock to fix class resolution race""
Mathieu Chartier [Fri, 29 Jul 2016 23:26:01 +0000 (16:26 -0700)]
Revert "Revert "Use try lock to fix class resolution race""

Fix possible deadlock in EnsureResolved caused by interaction with
GC. Since we were sleeping while holding the mutator lock, it could
block thread suspension. This would deadlock if the thread that
had locked h_class is already suspended since we would spin forever
and not make progress.

Bug: 27417671
Bug: 30500547

Test: test-art-host ART_TEST_GC_STRESS=true

This reverts commit 69bf969c055c31a75d17ea92aeee756042678114.

Change-Id: Id8750df065dc3b9ef7dc874f2eb2cc2c58e5d1eb

7 years agoMerge "Create OatFileAssistant::OatFileInfo inner class."
Richard Uhler [Sat, 30 Jul 2016 00:10:18 +0000 (00:10 +0000)]
Merge "Create OatFileAssistant::OatFileInfo inner class."

7 years agoFix for interpreter crash on new instance of class
Aart Bik [Tue, 26 Jul 2016 00:52:22 +0000 (17:52 -0700)]
Fix for interpreter crash on new instance of class

Rationale:
Fuzz testing found divergences between the compiler and interpreter
which turned out to be caused by calling instance on java.lang.Class
(this worked for compiler but crashed interpeter). Since RI does not
allow this construct, solution is to force interpreter in this
unlikely case and throw run time exception like RI. This fixes
two cases found with fuzz testing. CL also includes
fail-before/pass-after test.

Test: 600-verifier-fails

BUG=29758098

Change-Id: Ie80f7758def44e6655d28fec4c10c34ffa0fd60b

7 years agoMerge "Revert "Use try lock to fix class resolution race""
Treehugger Robot [Fri, 29 Jul 2016 21:23:49 +0000 (21:23 +0000)]
Merge "Revert "Use try lock to fix class resolution race""

7 years agoRevert "Use try lock to fix class resolution race"
Mathieu Chartier [Fri, 29 Jul 2016 20:06:45 +0000 (20:06 +0000)]
Revert "Use try lock to fix class resolution race"

This reverts commit a704eda0078989a73cac111ed309aca50d2e289b.

Bug: 27417671
Bug: 30500547
Change-Id: Ieea05236b9e61c722660cd9497c9d55d13ccd010

7 years agoMerge "Add arena stack and priority queue type aliases"
Treehugger Robot [Fri, 29 Jul 2016 18:57:26 +0000 (18:57 +0000)]
Merge "Add arena stack and priority queue type aliases"

7 years agoMerge "Revert "Scan immune spaces using mod union tables.""
Treehugger Robot [Fri, 29 Jul 2016 18:52:16 +0000 (18:52 +0000)]
Merge "Revert "Scan immune spaces using mod union tables.""

7 years agoMerge "ART: remove ART_JIT makefile variable"
Colin Cross [Fri, 29 Jul 2016 17:57:57 +0000 (17:57 +0000)]
Merge "ART: remove ART_JIT makefile variable"

7 years agoRevert "Scan immune spaces using mod union tables."
Hiroshi Yamauchi [Fri, 29 Jul 2016 17:41:01 +0000 (17:41 +0000)]
Revert "Scan immune spaces using mod union tables."

This reverts commit 8256da35feac0ba7589fcd4b692a4b9a936679a4.

Test failing.

Change-Id: I391dcbdba19c6f6313e06075b0a69ea406c7c50e

7 years agoAdd arena stack and priority queue type aliases
Matthew Gharrity [Fri, 29 Jul 2016 16:13:33 +0000 (09:13 -0700)]
Add arena stack and priority queue type aliases

These will be used in the graph coloring register allocator.

Test: m test-art-host

Change-Id: I4d3d063ae5a02e697f07fc8212f391b5347270e5

7 years agoMerge "Pass the right class loader when inlining."
Nicolas Geoffray [Fri, 29 Jul 2016 14:28:44 +0000 (14:28 +0000)]
Merge "Pass the right class loader when inlining."

7 years agoART: remove ART_JIT makefile variable
Colin Cross [Thu, 28 Jul 2016 23:03:13 +0000 (16:03 -0700)]
ART: remove ART_JIT makefile variable

The ART_JIT variable isn't used (and was never used?).

Test: mma, make test-art-host, make test-art-target
Change-Id: Ie6463c3c13fab43504f3c60fd5a15f696e2cf481

7 years agoCreate OatFileAssistant::OatFileInfo inner class.
Richard Uhler [Tue, 19 Apr 2016 22:39:37 +0000 (15:39 -0700)]
Create OatFileAssistant::OatFileInfo inner class.

To share code reused for getting info about both the odex and oat files.

Test: oat file assistant tests.
Change-Id: Ifcc48e0ac481899285e39e3b02f3ade180e38728

7 years agoMerge "Avoid read barrier for IntArray::GetArrayClass"
Mathieu Chartier [Thu, 28 Jul 2016 22:27:34 +0000 (22:27 +0000)]
Merge "Avoid read barrier for IntArray::GetArrayClass"

7 years agoAvoid read barrier for IntArray::GetArrayClass
Mathieu Chartier [Thu, 28 Jul 2016 18:02:38 +0000 (11:02 -0700)]
Avoid read barrier for IntArray::GetArrayClass

Changed the code use Mark instead of read barrier, this showed an
existing lock violation and possible deadlock which was fixed.
Prevent DCHECK failure from the assert.

Bug: 30469265
Test: test-art-host with CC

Change-Id: I275f953f06f6d13262043fc62eb88dca0356465a

7 years agoMerge "Use try lock to fix class resolution race"
Mathieu Chartier [Thu, 28 Jul 2016 18:12:56 +0000 (18:12 +0000)]
Merge "Use try lock to fix class resolution race"

7 years agoMerge "Scan immune spaces using mod union tables."
Hiroshi Yamauchi [Thu, 28 Jul 2016 17:24:43 +0000 (17:24 +0000)]
Merge "Scan immune spaces using mod union tables."

7 years agoMerge "Disable CheckSwapUsage test with read barriers on x86."
Roland Levillain [Thu, 28 Jul 2016 16:54:49 +0000 (16:54 +0000)]
Merge "Disable CheckSwapUsage test with read barriers on x86."

7 years agoMerge "Remove two ReadBarrierMarkRegX entrypoints."
Roland Levillain [Thu, 28 Jul 2016 16:20:19 +0000 (16:20 +0000)]
Merge "Remove two ReadBarrierMarkRegX entrypoints."

7 years agoPass the right class loader when inlining.
Nicolas Geoffray [Thu, 28 Jul 2016 02:49:14 +0000 (03:49 +0100)]
Pass the right class loader when inlining.

Otherwise, method and type resolution can resolve to the wrong
things and as a side effect update the dex cache with wrong data.

bug:30403437
test:./art/test/run-test --host --jit --dev --no-prebuild 613

(cherry picked from commit 0a210d9b108c87c0e7c1d430a92ce6fc89790c95)

Change-Id: I8fdca96fccae079c8e99b8e86e7b6935acfce89d

7 years agoART: Fix RegTypeCache for instance field declaring class
David Brazdil [Wed, 27 Jul 2016 14:29:25 +0000 (15:29 +0100)]
ART: Fix RegTypeCache for instance field declaring class

For bytecode instruction:

  iget(-*) ClassB->field:type

where the resolved field is actually declared in ClassA (ClassB
extends ClassA), MethodVerifier would create a RegType representing
ClassA but cache it under the descriptor "ClassB".

This is a bug but does not have any implications on correctness
because earlier resolution of ClassB (part of IGET handling) creates
another cache entry with the "ClassB" descriptor. Because the latter,
wrong entry is always imprecise (ClassA cannot be final because ClassB
extends it), either the earlier entry will be discovered or neither
of them will be a match.

Descriptor was replaced with the correct one and a DCHECK added when
creating a RegType to make sure the descriptor matches.

Bug: 30458218
Change-Id: I19e1bdd5dd79e5eac558122a06b9128d0a5c021f
Test: m test-art-host-run-test
Test: art/test/run-test --host 800-smali

7 years agoDisable CheckSwapUsage test with read barriers on x86.
Roland Levillain [Thu, 28 Jul 2016 15:37:28 +0000 (16:37 +0100)]
Disable CheckSwapUsage test with read barriers on x86.

This test does not produce the expected results on
some x86 systems when read barriers are enabled.

Also remove unused TEST_DISABLED_FOR_READ_BARRIER macro
definition.

Test: m test-art-host-gtest
Bug: 29259363
Bug: 12687968
Change-Id: If7c124226b32c10425725e62bb684150aba108ab

7 years agoMerge "ARM64: Add comment to mterp int-to-long."
Vladimir Marko [Thu, 28 Jul 2016 14:10:54 +0000 (14:10 +0000)]
Merge "ARM64: Add comment to mterp int-to-long."

7 years agoMerge "Add ProcessBuilderTest#testRedirectInherit() to known failures"
Tobias Thierer [Thu, 28 Jul 2016 13:49:20 +0000 (13:49 +0000)]
Merge "Add ProcessBuilderTest#testRedirectInherit() to known failures"

7 years agoARM64: Add comment to mterp int-to-long.
Vladimir Marko [Thu, 28 Jul 2016 13:04:18 +0000 (14:04 +0100)]
ARM64: Add comment to mterp int-to-long.

Test: Build for Nexus 9.
Change-Id: I649e71fc1cdc2a4a103159bf72ceeb005231e66f

7 years agoMerge "MIPS32: Improve string and class loads"
Vladimir Marko [Thu, 28 Jul 2016 12:43:29 +0000 (12:43 +0000)]
Merge "MIPS32: Improve string and class loads"

7 years agoMerge "ARM64: More mterp improvements."
Vladimir Marko [Thu, 28 Jul 2016 09:00:59 +0000 (09:00 +0000)]
Merge "ARM64: More mterp improvements."

7 years agoMerge "ART: Use old operator<< for MemBarrierKind"
Treehugger Robot [Thu, 28 Jul 2016 05:35:28 +0000 (05:35 +0000)]
Merge "ART: Use old operator<< for MemBarrierKind"

7 years agoART: Use old operator<< for MemBarrierKind
Andreas Gampe [Thu, 28 Jul 2016 04:25:41 +0000 (21:25 -0700)]
ART: Use old operator<< for MemBarrierKind

To fix assumptions in the tests.

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

7 years agoMIPS32: Improve string and class loads
Alexey Frunze [Tue, 19 Jul 2016 22:00:40 +0000 (15:00 -0700)]
MIPS32: Improve string and class loads

Tested:
- MIPS32 Android boots in QEMU
- test-art-host-gtest
- test-art-target-run-test-optimizing in QEMU, on CI20
- test-art-target-gtest on CI20

Change-Id: I70fd5d5267f8594c3b29d5a4ccf66b8ca8b09df3

7 years agoMerge "ART: Delete old compiler_enums.h"
Treehugger Robot [Thu, 28 Jul 2016 01:54:06 +0000 (01:54 +0000)]
Merge "ART: Delete old compiler_enums.h"

7 years agoMerge "Reduce unnecessary read barriers in GC"
Mathieu Chartier [Thu, 28 Jul 2016 01:05:07 +0000 (01:05 +0000)]
Merge "Reduce unnecessary read barriers in GC"

7 years agoART: Delete old compiler_enums.h
Andreas Gampe [Thu, 28 Jul 2016 00:53:11 +0000 (17:53 -0700)]
ART: Delete old compiler_enums.h

Holdover from the Quick days. Move the two enums that are still
used closer to the actual users (and prune no longer used cases).

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

7 years agoScan immune spaces using mod union tables.
Hiroshi Yamauchi [Wed, 27 Jul 2016 21:08:19 +0000 (14:08 -0700)]
Scan immune spaces using mod union tables.

It's faster to scan the immune spaces using the mod union tables (gray
objects on dirty pages) than the live bitmaps (gray objects).

The immune space scan time goes from ~13ms down to ~10ms in the
testWidgetsContainerFling test on angler at 1 GHz.

Change-Id: I0914d7bdb50cbf8a49c859070a3501b48eb79f3e
Test: N9 boot, art tests, Ritz EAAC.
Bug: 29516968
Bug: 29517059
Bug: 12687968

7 years agoUse try lock to fix class resolution race
Mathieu Chartier [Wed, 13 Jul 2016 16:53:35 +0000 (09:53 -0700)]
Use try lock to fix class resolution race

There was some possible deadlocks related to EnsureResolved caused by
acquiring an object lock.

Scenario:
Thread 1 acquires lock on obj1
Thread 1 begins to resolve / initialize class1
Thread 1 blocks since it sees that class1 is already being resolved and
gets preempted before it can acquire the object lock on class1
Thread 2 finishes resolving and initializing class1 and locks class1
Thread 2 blocks attempting to lock obj1
Thread 1 blocks attempting to lock class1
Deadlock

Fixed the deadlock by changing EnsureResolved to use a try lock for the
unresolved case.

Added a test.

Test: Device boot, test-art-host, monitor_test

Bug: 27417671
Change-Id: Ic6e1c3ca6f45490cf8a7bf8e137dee71ac83ff64

7 years agoMerge "MIPS32: Block callee save fp registers in debuggable"
Treehugger Robot [Wed, 27 Jul 2016 21:06:44 +0000 (21:06 +0000)]
Merge "MIPS32: Block callee save fp registers in debuggable"

7 years agoReduce unnecessary read barriers in GC
Mathieu Chartier [Wed, 27 Jul 2016 17:45:47 +0000 (10:45 -0700)]
Reduce unnecessary read barriers in GC

Removed read barrier from IsUnprocessed, DequeuePendingReference,
EnqueueReference, and a few other places.

Hard to tell if GC time goes down.

EAAC:
Before GC slow path count: 254857
After GC slow path count: 1005

Bug: 30162165
Bug: 12687968

Test: test-art-host, volantis boot with CC

Change-Id: Ic2add3a9b1e1d7561b0b167f2218b10f8dbff76c

7 years agoMerge "Fix profiling output to properly display class info."
Treehugger Robot [Wed, 27 Jul 2016 18:38:39 +0000 (18:38 +0000)]
Merge "Fix profiling output to properly display class info."

7 years agoARM64: More mterp improvements.
Vladimir Marko [Tue, 26 Jul 2016 15:38:11 +0000 (16:38 +0100)]
ARM64: More mterp improvements.

Several simple improvements:
  - use EOR for neg-float and neg-double,
  - use SBFX instead of LSL+ASR for const/4,
  - handle long-to-int as move,
  - use LDRSW for int-to-long,
  - remove bogus CMP from iput-quick,
  - use indexed load/store for iget/iput-wide-quick,
  - use CBZ, CBNZ, TBZ, TBNZ for if-eqz, if-nez, if-gez and
    if-ltz, respectively. (The short range of TBZ/TBNZ
    requires emitting the footer before alternate stubs.)

Test: Run ART test suite on Nexus 9 with the interpreter.
Change-Id: I2e65a7cee3d3e2128b870d98cf6157c21f57d607

7 years agoFix profiling output to properly display class info.
Jeff Hao [Wed, 27 Jul 2016 17:35:03 +0000 (10:35 -0700)]
Fix profiling output to properly display class info.

The profiler stores class def indexes, not type ids.

Change-Id: Ieec9374a2ba381387ed444f376922478183145f8

7 years agoAdd ProcessBuilderTest#testRedirectInherit() to known failures
Tobias Thierer [Wed, 27 Jul 2016 15:00:59 +0000 (16:00 +0100)]
Add ProcessBuilderTest#testRedirectInherit() to known failures

This test does fairly low level operations that previously exposed
other kernel issues. So far it has been observed failing 1/10 times
on an Android L kernel but never on CTS. Therefore, adding to list
of known failures. testRedirectErrorStream_outputAndErrorAreMerged
has not yet been observed to fail but is similar; it may need to be
added to the list if it fails in future.

Test: cts-tradefed run cts -c libcore.java.lang.ProcessBuilderTest

Bug: 27464570
Change-Id: I5d67f67099e66cba4d75d9bf621609cd2d88d58a

7 years agoMerge "Add missing filter cards to zygote mod union table"
Mathieu Chartier [Tue, 26 Jul 2016 19:54:28 +0000 (19:54 +0000)]
Merge "Add missing filter cards to zygote mod union table"

7 years agoAdd missing filter cards to zygote mod union table
Mathieu Chartier [Tue, 26 Jul 2016 00:48:52 +0000 (17:48 -0700)]
Add missing filter cards to zygote mod union table

Without filtering the cards, every object in the zygote is grayed
during the GC. This was deleted in a PS of previous CL.

GrayAllDirtyImmuneObjects goes from 1.974ms to 376.464us for CC on
N9 maps. This happens during the pause. This CL also fixes regression
in zygote PSS.

Bug: 29516968
Bug: 12687968

Change-Id: I42014e78b1de3ce9b2eefa3bd32f0d24e2ff71c6

7 years agoMIPS32: Block callee save fp registers in debuggable
Goran Jakovljevic [Fri, 22 Jul 2016 07:46:43 +0000 (09:46 +0200)]
MIPS32: Block callee save fp registers in debuggable

This fixes tests 454-get-vreg and 457-regs in debuggable.
Additional changes in LocationsBuilderMIPS::HandleFieldGet/Set
to prevent situations when running out of available fp registers.

Test: mma -j2 ART_TEST_RUN_TEST_DEBUGGABLE=true test-art-target-run-test
Change-Id: Iaad6a6e414ff747b39209780c21aeddc225a04c1

7 years agoMerge "Improve CC handling for immune objects"
Treehugger Robot [Mon, 25 Jul 2016 23:27:42 +0000 (23:27 +0000)]
Merge "Improve CC handling for immune objects"

7 years agoMerge "Remove redundant 601 test, it's all in 600."
Aart Bik [Mon, 25 Jul 2016 23:13:18 +0000 (23:13 +0000)]
Merge "Remove redundant 601 test, it's all in 600."

7 years agoMerge "runtime: Refactor asm_support to be auto-generated (mostly)"
Treehugger Robot [Mon, 25 Jul 2016 23:06:39 +0000 (23:06 +0000)]
Merge "runtime: Refactor asm_support to be auto-generated (mostly)"

7 years agoImprove CC handling for immune objects
Mathieu Chartier [Fri, 22 Jul 2016 17:47:45 +0000 (10:47 -0700)]
Improve CC handling for immune objects

Currently we reduce ram for immune objects by racing agianst the
mutators to try and finish processing them before the mutators
change many objects to gray. However there is still a window of time
where the mutator can dirty immune pages by changing the lock words
to gray. These pages remain dirty for the lifetime of the app.

This CL changes uses the FlipCallback pause to gray all of the
immune objects that have a dirty card. Once these objects are all
gray we don't to gray any more objects in the immune spaces since
these objects are the only ones that may reference non immune
objects.

Also only scan objects that are gray when scanning immune spaces to
reduce scanning time.

System wide PSS after boot on N9, before:
61668 kB: .art mmap
11249 kB: .Zygote

After:
36013 kB: .art mmap
12251 kB: .Zygote

Results are better than demonstrated since there are more apps
running after.

Maps PSS / Private Dirty, before:
.art mmap     3703     3116
  .Zygote      577      480

After:
.art mmap     1655     1092
  .Zygote      476      392

System server before:
.art mmap     4453     3956
  .Zygote      849      780

After:
.art mmap     2326     1748
  .Zygote      640      564

EAAC:
Before:
ScanImmuneSpaces takes 669.434ms GC time
Scores: 718, 761, 753 average 744
GC time: 4.2s, 4.35s, 4.3s average 4.28s

After:
ScanImmuneSpaces takes 138.328ms GC time
Scores: 731, 730, 704 average 722
GC time: 3.92s, 3.83s, 3.85s average 3.87s

Additional GC pause time is 285us on Maps on N9.
TODO: Reduce this pause time.

Test: N9 booting, test-art-host, EAAC all run with CC

Bug: 29516968
Bug: 12687968

Change-Id: I584b10d017547b321f33eb23fb5d64372af6f69c

7 years agoMerge "ART: Add pointer-size template to some reflection functions"
Treehugger Robot [Mon, 25 Jul 2016 22:24:42 +0000 (22:24 +0000)]
Merge "ART: Add pointer-size template to some reflection functions"

7 years agoruntime: Refactor asm_support to be auto-generated (mostly)
Igor Murashkin [Fri, 22 Jul 2016 22:59:16 +0000 (15:59 -0700)]
runtime: Refactor asm_support to be auto-generated (mostly)

Usage:

* If the defines are no longer up to date, re-run generate-asm-support

* To add a new field:
--- Edit one of the offset_ or constant def files.
--- Rebuild cpp-define-generator and re-run generate-asm-support

Change-Id: I772430fcf1ad9af40898ebb453848f8412612386
TODO: Integrate this into the build somehow
TODO: Account for 32 vs 64-bit and read barrier vs no read barrier

7 years agoRemove redundant 601 test, it's all in 600.
Aart Bik [Mon, 25 Jul 2016 22:12:24 +0000 (15:12 -0700)]
Remove redundant 601 test, it's all in 600.

Rationale:
Nicolas, I don't understand why you duplicated this test.
Since all (and now more) is in 600, removing this clone.

Change-Id: Ibc8b47549f054972f07b53b1554e7ab4dc0cb33e

7 years agoMerge "Make java 8 run-tests runnable on the RI again."
Treehugger Robot [Mon, 25 Jul 2016 21:31:19 +0000 (21:31 +0000)]
Merge "Make java 8 run-tests runnable on the RI again."

7 years agoMerge "Launch ahat server before processing the heap dump."
Treehugger Robot [Mon, 25 Jul 2016 20:18:25 +0000 (20:18 +0000)]
Merge "Launch ahat server before processing the heap dump."

7 years agoART: Add pointer-size template to some reflection functions
Andreas Gampe [Mon, 25 Jul 2016 20:06:04 +0000 (13:06 -0700)]
ART: Add pointer-size template to some reflection functions

The unstarted runtime may run code for a different pointer size,
even when no transaction is active (e.g., during startup). To
retain performance when the runtime is up and executing under
normal conditions, add a template parameter and use sizeof(void*)
in places where it is adequate.

For maintainability, it is necessary to drop the default for
the transaction template parameter. Implicit conversions from
bool to size_t may lead to incorrect code and hard to diagnose
problems. So instead ensure that all callers must give all
template parameter values.

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

7 years agoMerge "Fix stream-tracing with default methods"
Treehugger Robot [Mon, 25 Jul 2016 18:44:11 +0000 (18:44 +0000)]
Merge "Fix stream-tracing with default methods"

7 years agoMerge "Make static helper methods member functions of OptimizingCompiler class"
Aart Bik [Mon, 25 Jul 2016 17:53:51 +0000 (17:53 +0000)]
Merge "Make static helper methods member functions of OptimizingCompiler class"

7 years agoFix stream-tracing with default methods
Alex Light [Tue, 19 Jul 2016 18:21:32 +0000 (11:21 -0700)]
Fix stream-tracing with default methods

Test: Ran mma ART_TEST_TRACE=true ART_TEST_TRACE_STREAM=true -j40 test-art-host

Bug: 30102284
Bug: 30286605

Change-Id: I12f2534bc2d42a7504e6c1972c4cfdda2f77286f

7 years agoMerge "Revert "Revert "ART: Add dex2oat swap usage test"""
Treehugger Robot [Mon, 25 Jul 2016 17:27:55 +0000 (17:27 +0000)]
Merge "Revert "Revert "ART: Add dex2oat swap usage test"""

7 years agoMerge "Add fast path to arm64 READ_BARRIER macro"
Mathieu Chartier [Mon, 25 Jul 2016 16:44:33 +0000 (16:44 +0000)]
Merge "Add fast path to arm64 READ_BARRIER macro"

7 years agoRevert "Revert "ART: Add dex2oat swap usage test""
Andreas Gampe [Mon, 25 Jul 2016 15:27:35 +0000 (08:27 -0700)]
Revert "Revert "ART: Add dex2oat swap usage test""

Now correctly ignores the target (but with enough infrastructure
to introduce this some day).

This reverts commit ec743ffd47ac9d3c10a449926d78c2eb51e5208e.

Bug: 29259363
Test: m test-art-host-gtest-dex2oat_test
Test: m test-art-target-gtest-dex2oat_test (shamu)
Change-Id: I11b4e755bc8cb1e2eea29cd006e8df67df632c00

7 years agoMerge "Do not emit stack maps for runtime calls to ReadBarrierMarkRegX."
Roland Levillain [Mon, 25 Jul 2016 14:49:51 +0000 (14:49 +0000)]
Merge "Do not emit stack maps for runtime calls to ReadBarrierMarkRegX."

7 years agoRemove two ReadBarrierMarkRegX entrypoints.
Roland Levillain [Mon, 25 Jul 2016 11:49:15 +0000 (12:49 +0100)]
Remove two ReadBarrierMarkRegX entrypoints.

As entry points ReadBarrierMarkReg30 and
ReadBarrierMarkReg31 are undefined on all architectures
supporting the read barrier configuration (ARM, ARM64, x86
and x86-64), remove them from the entry point list.

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

7 years agoMerge "Revert "ART: Add dex2oat swap usage test""
Treehugger Robot [Sat, 23 Jul 2016 06:04:13 +0000 (06:04 +0000)]
Merge "Revert "ART: Add dex2oat swap usage test""

7 years agoRevert "ART: Add dex2oat swap usage test"
Andreas Gampe [Sat, 23 Jul 2016 05:17:18 +0000 (05:17 +0000)]
Revert "ART: Add dex2oat swap usage test"

The test doesn't correctly exclude the target, as it will only work
on the host.

This reverts commit ab2a54093386c85756fe78daedd11ff4408a5988.

Bug: 29259363
Change-Id: Ie50df2e6f0c63cb10359c3862ad44ee3c03d4e3b

7 years agoAdd fast path to arm64 READ_BARRIER macro
Mathieu Chartier [Thu, 21 Jul 2016 21:59:04 +0000 (14:59 -0700)]
Add fast path to arm64 READ_BARRIER macro

EAAC benchmark time from 978.7857143ms to 969.5714286ms on N9 based
on 42 samples. Reduces artReadBarrierSlow calls from 9M to 1M.

Not a huge improvement since we were already checking the lock word in
ReadBarrier::Barrier.

Test: N9 boots, test-art-host, EEAC runs. (All with CC enabled).

Bug: 30162165
Bug: 12687968

Change-Id: Ifb97b52ea84e21c7df83addfb91c5f05f41db32d

7 years agoMake static helper methods member functions of OptimizingCompiler class
Wojciech Staszkiewicz [Fri, 22 Jul 2016 20:33:11 +0000 (13:33 -0700)]
Make static helper methods member functions of OptimizingCompiler class

Make RunOptimizations, MaybeRunInliner and RunArchOptimizations member
functions of OptimizingCompiler class.

Both versions of RunOptimizations are protected in preparation for
bisection bug search CL.

Change-Id: I596efa9ed3fccd1ed3798c6427cc166e2a5d28bd

7 years agoMerge "ART: Change run-*-tests to ANDROID_{HOST|PRODUCT}_OUT"
Treehugger Robot [Fri, 22 Jul 2016 22:32:08 +0000 (22:32 +0000)]
Merge "ART: Change run-*-tests to ANDROID_{HOST|PRODUCT}_OUT"

7 years agoMerge "ART: Add dex2oat swap usage test"
Treehugger Robot [Fri, 22 Jul 2016 22:31:37 +0000 (22:31 +0000)]
Merge "ART: Add dex2oat swap usage test"

7 years agoMerge "Combine offsets in loop-based dynamic BCE."
Treehugger Robot [Fri, 22 Jul 2016 18:43:01 +0000 (18:43 +0000)]
Merge "Combine offsets in loop-based dynamic BCE."

7 years agoDo not emit stack maps for runtime calls to ReadBarrierMarkRegX.
Roland Levillain [Fri, 22 Jul 2016 16:10:06 +0000 (17:10 +0100)]
Do not emit stack maps for runtime calls to ReadBarrierMarkRegX.

* Boot image code size variation on Nexus 5X
  (aosp_bullhead-userdebug build):
  - total ARM64 framework Oat files size change:
    115584120 bytes -> 109124728 bytes (-5.59%)
  - total ARM framework Oat files size change:
    97387728 bytes -> 92517584 (-5.00%)

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

7 years agoCombine offsets in loop-based dynamic BCE.
Aart Bik [Fri, 15 Jul 2016 00:19:43 +0000 (17:19 -0700)]
Combine offsets in loop-based dynamic BCE.

Rationale:
Similar to what I did recently for dom-based dynamic BCE, this
CL combines offsets for the tests generated for loop-based
dynamic BCE. For a set of n references, this reduces the
number of generated tests from 2*n+1 down to at most 4
(in some cases even less).

TEST: 530-checker-loops3

BUG=27430379

Change-Id: Ic80c2563eaae23f514c1fd52965dd83bccb9d190

7 years agoMerge "ARM64/x86-64: Fix mterp fill-array-data-payload pointer calculation."
Treehugger Robot [Fri, 22 Jul 2016 16:53:29 +0000 (16:53 +0000)]
Merge "ARM64/x86-64: Fix mterp fill-array-data-payload pointer calculation."

7 years agoARM64/x86-64: Fix mterp fill-array-data-payload pointer calculation.
Vladimir Marko [Fri, 22 Jul 2016 09:52:24 +0000 (10:52 +0100)]
ARM64/x86-64: Fix mterp fill-array-data-payload pointer calculation.

Fix the pointer calculation to sign-extend the offset
instead of zero-extending it, just like we do for the switch
table pointer calculation. Clean up comments for the switch.

Test: Additional test in 412-new-array.
Change-Id: Ibb1d2d3fcb109f59280aca08de21e42edc4ce66b

8 years agoMerge "ARM64: Improve mterp cmpl/cmpg."
Vladimir Marko [Fri, 22 Jul 2016 09:24:41 +0000 (09:24 +0000)]
Merge "ARM64: Improve mterp cmpl/cmpg."

8 years agoMerge changes I295c7876,Ib4b84b7b
Treehugger Robot [Thu, 21 Jul 2016 23:58:00 +0000 (23:58 +0000)]
Merge changes I295c7876,Ib4b84b7b

* changes:
  ART: Remove PACKED from ArtMethod's ptr_sized_fields_
  ART: Rename ArtMethod JNI field

8 years agoMerge "Use non-CAS thread flip root visitor."
Hiroshi Yamauchi [Thu, 21 Jul 2016 23:24:44 +0000 (23:24 +0000)]
Merge "Use non-CAS thread flip root visitor."

8 years agoART: Remove PACKED from ArtMethod's ptr_sized_fields_
Andreas Gampe [Wed, 20 Jul 2016 01:27:17 +0000 (18:27 -0700)]
ART: Remove PACKED from ArtMethod's ptr_sized_fields_

Remove the PACKED(4) hack, as it's highly annoying when debugging
a 64-bit process. Instead, fix the actual offset and size computation
for cross-size accesses.

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

8 years agoART: Add dex2oat swap usage test
Andreas Gampe [Thu, 21 Jul 2016 22:36:22 +0000 (15:36 -0700)]
ART: Add dex2oat swap usage test

Add a test that checks that native alloc size goes down when using
swap, as an indication that we're actually effectively using swap.

Bug: 29259363
Test: m test-art-host-gtest-dex2oat_test
Change-Id: Ifa5aef1b97696309283de78be08699a6399a4d1d

8 years agoLaunch ahat server before processing the heap dump.
Richard Uhler [Thu, 21 Jul 2016 20:52:48 +0000 (13:52 -0700)]
Launch ahat server before processing the heap dump.

Change-Id: Ic8f18ad3010cb0937f5ef68228359258ec4793fd
Test: Manually launch ahat on a large heap dump with ahat already
      running. Verify that ahat fails immediately.
Test: Manually launch ahat on a large heap dump without ahat already
      running. Verify that visiting localhost:7100 immediately
      eventually resolves to the overview page rather than say the
      site can't be reached.
Bug: 28611294

8 years agoUse non-CAS thread flip root visitor.
Hiroshi Yamauchi [Thu, 21 Jul 2016 03:25:27 +0000 (20:25 -0700)]
Use non-CAS thread flip root visitor.

We don't need to use CAS to update the thread-local GC roots for the
thread flip.

Bug: 12687968
Bug: 29517059
Test: libartd.so boot. ART tests. Ritzperf EAAC.
Change-Id: Ia2acab824f756bd7d2ad501b2040233e0d394356

8 years agoART: Rename ArtMethod JNI field
Andreas Gampe [Tue, 19 Jul 2016 15:06:07 +0000 (08:06 -0700)]
ART: Rename ArtMethod JNI field

The field is multi-purpose, rename it to data and clean up
accessors in preparation of more checks.

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

8 years agoMerge "ART: Make run-test temp dir consistent"
Treehugger Robot [Thu, 21 Jul 2016 18:26:27 +0000 (18:26 +0000)]
Merge "ART: Make run-test temp dir consistent"

8 years agoART: Make run-test temp dir consistent
Andreas Gampe [Thu, 21 Jul 2016 04:09:29 +0000 (21:09 -0700)]
ART: Make run-test temp dir consistent

We use the username as a directory component in run-test. Use the
same when driven through the Makefile.

Drop the username in run-test when TMP_DIR is set.

Test: m test-art-host-run-test
Test: art/test/run-test --host 001-HelloWorld
Change-Id: I060997ffbd80cd4da30dd6ac8d3954641de3292b

8 years agoMerge "Add a way to measure read barrier slow paths"
Mathieu Chartier [Thu, 21 Jul 2016 16:52:44 +0000 (16:52 +0000)]
Merge "Add a way to measure read barrier slow paths"

8 years agoARM64: Improve mterp cmpl/cmpg.
Vladimir Marko [Thu, 21 Jul 2016 11:59:46 +0000 (12:59 +0100)]
ARM64: Improve mterp cmpl/cmpg.

Use CSET+CNEG instead of MOV+CNEG+CSEL. Prefer the
CNEG/CSET alias over the CSNEG/CSINC for readability.

Test: Run ART test suite on Nexus 9 with the interpreter.
Change-Id: I5c4fb0cf2c053904253e8e82f3e7e05c774b0583

8 years agoMerge "Change return type of artIsAssignableFromCode for MIPS64"
Treehugger Robot [Thu, 21 Jul 2016 14:19:33 +0000 (14:19 +0000)]
Merge "Change return type of artIsAssignableFromCode for MIPS64"

8 years agoMerge "Fix the definition of MACRO_LITERAL for OS X on x86-64."
Roland Levillain [Thu, 21 Jul 2016 14:17:40 +0000 (14:17 +0000)]
Merge "Fix the definition of MACRO_LITERAL for OS X on x86-64."

8 years agoFix the definition of MACRO_LITERAL for OS X on x86-64.
Roland Levillain [Tue, 5 Jul 2016 17:55:32 +0000 (18:55 +0100)]
Fix the definition of MACRO_LITERAL for OS X on x86-64.

Test: "ART_USE_READ_BARRIER=true mmma art" on OS X.
Change-Id: Ia2d4c7a3eb7fec346ddfa4c7b0f7b700f1137344

8 years agoChange return type of artIsAssignableFromCode for MIPS64
Goran Jakovljevic [Thu, 21 Jul 2016 12:21:46 +0000 (14:21 +0200)]
Change return type of artIsAssignableFromCode for MIPS64

This has been missed by Ic505befc6c94e2dccbc8abf2b13d4c2d662e68d1.
This fixes MIPS64 build.

Bug: 30232671
Test: make -j 32 out/target/product/generic_mips64/obj/SHARED_LIBRARIES/libart_intermediates/arch/mips64/entrypoints_init_mips64.o
Change-Id: Iec89d25e2d38c6efc0d1025767d0ac2a8bdb7dcd

8 years agoMerge "Move caller-saves saving/restoring to ReadBarrierMarkRegX."
Roland Levillain [Thu, 21 Jul 2016 12:11:15 +0000 (12:11 +0000)]
Merge "Move caller-saves saving/restoring to ReadBarrierMarkRegX."

8 years agoMerge "Clean up Class::FindStaticField()."
Vladimir Marko [Thu, 21 Jul 2016 10:33:13 +0000 (10:33 +0000)]
Merge "Clean up Class::FindStaticField()."

8 years agoMove caller-saves saving/restoring to ReadBarrierMarkRegX.
Roland Levillain [Wed, 20 Jul 2016 10:32:19 +0000 (11:32 +0100)]
Move caller-saves saving/restoring to ReadBarrierMarkRegX.

Instead of saving/restoring live caller-save registers
before/after the call to read barrier mark entry points
ReadBarrierMarkRegX, have these entry points save/restore
all the caller-save registers themselves (except register
rX, which contains the return value).

Also refactor the assembly code of these entry points
using macros.

* Boot image code size variation on Nexus 5X
  (aosp_bullhead-userdebug build):
  - total ARM64 framework Oat files size change:
    119196792 bytes -> 115575920 bytes (-3.04%)
  - total ARM framework Oat files size change:
    100435212 bytes -> 97621188 bytes (-2.80%)

* Benchmarks (ARM64) score variations on Nexus 5X
  (aosp_bullhead-userdebug build):
  - RitzPerf (lower is better)
    - average score difference: -2.71%
  - CaffeineMark (higher is better)
    - no real difference for most tests
      (absolute variation lower than 1%)
    - better score on the "Method" benchmark:
      score variation 41253 -> 44891 (+8.82%)

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

8 years agoMerge "ARM: Port instr simplification of array accesses."
Vladimir Marko [Thu, 21 Jul 2016 09:17:15 +0000 (09:17 +0000)]
Merge "ARM: Port instr simplification of array accesses."

8 years agoARM: Port instr simplification of array accesses.
Artem Serov [Wed, 6 Jul 2016 15:23:04 +0000 (16:23 +0100)]
ARM: Port instr simplification of array accesses.

After changing the addressing mode for array accesses (in
https://android-review.googlesource.com/248406) the 'add'
instruction that calculates the base address for the array can be
shared across accesses to the same array.

Before https://android-review.googlesource.com/248406:
    add IP, r[Array], r[Index0], LSL #2
    ldr r0, [IP, #12]
    add IP, r[Array], r[Index1], LSL #2
    ldr r0, [IP, #12]

Before this CL:
    add IP. r[Array], #12
    ldr r0, [IP, r[Index0], LSL #2]
    add IP. r[Array], #12
    ldr r0, [IP, r[Index1], LSL #2]

After this CL:
    add IP. r[Array], #12
    ldr r0, [IP, r[Index0], LSL #2]
    ldr r0, [IP, r[Index1], LSL #2]

Link to the original optimization:
    https://android-review.googlesource.com/#/c/127310/

Test: Run ART test suite on Nexus 6.
Change-Id: Iee26f9a0a7ca46abb90e3f60d19d22dc8dee4d8f

8 years agoMerge changes Ibcc11ce7,I9867dc11
Vladimir Marko [Thu, 21 Jul 2016 09:15:23 +0000 (09:15 +0000)]
Merge changes Ibcc11ce7,I9867dc11

* changes:
  ARM64: Improve Mterp.
  ARM64: Fix mterp switch table pointer calculation.

8 years agoAdd a way to measure read barrier slow paths
Mathieu Chartier [Thu, 14 Jul 2016 20:30:03 +0000 (13:30 -0700)]
Add a way to measure read barrier slow paths

If enabled, this option counts number of slow paths, measures the
total slow path time per GC and records the info into a histogram.
Also added support for systrace to see which threads are performing
slow paths.

Added runtime option -Xgc:measure to enable. The info is dumped
for SIGQUIT.

Test: Volantis boot with CC, test-art-host with CC, run EEAC with CC
and -Xgc:measure

Bug: 30162165

Change-Id: I3c2bdb4156065249c45695f13c77c0579bc8e57a