OSDN Git Service

android-x86/art.git
7 years agoAdd layout scheme to dexlayout for dex file reordering.
Jeff Hao [Tue, 22 Nov 2016 23:56:31 +0000 (23:56 +0000)]
Add layout scheme to dexlayout for dex file reordering.
am: 042e898f18

Change-Id: Id986b7e4565e8a212592cbea436bbc6f3fcd2144

7 years agoAdd new --layout-profile compiler-filter for dex2oat.
Jeff Hao [Tue, 22 Nov 2016 23:56:22 +0000 (23:56 +0000)]
Add new --layout-profile compiler-filter for dex2oat.
am: 608f2ce4b9

Change-Id: I1c9efafa21d8c5395e972ce877ec536b06cda0b6

7 years agoDexlayout cleanup and refactoring.
Jeff Hao [Tue, 22 Nov 2016 23:56:13 +0000 (23:56 +0000)]
Dexlayout cleanup and refactoring.
am: ea7c62983b

Change-Id: Icd9dfef960434e98f15d41c40587d49e9eeda39a

7 years agoMerge "Always fill in root table length"
Mathieu Chartier [Tue, 22 Nov 2016 23:16:41 +0000 (23:16 +0000)]
Merge "Always fill in root table length"
am: 47d840bcf9

Change-Id: Ib3d5aba98aa9bc309adc8b7da343c413dac097f5

7 years agoMerge "Always fill in root table length"
Mathieu Chartier [Tue, 22 Nov 2016 23:09:48 +0000 (23:09 +0000)]
Merge "Always fill in root table length"

7 years agoAdd layout scheme to dexlayout for dex file reordering.
Jeff Hao [Wed, 19 Oct 2016 18:17:11 +0000 (11:17 -0700)]
Add layout scheme to dexlayout for dex file reordering.

Currently takes startup classes from profile and groups them together
with the lowest class indexes. Moves the ClassDef, ClassData, and
CodeItem sections.

Results gathered from 5 second systrace of app startup (no other input):
Maps
base.vdex - 24.70MB -> 19.35MB (30.50MB file size)
base.odex - 13.22MB -> 12.82MB (13.22MB file size)
Running time of dex2oat: 27.5s -> 37.1s

Photos
base.vdex - 12.98MB ->  9.77MB (15.10MB file size)
base.odex -  6.84MB ->  6.24MB ( 6.84MB file size)
Running time of dex2oat: 15.6s -> 19.9s

Plus
base.vdex - 14.09MB -> 13.29MB (16.72MB file size)
base.odex -  2.47MB ->  2.47MB ( 2.47MB file size)
Running time of dex2oat: 14.1s -> 18.5s

Performance and memory tracking bug: b/33017139

Test: mm test-art-host-gtest-dexlayout_test
Bug: 29921113
Change-Id: Ib500ed353d71a606e2db0dd80378750c5f7b8e33

7 years agoAlways fill in root table length
Mathieu Chartier [Tue, 22 Nov 2016 21:24:40 +0000 (13:24 -0800)]
Always fill in root table length

Otherwise, there may be DCHECK failure in JitCodeCache::ClearData.
Fixes gcstress JIT tests.

Test: test/run-test --host --relocate --prebuild  --64 --jit --gcstress --dev 021-string2

Change-Id: I757ccd1e5a015c5e686254417a2a3f68b650da1c

7 years agoMerge "Verify for type_id out of range errors"
David Sehr [Tue, 22 Nov 2016 20:36:33 +0000 (20:36 +0000)]
Merge "Verify for type_id out of range errors"
am: 0e5e9fd335

Change-Id: I518647ad95f43009faedc6856e414c85a95ffe44

7 years agoMerge "Verify for type_id out of range errors"
Treehugger Robot [Tue, 22 Nov 2016 20:30:12 +0000 (20:30 +0000)]
Merge "Verify for type_id out of range errors"

7 years agoMerge "Correctly handle EINTR return from futex"
Mathieu Chartier [Tue, 22 Nov 2016 19:30:25 +0000 (19:30 +0000)]
Merge "Correctly handle EINTR return from futex"
am: f05ccaf2cc

Change-Id: I414188a3ea6a4e5012a3c7e3aa1dec80e7d23020

7 years agoMerge "Correctly handle EINTR return from futex"
Mathieu Chartier [Tue, 22 Nov 2016 19:26:09 +0000 (19:26 +0000)]
Merge "Correctly handle EINTR return from futex"

7 years agoVerify for type_id out of range errors
David Sehr [Mon, 21 Nov 2016 20:52:12 +0000 (12:52 -0800)]
Verify for type_id out of range errors

The dalvik documentation states that several fields used as type ids are
uint, which is 32 bits.  Other places use uint16, which is obviously 16.
This adds assertions that there are fewer than 65536
class_def_items/class_data_items and that the fields in question are
either valid (0 <= id <= 0xffff) or id == kDexNoIndex (0xffffffff).

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

