OSDN Git Service

android-x86/art.git
7 years agoMerge "Support GVN for HLoadClass::LoadKind::kJitTableAddress." am: 001e1c1202 am...
Nicolas Geoffray [Wed, 14 Dec 2016 09:40:16 +0000 (09:40 +0000)]
Merge "Support GVN for HLoadClass::LoadKind::kJitTableAddress." am: 001e1c1202 am: 7ccdebe66b
am: ba5c80e3b6

Change-Id: Ifbf1e59a0f73109e8d0164d4b0f94ef57c04e42a

7 years agoMerge "Handle primitive types in VerifierTypes::AddAssignability." am: dfc453b2ab...
Nicolas Geoffray [Wed, 14 Dec 2016 09:33:46 +0000 (09:33 +0000)]
Merge "Handle primitive types in VerifierTypes::AddAssignability." am: dfc453b2ab am: a22c7440ea
am: bd626bb279

Change-Id: I694683b1eeac29e0a38bbde53b739d9f4244d903

7 years agoMerge "Support GVN for HLoadClass::LoadKind::kJitTableAddress." am: 001e1c1202
Nicolas Geoffray [Wed, 14 Dec 2016 09:33:45 +0000 (09:33 +0000)]
Merge "Support GVN for HLoadClass::LoadKind::kJitTableAddress." am: 001e1c1202
am: 7ccdebe66b

Change-Id: Ic2253f50f3955c49845cab189c91564b717b4375

7 years agoMerge "Support GVN for HLoadClass::LoadKind::kJitTableAddress."
Nicolas Geoffray [Wed, 14 Dec 2016 09:27:15 +0000 (09:27 +0000)]
Merge "Support GVN for HLoadClass::LoadKind::kJitTableAddress."
am: 001e1c1202

Change-Id: I14e454cf6f5adbda61291af3d481f8c993743aff

7 years agoMerge "Handle primitive types in VerifierTypes::AddAssignability." am: dfc453b2ab
Nicolas Geoffray [Wed, 14 Dec 2016 09:27:14 +0000 (09:27 +0000)]
Merge "Handle primitive types in VerifierTypes::AddAssignability." am: dfc453b2ab
am: a22c7440ea

Change-Id: Iab729af1ac94abeb3519009776d11f72d7d3a4b2

7 years agoMerge "Support GVN for HLoadClass::LoadKind::kJitTableAddress."
Nicolas Geoffray [Wed, 14 Dec 2016 09:21:59 +0000 (09:21 +0000)]
Merge "Support GVN for HLoadClass::LoadKind::kJitTableAddress."

7 years agoMerge "Handle primitive types in VerifierTypes::AddAssignability."
Nicolas Geoffray [Wed, 14 Dec 2016 09:20:16 +0000 (09:20 +0000)]
Merge "Handle primitive types in VerifierTypes::AddAssignability."
am: dfc453b2ab

Change-Id: I087fd12b6215a92b5c8180c239303d2a71999137

7 years agoMerge "Handle primitive types in VerifierTypes::AddAssignability."
Nicolas Geoffray [Wed, 14 Dec 2016 09:15:05 +0000 (09:15 +0000)]
Merge "Handle primitive types in VerifierTypes::AddAssignability."

7 years agoMerge "ART: Make switch back-edge suspension point consistent" am: a248587487 am...
Andreas Gampe [Wed, 14 Dec 2016 01:18:49 +0000 (01:18 +0000)]
Merge "ART: Make switch back-edge suspension point consistent" am: a248587487 am: 006fa3a9e6
am: ff0f01c4e7

Change-Id: I2535717a98b9922e8cd5363956116518b451c75f

7 years agoMerge "ART: Make switch back-edge suspension point consistent" am: a248587487
Andreas Gampe [Wed, 14 Dec 2016 01:12:18 +0000 (01:12 +0000)]
Merge "ART: Make switch back-edge suspension point consistent" am: a248587487
am: 006fa3a9e6

Change-Id: Id4dabe365d6b0ec42bc7c33ccc2e490517416521

7 years agoMerge "ART: Make switch back-edge suspension point consistent"
Andreas Gampe [Wed, 14 Dec 2016 01:06:17 +0000 (01:06 +0000)]
Merge "ART: Make switch back-edge suspension point consistent"
am: a248587487

Change-Id: I8eb60834f9f1247860c97a740294020eabc27add

7 years agoMerge "ART: Make switch back-edge suspension point consistent"
Treehugger Robot [Wed, 14 Dec 2016 00:54:45 +0000 (00:54 +0000)]
Merge "ART: Make switch back-edge suspension point consistent"

7 years agoART: Make switch back-edge suspension point consistent
Andreas Gampe [Tue, 13 Dec 2016 22:43:58 +0000 (14:43 -0800)]
ART: Make switch back-edge suspension point consistent

