OSDN Git Service

android-x86/art.git
7 years agoMerge \\\"Fix profiling output to properly display class info.\\\" am: 9755c262df...
Jeff Hao [Wed, 27 Jul 2016 18:53:27 +0000 (18:53 +0000)]
Merge \\\"Fix profiling output to properly display class info.\\\" am: 9755c262df am: d4a452714e
am: 8b9f4df445

Change-Id: I4683004b9e4d35360564f0285cdb3704cb130cc9

7 years agoMerge \\"Fix profiling output to properly display class info.\\" am: 9755c262df
Jeff Hao [Wed, 27 Jul 2016 18:50:27 +0000 (18:50 +0000)]
Merge \\"Fix profiling output to properly display class info.\\" am: 9755c262df
am: d4a452714e

Change-Id: Ic69efc32ff05bcd4cb601ab4a7aaa2f95c3b28fd

7 years agoMerge \"Fix profiling output to properly display class info.\"
Jeff Hao [Wed, 27 Jul 2016 18:47:58 +0000 (18:47 +0000)]
Merge \"Fix profiling output to properly display class info.\"
am: 9755c262df

Change-Id: I417529769b10bd7693461c90f0306881158332a6

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 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 agoMerge \\\"Add missing filter cards to zygote mod union table\\\" am: 93afc5f20a am...
Mathieu Chartier [Tue, 26 Jul 2016 20:22:55 +0000 (20:22 +0000)]
Merge \\\"Add missing filter cards to zygote mod union table\\\" am: 93afc5f20a am: e42a192af4
am: ec52530a92

Change-Id: I8d05dbe1b9ab114b8db524179844f5b154f0e054

7 years agoMerge \\"Add missing filter cards to zygote mod union table\\" am: 93afc5f20a
Mathieu Chartier [Tue, 26 Jul 2016 20:19:55 +0000 (20:19 +0000)]
Merge \\"Add missing filter cards to zygote mod union table\\" am: 93afc5f20a
am: e42a192af4

Change-Id: Ieb57921d0fbc408f7c334df6682ff3b7121b08d8

7 years agoMerge \"Add missing filter cards to zygote mod union table\"
Mathieu Chartier [Tue, 26 Jul 2016 20:16:57 +0000 (20:16 +0000)]
Merge \"Add missing filter cards to zygote mod union table\"
am: 93afc5f20a

Change-Id: I40b355ebdabc4d53661836156b8106fa2c003fbd

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 agoMerge \\\"Improve CC handling for immune objects\\\" am: e92730cbc5 am: 58387badba
Mathieu Chartier [Mon, 25 Jul 2016 23:39:11 +0000 (23:39 +0000)]
Merge \\\"Improve CC handling for immune objects\\\" am: e92730cbc5 am: 58387badba
am: 2ad0dee98d

Change-Id: I470d9bbaf61185172bb30424ff1c065729bc9dc5

7 years agoMerge \\"Improve CC handling for immune objects\\" am: e92730cbc5
Mathieu Chartier [Mon, 25 Jul 2016 23:35:41 +0000 (23:35 +0000)]
Merge \\"Improve CC handling for immune objects\\" am: e92730cbc5
am: 58387badba

Change-Id: I899f68854dd6b35d478e0efb36741e56dc70a520

7 years agoMerge \"Improve CC handling for immune objects\"
Mathieu Chartier [Mon, 25 Jul 2016 23:32:14 +0000 (23:32 +0000)]
Merge \"Improve CC handling for immune objects\"
am: e92730cbc5

Change-Id: Ie0226a28ebfc44595e614c3c942fba82797ecfa0

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.\\\" am: 90187c9858 am: 64af3...
Aart Bik [Mon, 25 Jul 2016 23:23:39 +0000 (23:23 +0000)]
Merge \\\"Remove redundant 601 test, it\\\'s all in 600.\\\" am: 90187c9858 am: 64af33cc09
am: b167d443c9

Change-Id: I4b55415f466ec102c9bba86c1afeff08210729c2

7 years agoMerge \\"Remove redundant 601 test, it\\'s all in 600.\\" am: 90187c9858
Aart Bik [Mon, 25 Jul 2016 23:20:40 +0000 (23:20 +0000)]
Merge \\"Remove redundant 601 test, it\\'s all in 600.\\" am: 90187c9858
am: 64af33cc09