7 years agoMerge "Revert "Make sure that const-class linkage is preserved.""
Vladimir Marko [Tue, 22 Nov 2016 17:55:47 +0000 (17:55 +0000)]
Merge "Revert "Make sure that const-class linkage is preserved.""
am: c394d0558d

Change-Id: I814068b7798f1122adf45cd148b378ee58788562

7 years agoMerge "Revert "Make sure that const-class linkage is preserved.""
Vladimir Marko [Tue, 22 Nov 2016 17:49:05 +0000 (17:49 +0000)]
Merge "Revert "Make sure that const-class linkage is preserved.""

7 years agoRevert "Make sure that const-class linkage is preserved."
Vladimir Marko [Tue, 22 Nov 2016 17:37:21 +0000 (17:37 +0000)]
Revert "Make sure that const-class linkage is preserved."

Bug: 30627598

This reverts commit 19886dbeced9430579a27979beb92b09c95197b4.
Squashed reverts of subsequent partial fixes.
    This reverts commit bad475a63b7c938b7ff7903ea1dae27369c3f629.
    This reverts commit 0ba0c7d9b0328af39a385014652eb9af4e42d8b5.
    This reverts commit ddb8afec79492750f16f98e5bd07d44f3dc485d4.

Change-Id: Id94af5ae56a0335f9641a79c885cc75bba971713

7 years agoAdd new --layout-profile compiler-filter for dex2oat.
Jeff Hao [Wed, 19 Oct 2016 18:17:11 +0000 (11:17 -0700)]
Add new --layout-profile compiler-filter for dex2oat.

New compiler filter makes dex2oat call into dexlayout.
Added basic test for --layout-profile filter to make sure dex2oat runs
to completion and file is valid. Contests of file are not checked.

Test: mm test-art-host-gtest-dexlayout_test
Bug: 29921113
Change-Id: I4bd0dea3d3f1284c155d1d9dea80a48062e67770

7 years agoDexlayout cleanup and refactoring.
Jeff Hao [Tue, 15 Nov 2016 02:10:16 +0000 (18:10 -0800)]
Dexlayout cleanup and refactoring.

Created option to output to a mem map in preparation of hooking
dexlayout into dex2oat.

Test: mm test-art-host-gtest-dexlayout_test
Bug: 29921113
Change-Id: Id42ef15cb8f83cc8d05b025b7647a4338e9b96b0

7 years agoMerge "Use a per-thread VerifierDeps."
Nicolas Geoffray [Tue, 22 Nov 2016 17:11:46 +0000 (17:11 +0000)]
Merge "Use a per-thread VerifierDeps."
am: b46782abf6

Change-Id: I900234e05e0ec4bd9daaf2cbff4342bbc8cdc969

7 years agoMerge "Use a per-thread VerifierDeps."
Nicolas Geoffray [Tue, 22 Nov 2016 17:07:46 +0000 (17:07 +0000)]
Merge "Use a per-thread VerifierDeps."

7 years agoMerge "Clear the right data pointer."
Nicolas Geoffray [Tue, 22 Nov 2016 16:44:14 +0000 (16:44 +0000)]
Merge "Clear the right data pointer."
am: 24a56c6207

Change-Id: I81be126ea1ca97b4879196ac6ffd9d98c2ac75ed

7 years agoMerge "Clear the right data pointer."
Nicolas Geoffray [Tue, 22 Nov 2016 16:40:20 +0000 (16:40 +0000)]
Merge "Clear the right data pointer."

7 years agoMerge changes If9d1da45,I6daecb52
Vladimir Marko [Tue, 22 Nov 2016 15:05:45 +0000 (15:05 +0000)]
Merge changes If9d1da45,I6daecb52
am: 701bb7d1d7

Change-Id: I2f916d2ca886544bb8ea466be8ed4ff9b3e83261

7 years agoDo not test class unloading in 626-const-class-linking
Vladimir Marko [Tue, 22 Nov 2016 15:05:44 +0000 (15:05 +0000)]
Do not test class unloading in 626-const-class-linking
am: ddb8afec79

Change-Id: I0f4b03d17ac2ab4f8127547f349c62ffed51288b

7 years agoFix 626-const-class-linking for no-dex2oat configuration.
Vladimir Marko [Tue, 22 Nov 2016 15:05:36 +0000 (15:05 +0000)]
Fix 626-const-class-linking for no-dex2oat configuration.
am: 0ba0c7d9b0

Change-Id: I401dde049079e642520d3f7a1f721a226b9879ad

7 years agoMerge changes If9d1da45,I6daecb52
Vladimir Marko [Tue, 22 Nov 2016 14:58:42 +0000 (14:58 +0000)]
Merge changes If9d1da45,I6daecb52

* changes:
  Do not test class unloading in 626-const-class-linking
  Fix 626-const-class-linking for no-dex2oat configuration.

