OSDN Git Service

android-x86/art.git
7 years agoMerge "Fix the CC monkey crashes." am: 3d9f2834ba am: a548bc35cd
Hiroshi Yamauchi [Wed, 12 Oct 2016 21:02:33 +0000 (21:02 +0000)]
Merge "Fix the CC monkey crashes." am: 3d9f2834ba am: a548bc35cd
am: 36bb5717d2

Change-Id: Id9901460f0d60c0c3fffd083e70b05e0bfeff8ee

7 years agoMerge "Fix the CC monkey crashes." am: 3d9f2834ba
Hiroshi Yamauchi [Wed, 12 Oct 2016 20:56:01 +0000 (20:56 +0000)]
Merge "Fix the CC monkey crashes." am: 3d9f2834ba
am: a548bc35cd

Change-Id: I3c7f1e617f09a376d218db959e916061d8ae515c

7 years agoMerge "Fix the CC monkey crashes."
Hiroshi Yamauchi [Wed, 12 Oct 2016 20:49:01 +0000 (20:49 +0000)]
Merge "Fix the CC monkey crashes."
am: 3d9f2834ba

Change-Id: Id9c87bc5e374556bedbda894e971247e2ead2d43

7 years agoMerge "Fix the CC monkey crashes."
Treehugger Robot [Wed, 12 Oct 2016 20:42:56 +0000 (20:42 +0000)]
Merge "Fix the CC monkey crashes."

7 years agoMerge "ART: Disable test 906 for target" am: dbeceb3409 am: 54d7471d8e
Andreas Gampe [Wed, 12 Oct 2016 20:36:00 +0000 (20:36 +0000)]
Merge "ART: Disable test 906 for target" am: dbeceb3409 am: 54d7471d8e
am: 1340d4c37b

Change-Id: I84778de853bcf636da03548f878667acf2d73cf7

7 years agoMerge "ART: Disable test 906 for target" am: dbeceb3409
Andreas Gampe [Wed, 12 Oct 2016 20:29:29 +0000 (20:29 +0000)]
Merge "ART: Disable test 906 for target" am: dbeceb3409
am: 54d7471d8e

Change-Id: I851087a6e417cfdb5b4e6046709414c98b4fafc2

7 years agoMerge "ART: Disable test 906 for target"
Andreas Gampe [Wed, 12 Oct 2016 20:21:59 +0000 (20:21 +0000)]
Merge "ART: Disable test 906 for target"
am: dbeceb3409

Change-Id: Ie27510ba464dd917cbf587a4407004c5d9388799

7 years agoMerge "ART: Disable test 906 for target"
Andreas Gampe [Wed, 12 Oct 2016 20:11:11 +0000 (20:11 +0000)]
Merge "ART: Disable test 906 for target"

7 years agoART: Disable test 906 for target
Andreas Gampe [Wed, 12 Oct 2016 20:09:03 +0000 (13:09 -0700)]
ART: Disable test 906 for target

Bug: 31385354
Test: m test-art-host-run-test-906-iterate-heap
Change-Id: Ic31d25acd9c50dfefddd567ead30d8d3e3f97d0a

7 years agoMerge "ART: Add heap iteration callback" am: e8317d90c6 am: 0eaf868682
Andreas Gampe [Wed, 12 Oct 2016 20:08:28 +0000 (20:08 +0000)]
Merge "ART: Add heap iteration callback" am: e8317d90c6 am: 0eaf868682
am: e9e9d1042a

Change-Id: Ieefd7f894b592757be607a06857529526f913989

7 years agoMerge "ART: Add heap iteration callback" am: e8317d90c6
Andreas Gampe [Wed, 12 Oct 2016 20:01:59 +0000 (20:01 +0000)]
Merge "ART: Add heap iteration callback" am: e8317d90c6
am: 0eaf868682

Change-Id: I75882b3d753cb0af86390f2d645a03e18ed60446

7 years agoMerge "ART: Add heap iteration callback"
Andreas Gampe [Wed, 12 Oct 2016 19:55:59 +0000 (19:55 +0000)]
Merge "ART: Add heap iteration callback"
am: e8317d90c6

Change-Id: Ib6c44cd17f87cba92d41efbbaf408e8cf7851504

7 years agoMerge "ART: Add heap iteration callback"
Andreas Gampe [Wed, 12 Oct 2016 19:48:18 +0000 (19:48 +0000)]
Merge "ART: Add heap iteration callback"

7 years agoFix the CC monkey crashes.
Hiroshi Yamauchi [Wed, 12 Oct 2016 18:53:57 +0000 (11:53 -0700)]
Fix the CC monkey crashes.

Add ScopedGCCriticalSection around the monitor deflation to avoid race
conditions on the lock word.

