OSDN Git Service
Goran Jakovljevic [Mon, 11 Apr 2016 08:41:33 +0000 (08:41 +0000)]
Merge "Implement on-stack replacement for MIPS32 and MIPS64" am:
4009bc6 am:
5388c63
am:
536601e
* commit '
536601ec4b2a8ec053a0b0a35a4717470a30737e':
Implement on-stack replacement for MIPS32 and MIPS64
Change-Id: Ic5d095c9e7e1a8409ce836c0e665cb2f956ffc01
Nicolas Geoffray [Mon, 11 Apr 2016 08:36:55 +0000 (08:36 +0000)]
Merge "Implement on-stack replacement for MIPS32 and MIPS64" am:
4009bc6
am:
5388c63
* commit '
5388c636d4087d61d6bacd00a9e09f27aa3f6eda':
Implement on-stack replacement for MIPS32 and MIPS64
Change-Id: I5c921794219b8866c26ef84ee7d4e82e99c19d1d
Goran Jakovljevic [Mon, 11 Apr 2016 08:32:08 +0000 (08:32 +0000)]
Merge "Implement on-stack replacement for MIPS32 and MIPS64"
am:
4009bc6
* commit '
4009bc645e3358d3150b7f94dd90a2c939f0fa51':
Implement on-stack replacement for MIPS32 and MIPS64
Change-Id: I04f85f7e3245036607257afc2348dbd7f2bab632
Nicolas Geoffray [Mon, 11 Apr 2016 08:24:18 +0000 (08:24 +0000)]
Merge "Implement on-stack replacement for MIPS32 and MIPS64"
Mathieu Chartier [Sat, 9 Apr 2016 05:42:12 +0000 (05:42 +0000)]
Revert "Reduce dirty image pages by improving binning" am:
8ace610
am:
6633a0e
* commit '
6633a0e04a915ac4ee92891acd2f2534b2a59efa':
Revert "Reduce dirty image pages by improving binning"
Change-Id: I1fb127578305120fabb3f0dd2a42894de2ea22b4
Mathieu Chartier [Sat, 9 Apr 2016 02:06:59 +0000 (02:06 +0000)]
Revert "Reduce dirty image pages by improving binning"
am:
8ace610
* commit '
8ace610a222892f7b700e4f95e50fa6315ab85c0':
Revert "Reduce dirty image pages by improving binning"
Change-Id: I90a181ca6386357e7af46154b90f809632cf51a9
Mathieu Chartier [Sat, 9 Apr 2016 01:54:36 +0000 (18:54 -0700)]
Revert "Reduce dirty image pages by improving binning"
This reverts commit
794bff5f622c79fd7bd9899e700cf052a375c675.
Mathieu Chartier [Sat, 9 Apr 2016 00:33:55 +0000 (00:33 +0000)]
Merge "Reduce dirty image pages by improving binning" into nyc-dev am:
c9acdcc
am:
ad89685
* commit '
ad89685686fe87f0d29a1389df86e5488bb3987b':
Reduce dirty image pages by improving binning
Change-Id: I1cce3f0c96fdc0a7341c4e310a06fc799a2adbc9
Mathieu Chartier [Sat, 9 Apr 2016 00:33:55 +0000 (00:33 +0000)]
Store precice set of which constructors require barriers am:
b7248b9 -s ours
am:
76ac1ca
* commit '
76ac1cab0eb768cf36e91335a8dfd15ab016a4c7':
Store precice set of which constructors require barriers
Change-Id: I86833801e2c1adfc9751666d547746ff51144261
Mathieu Chartier [Sat, 9 Apr 2016 00:31:34 +0000 (00:31 +0000)]
Merge "Reduce dirty image pages by improving binning" into nyc-dev
am:
c9acdcc
* commit '
c9acdcc640052cdb7b73cfe7711a464eb5aea052':
Reduce dirty image pages by improving binning
Change-Id: I9889aca2bad332080e76ea9c4ae60430f0662fb1
Mathieu Chartier [Sat, 9 Apr 2016 00:31:34 +0000 (00:31 +0000)]
Store precice set of which constructors require barriers
am:
b7248b9 -s ours
* commit '
b7248b9f1a6d62a30f0cefc12de63c216b5d46e2':
Store precice set of which constructors require barriers
Change-Id: I7567dd7c7ebdff664f36d07c7f5ce5cc743e854b
Alex Light [Fri, 8 Apr 2016 19:15:12 +0000 (19:15 +0000)]
Merge "Make sure non-fatal errors aren\'t printed." am:
dea5933 am:
24d5417
am:
47f7f63
* commit '
47f7f63be179dfdc7c2d3b12b31020cf59136932':
Make sure non-fatal errors aren't printed.
Change-Id: If8da20586d37002dd712531ce8bdfd0242fb6eb8
Alex Light [Fri, 8 Apr 2016 19:06:56 +0000 (19:06 +0000)]
Merge "Make sure non-fatal errors aren\'t printed." am:
dea5933
am:
24d5417
* commit '
24d54171033021ba6bab8a099292fd5ee502ab39':
Make sure non-fatal errors aren't printed.
Change-Id: Ib38340f234e73e513010a9f438fd3aad5f8c2621
Andreas Gampe [Fri, 8 Apr 2016 19:06:56 +0000 (19:06 +0000)]
Merge "ART: Refactor imgdiag internals" am:
c52e3f9 am:
a35bde7
am:
b0dee92
* commit '
b0dee92d7e066df1528b9cd154207f6b9b99444e':
ART: Refactor imgdiag internals
Change-Id: Ie6237245f3d88778127e1b97925a61e57c9bd2c4
Andreas Gampe [Fri, 8 Apr 2016 18:58:46 +0000 (18:58 +0000)]
Merge "ART: Refactor imgdiag internals" am:
c52e3f9
am:
a35bde7
* commit '
a35bde7cf6cc9b6480569a1a9aba0a60f10a5295':
ART: Refactor imgdiag internals
Change-Id: I2c669814dd521a2c02932bb5480e4c9f3bc3d93b
Alex Light [Fri, 8 Apr 2016 18:58:45 +0000 (18:58 +0000)]
Merge "Make sure non-fatal errors aren\'t printed."
am:
dea5933
* commit '
dea59334a2bf9f7709fdb1874c5db6e9537bc291':
Make sure non-fatal errors aren't printed.
Change-Id: I2e8e6e5db320825e2d4cc4cbb931277181f0ed33
Andreas Gampe [Fri, 8 Apr 2016 18:49:35 +0000 (18:49 +0000)]
Merge "ART: Refactor imgdiag internals"
am:
c52e3f9
* commit '
c52e3f9e300d5c3f30f13a7812f0ff7aa8d9a4b1':
ART: Refactor imgdiag internals
Change-Id: I32cf0bcb4f4431562c32e510930e2b76dd738d80
Mathieu Chartier [Fri, 8 Apr 2016 18:49:01 +0000 (18:49 +0000)]
Merge "Reduce dirty image pages by improving binning" into nyc-dev
Alex Light [Fri, 8 Apr 2016 18:42:03 +0000 (18:42 +0000)]
Merge "Make sure non-fatal errors aren't printed."
Andreas Gampe [Fri, 8 Apr 2016 18:33:25 +0000 (18:33 +0000)]
Merge "ART: Refactor imgdiag internals"
Mathieu Chartier [Fri, 8 Apr 2016 18:28:20 +0000 (18:28 +0000)]
Merge changes from topic \'rr_barrier\' am:
e835f3a am:
5cf09ba
am:
132dbf8
* commit '
132dbf8841f9b3d0210efc17fb257745a1823dc3':
Store precice set of which constructors require barriers
Revert "Revert "Check if we require barrier if we did not resolve classes""
Revert "Revert "Change RequiresConstructorBarrier default to yes""
Change-Id: Ic1d7a306dd05173238b39b17966f40a1bfc7f11a
Mathieu Chartier [Fri, 8 Apr 2016 18:16:15 +0000 (18:16 +0000)]
Merge changes from topic \'rr_barrier\' am:
e835f3a
am:
5cf09ba
* commit '
5cf09ba6aba1d456ecc5b47085616914c490c708':
Store precice set of which constructors require barriers
Revert "Revert "Check if we require barrier if we did not resolve classes""
Revert "Revert "Change RequiresConstructorBarrier default to yes""
Change-Id: I0eac446a8b1b712fb3678d87d1be4b07aba7fffe
Mathieu Chartier [Fri, 8 Apr 2016 18:07:07 +0000 (18:07 +0000)]
Merge changes from topic \'rr_barrier\'
am:
e835f3a
* commit '
e835f3a2e4a7af404e61a88058712f77737d87cd':
Store precice set of which constructors require barriers
Revert "Revert "Check if we require barrier if we did not resolve classes""
Revert "Revert "Change RequiresConstructorBarrier default to yes""
Change-Id: Ib0083850b2870223c13e1aa3128f5f656de868e8
buzbee [Fri, 8 Apr 2016 18:07:07 +0000 (18:07 +0000)]
Merge "ART: Fix race in on-stack replacement" am:
250a23c am:
4766a4a
am:
085b698
* commit '
085b698d555c465d96348f23aa816a0bfa40cb5b':
ART: Fix race in on-stack replacement
Change-Id: I00a98bca303e8a0807cb95a25187cc05b75185f9
Mathieu Chartier [Thu, 7 Apr 2016 20:19:19 +0000 (13:19 -0700)]
Store precice set of which constructors require barriers
Fixes bugs where things in the boot image might not have been
calculated even though resolved_clases was true. This only occured
for app and test compiles though.
Fixes test 476-checker-ctor-memory-barrier which was failing due to
inlining something in the boot class path and getting a unexpected
barrier since the barrier defaults to enabled.
No measurable increase in RAM usage.
(cherry picked from commit
c4ae916def97b9e1ef6df35c8fabb3921a0e380c)
Bug:
28005874
Change-Id: I4a417819aa129c95f4a83c38df1a66eb77824ea9
Bill Buzbee [Fri, 8 Apr 2016 17:52:25 +0000 (17:52 +0000)]
Merge "ART: Fix race in on-stack replacement" am:
250a23c
am:
4766a4a
* commit '
4766a4af2bd5e3fe8433fe758db94921b6b1bb15':
ART: Fix race in on-stack replacement
Change-Id: Ib7fd162bdbd4ea62e1803a7420435a140c566456
Mathieu Chartier [Fri, 8 Apr 2016 17:50:05 +0000 (17:50 +0000)]
Merge changes from topic 'rr_barrier'
* changes:
Store precice set of which constructors require barriers
Revert "Revert "Check if we require barrier if we did not resolve classes""
Revert "Revert "Change RequiresConstructorBarrier default to yes""
Mathieu Chartier [Thu, 7 Apr 2016 21:16:26 +0000 (14:16 -0700)]
Reduce dirty image pages by improving binning
Change ordering from dirty to less dirty since ArtFields are clean
and they are last. Add separate binning for DexCache and instances
of java lang object (probably a lock object).
Business card .art RAM (on shamu):
PSS Private Dirty
.art mmap 1011 600
.art mmap 990 560
Bug:
27906566
Change-Id: Ib3116953df7adafdc1560b064365c8b56e71483e
buzbee [Fri, 8 Apr 2016 17:45:20 +0000 (17:45 +0000)]
Merge "ART: Fix race in on-stack replacement"
am:
250a23c
* commit '
250a23c892bb809267325c0744c6f70fca49ac94':
ART: Fix race in on-stack replacement
Change-Id: I73be63f71d7ad8c91ee617dee8e812cabf8bbbd3
Mathieu Chartier [Thu, 7 Apr 2016 20:19:19 +0000 (13:19 -0700)]
Store precice set of which constructors require barriers
Fixes bugs where things in the boot image might not have been
calculated even though resolved_clases was true. This only occured
for app and test compiles though.
Fixes test 476-checker-ctor-memory-barrier which was failing due to
inlining something in the boot class path and getting a unexpected
barrier since the barrier defaults to enabled.
No measurable increase in RAM usage.
Bug:
28005874
Change-Id: I4a417819aa129c95f4a83c38df1a66eb77824ea9
Bill Buzbee [Fri, 8 Apr 2016 17:28:49 +0000 (17:28 +0000)]
Merge "ART: Fix race in on-stack replacement"
Alex Light [Fri, 8 Apr 2016 16:44:54 +0000 (09:44 -0700)]
Make sure non-fatal errors aren't printed.
During run-test setup `du` can print error messages if the folder it
is running on is modified during its execution. We silence these error
messages since they shouldn't affect the validity of the test.
Change-Id: I9f59e39c2a346414f025ce1fa79b453329080d30
Roland Levillain [Fri, 8 Apr 2016 16:23:31 +0000 (16:23 +0000)]
Merge "Ignore libcore.java.lang.ThreadTest failures on device." am:
6c5d868 am:
2b63a40
am:
58b0a24
* commit '
58b0a24a2781348a364dcaeb44b22efe6484e581':
Ignore libcore.java.lang.ThreadTest failures on device.
Change-Id: Ib76ec022c90f16eeb63510a4da97f29217949fe6
Roland Levillain [Fri, 8 Apr 2016 16:18:48 +0000 (16:18 +0000)]
Merge "Ignore libcore.java.lang.ThreadTest failures on device." am:
6c5d868
am:
2b63a40
* commit '
2b63a40b125fbe0904947d523c66d1eb71a71796':
Ignore libcore.java.lang.ThreadTest failures on device.
Change-Id: I499ed39f2fe7c64dd391b60c68dd7b4863b57276
Roland Levillain [Fri, 8 Apr 2016 16:13:59 +0000 (16:13 +0000)]
Merge "Ignore libcore.java.lang.ThreadTest failures on device."
am:
6c5d868
* commit '
6c5d868c94401aeb7596d5d36380b61c7ed81222':
Ignore libcore.java.lang.ThreadTest failures on device.
Change-Id: I531a2a34824bdaadfacde195dfd179ceccfb9e62
buzbee [Thu, 7 Apr 2016 21:42:47 +0000 (14:42 -0700)]
ART: Fix race in on-stack replacement
The expected sequence of events for on-stack replacement is:
1. Method goes warm, triggering enhanced profiling
2. Method goes hot, triggering method compilation
3. Method goes really hot, triggering an osr method compilation.
4. Interpreter polls for the existence of an osr entry point,
and transitons to compiled code if found.
We have a race problem if #2 and #3 happen closely together, and
the osr method compilation begins before the regular method
compilation. In that case, the jit sees that the method is
already being compiled (the osr method - but it does not
distinguish the two), and discards the normal compilation request.
So, the osr version is compiled and the normal version is discarded.
In #4, the MaybeDoOnStackReplacement() check assumes that a normal
version of the compiled method must exist before doing an on-stack
replacement, so it keeps returning false.
This is why we were seeing sporadic timeout failures of
570-checker-osr when the mterp fast branch profiling was
introduced. The branch profiling performance enhancements
greatly reduced the time between #2 and #3, increasing the liklihood
of losing the race. Further, the new code clamped hotness to avoid
wrap-around. The race existed (and likely occurred) in the previous
version, but because hotness counters were allowed to overflow and
wrap around you'd eventually hit the threshold a second time and
try again - masking the problem.
Tip 'o the hat to Serguei Katkov for identifying the problem.
A possible solution (taken in this CL) is to differentiate osr
compilations from normal method compilations.
Bug:
27939339
Change-Id: I71044516b35dc69de9fc2d2a445e33809ac650ed
Roland Levillain [Fri, 8 Apr 2016 16:01:18 +0000 (16:01 +0000)]
Merge "Ignore libcore.java.lang.ThreadTest failures on device."
Roland Levillain [Fri, 8 Apr 2016 15:04:11 +0000 (16:04 +0100)]
Ignore libcore.java.lang.ThreadTest failures on device.
Since https://android-review.googlesource.com/#/c/209427
has been merged, libcore.java.lang.ThreadTest tests are
failing with this error on ARM64:
java.lang.UnsatisfiedLinkError: dlopen failed: library "libnativehelper_compat_libc++.so" not found
at java.lang.Runtime.loadLibrary0(Runtime.java:977)
at java.lang.System.loadLibrary(System.java:1628)
at libcore.java.lang.ThreadTest.<clinit>(ThreadTest.java:26)
Ignore those failures for now to make the build turn green
again, while we investigate.
Bug:
28082914
Change-Id: Ia8c3c776c99aace06701479d1440c828d39cbec3
Jeff Hao [Fri, 8 Apr 2016 08:16:49 +0000 (08:16 +0000)]
Merge "Fix combined checksum calculation to use isa." am:
82a0229 am:
a5bfd62
am:
c6c5497
* commit '
c6c549724f2ecee2e431baf51d70d497f68ae935':
Fix combined checksum calculation to use isa.
Change-Id: I4525969b47f1352a9387c83ced89421253fdf4fd
Jeff Hao [Fri, 8 Apr 2016 08:16:49 +0000 (08:16 +0000)]
Merge "Combine checksum of all boot images." am:
9863b6c am:
6c24b6a -s ours
am:
e9b5a45
* commit '
e9b5a45e058d3a4ba79d7d49404cfdd7d03aade9':
Combine checksum of all boot images.
Change-Id: I3e10dd98abccd718df84302df49a7e0516ab48e5
Jeff Hao [Fri, 8 Apr 2016 08:12:40 +0000 (08:12 +0000)]
Merge "Fix combined checksum calculation to use isa." am:
82a0229
am:
a5bfd62
* commit '
a5bfd6228ce2d36c342e240e0cd5d6d06d8388e7':
Fix combined checksum calculation to use isa.
Change-Id: I6b7ad47114b6770bf062286629f0297dc97596fb
Jeff Hao [Fri, 8 Apr 2016 08:12:39 +0000 (08:12 +0000)]
Merge "Combine checksum of all boot images." am:
9863b6c
am:
6c24b6a -s ours
* commit '
6c24b6a91bf2d75ec93452ba5f85e3def9d7ee60':
Combine checksum of all boot images.
Change-Id: I7214920053576d77c324cbd477c2800eb60f76c1
Jeff Hao [Fri, 8 Apr 2016 03:23:36 +0000 (03:23 +0000)]
Merge "Fix combined checksum calculation to use isa."
am:
82a0229
* commit '
82a0229e949eb3ea209c2bd33fe2d60908f5dbc7':
Fix combined checksum calculation to use isa.
Change-Id: I94ed5fb0d1a738111974e8bf502251859e8df855
Jeff Hao [Fri, 8 Apr 2016 03:23:36 +0000 (03:23 +0000)]
Merge "Combine checksum of all boot images."
am:
9863b6c
* commit '
9863b6cd07945b83d3a91a27c94963d8b313df2d':
Combine checksum of all boot images.
Change-Id: I1926eeff7d3e69bc2925fa7507fbe845bb982899
Jeff Hao [Fri, 8 Apr 2016 03:16:37 +0000 (03:16 +0000)]
Merge "Fix combined checksum calculation to use isa."
Jeff Hao [Fri, 8 Apr 2016 03:16:24 +0000 (03:16 +0000)]
Merge "Combine checksum of all boot images."
Jeff Hao [Fri, 8 Apr 2016 02:46:31 +0000 (19:46 -0700)]
Fix combined checksum calculation to use isa.
Bug:
28054110
(cherry-picked from commit
8bbda8e683a1933755d0b8a68fed620cd63148ee)
Change-Id: I228db6ea1003e4e70d6a5fa7345d56409e70bd87
Jeff Hao [Fri, 8 Apr 2016 03:01:15 +0000 (03:01 +0000)]
Fix combined checksum calculation to use isa. am:
539d38c
am:
6b64d4b
* commit '
6b64d4b89c2d0282d8a0af8d20a4c138a9bbf257':
Fix combined checksum calculation to use isa.
Change-Id: I870e1915bfcb85f7890682a3b686d141f9eb13a1
Jeff Hao [Fri, 8 Apr 2016 02:57:27 +0000 (02:57 +0000)]
Fix combined checksum calculation to use isa.
am:
539d38c
* commit '
539d38c67c521aa17741a41fc4c4462b576adfd9':
Fix combined checksum calculation to use isa.
Change-Id: I6a67cd930954248451f7948f3ae366595c0b83cc
Jeff Hao [Thu, 7 Apr 2016 22:40:54 +0000 (15:40 -0700)]
Combine checksum of all boot images.
Allows a change to be detected in more than just the first image.
Combines checksums of all boot images using xor. A better hash is left
as TODO.
Bug:
28054110
(cherry-picked from commit
4f351aae00f43dd4e3290976f249d3664cc47091)
Change-Id: Ia557e2460ca582082368ef93508c04ce32c3036a
Jeff Hao [Fri, 8 Apr 2016 02:46:31 +0000 (19:46 -0700)]
Fix combined checksum calculation to use isa.
Bug:
28054110
Change-Id: Ifcd1b0c4549a22bf4181f8acad222da05ac9f1ce
Jeff Hao [Fri, 8 Apr 2016 01:55:34 +0000 (01:55 +0000)]
Combine checksum of all boot images. am:
4f351aa
am:
54d78b6
* commit '
54d78b66f5a614fd85d89008e17ec9e3c65e2f46':
Combine checksum of all boot images.
Change-Id: Ie3696c5e16fcb9fb0b6864a40a0d5b42ee33c35e
Jeff Hao [Fri, 8 Apr 2016 01:51:38 +0000 (01:51 +0000)]
Combine checksum of all boot images.
am:
4f351aa
* commit '
4f351aae00f43dd4e3290976f249d3664cc47091':
Combine checksum of all boot images.
Change-Id: Ife392ac22d5cb97035468408db0818ca06ad338b
Jeff Hao [Thu, 7 Apr 2016 22:40:54 +0000 (15:40 -0700)]
Combine checksum of all boot images.
Allows a change to be detected in more than just the first image.
Combines checksums of all boot images using xor. A better hash is left
as TODO.
Bug:
28054110
Change-Id: Ifbdd6cbb0104c95e8926ba4f8a207cc72dbb7f79
buzbee [Fri, 8 Apr 2016 00:10:26 +0000 (00:10 +0000)]
Merge "ART: Fix interpreter single-step when doing OSR" am:
dc80925 am:
dc7e534
am:
64d84bc
* commit '
64d84bc574d539b32b0903dd8c6fe84123fb618d':
ART: Fix interpreter single-step when doing OSR
Change-Id: Id93db5e7a2dce43357be42ca51b7517b470e9f7c
Bill Buzbee [Fri, 8 Apr 2016 00:03:10 +0000 (00:03 +0000)]
Merge "ART: Fix interpreter single-step when doing OSR" am:
dc80925
am:
dc7e534
* commit '
dc7e534cd0a56380bf0d1934a368f90495c39064':
ART: Fix interpreter single-step when doing OSR
Change-Id: Icc4ca25b95e1100e438e125ac8ecee7c851ed4e6
buzbee [Thu, 7 Apr 2016 23:59:31 +0000 (23:59 +0000)]
Merge "ART: Fix interpreter single-step when doing OSR"
am:
dc80925
* commit '
dc8092521b50b108607ed54afde94d20a22468df':
ART: Fix interpreter single-step when doing OSR
Change-Id: I717599ea10d051b56167b82784087c48631ef322
Bill Buzbee [Thu, 7 Apr 2016 23:47:55 +0000 (23:47 +0000)]
Merge "ART: Fix interpreter single-step when doing OSR"
Jeff Hao [Thu, 7 Apr 2016 22:38:33 +0000 (22:38 +0000)]
Remove AnnotationAccess and its remaining uses. am:
0830532
am:
f54591c
* commit '
f54591c43b51f794fa81d625e436fc20460172e0':
Remove AnnotationAccess and its remaining uses.
Change-Id: I1b8a97d3e1a004d182e8b925022ca0b78f082537
Jeff Hao [Thu, 7 Apr 2016 22:35:02 +0000 (22:35 +0000)]
Remove AnnotationAccess and its remaining uses.
am:
0830532
* commit '
08305325d3468d5ef413eb0b36b1ea1b3746a6c4':
Remove AnnotationAccess and its remaining uses.
Change-Id: Ic66ac22c300d6e372e15d1f8e6ee329a24f44844
buzbee [Thu, 7 Apr 2016 20:52:48 +0000 (13:52 -0700)]
ART: Fix interpreter single-step when doing OSR
Records an interpreter exit when in single-step mode and we've
finished processing the method via on-stack replacement.
Change-Id: I7a7d9ee9e4f3fbf7f829d9f54eca0e7c64395003
Hiroshi Yamauchi [Thu, 7 Apr 2016 21:59:38 +0000 (21:59 +0000)]
Merge changes Ie23877ac,I262f6be8 am:
f2197e4 am:
39881e2
am:
380b1bd
* commit '
380b1bd299577fc14c07f4ea2a2552369bfe42a9':
Revert "Disable some image_test cases with concurrent collector."
Fix image_test for the CC collector.
Change-Id: Ic679605cbe3345e9e08ca905f3b02abb709f2096
Hiroshi Yamauchi [Thu, 7 Apr 2016 21:56:02 +0000 (21:56 +0000)]
Merge changes Ie23877ac,I262f6be8 am:
f2197e4
am:
39881e2
* commit '
39881e263e6844766dbca14509226b87e5cf65f8':
Revert "Disable some image_test cases with concurrent collector."
Fix image_test for the CC collector.
Change-Id: I226b9341418d659a8dc59ba1465a8023fd034c88
Hiroshi Yamauchi [Thu, 7 Apr 2016 21:18:29 +0000 (21:18 +0000)]
Merge changes Ie23877ac,I262f6be8
am:
f2197e4
* commit '
f2197e43f42499be852a0fce2d755f25e2007be8':
Revert "Disable some image_test cases with concurrent collector."
Fix image_test for the CC collector.
Change-Id: I91f1527c9b32cc3889b64a8c30486ee9c0a29f16
Hiroshi Yamauchi [Thu, 7 Apr 2016 21:10:54 +0000 (21:10 +0000)]
Merge changes Ie23877ac,I262f6be8
* changes:
Revert "Disable some image_test cases with concurrent collector."
Fix image_test for the CC collector.
Hiroshi Yamauchi [Thu, 7 Apr 2016 18:44:50 +0000 (11:44 -0700)]
Revert "Disable some image_test cases with concurrent collector."
This reverts commit
d52765768b634c6f32a9bddd5c1269f26d32ea3a.
Bug:
27578460
Change-Id: Ie23877ac5332e05805c251749159e8f00af4ac8c
Hiroshi Yamauchi [Thu, 7 Apr 2016 18:31:26 +0000 (11:31 -0700)]
Fix image_test for the CC collector.
Increase the image address space reserve.
Bug:
27578460
Change-Id: I262f6be81c496a7a777013702e3da74ea4d619b4
Jeff Hao [Thu, 7 Apr 2016 18:20:20 +0000 (18:20 +0000)]
Merge "Remove AnnotationAccess and its remaining uses." am:
2c6760a am:
5b2f8e0
am:
6e88fe8
* commit '
6e88fe80e84788cdfcb93a9f599eabea06ef78fd':
Remove AnnotationAccess and its remaining uses.
Change-Id: I8264e98ac7909114b7d014b112ddf3da21a304b2
Jeff Hao [Tue, 5 Apr 2016 02:50:14 +0000 (19:50 -0700)]
Remove AnnotationAccess and its remaining uses.
Art side of this change. Adds a test to ensure annotations not marked
for runtime retention can't be seen at runtime.
Bug:
27912552
(cherry picked from commit
1133db79350060158f99210c56f111c6dad43563)
Change-Id: I090a90bc82fc9b5e51aba02dcb3d8cccb6fb0f90
Jeff Hao [Thu, 7 Apr 2016 18:16:57 +0000 (18:16 +0000)]
Merge "Remove AnnotationAccess and its remaining uses." am:
2c6760a
am:
5b2f8e0
* commit '
5b2f8e07a1859762c30c3a1f792594c34ffc0b18':
Remove AnnotationAccess and its remaining uses.
Change-Id: Ib9ebea19b91f5ba3345b372ea50b8391e01ce8b3
Jeff Hao [Thu, 7 Apr 2016 18:12:58 +0000 (18:12 +0000)]
Merge "Remove AnnotationAccess and its remaining uses."
am:
2c6760a
* commit '
2c6760a0eb1e05d3a89a6cca9d2746da3d547e9e':
Remove AnnotationAccess and its remaining uses.
Change-Id: I40401184b8576440585d6e1c4f7d138965887c30
Jeff Hao [Thu, 7 Apr 2016 18:06:13 +0000 (18:06 +0000)]
Merge "Remove AnnotationAccess and its remaining uses."
Mathieu Chartier [Thu, 7 Apr 2016 17:52:52 +0000 (10:52 -0700)]
Revert "Revert "Check if we require barrier if we did not resolve classes""
This reverts commit
a7ab4997f7263439561093ffbc7dea29181a47c5.
Mathieu Chartier [Thu, 7 Apr 2016 17:19:48 +0000 (10:19 -0700)]
Revert "Revert "Change RequiresConstructorBarrier default to yes""
This reverts commit
0436ee6bd33a0b905cd2a7e333f7935da1bd5d86.
Roland Levillain [Thu, 7 Apr 2016 16:27:24 +0000 (16:27 +0000)]
Merge "Remove more Quick-related macros in tests." am:
7fa1f92 am:
be72bec
am:
9fb77d7
* commit '
9fb77d7ac04ae54880eaca030aeea475740880ce':
Remove more Quick-related macros in tests.
Change-Id: Ic6016f9ccadbf002476affc8f83ff067b6fa6bdc
Roland Levillain [Thu, 7 Apr 2016 16:24:08 +0000 (16:24 +0000)]
Merge "Remove more Quick-related macros in tests." am:
7fa1f92
am:
be72bec
* commit '
be72beca9ec185c85d1cd16c2c23b24cfefe1f4d':
Remove more Quick-related macros in tests.
Change-Id: Ic7caa127a2a43cce96d47ffd9cb7bcb49121e463
Roland Levillain [Thu, 7 Apr 2016 16:20:25 +0000 (16:20 +0000)]
Merge "Remove more Quick-related macros in tests."
am:
7fa1f92
* commit '
7fa1f92cbf98c40baa00c6fb9331ec7ac72abfa8':
Remove more Quick-related macros in tests.
Change-Id: I001069102af646ac0a53d9cbbb106a61199b42c6
David Brazdil [Thu, 7 Apr 2016 16:20:25 +0000 (16:20 +0000)]
Merge "Revert "Revert "Refactor HGraphBuilder and SsaBuilder to remove HLocals""" am:
8913162 am:
9eff981
am:
a6c1ce3
* commit '
a6c1ce3719d3b77561b6e21bc95cb6b88985fbaf':
Revert "Revert "Refactor HGraphBuilder and SsaBuilder to remove HLocals""
Change-Id: Ie55795d4b0970f5c6ab6aa4b4ff17102f468bfc7
David Brazdil [Thu, 7 Apr 2016 16:16:29 +0000 (16:16 +0000)]
Merge "Revert "Revert "Refactor HGraphBuilder and SsaBuilder to remove HLocals""" am:
8913162
am:
9eff981
* commit '
9eff98156ec2924c47bf816650a8ee127f74502f':
Revert "Revert "Refactor HGraphBuilder and SsaBuilder to remove HLocals""
Change-Id: Idc9951c9ae6463c75662a553c3848ef66d64184d
David Brazdil [Thu, 7 Apr 2016 16:13:12 +0000 (16:13 +0000)]
Merge "Revert "Revert "Refactor HGraphBuilder and SsaBuilder to remove HLocals"""
am:
8913162
* commit '
8913162a5959035f100f608fd5ccc348cf3922cf':
Revert "Revert "Refactor HGraphBuilder and SsaBuilder to remove HLocals""
Change-Id: I5697e5764208115f7bdd9e70e6322cefa2451c77
Roland Levillain [Thu, 7 Apr 2016 16:13:10 +0000 (16:13 +0000)]
Merge "Remove more Quick-related macros in tests."
David Brazdil [Thu, 7 Apr 2016 16:03:51 +0000 (16:03 +0000)]
Merge "Revert "Revert "Refactor HGraphBuilder and SsaBuilder to remove HLocals"""
David Brazdil [Thu, 7 Apr 2016 09:54:26 +0000 (09:54 +0000)]
Revert "Revert "Refactor HGraphBuilder and SsaBuilder to remove HLocals""
This patch merges the instruction-building phases from HGraphBuilder
and SsaBuilder into a single HInstructionBuilder class. As a result,
it is not necessary to generate HLocal, HLoadLocal and HStoreLocal
instructions any more, as the builder produces SSA form directly.
Saves 5-15% of arena-allocated memory (see bug for more data):
GMS 20.46MB => 19.26MB (-5.86%)
Maps 24.12MB => 21.47MB (-10.98%)
YouTube 28.60MB => 26.01MB (-9.05%)
This CL fixed an issue with parsing quickened instructions.
Bug:
27894376
Bug:
27998571
Bug:
27995065
Change-Id: I20dbe1bf2d0fe296377478db98cb86cba695e694
Roland Levillain [Wed, 6 Apr 2016 17:23:01 +0000 (18:23 +0100)]
Remove more Quick-related macros in tests.
Remove these macros, as Quick is gone:
- TEST_DISABLED_FOR_HEAP_REFERENCE_POISONING_WITH_QUICK
- TEST_DISABLED_FOR_READ_BARRIER_WITH_QUICK
Also remove TEST_DISABLED_FOR_NON_PIC_COMPILING_WITH_OPTIMIZING,
as it is no longer used anywhere.
Change-Id: I78617fc060b7727f9b6fffcb2348d6fca01b4928
Roland Levillain [Thu, 7 Apr 2016 15:13:23 +0000 (15:13 +0000)]
Merge "Revert "Change RequiresConstructorBarrier default to yes"" am:
950dd55 am:
d3d2747
am:
91cf14b
* commit '
91cf14b02ec55a3d7aadb77ec4e9e722ca7ab5d4':
Revert "Change RequiresConstructorBarrier default to yes"
Change-Id: I75f4dd0563beea5ecfdc49dc43a5697370462e14
Roland Levillain [Thu, 7 Apr 2016 15:13:22 +0000 (15:13 +0000)]
Merge "Revert "Check if we require barrier if we did not resolve classes"" am:
35d6a42 am:
bc5334e
am:
ae03a91
* commit '
ae03a9160f743a99369736f031a1902d02983595':
Revert "Check if we require barrier if we did not resolve classes"
Change-Id: I57b5dcbd5860099546bb513c0e8d6aeefd873a4f
Roland Levillain [Thu, 7 Apr 2016 15:10:11 +0000 (15:10 +0000)]
Merge "Revert "Change RequiresConstructorBarrier default to yes"" am:
950dd55
am:
d3d2747
* commit '
d3d2747626c003c014d7d771db1035b5f3f0c8e1':
Revert "Change RequiresConstructorBarrier default to yes"
Change-Id: Ib329d3c20da29b28cade87a1c6fb71926f4a07eb
Roland Levillain [Thu, 7 Apr 2016 15:10:10 +0000 (15:10 +0000)]
Merge "Revert "Check if we require barrier if we did not resolve classes"" am:
35d6a42
am:
bc5334e
* commit '
bc5334e68da1a17e6c24435756a25607394d23cd':
Revert "Check if we require barrier if we did not resolve classes"
Change-Id: Ic7c3fc1c68c72353f7393373690deb9bd85af46a
Roland Levillain [Thu, 7 Apr 2016 15:06:54 +0000 (15:06 +0000)]
Merge "Revert "Change RequiresConstructorBarrier default to yes""
am:
950dd55
* commit '
950dd553041b324e9e343a60d94d45596b5c7926':
Revert "Change RequiresConstructorBarrier default to yes"
Change-Id: Idc9003dc03b001eb248866eef9edf35752d60e59
Roland Levillain [Thu, 7 Apr 2016 15:06:54 +0000 (15:06 +0000)]
Merge "Revert "Check if we require barrier if we did not resolve classes""
am:
35d6a42
* commit '
35d6a426c699da05ee6f962cfbe426b7d638780a':
Revert "Check if we require barrier if we did not resolve classes"
Change-Id: I4e7cb7257bb9b5949d1d05526c647e8fc1ed48f2
Roland Levillain [Thu, 7 Apr 2016 14:58:32 +0000 (14:58 +0000)]
Merge "Revert "Change RequiresConstructorBarrier default to yes""
Roland Levillain [Thu, 7 Apr 2016 14:58:12 +0000 (14:58 +0000)]
Revert "Change RequiresConstructorBarrier default to yes"
CL https://android-review.googlesource.com/#/c/213119/ is
breaking run-test 476-checker-ctor-memory-barrier on ARM
and ARM64.
Bug:
28005874
This reverts commit
f2f0f4b0b9185fe0b6d1fb22744a871c96296db2.
Change-Id: Ic6e97ab07358406c07c654ac9de700f0186f15f8
Roland Levillain [Thu, 7 Apr 2016 14:57:50 +0000 (14:57 +0000)]
Merge "Revert "Check if we require barrier if we did not resolve classes""
Roland Levillain [Thu, 7 Apr 2016 14:56:58 +0000 (14:56 +0000)]
Revert "Check if we require barrier if we did not resolve classes"
CL https://android-review.googlesource.com/#/c/213119/ is
breaking run-test 476-checker-ctor-memory-barrier on ARM
and ARM64, and reverting it requires reverting this CL
(https://android-review.googlesource.com/#/c/213109/)
first.
Bug:
28005874
This reverts commit
20fd7cdd25364b16d878df037c6ae0fbd5f2a9ac.
Change-Id: Iaf174b2df3dd4dd469c79ca3f2c68ef87748d124
Vladimir Marko [Thu, 7 Apr 2016 14:50:46 +0000 (14:50 +0000)]
Merge "Thumb2: Show the immediate in ROR (immediate) disassembly." am:
173e99a am:
704da2f
am:
263b77b
* commit '
263b77b34053a312ee6243420530d4493ab308ed':
Thumb2: Show the immediate in ROR (immediate) disassembly.
Change-Id: I325f70a288c7b8da7dcb5f2cb8ad1fc27ec9e0b3
Vladimir Marko [Thu, 7 Apr 2016 14:47:32 +0000 (14:47 +0000)]
Merge "Thumb2: Show the immediate in ROR (immediate) disassembly." am:
173e99a
am:
704da2f
* commit '
704da2f8e81659f98f3df9ed6924ec0349936f87':
Thumb2: Show the immediate in ROR (immediate) disassembly.
Change-Id: I8c73cdacd92ccd22138d32addc4a5682f0130be7
Vladimir Marko [Thu, 7 Apr 2016 14:44:16 +0000 (14:44 +0000)]
Merge "Thumb2: Show the immediate in ROR (immediate) disassembly."
am:
173e99a
* commit '
173e99a73e535f07bc32fc76d3ff9f987caeffda':
Thumb2: Show the immediate in ROR (immediate) disassembly.
Change-Id: If5d0d4b38f673d4c1a7353ab2f1a7def5a086afe
Vladimir Marko [Thu, 7 Apr 2016 14:38:29 +0000 (14:38 +0000)]
Merge "Thumb2: Show the immediate in ROR (immediate) disassembly."
Vladimir Marko [Thu, 7 Apr 2016 12:27:07 +0000 (12:27 +0000)]
Merge "Add 20s timeout to 570-checker-osr." am:
748ad81 am:
522354b
am:
e85230a
* commit '
e85230af78dc3e803080c6138b2bb683bfb35d49':
Add 20s timeout to 570-checker-osr.
Change-Id: I2da9aa67ed8bc09bc6e8945c4ce7d27acdffd173
Vladimir Marko [Thu, 7 Apr 2016 12:23:34 +0000 (12:23 +0000)]
Merge "Add 20s timeout to 570-checker-osr." am:
748ad81
am:
522354b
* commit '
522354b3f7c76970eb37be50836b8473e301286c':
Add 20s timeout to 570-checker-osr.
Change-Id: I282bd15ba2465c5225933a22ebdcce4094bd36ea