7 years agoDo not test class unloading in 626-const-class-linking
Vladimir Marko [Tue, 22 Nov 2016 14:38:31 +0000 (14:38 +0000)]
Do not test class unloading in 626-const-class-linking

Keep tests that classes were not unloaded but do not test
that they are actually unloaded. Both JIT and tracing can
hold onto those classes.

Test: m ART_USE_JIT=true test-art-host-run-test-626-const-class-linking
Test: m ART_TEST_TRACE=true test-art-host-run-test-626-const-class-linking
Bug: 30627598
Change-Id: If9d1da45d8691c5ee05b6cf500d7d132bcab611f

7 years agoClear the right data pointer.
Nicolas Geoffray [Tue, 22 Nov 2016 13:45:36 +0000 (13:45 +0000)]
Clear the right data pointer.

Internally, stack_map_data is an offset of the roots_data allocation.
Pass both to the ClearData method, which will use the right pointer
to deallocate.

Test: test-art-host in debug mode
Change-Id: Ibfe38e7f1853870076048427f2efe7121c11c136

7 years agoMerge "ARM: VIXL32: Fix the assembler usage in the intrinsics."
Nicolas Geoffray [Tue, 22 Nov 2016 13:23:59 +0000 (13:23 +0000)]
Merge "ARM: VIXL32: Fix the assembler usage in the intrinsics."
am: eb9c58e88f

Change-Id: I3327dea73266d30d2b98ae83e6cf913028a29f08

7 years agoFix 626-const-class-linking for no-dex2oat configuration.
Vladimir Marko [Tue, 22 Nov 2016 13:18:00 +0000 (13:18 +0000)]
Fix 626-const-class-linking for no-dex2oat configuration.

For this configuration, the MisbehavingLoader.loadClass()
is called twice, so we cannot rely on printing the message
exactly once.

Test: m ART_TEST_RUN_TEST_NO_DEX2OAT=true \
      test-art-host-run-test-626-const-class-linking
Bug: 30627598
Change-Id: I6daecb52efc1d25fc5cf796f8aef726666e97c8b

7 years agoMerge "ARM: VIXL32: Fix the assembler usage in the intrinsics."
Nicolas Geoffray [Tue, 22 Nov 2016 13:18:55 +0000 (13:18 +0000)]
Merge "ARM: VIXL32: Fix the assembler usage in the intrinsics."

7 years agoUse a per-thread VerifierDeps.
Nicolas Geoffray [Fri, 18 Nov 2016 16:03:10 +0000 (16:03 +0000)]
Use a per-thread VerifierDeps.

Avoid lock contention on a singleton VerifierDeps by allocating
temporary per-thread VerifierDeps that get merged after verification.

This saves around ~35% compile-times on interpret-only.

Only the creation of extra strings is guarded by a lock, for simplicity.

Test: test-art-host, test-art-target
bug: 32641252
bug: 30937355

Change-Id: I11a2367da882b58e39afa7b42cba2e74a209b75d

7 years agoMerge "Fix build: update test to use dex::TypeIndex."
Vladimir Marko [Tue, 22 Nov 2016 12:14:56 +0000 (12:14 +0000)]
Merge "Fix build: update test to use dex::TypeIndex."
am: 71d15102b5

Change-Id: Icffcb8367e69bfa2db75c908ea0ec56309322882

7 years agoMerge "Fix build: update test to use dex::TypeIndex."
Vladimir Marko [Tue, 22 Nov 2016 12:12:12 +0000 (12:12 +0000)]
Merge "Fix build: update test to use dex::TypeIndex."

7 years agoFix build: update test to use dex::TypeIndex.
Vladimir Marko [Tue, 22 Nov 2016 11:56:48 +0000 (11:56 +0000)]
Fix build: update test to use dex::TypeIndex.

Test: m test-art-host
Bug: 30627598
Change-Id: I1aad84c6367b7b60b60391488aeb9777d3a627e4

7 years agoMerge "Make sure that const-class linkage is preserved."
Vladimir Marko [Tue, 22 Nov 2016 11:29:23 +0000 (11:29 +0000)]
Merge "Make sure that const-class linkage is preserved."
am: 9ee5fdf92f

Change-Id: I8afb9b99379656a8206b3bfed565a887189fbf16

7 years agoMerge "Make sure that const-class linkage is preserved."
Vladimir Marko [Tue, 22 Nov 2016 11:23:16 +0000 (11:23 +0000)]
Merge "Make sure that const-class linkage is preserved."

7 years agoCorrectly handle EINTR return from futex
Daniel Colascione [Mon, 21 Nov 2016 22:35:42 +0000 (14:35 -0800)]
Correctly handle EINTR return from futex

We should handle EINTR the same way we do EAGAIN: they're both
transient failures. Either way, higher-level code (see
ReaderWriterMutex::SharedLock) will do the right thing, loop around,
and try again.