Both compiled code and mterp attribute a back-edge suspend point
to the target. Make switch consistent by proactively updating
the frame's dex PC in that case.

Add another macro for reuse.

Bug: 31684812
Test: m test-art-host-run-test-911-get-stack-trace
Test: m ART_TEST_INTERPRETER=true ART_TEST_JIT=true ART_TEST_TRACE=true test-art-host
Change-Id: I9969cc4ffbc34cf1d8849938a1cd7e2c9aec462d

7 years agoMerge "ART: Clean up utils.h" am: d812f78297 am: 3539cb7018
Andreas Gampe [Tue, 13 Dec 2016 22:14:06 +0000 (22:14 +0000)]
Merge "ART: Clean up utils.h" am: d812f78297 am: 3539cb7018
am: af14d2c1ae

Change-Id: I57fb1d2bf7bfac619c6f03240ba04ce0b826dc64

7 years agoSupport GVN for HLoadClass::LoadKind::kJitTableAddress.
Nicolas Geoffray [Tue, 13 Dec 2016 13:43:31 +0000 (13:43 +0000)]
Support GVN for HLoadClass::LoadKind::kJitTableAddress.

Fixes performance regressions seen in eg Dhrystone.

Also add comment on why a class may not be found when sharpening.

Test: manual Dhrystone run, performance recovers
Test: ART_TEST_JIT=true test-art-host-run-test-jit
Change-Id: I8e879f1c390f83e8bc930f343beb7b4a41c2f190

7 years agoMerge "ART: Clean up utils.h" am: d812f78297
Andreas Gampe [Tue, 13 Dec 2016 22:07:07 +0000 (22:07 +0000)]
Merge "ART: Clean up utils.h" am: d812f78297
am: 3539cb7018

Change-Id: Ib4ca51475998b2aa8b4392287f425f633ce5cd68

7 years agoMerge "ART: Clean up utils.h"
Andreas Gampe [Tue, 13 Dec 2016 22:00:36 +0000 (22:00 +0000)]
Merge "ART: Clean up utils.h"
am: d812f78297

Change-Id: I5bbe18362ccd1b13413efe5d346b39436e739820

7 years agoMerge "ART: Clean up utils.h"
Treehugger Robot [Tue, 13 Dec 2016 21:54:10 +0000 (21:54 +0000)]
Merge "ART: Clean up utils.h"

7 years agoMerge changes Iac3db17f,I4221ef81 am: 0955e34843 am: 4ed9f2295a
Andreas Gampe [Tue, 13 Dec 2016 20:36:51 +0000 (20:36 +0000)]
Merge changes Iac3db17f,I4221ef81 am: 0955e34843 am: 4ed9f2295a
am: fb370e54d6

Change-Id: I7a12a57ff43f815df15fa074417950a290c1fc89

7 years agoART: Fix stack trace location reporting am: 2340e3f3aa am: ed29d84356
Andreas Gampe [Tue, 13 Dec 2016 20:36:41 +0000 (20:36 +0000)]
ART: Fix stack trace location reporting am: 2340e3f3aa am: ed29d84356
am: b3f182000d

Change-Id: Ib13275eed4c0a0b78c610f4cd2d8c93ea9cfffca

7 years agoART: Rewrite test 911 stack trace reporting am: ceafe35513 am: f0d04b7c87
Andreas Gampe [Tue, 13 Dec 2016 20:36:31 +0000 (20:36 +0000)]
ART: Rewrite test 911 stack trace reporting am: ceafe35513 am: f0d04b7c87
am: 3e9a7daaa0

Change-Id: If9ab789211aedaa527bf11878e1e8ce932c6e8a9

7 years agoMerge changes Iac3db17f,I4221ef81 am: 0955e34843
Andreas Gampe [Tue, 13 Dec 2016 20:23:18 +0000 (20:23 +0000)]
Merge changes Iac3db17f,I4221ef81 am: 0955e34843
am: 4ed9f2295a

Change-Id: I15e9af44cd60275afdd8491605a21555fdefc423

7 years agoART: Fix stack trace location reporting am: 2340e3f3aa
Andreas Gampe [Tue, 13 Dec 2016 20:23:10 +0000 (20:23 +0000)]
ART: Fix stack trace location reporting am: 2340e3f3aa
am: ed29d84356

Change-Id: Ie7b39b6b53c09cd086c2216744f49005ae7fa355

7 years agoMerge "Address some review comments" am: 017c55c120 am: ed9771b350
Mathieu Chartier [Tue, 13 Dec 2016 20:23:00 +0000 (20:23 +0000)]
Merge "Address some review comments" am: 017c55c120 am: ed9771b350
am: 9e53f52b30

Change-Id: If5fd5dbb4de8e1ff75f7111da1ae04e6a2d6d2ee