Change-Id: I6a82ce53064a38362561f3d73535f5bb1ce50166

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

Change-Id: Ibdc01b2f1047bca176c39942e5e80097706ad570

7 years agoMerge \\\"runtime: Refactor asm_support to be auto-generated (mostly)\\\" am: 10656de...
Igor Murashkin [Mon, 25 Jul 2016 23:18:09 +0000 (23:18 +0000)]
Merge \\\"runtime: Refactor asm_support to be auto-generated (mostly)\\\" am: 10656de47c am: 5153722d83
am: a6c636e84d

Change-Id: I644b487b757ffef277791b12bf6549dbc4610bd1

7 years agoMerge \\"runtime: Refactor asm_support to be auto-generated (mostly)\\" am: 10656de47c
Igor Murashkin [Mon, 25 Jul 2016 23:15:10 +0000 (23:15 +0000)]
Merge \\"runtime: Refactor asm_support to be auto-generated (mostly)\\" am: 10656de47c
am: 5153722d83

Change-Id: I4392365edd778fcfc14637237ed3495c1ee5c012

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)\"
Igor Murashkin [Mon, 25 Jul 2016 23:12:41 +0000 (23:12 +0000)]
Merge \"runtime: Refactor asm_support to be auto-generated (mostly)\"
am: 10656de47c

Change-Id: Ida3192ed82ad2f835eae6f49c46f013ed012a77f

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 agoMerge \\\"ART: Add pointer-size template to some reflection functions\\\" am: 3023890...
Andreas Gampe [Mon, 25 Jul 2016 22:42:07 +0000 (22:42 +0000)]
Merge \\\"ART: Add pointer-size template to some reflection functions\\\" am: 3023890d94 am: 7f53486ab4
am: a74875c59f

Change-Id: Ide90564f0c54f9459e5a90c5645e92a29e6a6f31

7 years agoMerge \\"ART: Add pointer-size template to some reflection functions\\" am: 3023890d94
Andreas Gampe [Mon, 25 Jul 2016 22:36:36 +0000 (22:36 +0000)]
Merge \\"ART: Add pointer-size template to some reflection functions\\" am: 3023890d94
am: 7f53486ab4

Change-Id: Id56b9d72125de03bb1c334bdd60ddbea4db19d32

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\"
Andreas Gampe [Mon, 25 Jul 2016 22:34:09 +0000 (22:34 +0000)]
Merge \"ART: Add pointer-size template to some reflection functions\"
am: 3023890d94

Change-Id: I4310ad3ef62f7645ff82427512f0ef975f386341

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.\\\" am: 659ad8fe6b am:...
Alex Light [Mon, 25 Jul 2016 21:46:32 +0000 (21:46 +0000)]
Merge \\\"Make java 8 run-tests runnable on the RI again.\\\" am: 659ad8fe6b am: e18ea7f2f2
am: b249ca9d20

Change-Id: I0f66b9cb46ac498b4ca4247b76ea644e106fa759

7 years agoMerge \\"Make java 8 run-tests runnable on the RI again.\\" am: 659ad8fe6b
Alex Light [Mon, 25 Jul 2016 21:43:02 +0000 (21:43 +0000)]
Merge \\"Make java 8 run-tests runnable on the RI again.\\" am: 659ad8fe6b
am: e18ea7f2f2

Change-Id: I3430f7ea91b24810c09543aa783cd98f6723dccb

7 years agoMerge \"Make java 8 run-tests runnable on the RI again.\"
Alex Light [Mon, 25 Jul 2016 21:40:38 +0000 (21:40 +0000)]
Merge \"Make java 8 run-tests runnable on the RI again.\"
am: 659ad8fe6b

Change-Id: I73852191af8517db26adf0f7b744441853c05187

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.\\\" am: 0abe10a59b...
Richard Uhler [Mon, 25 Jul 2016 20:28:28 +0000 (20:28 +0000)]
Merge \\\"Launch ahat server before processing the heap dump.\\\" am: 0abe10a59b am: cc706a4a1b
am: ec37071122

Change-Id: I8a1897499ffa54608265851f50cc1a62fd04949f

7 years agoMerge \\"Launch ahat server before processing the heap dump.\\" am: 0abe10a59b
Richard Uhler [Mon, 25 Jul 2016 20:25:58 +0000 (20:25 +0000)]
Merge \\"Launch ahat server before processing the heap dump.\\" am: 0abe10a59b
am: cc706a4a1b