Test: code inspection
Change-Id: I1eb7fb6851cc1a65acc9a0cf7cbeef787b6b28b6

7 years agoMerge "Check same dex file for finding class descriptor string id"
Mathieu Chartier [Mon, 21 Nov 2016 23:37:02 +0000 (23:37 +0000)]
Merge "Check same dex file for finding class descriptor string id"
am: da2d78ba97

Change-Id: I9b1b817d53bdc3d90287a73ea1765628aa5d12bb

7 years agoMerge "Check same dex file for finding class descriptor string id"
Mathieu Chartier [Mon, 21 Nov 2016 23:32:45 +0000 (23:32 +0000)]
Merge "Check same dex file for finding class descriptor string id"

7 years agoMerge changes I8e51415a,I79a255c1
Andreas Gampe [Mon, 21 Nov 2016 22:11:59 +0000 (22:11 +0000)]
Merge changes I8e51415a,I79a255c1
am: 668ba83a0a

Change-Id: Ibebfdde3f142515400a75a53f8d40ef99f64f50a

7 years agoART: Add JNI local details for FollowReferences
Andreas Gampe [Mon, 21 Nov 2016 22:11:57 +0000 (22:11 +0000)]
ART: Add JNI local details for FollowReferences
am: 93c3090f39

Change-Id: I005db15356e6fdbbebd3fd56163a2c41dd406079

7 years agoART: Fix generic_ptr handling in GetMethodName
Andreas Gampe [Mon, 21 Nov 2016 22:11:50 +0000 (22:11 +0000)]
ART: Fix generic_ptr handling in GetMethodName
am: 862bdd8ac9

Change-Id: Idb8ac2e3df2215aeaaa58998b5cd78b25e979514

7 years agoMerge changes I8e51415a,I79a255c1
Treehugger Robot [Mon, 21 Nov 2016 22:01:14 +0000 (22:01 +0000)]
Merge changes I8e51415a,I79a255c1

* changes:
  ART: Add JNI local details for FollowReferences
  ART: Fix generic_ptr handling in GetMethodName

7 years agoCheck same dex file for finding class descriptor string id
Mathieu Chartier [Thu, 17 Nov 2016 21:08:35 +0000 (13:08 -0800)]
Check same dex file for finding class descriptor string id

Use ClassDef for finding same dex file class descriptor string id
for vdex. Removes some calls to FindStringId, the remaining calls to
FindStringId are due to multidex or referring to types in the boot
class path.

Also check method index slot to see if we get lucky.

Host perf:
DexFile::FindStringId: 2.57% -> 0.94%

Not done for fields since these do not seem to reach the FindStringId
case accordingto perf. The remaining calls to FindStringId come from:
100.00% verifier::VerifierDeps::GetClassDescriptorStringId
-> 66.62% verifier::VerifierDeps::AddAssignability
-> 33.38% verifier::VerifierDeps::AddMethodResolution

FB install time: 35.54s -> 34.41s (avg of 40 samples at 960MHZ N6P).

Bug: 32641252

Test: test-art-host

Change-Id: If50408cf1be5c2d2127140780b8d5af66306939c

7 years agoMerge "ART: Add dex::TypeIndex"
Andreas Gampe [Mon, 21 Nov 2016 21:21:47 +0000 (21:21 +0000)]
Merge "ART: Add dex::TypeIndex"
am: a598b869b2

Change-Id: I37ff0c2a56b79e1288375f9126dc885688f2facc

7 years agoMerge "ART: Add dex::TypeIndex"
Treehugger Robot [Mon, 21 Nov 2016 21:17:32 +0000 (21:17 +0000)]
Merge "ART: Add dex::TypeIndex"

7 years agoMerge "ART: Add boot classpath check for initialization"
Andreas Gampe [Mon, 21 Nov 2016 20:51:14 +0000 (20:51 +0000)]
Merge "ART: Add boot classpath check for initialization"
am: b2dc551496

Change-Id: Ifc8f22c78299f05575bd122c36b00c5a57391b68

7 years agoMerge "ART: Add boot classpath check for initialization"
Treehugger Robot [Mon, 21 Nov 2016 20:43:12 +0000 (20:43 +0000)]
Merge "ART: Add boot classpath check for initialization"

7 years agoMerge "Use type lookup tables in compiler"
Mathieu Chartier [Mon, 21 Nov 2016 20:25:12 +0000 (20:25 +0000)]
Merge "Use type lookup tables in compiler"
am: e38f0320df

Change-Id: I15abc8dd3dd125cc58a0db8805708fcf9f548411

7 years agoMerge "Use type lookup tables in compiler"
Mathieu Chartier [Mon, 21 Nov 2016 20:19:58 +0000 (20:19 +0000)]
Merge "Use type lookup tables in compiler"