7 years agoART: Rewrite test 911 stack trace reporting am: ceafe35513
Andreas Gampe [Tue, 13 Dec 2016 20:23:00 +0000 (20:23 +0000)]
ART: Rewrite test 911 stack trace reporting am: ceafe35513
am: f0d04b7c87

Change-Id: I21f88f10a79c02e897850d1d944742ecbd4c1cda

7 years agoMerge changes Iac3db17f,I4221ef81
Andreas Gampe [Tue, 13 Dec 2016 20:16:10 +0000 (20:16 +0000)]
Merge changes Iac3db17f,I4221ef81
am: 0955e34843

Change-Id: Ic30935bfd9aff2ac04fd42ac58932170d94266f5

7 years agoART: Fix stack trace location reporting
Andreas Gampe [Tue, 13 Dec 2016 20:16:08 +0000 (20:16 +0000)]
ART: Fix stack trace location reporting
am: 2340e3f3aa

Change-Id: I481b7d5b2840a0c72507f61743f325a64572945a

7 years agoART: Rewrite test 911 stack trace reporting
Andreas Gampe [Tue, 13 Dec 2016 20:16:00 +0000 (20:16 +0000)]
ART: Rewrite test 911 stack trace reporting
am: ceafe35513

Change-Id: I8b81ba40224fc36b045bddb92c82a619ac62b74a

7 years agoMerge changes Iac3db17f,I4221ef81
Treehugger Robot [Tue, 13 Dec 2016 20:11:26 +0000 (20:11 +0000)]
Merge changes Iac3db17f,I4221ef81

* changes:
  ART: Fix stack trace location reporting
  ART: Rewrite test 911 stack trace reporting

7 years agoMerge "Address some review comments" am: 017c55c120
Mathieu Chartier [Tue, 13 Dec 2016 20:09:30 +0000 (20:09 +0000)]
Merge "Address some review comments" am: 017c55c120
am: ed9771b350

Change-Id: I4cdb6b515f5d66c1f7b07c7492ca91ed758f24d2

7 years agoMerge "Address some review comments"
Mathieu Chartier [Tue, 13 Dec 2016 20:02:29 +0000 (20:02 +0000)]
Merge "Address some review comments"
am: 017c55c120

Change-Id: Iafd709eacf9a986452179b5661c70b150b17e3f1

7 years agoMerge "Address some review comments"
Mathieu Chartier [Tue, 13 Dec 2016 19:55:45 +0000 (19:55 +0000)]
Merge "Address some review comments"

7 years agoMerge "Prune uses library classes even without profile" am: 319261e13a am: b4708114b6
Mathieu Chartier [Tue, 13 Dec 2016 19:44:28 +0000 (19:44 +0000)]
Merge "Prune uses library classes even without profile" am: 319261e13a am: b4708114b6
am: affdc95518

Change-Id: I3263a8c4cea9927403e0351bf85e24bdac2fd3c4

7 years agoART: Clean up utils.h
Andreas Gampe [Mon, 12 Dec 2016 22:28:21 +0000 (14:28 -0800)]
ART: Clean up utils.h

Remove functionality provided by libbase. Move some single-use
functions to their respective users.

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

7 years agoMerge "Prune uses library classes even without profile" am: 319261e13a
Mathieu Chartier [Tue, 13 Dec 2016 19:38:27 +0000 (19:38 +0000)]
Merge "Prune uses library classes even without profile" am: 319261e13a
am: b4708114b6

Change-Id: Ie199cff46d2bdb88350dedb87ad1c8210af325a4

7 years agoMerge "Prune uses library classes even without profile"
Mathieu Chartier [Tue, 13 Dec 2016 19:31:28 +0000 (19:31 +0000)]
Merge "Prune uses library classes even without profile"
am: 319261e13a

Change-Id: I372d44be97b4a94296ebf52d5f597478a48669a8

7 years agoMerge "Prune uses library classes even without profile"
Mathieu Chartier [Tue, 13 Dec 2016 19:24:35 +0000 (19:24 +0000)]
Merge "Prune uses library classes even without profile"

7 years agoMerge "Fix CC DCHECK failure in 152-gc-and-run-finalization." am: aa2657d6d9 am:...
Hiroshi Yamauchi [Tue, 13 Dec 2016 18:15:24 +0000 (18:15 +0000)]
Merge "Fix CC DCHECK failure in 152-gc-and-run-finalization." am: aa2657d6d9 am: 0077c964c0
am: 8823a1d702

Change-Id: Iace5389524ea099590f731f0f8bdc9b929a1cd15

7 years agoAddress some review comments
Mathieu Chartier [Mon, 12 Dec 2016 19:06:59 +0000 (11:06 -0800)]
Address some review comments

Addressed comments in dex cache and class table. Added class table
test.