Change-Id: I854871991844e05c82e94f969b76db0093fd509a

7 years agoMerge \"Launch ahat server before processing the heap dump.\"
Richard Uhler [Mon, 25 Jul 2016 20:22:59 +0000 (20:22 +0000)]
Merge \"Launch ahat server before processing the heap dump.\"
am: 0abe10a59b

Change-Id: I051ad88d1460d129a5eb65fc36a6e28354bbc251

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\\\" am: 38be534337 am: 2382f012bb
Alex Light [Mon, 25 Jul 2016 19:13:56 +0000 (19:13 +0000)]
Merge \\\"Fix stream-tracing with default methods\\\" am: 38be534337 am: 2382f012bb
am: c3a05aa968

Change-Id: I381f2fb49cd077eee891daed24ab096c39806a5b

7 years agoMerge \\"Fix stream-tracing with default methods\\" am: 38be534337
Alex Light [Mon, 25 Jul 2016 19:09:26 +0000 (19:09 +0000)]
Merge \\"Fix stream-tracing with default methods\\" am: 38be534337
am: 2382f012bb

Change-Id: I420d52342c2d08ab2ede048372b362c642d4a0d2

7 years agoMerge \"Fix stream-tracing with default methods\"
Alex Light [Mon, 25 Jul 2016 19:05:26 +0000 (19:05 +0000)]
Merge \"Fix stream-tracing with default methods\"
am: 38be534337

Change-Id: Ibad99838d15d0b87ea5ba1fe897f27d4ba83f447

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...
Wojciech Staszkiewicz [Mon, 25 Jul 2016 18:03:49 +0000 (18:03 +0000)]
Merge \\\"Make static helper methods member functions of OptimizingCompiler class\\\" am: a69e790ad9 am: d786250bbb
am: 92ce87566d

Change-Id: Ia56d2d4834f93fe6b902dda30d2fae75129b65c0

7 years agoMerge \\"Make static helper methods member functions of OptimizingCompiler class...
Aart Bik [Mon, 25 Jul 2016 18:01:17 +0000 (18:01 +0000)]
Merge \\"Make static helper methods member functions of OptimizingCompiler class\\" am: a69e790ad9
am: d786250bbb

Change-Id: I9401fc2711224c9c47285738bb139e25befb82c0

7 years agoMerge \"Make static helper methods member functions of OptimizingCompiler class\"
Wojciech Staszkiewicz [Mon, 25 Jul 2016 17:58:19 +0000 (17:58 +0000)]
Merge \"Make static helper methods member functions of OptimizingCompiler class\"
am: a69e790ad9

Change-Id: Iaf23b0f1163ac836a3a4e4c5319517388e6cfa62

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\\\"\\\"\\\" am:...
Andreas Gampe [Mon, 25 Jul 2016 17:45:17 +0000 (17:45 +0000)]
Merge \\\"Revert \\\"Revert \\\"ART: Add dex2oat swap usage test\\\"\\\"\\\" am: edbecee66f am: 37d11c693a
am: cc44f48560

Change-Id: I41b1ec2ed2e73a8ab7a04a863e1c5c559ae0cdd7

7 years agoMerge \\"Revert \\"Revert \\"ART: Add dex2oat swap usage test\\"\\"\\" am: edbecee66f
Andreas Gampe [Mon, 25 Jul 2016 17:41:31 +0000 (17:41 +0000)]
Merge \\"Revert \\"Revert \\"ART: Add dex2oat swap usage test\\"\\"\\" am: edbecee66f
am: 37d11c693a

Change-Id: Ia5b8bc6d23018bf14b9200ef74899ba7558b8449

7 years agoMerge \"Revert \"Revert \"ART: Add dex2oat swap usage test\"\"\"
Andreas Gampe [Mon, 25 Jul 2016 17:37:01 +0000 (17:37 +0000)]
Merge \"Revert \"Revert \"ART: Add dex2oat swap usage test\"\"\"
am: edbecee66f