7 years agoARM: VIXL32: Fix the assembler usage in the intrinsics.
Anton Kirilov [Mon, 14 Nov 2016 14:37:00 +0000 (14:37 +0000)]
ARM: VIXL32: Fix the assembler usage in the intrinsics.

The assembler must not be used outside of any scopes;
the macroassembler methods should be called instead.

Test: ART_USE_VIXL_ARM_BACKEND=true m test-art-host
Test: ART_USE_VIXL_ARM_BACKEND=true m test-art-target
Change-Id: I1358bea5330547db9b7a8446932d85ba946e5683

7 years agoMake sure that const-class linkage is preserved.
Vladimir Marko [Fri, 11 Nov 2016 11:40:40 +0000 (11:40 +0000)]
Make sure that const-class linkage is preserved.

After calling loadClass() on the initiating loader, insert
the Class to the ClassTable. Check that the returned class
has the correct name and that the ClassTable does not yet
contain a different Class for the same name. If either check
fails, follow the RI behavior for parallel capable class
loaders, i.e. throw NoClassDefFoundError for name mismatch
(with more descriptive message than RI) or return the Class
already present in the ClassTable. This ensures that the
const-class instruction for a given name always gives the
same result as the first time it succeeded for the same
initiating loader, even for non-well-behaved loader.

Inserting the Class to the ClassTable is also a necessary
step for changing to hash-based dex cache type array when
the DexCache will not necessarily keep the Class and
therefore the defining loader alive while the initiating
loader stays alive, so the ClassTable entry is necessary
to keep the dependecy.

Add tests that a const-class instruction always returns the
same Class<?> as it returned the first time, i.e. when it
was "linked", even for class loaders that are not
well-behaved, even if the dex cache type array is cleared.
Also test the edge cases, i.e. NoClassDefFoundError and
returning old entry from ClassTable when already inserted
by another thread.

Bug: 30627598
Test: 626-const-class-linking
Test: m test-art-host
Change-Id: Ie9b721464b4e9a5dcce8df8095548e983bba1fe8

7 years agoART: Add dex::TypeIndex
Andreas Gampe [Thu, 17 Nov 2016 23:21:22 +0000 (15:21 -0800)]
ART: Add dex::TypeIndex

Add abstraction for uint16_t type index.

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

7 years agoART: Add boot classpath check for initialization
Andreas Gampe [Mon, 21 Nov 2016 18:10:08 +0000 (10:10 -0800)]
ART: Add boot classpath check for initialization

Boot classpath classes should not fail initialization.

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

7 years agoUse type lookup tables in compiler
Mathieu Chartier [Thu, 17 Nov 2016 00:22:37 +0000 (16:22 -0800)]
Use type lookup tables in compiler

This recently regressed and stopped happening, the fix creates fake
OatDexFiles so that the compiler uses the type lookup tables instead
of slow FindClassDef and FindTypeId.

Perf on host compile Facebook:
Before:
2.49%: art::DexFile::FindClassDef(unsigned short) const
1.59%: art::DexFile::FindTypeId(char const*) const

After:
0.42%: art::OatDexFile::FindClassDef(art::DexFile const&, char const*, unsigned long)
0%: art::DexFile::FindTypeId(char const*) const
0%: art::DexFile::FindClassDef(unsigned short) const

Average install (N6P 960 mhz average of 40 samples): 38.2s -> 35.64s

Bug: 32641252

Test: test-art-host, adb install.

Change-Id: I34df21dc2c155bc2579c5cafdd91f9cb0fead1a9

7 years agoMerge "ART: Fix line break in Throwable::Dump"
Andreas Gampe [Mon, 21 Nov 2016 17:43:03 +0000 (17:43 +0000)]
Merge "ART: Fix line break in Throwable::Dump"
am: bb4366d2b0

Change-Id: Ib5a4c88e55c982563e607282d9f3100ec7fc1101

7 years agoMerge "ART: Fix line break in Throwable::Dump"
Treehugger Robot [Mon, 21 Nov 2016 17:38:14 +0000 (17:38 +0000)]
Merge "ART: Fix line break in Throwable::Dump"

7 years agoMerge "Revert "Revert "Revert "Revert "JIT root tables."""""
Nicolas Geoffray [Mon, 21 Nov 2016 10:24:07 +0000 (10:24 +0000)]
Merge "Revert "Revert "Revert "Revert "JIT root tables."""""
am: dac7ad17c7

Change-Id: Ie713d994800586937fb5fa09b1e21610bf3c3a47

7 years agoMerge "Revert "Revert "Revert "Revert "JIT root tables."""""
Nicolas Geoffray [Mon, 21 Nov 2016 10:14:06 +0000 (10:14 +0000)]
Merge "Revert "Revert "Revert "Revert "JIT root tables."""""

7 years agoMerge changes I240f8bb7,I27defaa7,Ib82d64cc
Andreas Gampe [Sun, 20 Nov 2016 00:45:26 +0000 (00:45 +0000)]
Merge changes I240f8bb7,I27defaa7,Ib82d64cc
am: af524438b8