Bug: 31773180
Bug: 31712602
Bug: 31712174
Bug: 31712601
Bug: 31712256
Bug: 31710993
Bug: 12687968
Test: test-art host/N9, N9 libartd boot, Ritz EAAC.
Change-Id: Id05c6502fb08ca2e0770af4940b737038c3412d6

7 years agoMerge "Move Heap parameters to ObjPtr" am: 33625ed00f am: a23f6e88e9
Mathieu Chartier [Wed, 12 Oct 2016 19:01:25 +0000 (19:01 +0000)]
Merge "Move Heap parameters to ObjPtr" am: 33625ed00f am: a23f6e88e9
am: 10fb9eb749

Change-Id: I10e259dd9d69aff3aefa59a7e68615fa26968c1a

7 years agoMerge "Move Heap parameters to ObjPtr" am: 33625ed00f
Mathieu Chartier [Wed, 12 Oct 2016 18:54:23 +0000 (18:54 +0000)]
Merge "Move Heap parameters to ObjPtr" am: 33625ed00f
am: a23f6e88e9

Change-Id: Idf99cf43f6f23dd983ce1dd0155b345ce2c34c69

7 years agoMerge "Move Heap parameters to ObjPtr"
Mathieu Chartier [Wed, 12 Oct 2016 18:47:53 +0000 (18:47 +0000)]
Merge "Move Heap parameters to ObjPtr"
am: 33625ed00f

Change-Id: I9e58f55afb03552095f81f39eea275fa40639895

7 years agoMerge "Move Heap parameters to ObjPtr"
Mathieu Chartier [Wed, 12 Oct 2016 18:35:03 +0000 (18:35 +0000)]
Merge "Move Heap parameters to ObjPtr"

7 years agoART: Add heap iteration callback
Andreas Gampe [Wed, 12 Oct 2016 02:55:37 +0000 (19:55 -0700)]
ART: Add heap iteration callback

Add callback support for heap iteration. Visiting of fields will
be done in a follow-up.

Add a test.

Bug: 31385354
Test: m test-art-host-run-test-906-iterate-heap
Test: m ART_TEST_GC_STRESS=true ART_TEST_GC_VERIFY=true test-art-host-run-test-906-iterate-heap
Change-Id: I7bcf6751e6df4ef58756ba97701050b2ff5eb07b

7 years agoMove Heap parameters to ObjPtr
Mathieu Chartier [Fri, 7 Oct 2016 00:44:26 +0000 (17:44 -0700)]
Move Heap parameters to ObjPtr

Deleted some unused object dumping code.

Test: test-art-host

Bug: 31113334

Change-Id: I747220caafe6679591fd4b361d7f50383a046164

7 years agoMerge "ART: Use cerr for host unexpected errors" am: 078483d4df am: b6256f1c63
Andreas Gampe [Wed, 12 Oct 2016 16:11:14 +0000 (16:11 +0000)]
Merge "ART: Use cerr for host unexpected errors" am: 078483d4df am: b6256f1c63
am: f26f700601

Change-Id: I5d1973adc46e5082112efe711384f977131124d2

7 years agoMerge "ART: Use cerr for host unexpected errors" am: 078483d4df
Andreas Gampe [Wed, 12 Oct 2016 16:04:12 +0000 (16:04 +0000)]
Merge "ART: Use cerr for host unexpected errors" am: 078483d4df
am: b6256f1c63

Change-Id: I5034329e688f675af68c115902c3302fda45322e

7 years agoMerge "ART: Use cerr for host unexpected errors"
Andreas Gampe [Wed, 12 Oct 2016 15:57:43 +0000 (15:57 +0000)]
Merge "ART: Use cerr for host unexpected errors"
am: 078483d4df

Change-Id: I3f3ddcdbb684862c1683e32ebedcf43505364988

7 years agoMerge "ART: Use cerr for host unexpected errors"
Treehugger Robot [Wed, 12 Oct 2016 15:47:44 +0000 (15:47 +0000)]
Merge "ART: Use cerr for host unexpected errors"

7 years agoMerge "Address revew comments for change Ia653d2c72df13889dc85dd8c84997582c034ea4b...
Nicolas Geoffray [Wed, 12 Oct 2016 13:29:04 +0000 (13:29 +0000)]
Merge "Address revew comments for change Ia653d2c72df13889dc85dd8c84997582c034ea4b." am: e2ced0db78 am: 0db04d1e99
am: 907c2e1dcb

Change-Id: Ic9cbdf2cee9508b595524bac6cd8763b83acf380