Test: mm test-art-host-gtest-class_table_test -j20

Change-Id: I3ec0282247187acb1ec7af25b309501f001a1c3e

7 years agoMerge "Fix CC DCHECK failure in 152-gc-and-run-finalization." am: aa2657d6d9
Hiroshi Yamauchi [Tue, 13 Dec 2016 18:09:22 +0000 (18:09 +0000)]
Merge "Fix CC DCHECK failure in 152-gc-and-run-finalization." am: aa2657d6d9
am: 0077c964c0

Change-Id: I0394bb7b76f2b0562004e6cb891106a6a99078db

7 years agoMerge "Fix CC DCHECK failure in 152-gc-and-run-finalization."
Hiroshi Yamauchi [Tue, 13 Dec 2016 18:02:51 +0000 (18:02 +0000)]
Merge "Fix CC DCHECK failure in 152-gc-and-run-finalization."
am: aa2657d6d9

Change-Id: I71f78805750b4c695eeb829c56c7ff2b86fd67ad

7 years agoMerge "Fix CC DCHECK failure in 152-gc-and-run-finalization."
Hiroshi Yamauchi [Tue, 13 Dec 2016 17:55:33 +0000 (17:55 +0000)]
Merge "Fix CC DCHECK failure in 152-gc-and-run-finalization."

7 years agoMerge "Remove obsolete DeduplicateDexCacheAddressLiteral()." am: ea63e4d1c3 am: 7cad3...
Vladimir Marko [Tue, 13 Dec 2016 16:00:45 +0000 (16:00 +0000)]
Merge "Remove obsolete DeduplicateDexCacheAddressLiteral()." am: ea63e4d1c3 am: 7cad34ad64
am: 95331a7f11

Change-Id: Ibe9d771b13a84c14e86e1bbe7412c565fa05a584

7 years agoMerge "Remove obsolete DeduplicateDexCacheAddressLiteral()." am: ea63e4d1c3
Vladimir Marko [Tue, 13 Dec 2016 15:53:46 +0000 (15:53 +0000)]
Merge "Remove obsolete DeduplicateDexCacheAddressLiteral()." am: ea63e4d1c3
am: 7cad34ad64

Change-Id: I73a441897eee756837c3686868a9323356af2bbe

7 years agoMerge "Remove obsolete DeduplicateDexCacheAddressLiteral()."
Vladimir Marko [Tue, 13 Dec 2016 15:46:45 +0000 (15:46 +0000)]
Merge "Remove obsolete DeduplicateDexCacheAddressLiteral()."
am: ea63e4d1c3

Change-Id: Icdfcecbcfe20e24e04c220c308407efbf163cfee

7 years agoMerge "Remove obsolete DeduplicateDexCacheAddressLiteral()."
Vladimir Marko [Tue, 13 Dec 2016 15:37:09 +0000 (15:37 +0000)]
Merge "Remove obsolete DeduplicateDexCacheAddressLiteral()."

7 years agoHandle primitive types in VerifierTypes::AddAssignability.
Nicolas Geoffray [Mon, 12 Dec 2016 13:07:07 +0000 (13:07 +0000)]
Handle primitive types in VerifierTypes::AddAssignability.

The dex2dex compiler might indirectly call it with arrays
of primitives.

Also remove dead APUT_OBJECT optimization in VerifiedMethod.
It was added for optimizing Quick:
https://googleplex-android-review.googlesource.com/#/c/371193

Commit hash:
a9a8254c920ce8e22210abfc16c9842ce0aea28f

But Quick is gone.

Test: 630-safecast-array
bug: 334987503254680732546608

Change-Id: Icfd3f8d915bfe225f05dbec42f9ba25dc1243fdc

7 years agoMerge "ARM: VIXL32: Test both current and new assemblers with optimizing_cfi_test...
Nicolas Geoffray [Tue, 13 Dec 2016 14:19:09 +0000 (14:19 +0000)]
Merge "ARM: VIXL32: Test both current and new assemblers with optimizing_cfi_test." am: 831cb268e0 am: 79f52245c0
am: 07707a0ce0

Change-Id: I1e5cd4a941fd1eece2d299f8a6cc980bdad07b9d

7 years agoMerge "ARM: VIXL32: Test both current and new assemblers with optimizing_cfi_test...
Nicolas Geoffray [Tue, 13 Dec 2016 14:13:10 +0000 (14:13 +0000)]
Merge "ARM: VIXL32: Test both current and new assemblers with optimizing_cfi_test." am: 831cb268e0
am: 79f52245c0

Change-Id: I291081799e9ba0d26c21e0bb7b84e14dd3e6946a

7 years agoMerge "ARM: VIXL32: Test both current and new assemblers with optimizing_cfi_test."
Nicolas Geoffray [Tue, 13 Dec 2016 14:07:10 +0000 (14:07 +0000)]
Merge "ARM: VIXL32: Test both current and new assemblers with optimizing_cfi_test."
am: 831cb268e0