Change-Id: I18004b2d494439d0049bab27c3b1e17acf358fa3

7 years agoART: Do not DCHECK in verifier when already aborting
Andreas Gampe [Sun, 20 Nov 2016 00:45:24 +0000 (00:45 +0000)]
ART: Do not DCHECK in verifier when already aborting
am: f8f36c246e

Change-Id: Ibdb46ec8ba6cceafa632d9598cb1ecfd1365321a

7 years agoART: Add debug exception check to JIT
Andreas Gampe [Sun, 20 Nov 2016 00:45:14 +0000 (00:45 +0000)]
ART: Add debug exception check to JIT
am: 320ba91911

Change-Id: Iea08ffba838db12b597ac6019963ba591299ee46

7 years agoART: Extend DumpRecursiveAbort
Andreas Gampe [Sun, 20 Nov 2016 00:45:05 +0000 (00:45 +0000)]
ART: Extend DumpRecursiveAbort
am: 9fd470f873

Change-Id: I1ac6cd762b562d95cbd783f2eb0ff3cb81fa4ae3

7 years agoMerge changes I240f8bb7,I27defaa7,Ib82d64cc
Treehugger Robot [Sun, 20 Nov 2016 00:37:56 +0000 (00:37 +0000)]
Merge changes I240f8bb7,I27defaa7,Ib82d64cc

* changes:
  ART: Do not DCHECK in verifier when already aborting
  ART: Add debug exception check to JIT
  ART: Extend DumpRecursiveAbort

7 years agoART: Fix line break in Throwable::Dump
Andreas Gampe [Sat, 19 Nov 2016 01:43:05 +0000 (17:43 -0800)]
ART: Fix line break in Throwable::Dump

Add line breaks for missing stack traces.

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

7 years agoART: Do not DCHECK in verifier when already aborting
Andreas Gampe [Sat, 19 Nov 2016 22:51:52 +0000 (14:51 -0800)]
ART: Do not DCHECK in verifier when already aborting

Only log an error in FailOrAbort in the debug build when the
runtime is already aborting.

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

7 years agoART: Add debug exception check to JIT
Andreas Gampe [Sat, 19 Nov 2016 01:39:45 +0000 (17:39 -0800)]
ART: Add debug exception check to JIT

Check for a pending exception after JIT compilation finishes.

Test: m ART_TEST_JIT=true test-art-host
Change-Id: I27defaa733f360cb1dbabede62d4908777bc5d2b

7 years agoART: Extend DumpRecursiveAbort
Andreas Gampe [Sat, 19 Nov 2016 01:21:12 +0000 (17:21 -0800)]
ART: Extend DumpRecursiveAbort

Accept recursive dump request for deeper recursions. Otherwise,
two or more threads aborting concurrently would ensure that there
are no dumps.

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

7 years agoMerge "Fix valgrind issue with thread_pool_test."
Andreas Gampe [Sat, 19 Nov 2016 01:13:36 +0000 (01:13 +0000)]
Merge "Fix valgrind issue with thread_pool_test."
am: ab07cbe238

Change-Id: Ia415fcd73aa4533af33273f71bb8c8fa8827ffcc

7 years agoMerge "Fix valgrind issue with thread_pool_test."
Treehugger Robot [Sat, 19 Nov 2016 01:07:35 +0000 (01:07 +0000)]
Merge "Fix valgrind issue with thread_pool_test."

7 years agoFix valgrind issue with thread_pool_test.
Andreas Gampe [Fri, 18 Nov 2016 23:06:21 +0000 (15:06 -0800)]
Fix valgrind issue with thread_pool_test.

Make sure the task list is empty at the end of the test. Follow-up
to commit e2fc98e88106b9cfa44eeacc6765c291feda04a8.

Test: m test-art-host-gtest-thread_pool_test
Test: m valgrind-test-art-host-gtest-thread_pool_test
Change-Id: Ib41a1f7dde9d45f1195e18ff6db4241fb7dc7428

7 years agoART: Add JNI local details for FollowReferences
Andreas Gampe [Fri, 18 Nov 2016 21:30:30 +0000 (13:30 -0800)]
ART: Add JNI local details for FollowReferences

Give details for the thread.

Stack depth and method are currently approximated (as
bottom of the stack), as the RootInfo does not have that
information.

Bug: 31385354
Test: m test-art-host-run-test-913-heaps
Change-Id: I8e51415a02678c55b687144b4cb749c4105bd3c1

7 years agoART: Fix generic_ptr handling in GetMethodName
Andreas Gampe [Fri, 18 Nov 2016 21:31:13 +0000 (13:31 -0800)]
ART: Fix generic_ptr handling in GetMethodName

Do not write null into a null pointer.

Bug: 31684812
Test: m test-art-host-run-test-910-methods
Change-Id: I79a255c1403ca9621390c9cdc09d2381c26fffb6