7 years agoMerge "Address revew comments for change Ia653d2c72df13889dc85dd8c84997582c034ea4b...
Nicolas Geoffray [Wed, 12 Oct 2016 13:22:35 +0000 (13:22 +0000)]
Merge "Address revew comments for change Ia653d2c72df13889dc85dd8c84997582c034ea4b." am: e2ced0db78
am: 0db04d1e99

Change-Id: Ia0ad6dfb81d3dda838916c4245917ba9e56ed0af

7 years agoMerge "Address revew comments for change Ia653d2c72df13889dc85dd8c84997582c034ea4b."
Nicolas Geoffray [Wed, 12 Oct 2016 13:16:03 +0000 (13:16 +0000)]
Merge "Address revew comments for change Ia653d2c72df13889dc85dd8c84997582c034ea4b."
am: e2ced0db78

Change-Id: I11254bf9114ee61dbc96f447237abbef9e7c7faf

7 years agoMerge "Address revew comments for change Ia653d2c72df13889dc85dd8c84997582c034ea4b."
Nicolas Geoffray [Wed, 12 Oct 2016 13:05:08 +0000 (13:05 +0000)]
Merge "Address revew comments for change Ia653d2c72df13889dc85dd8c84997582c034ea4b."

7 years agoART: Use cerr for host unexpected errors
Andreas Gampe [Wed, 12 Oct 2016 03:04:11 +0000 (20:04 -0700)]
ART: Use cerr for host unexpected errors

Use cerr and endl when dumping unexpected signals on Linux. This
simulates the previous special-casing of INTERNAL_FATAL to
immediately print output.

Bug: 31338270
Test: m test-art-host
Test: manual segfault
Change-Id: I9d4471836339bf69681cc4aa43df6d558e7f123d

7 years agoMerge "ART: Add object reclaim support" am: f0ab2ec600 am: 52847e9c5b
Andreas Gampe [Wed, 12 Oct 2016 00:30:49 +0000 (00:30 +0000)]
Merge "ART: Add object reclaim support" am: f0ab2ec600 am: 52847e9c5b
am: 900ea58883

Change-Id: Ie195eb6c216859184718c8abf7d1b695bb8f5166

7 years agoMerge "ART: Add object reclaim support" am: f0ab2ec600
Andreas Gampe [Wed, 12 Oct 2016 00:24:19 +0000 (00:24 +0000)]
Merge "ART: Add object reclaim support" am: f0ab2ec600
am: 52847e9c5b

Change-Id: Idbb6efc1aa769f8d9014af7f9b217d3d55e3128d

7 years agoMerge "ART: Add object reclaim support"
Andreas Gampe [Wed, 12 Oct 2016 00:18:48 +0000 (00:18 +0000)]
Merge "ART: Add object reclaim support"
am: f0ab2ec600

Change-Id: Id8364853b0856cfe3238ce2133f2e65b381a31bf

7 years agoMerge "ART: Add object reclaim support"
Treehugger Robot [Tue, 11 Oct 2016 23:16:48 +0000 (23:16 +0000)]
Merge "ART: Add object reclaim support"

7 years agoART: Add object reclaim support
Andreas Gampe [Tue, 11 Oct 2016 02:09:09 +0000 (19:09 -0700)]
ART: Add object reclaim support

Add support for the object free callback.

Refactor code in support. Add test.

Bug: 31384923
Test: m test-art-host
Test: m test-art-host-run-test-905-object-free
Test: m ART_USE_READ_BARRIER=true test-art-host-run-test-905-object-free
Change-Id: Icde40ad464c723cfe2f7660c07cd2f79b6dc2032

7 years agoMerge "Improved and simplified loop optimizations." am: c1f24b947a am: 18173e50b8
Aart Bik [Tue, 11 Oct 2016 20:19:33 +0000 (20:19 +0000)]
Merge "Improved and simplified loop optimizations." am: c1f24b947a am: 18173e50b8
am: 63b9e50802

Change-Id: I29f4983b6429b55ced027fb1dbc67e8dbfad4d9c

7 years agoMerge "Improved and simplified loop optimizations." am: c1f24b947a
Aart Bik [Tue, 11 Oct 2016 20:13:03 +0000 (20:13 +0000)]
Merge "Improved and simplified loop optimizations." am: c1f24b947a
am: 18173e50b8

Change-Id: If1555e3bcfec791c94d7569fc667f44783d14cc5

7 years agoMerge "Improved and simplified loop optimizations."
Aart Bik [Tue, 11 Oct 2016 20:06:34 +0000 (20:06 +0000)]
Merge "Improved and simplified loop optimizations."
am: c1f24b947a

Change-Id: I8d8bfb2e2288f8c4f468a0d21fdf5eef45f10163

7 years agoMerge "Improved and simplified loop optimizations."
Treehugger Robot [Tue, 11 Oct 2016 19:55:32 +0000 (19:55 +0000)]
Merge "Improved and simplified loop optimizations."