Change-Id: I3321270cf3746b172208b628dbddc968db1c5482

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\\\" am: a71ad9a2d3 am: fb2092dab3
Mathieu Chartier [Mon, 25 Jul 2016 16:59:57 +0000 (16:59 +0000)]
Merge \\\"Add fast path to arm64 READ_BARRIER macro\\\" am: a71ad9a2d3 am: fb2092dab3
am: d2c6cb2be8

Change-Id: I5a504aa6c06129e5e0628875f2f314883d9bbf2c

7 years agoMerge \\"Add fast path to arm64 READ_BARRIER macro\\" am: a71ad9a2d3
Mathieu Chartier [Mon, 25 Jul 2016 16:56:26 +0000 (16:56 +0000)]
Merge \\"Add fast path to arm64 READ_BARRIER macro\\" am: a71ad9a2d3
am: fb2092dab3

Change-Id: Ie0dedfae86f63ecfa0cf393d372070ea42fbfa0a

7 years agoMerge \"Add fast path to arm64 READ_BARRIER macro\"
Mathieu Chartier [Mon, 25 Jul 2016 16:52:59 +0000 (16:52 +0000)]
Merge \"Add fast path to arm64 READ_BARRIER macro\"
am: a71ad9a2d3

Change-Id: I0bebdeed40c436e59f294e2c2b94c7ac6085b374

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.\\\" am...
Roland Levillain [Mon, 25 Jul 2016 15:04:20 +0000 (15:04 +0000)]
Merge \\\"Do not emit stack maps for runtime calls to ReadBarrierMarkRegX.\\\" am: de4cf16f46 am: 6c652d78ce
am: b9ebe13539

Change-Id: I2dd1977b5bc75dc0a630d5499954766b36a97055

7 years agoMerge \\"Do not emit stack maps for runtime calls to ReadBarrierMarkRegX.\\" am:...
Roland Levillain [Mon, 25 Jul 2016 15:00:49 +0000 (15:00 +0000)]
Merge \\"Do not emit stack maps for runtime calls to ReadBarrierMarkRegX.\\" am: de4cf16f46
am: 6c652d78ce

Change-Id: Ic398c02cb7e3a3ffb1029681b3ac6c36eaaaba0c

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

Change-Id: I58975c1fa1cdc2627b5fdee0d84322b8282a6411

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."

8 years agoMerge \\\"Revert \\\"ART: Add dex2oat swap usage test\\\"\\\" am: c4aa896181 am:...
Andreas Gampe [Sat, 23 Jul 2016 06:17:45 +0000 (06:17 +0000)]
Merge \\\"Revert \\\"ART: Add dex2oat swap usage test\\\"\\\" am: c4aa896181 am: da07be90c5
am: 96c04d4292

Change-Id: Ib5c928d2dcc23bfa6504b76e7d80787acb1deef0

8 years agoMerge \\"Revert \\"ART: Add dex2oat swap usage test\\"\\" am: c4aa896181
Andreas Gampe [Sat, 23 Jul 2016 06:14:45 +0000 (06:14 +0000)]
Merge \\"Revert \\"ART: Add dex2oat swap usage test\\"\\" am: c4aa896181
am: da07be90c5

Change-Id: I9744169d0d5f109f07d1c67f3ed55ee19ba645fb

8 years agoMerge \"Revert \"ART: Add dex2oat swap usage test\"\"
Andreas Gampe [Sat, 23 Jul 2016 06:11:47 +0000 (06:11 +0000)]
Merge \"Revert \"ART: Add dex2oat swap usage test\"\"
am: c4aa896181

Change-Id: I61c6aa7d5057a49639312262bc74f9162c827a70

8 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""

8 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

8 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

8 years agoMerge \\\"ART: Change run-*-tests to ANDROID_{HOST|PRODUCT}_OUT\\\" am: 115c1de1f8...
Andreas Gampe [Fri, 22 Jul 2016 22:53:23 +0000 (22:53 +0000)]
Merge \\\"ART: Change run-*-tests to ANDROID_{HOST|PRODUCT}_OUT\\\" am: 115c1de1f8 am: 88b5cdb5be
am: 01f3d55d1d

Change-Id: Ia13acde5abdb224b7917dda0669910bca09b84d7

8 years agoMerge \\\"ART: Add dex2oat swap usage test\\\" am: da2b8dc3ed am: f11b3aa623
Andreas Gampe [Fri, 22 Jul 2016 22:53:22 +0000 (22:53 +0000)]
Merge \\\"ART: Add dex2oat swap usage test\\\" am: da2b8dc3ed am: f11b3aa623
am: 682cd7fedf