7 years agoMerge "Revert "Revert "Use interpret-only instead of verify-at-runtime when testing...
Calin Juravle [Fri, 18 Nov 2016 21:10:01 +0000 (21:10 +0000)]
Merge "Revert "Revert "Use interpret-only instead of verify-at-runtime when testing JIT"""
am: 3bf14d69ab

Change-Id: Iff02510755c850b0e7221174236ee8334e5e90c7

7 years agoMerge "ART: Dump native stack on recursive abort"
Andreas Gampe [Fri, 18 Nov 2016 21:09:46 +0000 (21:09 +0000)]
Merge "ART: Dump native stack on recursive abort"
am: 88c4ff69df

Change-Id: Id4ee3b6dadb4de689858d388ca8171f326dac651

7 years agoMerge "Revert "Revert "Use interpret-only instead of verify-at-runtime when testing...
Treehugger Robot [Fri, 18 Nov 2016 21:04:59 +0000 (21:04 +0000)]
Merge "Revert "Revert "Use interpret-only instead of verify-at-runtime when testing JIT"""

7 years agoMerge "ART: Dump native stack on recursive abort"
Andreas Gampe [Fri, 18 Nov 2016 21:03:13 +0000 (21:03 +0000)]
Merge "ART: Dump native stack on recursive abort"

7 years agoMerge "Run 103-string-append with libartd."
Hiroshi Yamauchi [Fri, 18 Nov 2016 20:24:41 +0000 (20:24 +0000)]
Merge "Run 103-string-append with libartd."
am: a9d89686c9

Change-Id: Ifff1e1be69afc4b3704e3c6f88a3f586dfb3acfe

7 years agoMerge "Run 103-string-append with libartd."
Hiroshi Yamauchi [Fri, 18 Nov 2016 20:16:30 +0000 (20:16 +0000)]
Merge "Run 103-string-append with libartd."

7 years agoMerge "ART: Use cerr in Runtime::Abort on the host"
Andreas Gampe [Fri, 18 Nov 2016 19:39:40 +0000 (19:39 +0000)]
Merge "ART: Use cerr in Runtime::Abort on the host"
am: 8df07aa7fe

Change-Id: Ibd60bc9c0ef901cc6bd2b51d8a1593943776bb99

7 years agoMerge "ART: Use cerr in Runtime::Abort on the host"
Treehugger Robot [Fri, 18 Nov 2016 19:33:25 +0000 (19:33 +0000)]
Merge "ART: Use cerr in Runtime::Abort on the host"

7 years agoRevert "Revert "Use interpret-only instead of verify-at-runtime when testing JIT""
Calin Juravle [Fri, 18 Nov 2016 17:39:26 +0000 (17:39 +0000)]
Revert "Revert "Use interpret-only instead of verify-at-runtime when testing JIT""

This reverts commit 0b4d05e096d31e9c2d5ae522dbcc7b190b60a6f6.

Test: m test-art-host-run-test
Change-Id: Ie946ebd899002bdc7502276b3d53000c551be768

7 years agoART: Dump native stack on recursive abort
Andreas Gampe [Fri, 18 Nov 2016 17:51:06 +0000 (09:51 -0800)]
ART: Dump native stack on recursive abort

Dump the native stack of the current thread on recursive abort.
That is safe to do, as it requires no runtime interaction.

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

7 years agoART: Use cerr in Runtime::Abort on the host
Andreas Gampe [Fri, 18 Nov 2016 17:30:08 +0000 (09:30 -0800)]
ART: Use cerr in Runtime::Abort on the host

Use cerr to immediately write out abort info on the host, in an
effort to make recursive aborts diagnosable. This is similar
(but slightly inferior) to the previous INTERNAL_FATAL fastpathing.

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

7 years agoMerge "Revert "Revert Revert "Use interpret-only instead of verify-at-runtime when...
Calin Juravle [Fri, 18 Nov 2016 16:13:25 +0000 (16:13 +0000)]
Merge "Revert "Revert Revert "Use interpret-only instead of verify-at-runtime when testing JIT"""
am: 5e294c3f01

Change-Id: I9332d9ffd587dad73f41d4bfb76c662967208079

7 years agoMerge "Revert "Revert Revert "Use interpret-only instead of verify-at-runtime when...
Calin Juravle [Fri, 18 Nov 2016 16:09:11 +0000 (16:09 +0000)]
Merge "Revert "Revert Revert "Use interpret-only instead of verify-at-runtime when testing JIT"""

7 years agoRevert "Revert Revert "Use interpret-only instead of verify-at-runtime when testing...
Calin Juravle [Fri, 18 Nov 2016 16:07:58 +0000 (16:07 +0000)]
Revert "Revert Revert "Use interpret-only instead of verify-at-runtime when testing JIT""

test-art-host-run-test-debug-prebuild-jit-relocate-ntrace-gcstress-checkjni-picimage-npictest-ndebuggable-974-verify-interface-super64 fails on the build servers.