7 years agoImproved and simplified loop optimizations.
Aart Bik [Mon, 10 Oct 2016 22:39:10 +0000 (15:39 -0700)]
Improved and simplified loop optimizations.

Rationale:
Empty preheader simplification has been simplified
to a much more general empty block removal optimization
step. Incremental updating of induction variable
analysis enables repeated elimination or simplification
of induction cycles.

This enabled an extra layer of optimization for
e.g. Benchpress Loop (17.5us. -> 0.24us. -> 0.08us).
So the original 73x speedup is now multiplied
by another 3x, for a total of about 218x.

Test: 618-checker-induction et al.
Change-Id: I394699981481cdd5357e0531bce88cd48bd32879

7 years agoMerge "Enable generic JNI tests for MIPS32" am: 1e0d8ce4e5 am: 267bdd513e
Goran Jakovljevic [Tue, 11 Oct 2016 16:21:18 +0000 (16:21 +0000)]
Merge "Enable generic JNI tests for MIPS32" am: 1e0d8ce4e5 am: 267bdd513e
am: 2de218ea04

Change-Id: I46d3d34bb83260ade0ee9edd3a7c2cc67a19022f

7 years agoMerge "Enable generic JNI tests for MIPS32" am: 1e0d8ce4e5
Goran Jakovljevic [Tue, 11 Oct 2016 16:15:47 +0000 (16:15 +0000)]
Merge "Enable generic JNI tests for MIPS32" am: 1e0d8ce4e5
am: 267bdd513e

Change-Id: I56747d4c6c9c9330ab14633569de4d7eae438bae

7 years agoMerge "Enable generic JNI tests for MIPS32"
Goran Jakovljevic [Tue, 11 Oct 2016 16:09:18 +0000 (16:09 +0000)]
Merge "Enable generic JNI tests for MIPS32"
am: 1e0d8ce4e5

Change-Id: I6dec138ffc9ebd55a307510201bb97f2a16b1ff4

7 years agoMerge "Enable generic JNI tests for MIPS32"
Treehugger Robot [Tue, 11 Oct 2016 16:03:13 +0000 (16:03 +0000)]
Merge "Enable generic JNI tests for MIPS32"

7 years agoMerge "Add missing cases in quick_trampoline_entrypoints_test for MIPS64" am: 91d1b61...
Goran Jakovljevic [Tue, 11 Oct 2016 13:40:37 +0000 (13:40 +0000)]
Merge "Add missing cases in quick_trampoline_entrypoints_test for MIPS64" am: 91d1b61db7 am: 9029878777
am: a10e41b2e3

Change-Id: I575d62622293e43b3daf7771479a1df5ba6169ab

7 years agoMerge "Add missing cases in quick_trampoline_entrypoints_test for MIPS64" am: 91d1b61db7
Goran Jakovljevic [Tue, 11 Oct 2016 13:34:09 +0000 (13:34 +0000)]
Merge "Add missing cases in quick_trampoline_entrypoints_test for MIPS64" am: 91d1b61db7
am: 9029878777

Change-Id: Ib28f6a7175c7ba4b53b87a779be666dde9bc6e4e

7 years agoMerge "Add missing cases in quick_trampoline_entrypoints_test for MIPS64"
Goran Jakovljevic [Tue, 11 Oct 2016 13:28:07 +0000 (13:28 +0000)]
Merge "Add missing cases in quick_trampoline_entrypoints_test for MIPS64"
am: 91d1b61db7

Change-Id: Ieb3460c2993e2c5c547bd6fb76de0aec51580bf0

7 years agoMerge "Add missing cases in quick_trampoline_entrypoints_test for MIPS64"
Treehugger Robot [Tue, 11 Oct 2016 13:20:48 +0000 (13:20 +0000)]
Merge "Add missing cases in quick_trampoline_entrypoints_test for MIPS64"

7 years agoMerge "ART: Fix test 904" am: 6136dc6841 am: 9bb0bae74c
Andreas Gampe [Tue, 11 Oct 2016 03:22:30 +0000 (03:22 +0000)]
Merge "ART: Fix test 904" am: 6136dc6841 am: 9bb0bae74c
am: d2bd410180

Change-Id: Id5012164d37f153ea4806d84444ec4e1be2ec5aa

7 years agoMerge "ART: Fix test 904" am: 6136dc6841
Andreas Gampe [Tue, 11 Oct 2016 03:16:29 +0000 (03:16 +0000)]
Merge "ART: Fix test 904" am: 6136dc6841
am: 9bb0bae74c

Change-Id: I3af40731f0cfd66a27bc5f15f441af610b3bb7fe