Change-Id: I5aa68f3529c0d4cc37eb050344bc38d77c56b506

7 years agoMerge "ARM: VIXL32: Test both current and new assemblers with optimizing_cfi_test."
Nicolas Geoffray [Tue, 13 Dec 2016 13:57:39 +0000 (13:57 +0000)]
Merge "ARM: VIXL32: Test both current and new assemblers with optimizing_cfi_test."

7 years agoRemove obsolete DeduplicateDexCacheAddressLiteral().
Vladimir Marko [Tue, 13 Dec 2016 13:50:14 +0000 (13:50 +0000)]
Remove obsolete DeduplicateDexCacheAddressLiteral().

Test: Rely on TreeHugger
Bug: 30627598
Change-Id: Ia3c7a1d528f62b730d7ac1cc7b67f21d9ff06c9e

7 years agoMerge "Disable 626-const-class-linking for JIT." am: 1e35a69a44 am: 7ffb7155dc
Vladimir Marko [Tue, 13 Dec 2016 13:00:07 +0000 (13:00 +0000)]
Merge "Disable 626-const-class-linking for JIT." am: 1e35a69a44 am: 7ffb7155dc
am: d004d7f1e1

Change-Id: I377571a824d460e2eb4ce4aa55fd755e3bd96645

7 years agoMerge "Disable 626-const-class-linking for JIT." am: 1e35a69a44
Vladimir Marko [Tue, 13 Dec 2016 12:53:06 +0000 (12:53 +0000)]
Merge "Disable 626-const-class-linking for JIT." am: 1e35a69a44
am: 7ffb7155dc

Change-Id: Id2114978d3d749d2dddda692186ae13f065fbecb

7 years agoMerge "Disable 626-const-class-linking for JIT."
Vladimir Marko [Tue, 13 Dec 2016 12:46:36 +0000 (12:46 +0000)]
Merge "Disable 626-const-class-linking for JIT."
am: 1e35a69a44

Change-Id: I4bb6ba663767d7a8fb61a4b7c3b55396f648f407

7 years agoMerge "Disable 626-const-class-linking for JIT."
Vladimir Marko [Tue, 13 Dec 2016 12:36:49 +0000 (12:36 +0000)]
Merge "Disable 626-const-class-linking for JIT."

7 years agoMerge "Fix string compression for embedded zero chars." am: 3a0c53f93c am: c65eecb3db
Vladimir Marko [Tue, 13 Dec 2016 12:26:04 +0000 (12:26 +0000)]
Merge "Fix string compression for embedded zero chars." am: 3a0c53f93c am: c65eecb3db
am: 9ef5ec8352

Change-Id: I0580050454c1eff6ad0cb1574ab08f105961d2ef

7 years agoMerge "Fix string compression for embedded zero chars." am: 3a0c53f93c
Vladimir Marko [Tue, 13 Dec 2016 12:19:05 +0000 (12:19 +0000)]
Merge "Fix string compression for embedded zero chars." am: 3a0c53f93c
am: c65eecb3db

Change-Id: Ic99fcb0661cc42ffa9ee1b71efd80a3299549a58

7 years agoMerge "Fix string compression for embedded zero chars."
Vladimir Marko [Tue, 13 Dec 2016 12:12:34 +0000 (12:12 +0000)]
Merge "Fix string compression for embedded zero chars."
am: 3a0c53f93c

Change-Id: Iafa28e39957877e329365ed9e7fd991bdd3baee6

7 years agoMerge "Fix string compression for embedded zero chars."
Treehugger Robot [Tue, 13 Dec 2016 12:04:20 +0000 (12:04 +0000)]
Merge "Fix string compression for embedded zero chars."

7 years agoDisable 626-const-class-linking for JIT.
Vladimir Marko [Tue, 13 Dec 2016 10:37:07 +0000 (10:37 +0000)]
Disable 626-const-class-linking for JIT.

Test: m ART_TEST_JIT=true test-art-host; test skipped.
Bug: 33567581
Change-Id: Ib530a27b14d918bc8a24f85473c8705f023280b0

7 years agoFix string compression for embedded zero chars.
Vladimir Marko [Fri, 9 Dec 2016 14:01:02 +0000 (14:01 +0000)]
Fix string compression for embedded zero chars.

Treat embedded zero character as non-ASCII.

Test: m test-art-host
Test: m test-art-host with string compression enabled.
Bug: 31040547
Change-Id: Iea6e92f89d424953814953ba27f1c7a991589c65

7 years agoMerge "Revert "Revert "Add kJitTableAddress for HLoadClass.""" am: fb678bfaad am...
Nicolas Geoffray [Tue, 13 Dec 2016 09:57:26 +0000 (09:57 +0000)]
Merge "Revert "Revert "Add kJitTableAddress for HLoadClass.""" am: fb678bfaad am: 44f89e9d66
am: ededdac837