It's unclear if it's because of this CL but revert again to check if it fixes the problem.

Locally everything is green...
This reverts commit 0b64a5195b38773084ff94618ac22284bc855b92.

Change-Id: I4668b8d8f8c9672fd942a693d98a20113fbb6b9e

7 years agoRevert "Revert "Revert "Revert "JIT root tables.""""
Nicolas Geoffray [Wed, 16 Nov 2016 09:19:42 +0000 (09:19 +0000)]
Revert "Revert "Revert "Revert "JIT root tables.""""

Test: 626-set-resolved-string, test-art-host, test-art-target
Test: run-libcore-tests.sh
Test: phone boots and runs

This reverts commit 3395fbc20bcd20948bec8958db91b304c17cacd8.

Change-Id: I104b73d093e3eb6a271d564cfdb9ab09c1c8cf24

7 years agoMerge "Add dequickening support."
Nicolas Geoffray [Fri, 18 Nov 2016 13:17:43 +0000 (13:17 +0000)]
Merge "Add dequickening support."
am: 2dae2f256b

Change-Id: I9805a26323da3fdac86007c40c352e785a072f21

7 years agoMerge "Add dequickening support."
Nicolas Geoffray [Fri, 18 Nov 2016 13:14:10 +0000 (13:14 +0000)]
Merge "Add dequickening support."

7 years agoMerge "ARM: VIXL32: Fix PackedSwitch."
Nicolas Geoffray [Fri, 18 Nov 2016 12:57:42 +0000 (12:57 +0000)]
Merge "ARM: VIXL32: Fix PackedSwitch."
am: 67eb3914d2

Change-Id: Ief0125bd997c8a55f4a30118c7c5d59cc84726d1

7 years agoMerge "ARM: VIXL32: Fix PackedSwitch."
Nicolas Geoffray [Fri, 18 Nov 2016 12:54:00 +0000 (12:54 +0000)]
Merge "ARM: VIXL32: Fix PackedSwitch."

7 years agoMerge "Fix valgrind issue with thread_pool_test."
Nicolas Geoffray [Fri, 18 Nov 2016 12:06:56 +0000 (12:06 +0000)]
Merge "Fix valgrind issue with thread_pool_test."
am: 80fdea404b

Change-Id: I8ba8fc9d9dd76324dfc59661d07771c03daa2023

7 years agoMerge "Revert Revert "Use interpret-only instead of verify-at-runtime when testing...
Calin Juravle [Fri, 18 Nov 2016 12:06:38 +0000 (12:06 +0000)]
Merge "Revert Revert "Use interpret-only instead of verify-at-runtime when testing JIT""
am: b760a2f966

Change-Id: I7905e75d61f67fafb8733d4c9e4eb7293ade2b44

7 years agoMerge "Fix valgrind issue with thread_pool_test."
Nicolas Geoffray [Fri, 18 Nov 2016 12:02:15 +0000 (12:02 +0000)]
Merge "Fix valgrind issue with thread_pool_test."

7 years agoMerge "Revert Revert "Use interpret-only instead of verify-at-runtime when testing...
Calin Juravle [Fri, 18 Nov 2016 12:01:36 +0000 (12:01 +0000)]
Merge "Revert Revert "Use interpret-only instead of verify-at-runtime when testing JIT""

7 years agoMerge "Make ImageWriter and PatchOat helper classes nested."
Vladimir Marko [Fri, 18 Nov 2016 11:28:06 +0000 (11:28 +0000)]
Merge "Make ImageWriter and PatchOat helper classes nested."
am: 965a21e284

Change-Id: Icf09afb796f18054d8d9f11af4b0903c0b96c9ff

7 years agoMerge "Make ImageWriter and PatchOat helper classes nested."
Treehugger Robot [Fri, 18 Nov 2016 11:24:20 +0000 (11:24 +0000)]
Merge "Make ImageWriter and PatchOat helper classes nested."

7 years agoAdd dequickening support.
Nicolas Geoffray [Thu, 17 Nov 2016 10:58:36 +0000 (10:58 +0000)]
Add dequickening support.

Both vdex and BCI require full dequickening support. This
change implements dequickening by using the existing encoded
quickening, and adds the checkcast quickening to that encoding.

bug: 30937355
bug: 32369913
Test: dex_to_dex_decompiler_test.cc test-art-host

Change-Id: Ie95f46946d59b28157d6e47dcf4a859be032d1c3

7 years agoFix valgrind issue with thread_pool_test.
Nicolas Geoffray [Fri, 18 Nov 2016 10:12:51 +0000 (10:12 +0000)]
Fix valgrind issue with thread_pool_test.

Make sure the task list is empty at the end of the test.

Test: thread_pool_test

Change-Id: I155a8eb90dc83a0dd9128f0c0bc64deeba7a92e9