7 years agoMerge "ART: Fix test 904"
Andreas Gampe [Tue, 11 Oct 2016 03:10:59 +0000 (03:10 +0000)]
Merge "ART: Fix test 904"
am: 6136dc6841

Change-Id: I83254cf3f4caf43218f3e542823c65e69e01bfc6

7 years agoMerge "ART: Fix test 904"
Andreas Gampe [Tue, 11 Oct 2016 03:04:35 +0000 (03:04 +0000)]
Merge "ART: Fix test 904"

7 years agoART: Fix test 904
Andreas Gampe [Tue, 11 Oct 2016 03:01:41 +0000 (20:01 -0700)]
ART: Fix test 904

Prefetch class names to avoid allocation for logging.

Bug: 31684277
Test: m ART_TEST_RUN_TEST_RELOCATE_NO_PATCHOAT=true test-art-host-run-test-904-object-allocation
Change-Id: I8d12ea1a2b15680995af84d243de4d07d22bede5

7 years agoMerge "Use art::Atomic for CopyObject" am: bf9e543636 am: 0e84fc7d6c
Mathieu Chartier [Tue, 11 Oct 2016 01:16:23 +0000 (01:16 +0000)]
Merge "Use art::Atomic for CopyObject" am: bf9e543636 am: 0e84fc7d6c
am: d0cda18b4e

Change-Id: Ib1b0ecec4cf3a65b36a18f58ff3cfcf401f1eee7

7 years agoMerge "Use art::Atomic for CopyObject" am: bf9e543636
Mathieu Chartier [Tue, 11 Oct 2016 01:10:51 +0000 (01:10 +0000)]
Merge "Use art::Atomic for CopyObject" am: bf9e543636
am: 0e84fc7d6c

Change-Id: Ib43feab48898cf3c047f747080f41488c2445864

7 years agoMerge "ART: Add allocation callback" am: f24ddb28eb am: de967edf69
Andreas Gampe [Tue, 11 Oct 2016 01:04:52 +0000 (01:04 +0000)]
Merge "ART: Add allocation callback" am: f24ddb28eb am: de967edf69
am: f7e830bbb9

Change-Id: Ifd61be9f108b4914de9bb2543e9d9bb486acf5de

7 years agoMerge "Use art::Atomic for CopyObject"
Mathieu Chartier [Tue, 11 Oct 2016 01:04:51 +0000 (01:04 +0000)]
Merge "Use art::Atomic for CopyObject"
am: bf9e543636

Change-Id: I2566ef7e0cbfc667f1c0102e1f3809711639bfdd

7 years agoMerge "ART: Add allocation callback" am: f24ddb28eb
Andreas Gampe [Tue, 11 Oct 2016 00:59:20 +0000 (00:59 +0000)]
Merge "ART: Add allocation callback" am: f24ddb28eb
am: de967edf69

Change-Id: I158b0aec095950f4f4655b1b0a11791155bcb9b6

7 years agoMerge "Use art::Atomic for CopyObject"
Mathieu Chartier [Tue, 11 Oct 2016 00:59:03 +0000 (00:59 +0000)]
Merge "Use art::Atomic for CopyObject"

7 years agoMerge "ART: Add allocation callback"
Andreas Gampe [Tue, 11 Oct 2016 00:53:50 +0000 (00:53 +0000)]
Merge "ART: Add allocation callback"
am: f24ddb28eb

Change-Id: I1f565590fc884312c40b279ac9ea8d0798d2f396

7 years agoMerge "ART: Add allocation callback"
Andreas Gampe [Tue, 11 Oct 2016 00:43:31 +0000 (00:43 +0000)]
Merge "ART: Add allocation callback"

7 years agoMerge "ART: Switch to name-based IMT hashing" am: a6bfd5f8e5 am: 3c1ddc541e
Andreas Gampe [Mon, 10 Oct 2016 23:56:02 +0000 (23:56 +0000)]
Merge "ART: Switch to name-based IMT hashing" am: a6bfd5f8e5 am: 3c1ddc541e
am: 8f109ef05e

Change-Id: I55148a8baf1b027256d8a74f4d3df586237b2a34

7 years agoMerge "ART: Switch to name-based IMT hashing" am: a6bfd5f8e5
Andreas Gampe [Mon, 10 Oct 2016 23:50:17 +0000 (23:50 +0000)]
Merge "ART: Switch to name-based IMT hashing" am: a6bfd5f8e5
am: 3c1ddc541e

Change-Id: I95cef95c949f9629d912370ce10dd5a5022a8d0e

7 years agoMerge "ART: Switch to name-based IMT hashing"
Andreas Gampe [Mon, 10 Oct 2016 23:44:46 +0000 (23:44 +0000)]
Merge "ART: Switch to name-based IMT hashing"
am: a6bfd5f8e5