Change-Id: I1dbee8567217d5cb588d1329b0f6793abad4f454

7 years agoMerge "Revert "Revert "Add kJitTableAddress for HLoadClass.""" am: fb678bfaad
Nicolas Geoffray [Tue, 13 Dec 2016 09:50:26 +0000 (09:50 +0000)]
Merge "Revert "Revert "Add kJitTableAddress for HLoadClass.""" am: fb678bfaad
am: 44f89e9d66

Change-Id: I6747d99600d4e330390450d16f1d527ae13161fe

7 years agoMerge "Revert "Revert "Add kJitTableAddress for HLoadClass."""
Nicolas Geoffray [Tue, 13 Dec 2016 09:43:56 +0000 (09:43 +0000)]
Merge "Revert "Revert "Add kJitTableAddress for HLoadClass."""
am: fb678bfaad

Change-Id: I35eb743806ca582d729ddbe8a95719a4959d8599

7 years agoMerge "Revert "Revert "Add kJitTableAddress for HLoadClass."""
Nicolas Geoffray [Tue, 13 Dec 2016 09:34:11 +0000 (09:34 +0000)]
Merge "Revert "Revert "Add kJitTableAddress for HLoadClass."""

7 years agoART: Fix stack trace location reporting
Andreas Gampe [Tue, 13 Dec 2016 03:37:19 +0000 (19:37 -0800)]
ART: Fix stack trace location reporting

The frame info contains the location, not the line number. Add
location to output.

Bug: 31684812
Test: m test-art-host-run-test-911-get-stack-trace
Change-Id: Iac3db17fb32e9a7f83ca9f3614dee0d16fd2120d

7 years agoART: Rewrite test 911 stack trace reporting
Andreas Gampe [Tue, 13 Dec 2016 02:49:33 +0000 (18:49 -0800)]
ART: Rewrite test 911 stack trace reporting

Return an array of arrays, which is easier to extend and doesn't
have the tight coupling of a collapsed array.

Bug: 31684812
Test: m test-art-host-run-test-911-get-stack-trace
Change-Id: I4221ef8135c7b76a50c1af25f6328f447cf40ab2

7 years agoMerge "ART: Add missing space in log line" am: 7c73bf3518 am: eb05504443
Andreas Gampe [Mon, 12 Dec 2016 23:52:51 +0000 (23:52 +0000)]
Merge "ART: Add missing space in log line" am: 7c73bf3518 am: eb05504443
am: 65879652e4

Change-Id: Ic8705f76134d4bdf8ffd38c0613c867ef1654be0

7 years agoMerge "ART: Add missing space in log line" am: 7c73bf3518
Andreas Gampe [Mon, 12 Dec 2016 23:47:20 +0000 (23:47 +0000)]
Merge "ART: Add missing space in log line" am: 7c73bf3518
am: eb05504443

Change-Id: I809a37228909ab7fe052b72360b91f9f2a275a1c

7 years agoMerge "ART: Add missing space in log line"
Andreas Gampe [Mon, 12 Dec 2016 23:41:21 +0000 (23:41 +0000)]
Merge "ART: Add missing space in log line"
am: 7c73bf3518

Change-Id: Ie69f9cd33fc6b1bb91db015558e1547b14b78d5f

7 years agoMerge "ART: Add missing space in log line"
Treehugger Robot [Mon, 12 Dec 2016 23:31:26 +0000 (23:31 +0000)]
Merge "ART: Add missing space in log line"

7 years agoRevert "Revert "Add kJitTableAddress for HLoadClass.""
Nicolas Geoffray [Mon, 12 Dec 2016 22:33:36 +0000 (22:33 +0000)]
Revert "Revert "Add kJitTableAddress for HLoadClass.""

This reverts commit d2d5262c8370309e1f2a009f00aafc24f1cf00a0.

Change-Id: I6149d5c7d5df0b0fc5cb646a802a2eea8d01ac08

7 years agoPrune uses library classes even without profile
Mathieu Chartier [Fri, 5 Aug 2016 23:09:09 +0000 (16:09 -0700)]
Prune uses library classes even without profile

The previous pruning relied on the classes being pruned from the
profile, and then using the profile to prune classes. If there was
no profile, the uses library classes were incorrectly left unpruned.

Leaving these classes unpruned caused aborts during compilation.

Bug: 30688277

Test: adb shell dex2oat --runtime-arg -classpath --runtime-arg /system/framework/com.google.android.maps.jar --dex-file=/data/app/comb.BBClient-1/base.apk --dex-location=/data/app/comb.BBClient-1/base.apk --oat-file=/data/app/comb.BBClient-1/oat/arm/base.odex  --app-image-file=/data/app/comb.BBClient-1/oat/arm/base.art --image-format=lz4 --compiler-filter=speed