Change-Id: I877d90bef1fb6e37fa6f1effc211edcc87037639

8 years agoMerge \\"ART: Change run-*-tests to ANDROID_{HOST|PRODUCT}_OUT\\" am: 115c1de1f8
Andreas Gampe [Fri, 22 Jul 2016 22:50:51 +0000 (22:50 +0000)]
Merge \\"ART: Change run-*-tests to ANDROID_{HOST|PRODUCT}_OUT\\" am: 115c1de1f8
am: 88b5cdb5be

Change-Id: Ic5a32cf1eba832fe189c720898185ae876479bc7

8 years agoMerge \\"ART: Add dex2oat swap usage test\\" am: da2b8dc3ed
Andreas Gampe [Fri, 22 Jul 2016 22:50:51 +0000 (22:50 +0000)]
Merge \\"ART: Add dex2oat swap usage test\\" am: da2b8dc3ed
am: f11b3aa623

Change-Id: I8164b21964584a3caeaee79689a0453ab6c9717a

8 years agoMerge \"ART: Change run-*-tests to ANDROID_{HOST|PRODUCT}_OUT\"
Andreas Gampe [Fri, 22 Jul 2016 22:47:55 +0000 (22:47 +0000)]
Merge \"ART: Change run-*-tests to ANDROID_{HOST|PRODUCT}_OUT\"
am: 115c1de1f8

Change-Id: I6a977a1a3ed81c25ce20c43ee55a55c2028d20b1

8 years agoMerge \"ART: Add dex2oat swap usage test\"
Andreas Gampe [Fri, 22 Jul 2016 22:47:53 +0000 (22:47 +0000)]
Merge \"ART: Add dex2oat swap usage test\"
am: da2b8dc3ed

Change-Id: I019cccda99f190384f57bf2e23909ed79a74dc2d

8 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

8 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"

8 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"

8 years agoMerge \\\"Combine offsets in loop-based dynamic BCE.\\\" am: 7b922ff88b am: f45e600ea6
Aart Bik [Fri, 22 Jul 2016 18:57:36 +0000 (18:57 +0000)]
Merge \\\"Combine offsets in loop-based dynamic BCE.\\\" am: 7b922ff88b am: f45e600ea6
am: b7db6d7a7e

Change-Id: I7835992abc9ef048dfed165c01a7b28e7ea016f5

8 years agoMerge \\"Combine offsets in loop-based dynamic BCE.\\" am: 7b922ff88b
Aart Bik [Fri, 22 Jul 2016 18:55:06 +0000 (18:55 +0000)]
Merge \\"Combine offsets in loop-based dynamic BCE.\\" am: 7b922ff88b
am: f45e600ea6

Change-Id: Ied92881efb83a4a7dcd6238f459f8e5e5c96ead4

8 years agoMerge \"Combine offsets in loop-based dynamic BCE.\"
Aart Bik [Fri, 22 Jul 2016 18:52:07 +0000 (18:52 +0000)]
Merge \"Combine offsets in loop-based dynamic BCE.\"
am: 7b922ff88b

Change-Id: I6889e535ce4ea69404562c95451bf82d70c35a23

8 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."

8 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

8 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

8 years agoMerge \\\"ARM64/x86-64: Fix mterp fill-array-data-payload pointer calculation.\\...
Vladimir Marko [Fri, 22 Jul 2016 17:12:01 +0000 (17:12 +0000)]
Merge \\\"ARM64/x86-64: Fix mterp fill-array-data-payload pointer calculation.\\\" am: 9e27d02040 am: 6aec037d15
am: db558dff77

Change-Id: I82c08dfc2ece63adb5d5b5bf0b96742ce061b3ad

8 years agoMerge \\"ARM64/x86-64: Fix mterp fill-array-data-payload pointer calculation.\\"...
Vladimir Marko [Fri, 22 Jul 2016 17:09:00 +0000 (17:09 +0000)]
Merge \\"ARM64/x86-64: Fix mterp fill-array-data-payload pointer calculation.\\" am: 9e27d02040
am: 6aec037d15

Change-Id: I48398d2bcb731b60ded4aeb6f4263f5c3152136a