Change-Id: I5d3f934b8ffdd11a29a9f38710376169fb267b1a

7 years agoMerge "ART: Switch to name-based IMT hashing"
Treehugger Robot [Mon, 10 Oct 2016 23:39:05 +0000 (23:39 +0000)]
Merge "ART: Switch to name-based IMT hashing"

7 years agoMerge "Avoid ThreadStress timeout with art-read-barrier-table-lookup." am: f95054f489...
Hiroshi Yamauchi [Mon, 10 Oct 2016 21:35:04 +0000 (21:35 +0000)]
Merge "Avoid ThreadStress timeout with art-read-barrier-table-lookup." am: f95054f489 am: 54f60d6da7
am: 7c096f92c5

Change-Id: I4b724cef078bc735f4a55b4f8374dfc8a0033c1a

7 years agoMerge "ART: Add event callback support" am: ed63aad1a7 am: 5119324986
Andreas Gampe [Mon, 10 Oct 2016 21:33:25 +0000 (21:33 +0000)]
Merge "ART: Add event callback support" am: ed63aad1a7 am: 5119324986
am: 164df326ff

Change-Id: I11ca6917b323c1d951a1ba148425c76e5407eae3

7 years agoMerge "mterp: Placeholder support for invoke-polymorphic" am: 4404fb30fa am: c98a0c3e4f
Bill Buzbee [Mon, 10 Oct 2016 21:33:08 +0000 (21:33 +0000)]
Merge "mterp: Placeholder support for invoke-polymorphic" am: 4404fb30fa am: c98a0c3e4f
am: cb7be725dd

Change-Id: I80695a4b1ef74f770504903eb8a0c72730f020d4

7 years agoART: Switch to name-based IMT hashing
Andreas Gampe [Tue, 27 Sep 2016 19:19:45 +0000 (12:19 -0700)]
ART: Switch to name-based IMT hashing

Use a hash scheme based on the name. This keeps IMT slots stable
when dex tables change.

This incurs a severe performance penalty for computing the slot.
Measurements on host degraded from 30ns to an average of 85mus.
However, calls in compiled code will not incur this overhead.

Added a test comparing similar interfaces in similar dex files.

Bug: 31594153
Test: test-art-host
Change-Id: Ibb86679ee94bec561984ea25826e56b1a7964cd0

7 years agoMerge "Avoid ThreadStress timeout with art-read-barrier-table-lookup." am: f95054f489
Hiroshi Yamauchi [Mon, 10 Oct 2016 21:28:05 +0000 (21:28 +0000)]
Merge "Avoid ThreadStress timeout with art-read-barrier-table-lookup." am: f95054f489
am: 54f60d6da7

Change-Id: Ib7e6ec12402a3644583e21fed23ecb2677891f61

7 years agoMerge "ART: Add event callback support" am: ed63aad1a7
Andreas Gampe [Mon, 10 Oct 2016 21:27:50 +0000 (21:27 +0000)]
Merge "ART: Add event callback support" am: ed63aad1a7
am: 5119324986

Change-Id: I6d3e645e517b7bf479475a3565aef89df2bcb329

7 years agoMerge "mterp: Placeholder support for invoke-polymorphic" am: 4404fb30fa
Bill Buzbee [Mon, 10 Oct 2016 21:27:37 +0000 (21:27 +0000)]
Merge "mterp: Placeholder support for invoke-polymorphic" am: 4404fb30fa
am: c98a0c3e4f

Change-Id: Ibe077fadb214e9607f594034f758be838c871752

7 years agoMerge "Avoid ThreadStress timeout with art-read-barrier-table-lookup."
Hiroshi Yamauchi [Mon, 10 Oct 2016 21:12:40 +0000 (21:12 +0000)]
Merge "Avoid ThreadStress timeout with art-read-barrier-table-lookup."
am: f95054f489

Change-Id: Icb8a5915b1649d2abe9b5ee7080842bf547859b2

7 years agoMerge "ART: Add event callback support"
Andreas Gampe [Mon, 10 Oct 2016 21:12:27 +0000 (21:12 +0000)]
Merge "ART: Add event callback support"
am: ed63aad1a7

Change-Id: Ic8517b91e9e37001df5bb319130243f32e54eca3

7 years agoMerge "mterp: Placeholder support for invoke-polymorphic"
Bill Buzbee [Mon, 10 Oct 2016 21:12:13 +0000 (21:12 +0000)]
Merge "mterp: Placeholder support for invoke-polymorphic"
am: 4404fb30fa

Change-Id: I8149023ef9a46c29f61710cacc7c99bef6e84f0d