Change-Id: I261b8894847b5b0a4f7330f49666e823a1b38bb0

7 years agoMerge changes Ieb86f678,I8e7280f0 am: 0ee6447c63 am: 83f645be5f
Andreas Gampe [Mon, 12 Dec 2016 21:57:02 +0000 (21:57 +0000)]
Merge changes Ieb86f678,I8e7280f0 am: 0ee6447c63 am: 83f645be5f
am: 2a37bbaea7

Change-Id: Ic3f09c62b353e4f630826284627ecfc5a3a75243

7 years agoART: Stack locals am: f10dfcdb76 am: 19a970d771
Andreas Gampe [Mon, 12 Dec 2016 21:56:54 +0000 (21:56 +0000)]
ART: Stack locals am: f10dfcdb76 am: 19a970d771
am: 45cbb1cf63

Change-Id: I6f92f38ceb356ce8bc0aee1bf2cd2e25ed0a54a2

7 years agoART: Add precise root visiting am: 585da955bc am: 96d174d1f8
Andreas Gampe [Mon, 12 Dec 2016 21:56:44 +0000 (21:56 +0000)]
ART: Add precise root visiting am: 585da955bc am: 96d174d1f8
am: 346bba2bb3

Change-Id: I0f58c8e66fc80799c950e08ba714c4afba39d076

7 years agoMerge changes Ieb86f678,I8e7280f0 am: 0ee6447c63
Andreas Gampe [Mon, 12 Dec 2016 21:50:59 +0000 (21:50 +0000)]
Merge changes Ieb86f678,I8e7280f0 am: 0ee6447c63
am: 83f645be5f

Change-Id: Ie29863a56154012a8721d48beb6d753c159bbe72

7 years agoMerge "Disable test 964 with no-image" am: d9fb4dd3f9 am: 7af0c534cf
Alex Light [Mon, 12 Dec 2016 21:50:58 +0000 (21:50 +0000)]
Merge "Disable test 964 with no-image" am: d9fb4dd3f9 am: 7af0c534cf
am: ee52aed804

Change-Id: Id7e0e52292aabc20a708f0f8e78593dd427c35b4

7 years agoART: Stack locals am: f10dfcdb76
Andreas Gampe [Mon, 12 Dec 2016 21:50:51 +0000 (21:50 +0000)]
ART: Stack locals am: f10dfcdb76
am: 19a970d771

Change-Id: I0a7bbb1e5e53e9c4608207d01c76f63c52960b13

7 years agoART: Add precise root visiting am: 585da955bc
Andreas Gampe [Mon, 12 Dec 2016 21:50:43 +0000 (21:50 +0000)]
ART: Add precise root visiting am: 585da955bc
am: 96d174d1f8

Change-Id: I4f735069322426612ddc0b449bc0c6ab21da781c

7 years agoMerge "ART: Report cputime in dex2oat" am: 3c7b8f4c45 am: 1d0095825d
Andreas Gampe [Mon, 12 Dec 2016 21:50:42 +0000 (21:50 +0000)]
Merge "ART: Report cputime in dex2oat" am: 3c7b8f4c45 am: 1d0095825d
am: ee65c9f5fa

Change-Id: Ie50d774d1c007b3b9079d5b9ca149d1a25792c3b

7 years agoART: Add missing space in log line
Andreas Gampe [Mon, 12 Dec 2016 21:49:00 +0000 (13:49 -0800)]
ART: Add missing space in log line

Follow-up to commit c560fc0b430816825add4125134b20eb791f6036.

Test: m
Change-Id: Ie558b2984ec629706d2122eca9dd96b8c3497298

7 years agoMerge "Disable test 964 with no-image" am: d9fb4dd3f9
Alex Light [Mon, 12 Dec 2016 21:45:28 +0000 (21:45 +0000)]
Merge "Disable test 964 with no-image" am: d9fb4dd3f9
am: 7af0c534cf

Change-Id: Ia439f4420259ac64b0ff325d3edb7be44a301fb0

7 years agoMerge changes Ieb86f678,I8e7280f0
Andreas Gampe [Mon, 12 Dec 2016 21:45:24 +0000 (21:45 +0000)]
Merge changes Ieb86f678,I8e7280f0
am: 0ee6447c63

Change-Id: If0ddecf05d828c42a50b77916c4a350389269bcb

7 years agoART: Stack locals
Andreas Gampe [Mon, 12 Dec 2016 21:45:23 +0000 (21:45 +0000)]
ART: Stack locals
am: f10dfcdb76

Change-Id: I1a3b0eb5f7a55602bc7606c2d7097f0f58271704