8 years agoMerge \"ARM64/x86-64: Fix mterp fill-array-data-payload pointer calculation.\"
Vladimir Marko [Fri, 22 Jul 2016 17:06:32 +0000 (17:06 +0000)]
Merge \"ARM64/x86-64: Fix mterp fill-array-data-payload pointer calculation.\"
am: 9e27d02040

Change-Id: Ib9198592d068055b0caa2051072795cb77fc6a0f

8 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."

8 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.\\\" am: 41c7e2e6ac am: 1562d62bf2
Vladimir Marko [Fri, 22 Jul 2016 09:37:35 +0000 (09:37 +0000)]
Merge \\\"ARM64: Improve mterp cmpl/cmpg.\\\" am: 41c7e2e6ac am: 1562d62bf2
am: f8d69756a0

Change-Id: Ia4a20f4f395fd0ce40bed24dfdcc4aeaad39458b

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

Change-Id: I5596939b447cf2591c2197a12888c289a773e931

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

Change-Id: I8abfa3377a1e884e46f28ce413a67e97492335e2

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 agoJIT: Don\\'t update the dex cache of another class loader. am: e50a7b834b -s ours
Nicolas Geoffray [Fri, 22 Jul 2016 01:18:17 +0000 (01:18 +0000)]
JIT: Don\\'t update the dex cache of another class loader. am: e50a7b834b  -s ours
am: b9a2486834

Change-Id: I7bba7a5aeac1cfb5d551fa8048dec5ab4451af19

8 years agoJIT: Don\'t update the dex cache of another class loader.
Nicolas Geoffray [Fri, 22 Jul 2016 01:15:48 +0000 (01:15 +0000)]
JIT: Don\'t update the dex cache of another class loader.
am: e50a7b834b  -s ours

Change-Id: I0af74a19e19bc66fcca47aca21757136073a9161

8 years agoJIT: Don\\'t update the dex cache of another class loader. am: e50a7b834b
Nicolas Geoffray [Fri, 22 Jul 2016 01:00:55 +0000 (01:00 +0000)]
JIT: Don\\'t update the dex cache of another class loader. am: e50a7b834b
am: 2114993e9a

Change-Id: I8cb090ed6334478fecf480d3fbe365ab0d0e9e5c

8 years agoMerge changes I295c7876,Ib4b84b7b am: 84413a7617 am: 7aee171992
Andreas Gampe [Fri, 22 Jul 2016 00:11:11 +0000 (00:11 +0000)]
Merge changes I295c7876,Ib4b84b7b am: 84413a7617 am: 7aee171992
am: 3ec5be2608

Change-Id: Ie826b8f7de8087b68658d2a69dbcd911d0824987

8 years agoMerge changes I295c7876,Ib4b84b7b am: 84413a7617
Andreas Gampe [Fri, 22 Jul 2016 00:05:41 +0000 (00:05 +0000)]
Merge changes I295c7876,Ib4b84b7b am: 84413a7617
am: 7aee171992

Change-Id: Iccde165be1e432c9c3e86f03f07a1e2d45428d5f

8 years agoMerge changes I295c7876,Ib4b84b7b
Andreas Gampe [Fri, 22 Jul 2016 00:03:12 +0000 (00:03 +0000)]
Merge changes I295c7876,Ib4b84b7b
am: 84413a7617

Change-Id: I8b32598a46cb589cdefa1937ba4b9b69926f25b9

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.\\\" am: d4b7ad7135 am: 0cbcc8b076
Hiroshi Yamauchi [Thu, 21 Jul 2016 23:37:33 +0000 (23:37 +0000)]
Merge \\\"Use non-CAS thread flip root visitor.\\\" am: d4b7ad7135 am: 0cbcc8b076
am: 6863897ca7

Change-Id: I2add02017f63a7e0f16511ddc1abb18898dae2bf

8 years agoMerge \\"Use non-CAS thread flip root visitor.\\" am: d4b7ad7135
Hiroshi Yamauchi [Thu, 21 Jul 2016 23:34:42 +0000 (23:34 +0000)]
Merge \\"Use non-CAS thread flip root visitor.\\" am: d4b7ad7135
am: 0cbcc8b076

Change-Id: I7ace21c998f00f53dd5e9d56703b385dc1457e26

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

Change-Id: I4c560952f5f4ed488d0a849feadf2a2d25e15a2b