7 years agoMerge "Avoid ThreadStress timeout with art-read-barrier-table-lookup."
Hiroshi Yamauchi [Mon, 10 Oct 2016 20:42:18 +0000 (20:42 +0000)]
Merge "Avoid ThreadStress timeout with art-read-barrier-table-lookup."

7 years agoMerge "ART: Add event callback support"
Treehugger Robot [Mon, 10 Oct 2016 20:37:52 +0000 (20:37 +0000)]
Merge "ART: Add event callback support"

7 years agoART: Add allocation callback
Andreas Gampe [Fri, 7 Oct 2016 22:05:24 +0000 (15:05 -0700)]
ART: Add allocation callback

Bug: 31684277
Test: m test-art-host
Change-Id: I959f44e23ca5fe55ed678315708895faf0aadb04

7 years agoMerge "mterp: Placeholder support for invoke-polymorphic"
Bill Buzbee [Mon, 10 Oct 2016 20:27:34 +0000 (20:27 +0000)]
Merge "mterp: Placeholder support for invoke-polymorphic"

7 years agoUse art::Atomic for CopyObject
Mathieu Chartier [Fri, 7 Oct 2016 19:59:33 +0000 (12:59 -0700)]
Use art::Atomic for CopyObject

Just to be sure it doesn't get turned into memcpy.

Also avoid casting ObjectArray to IntArray. This is a strict aliasing
violation.

Bug: 32012820

Test: test-art-host

Change-Id: Icc5d4a758cb4f4e1686389bb0cb74ac08e554f04

7 years agoAdd missing cases in quick_trampoline_entrypoints_test for MIPS64
Goran Jakovljevic [Mon, 10 Oct 2016 17:12:09 +0000 (19:12 +0200)]
Add missing cases in quick_trampoline_entrypoints_test for MIPS64

Test: mma test-art-target-gtest-quick_trampoline_entrypoints_test
Change-Id: I4596d47f7219b375a60d6b9d80f797d1f01facd7

7 years agoMerge "MIPS64: Fix art_quick_aput_obj stubs" am: 5065b09332 am: 669a9b8491
Nicolas Geoffray [Mon, 10 Oct 2016 08:58:17 +0000 (08:58 +0000)]
Merge "MIPS64: Fix art_quick_aput_obj stubs" am: 5065b09332 am: 669a9b8491
am: fcae823250

Change-Id: Ia9c5ce4f40cc1e94a1b054fc95e4b515f5dd2b01

7 years agoMerge "MIPS64: Fix art_quick_aput_obj stubs" am: 5065b09332
Nicolas Geoffray [Mon, 10 Oct 2016 08:52:27 +0000 (08:52 +0000)]
Merge "MIPS64: Fix art_quick_aput_obj stubs" am: 5065b09332
am: 669a9b8491

Change-Id: Ic1e058322dca6dac1b24521f326af14fa37b5455

7 years agoMerge "MIPS64: Fix art_quick_aput_obj stubs"
Nicolas Geoffray [Mon, 10 Oct 2016 08:46:55 +0000 (08:46 +0000)]
Merge "MIPS64: Fix art_quick_aput_obj stubs"
am: 5065b09332

Change-Id: Ieb5d20974275cfb5f48f2d76f92180f2b93351f2

7 years agoMerge "MIPS64: Fix art_quick_aput_obj stubs"
Nicolas Geoffray [Mon, 10 Oct 2016 08:34:17 +0000 (08:34 +0000)]
Merge "MIPS64: Fix art_quick_aput_obj stubs"

7 years agoART: Add event callback support
Andreas Gampe [Fri, 7 Oct 2016 18:48:21 +0000 (11:48 -0700)]
ART: Add event callback support

Add basic event callback support infrastructure. Actual users will
follow.

Bug: 31684920
Test: m test-art-host
Change-Id: Ic496933ef3a94f9d27a2779b7f4fdc5b096eab22

7 years agoAvoid ThreadStress timeout with art-read-barrier-table-lookup.
Hiroshi Yamauchi [Sat, 8 Oct 2016 00:07:03 +0000 (17:07 -0700)]
Avoid ThreadStress timeout with art-read-barrier-table-lookup.

Disable MarkFromReadBarrierWithMeasurements for
art-read-barrier-table-lookup to avoid slowdown as it takes more read
barrier slow paths than art-read-barrier.

Increase the timeout.

Bug: 31679493
Bug: 12687968
Test: test-art-host with ART_READ_BARRIER_TYPE=TABLELOOKUP
Change-Id: I1a87864448e28099e522dc7fedce2208189248f2

7 years agomterp: Placeholder support for invoke-polymorphic
buzbee [Fri, 7 Oct 2016 19:56:32 +0000 (12:56 -0700)]
mterp: Placeholder support for invoke-polymorphic