7 years agoART: Add precise root visiting
Andreas Gampe [Mon, 12 Dec 2016 21:45:13 +0000 (21:45 +0000)]
ART: Add precise root visiting
am: 585da955bc

Change-Id: I3dca109401326b4494de963d37c490f2185beb61

7 years agoMerge "ART: Report cputime in dex2oat" am: 3c7b8f4c45
Andreas Gampe [Mon, 12 Dec 2016 21:45:12 +0000 (21:45 +0000)]
Merge "ART: Report cputime in dex2oat" am: 3c7b8f4c45
am: 1d0095825d

Change-Id: I61ce6121f4ef804cb7b90ba12bdbc8c0c907fb8d

7 years agoMerge "Disable test 964 with no-image"
Alex Light [Mon, 12 Dec 2016 21:39:32 +0000 (21:39 +0000)]
Merge "Disable test 964 with no-image"
am: d9fb4dd3f9

Change-Id: I398437a3be31d2913de3209c65d3c73885ec4ea2

7 years agoMerge "ART: Report cputime in dex2oat"
Andreas Gampe [Mon, 12 Dec 2016 21:39:16 +0000 (21:39 +0000)]
Merge "ART: Report cputime in dex2oat"
am: 3c7b8f4c45

Change-Id: Ib1709151de04c20b452580a2e4c2a7ea36f9cb5f

7 years agoMerge changes Ieb86f678,I8e7280f0
Treehugger Robot [Mon, 12 Dec 2016 21:38:28 +0000 (21:38 +0000)]
Merge changes Ieb86f678,I8e7280f0

* changes:
  ART: Stack locals
  ART: Add precise root visiting

7 years agoMerge "Disable test 964 with no-image"
Alex Light [Mon, 12 Dec 2016 21:33:25 +0000 (21:33 +0000)]
Merge "Disable test 964 with no-image"

7 years agoMerge "ART: Report cputime in dex2oat"
Treehugger Robot [Mon, 12 Dec 2016 21:29:20 +0000 (21:29 +0000)]
Merge "ART: Report cputime in dex2oat"

7 years agoART: Stack locals
Andreas Gampe [Fri, 2 Dec 2016 22:42:33 +0000 (14:42 -0800)]
ART: Stack locals

Add reporting of stack-locals roots. Use the new
precise root visiting to get dalvik register
information for compiled frames.

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

7 years agoART: Add precise root visiting
Andreas Gampe [Fri, 2 Dec 2016 22:52:29 +0000 (14:52 -0800)]
ART: Add precise root visiting

Add VisitRootFlags::kVisitRootFlagPrecise to signal a
request for precise RootInfo objects.

Move VisitRootFlags to gc_root.h. Refactor VisitRoot
functions to pass flags. Add code in Thread visiting
to decode vregs in compiled code.

Bug: 31385354
Test: m test-art-host
Change-Id: I8e7280f0ab682871f729f2a1c6b18670cf2dbf82

7 years agoMerge "ART: Implement FollowReferences for initial object" am: ce29d18139 am: e70e46afb6
Andreas Gampe [Mon, 12 Dec 2016 19:41:35 +0000 (19:41 +0000)]
Merge "ART: Implement FollowReferences for initial object" am: ce29d18139 am: e70e46afb6
am: 00be6c2fb8

Change-Id: I987772f0153d73e0ea8904c70bb72a23e3e8aeea

7 years agoMerge "ART: Implement FollowReferences for initial object" am: ce29d18139
Andreas Gampe [Mon, 12 Dec 2016 19:35:04 +0000 (19:35 +0000)]
Merge "ART: Implement FollowReferences for initial object" am: ce29d18139
am: e70e46afb6

Change-Id: Ief02c6b4d7a5b4c56bb66ba78aaa9c54fdd0a1a2

7 years agoMerge "ART: Implement FollowReferences for initial object"
Andreas Gampe [Mon, 12 Dec 2016 19:29:03 +0000 (19:29 +0000)]
Merge "ART: Implement FollowReferences for initial object"
am: ce29d18139

Change-Id: I350196d99ee333320aeda6bced525dcac382bad9

7 years agoART: Report cputime in dex2oat
Andreas Gampe [Wed, 16 Jul 2014 16:57:39 +0000 (09:57 -0700)]
ART: Report cputime in dex2oat

Add ProcessCpuNanoTime. Log cputime in dex2oat completion message.

Sample:

 dex2oat took 20.036s(64.843s cpu) (threads: 48) arena alloc=25MB (26760672B) java alloc=2MB (2311688B) native alloc=44MB (46792784B) free=35MB (37502896B)

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

7 years agoMerge "ART: Implement FollowReferences for initial object"
Treehugger Robot [Mon, 12 Dec 2016 19:16:43 +0000 (19:16 +0000)]
Merge "ART: Implement FollowReferences for initial object"