Force the mterp assembly interpreters to fall back to the
reference switch interpreter for invoke-polymorphic and
invoke-polymorphic-range while those new opcodes are under
development.

Test: test-art-host

Change-Id: I6167432164bd869c91d0804521d5edc9549f622e

7 years agoMerge "Use word copying for CopyObject" am: f361a29848 am: 319739ce5c
Mathieu Chartier [Fri, 7 Oct 2016 19:58:41 +0000 (19:58 +0000)]
Merge "Use word copying for CopyObject" am: f361a29848 am: 319739ce5c
am: d3c04ed508

Change-Id: I04fa630f08df9c8664ae84fb32d25ebc063360e9

7 years agoMerge "Use word copying for CopyObject" am: f361a29848
Mathieu Chartier [Fri, 7 Oct 2016 19:54:10 +0000 (19:54 +0000)]
Merge "Use word copying for CopyObject" am: f361a29848
am: 319739ce5c

Change-Id: Ib4232e4fcb247950ad2d42e3e7d475f7231defb6

7 years agoMerge "Use word copying for CopyObject"
Mathieu Chartier [Fri, 7 Oct 2016 19:50:11 +0000 (19:50 +0000)]
Merge "Use word copying for CopyObject"
am: f361a29848

Change-Id: I1aa32d2e9102818da1ca14cb1f66f4781b76749a

7 years agoMerge "Use word copying for CopyObject"
Mathieu Chartier [Fri, 7 Oct 2016 19:45:02 +0000 (19:45 +0000)]
Merge "Use word copying for CopyObject"

7 years agoUse word copying for CopyObject
Mathieu Chartier [Fri, 7 Oct 2016 17:51:53 +0000 (10:51 -0700)]
Use word copying for CopyObject

Prevent word tearing.

Bug: 32012820

Test: test-art-host

Change-Id: Ie3d5817f3bdf49e0d949caeccd7cd3512d61bdf7

7 years agoMerge "Move mirror::Object setters to ObjPtr" am: 0d7398fd54 am: 153b83e8da
Mathieu Chartier [Fri, 7 Oct 2016 17:12:32 +0000 (17:12 +0000)]
Merge "Move mirror::Object setters to ObjPtr" am: 0d7398fd54 am: 153b83e8da
am: 1c83b0886e

Change-Id: Ic058da37193c9c232200d7e9569b7467a1baba6b

7 years agoMerge "Move mirror::Object setters to ObjPtr" am: 0d7398fd54
Mathieu Chartier [Fri, 7 Oct 2016 17:08:01 +0000 (17:08 +0000)]
Merge "Move mirror::Object setters to ObjPtr" am: 0d7398fd54
am: 153b83e8da

Change-Id: I813b4b90b3ff65f9f0c9daa61cc3717972968c71

7 years agoMerge "Improved and simplified loop optimizations." am: 6ed8fc7a68 am: c9550a70a4
Aart Bik [Fri, 7 Oct 2016 17:04:02 +0000 (17:04 +0000)]
Merge "Improved and simplified loop optimizations." am: 6ed8fc7a68 am: c9550a70a4
am: a8388c8c10

Change-Id: Icc7d087cf9726aac9cf7c7a28bd24427f1e6969e

7 years agoMerge "Move mirror::Object setters to ObjPtr"
Mathieu Chartier [Fri, 7 Oct 2016 17:04:01 +0000 (17:04 +0000)]
Merge "Move mirror::Object setters to ObjPtr"
am: 0d7398fd54

Change-Id: I0b01e829b2653192c1c8f6839757c5c648ebc33f

7 years agoMerge "Improved and simplified loop optimizations." am: 6ed8fc7a68
Aart Bik [Fri, 7 Oct 2016 16:58:59 +0000 (16:58 +0000)]
Merge "Improved and simplified loop optimizations." am: 6ed8fc7a68
am: c9550a70a4

Change-Id: Ia3e24acdd7fbc4c72e460c42c2f290e0608011a7

7 years agoMerge "Move mirror::Object setters to ObjPtr"
Mathieu Chartier [Fri, 7 Oct 2016 16:57:40 +0000 (16:57 +0000)]
Merge "Move mirror::Object setters to ObjPtr"

7 years agoMerge "Improved and simplified loop optimizations."
Aart Bik [Fri, 7 Oct 2016 16:55:00 +0000 (16:55 +0000)]
Merge "Improved and simplified loop optimizations."
am: 6ed8fc7a68

Change-Id: Ia0364c2b78ea63ba55e345fc0decdfdca8c35dcd

7 years agoMerge "Improved and simplified loop optimizations."
Treehugger Robot [Fri, 7 Oct 2016 16:51:06 +0000 (16:51 +0000)]
Merge "Improved and simplified loop optimizations."