OSDN Git Service
Vladimir Marko [Tue, 5 Apr 2016 12:03:42 +0000 (12:03 +0000)]
Merge "Revert "Remove many `instrumentation` variables from goto interpreter."" am:
c2c9bcb am:
bda7cb2
am:
62db591
* commit '
62db59111d2170f28701079e4a34f2b7c10509f9':
Revert "Remove many `instrumentation` variables from goto interpreter."
Change-Id: I7b6ce457888870982306f2659732bee3fe6f2c9e
Vladimir Marko [Tue, 5 Apr 2016 12:00:57 +0000 (12:00 +0000)]
Merge "Revert "Remove many `instrumentation` variables from goto interpreter."" am:
c2c9bcb
am:
bda7cb2
* commit '
bda7cb2d4a87e93ecbfe3eaf9f0e043a9fa32e33':
Revert "Remove many `instrumentation` variables from goto interpreter."
Change-Id: I5d85cbf55914c0cc4568382548d63671f3fa84d2
Vladimir Marko [Tue, 5 Apr 2016 11:58:12 +0000 (11:58 +0000)]
Merge "Revert "Remove many `instrumentation` variables from goto interpreter.""
am:
c2c9bcb
* commit '
c2c9bcb716cdfed2337a7715dd33667b3bb71fba':
Revert "Remove many `instrumentation` variables from goto interpreter."
Change-Id: Ia9d1f17ea824623d6949b6903f63d537dd134381
Vladimir Marko [Tue, 5 Apr 2016 11:52:23 +0000 (11:52 +0000)]
Merge "Revert "Remove many `instrumentation` variables from goto interpreter.""
Vladimir Marko [Tue, 5 Apr 2016 11:48:02 +0000 (11:48 +0000)]
Revert "Remove many `instrumentation` variables from goto interpreter."
This reverts commit
4cb22b4f6d0afbdf424369df99c6eb11999f2473.
Change-Id: I1d84965c2cde2ffc2ebdb46fb5251691ea12569b
Vladimir Marko [Tue, 5 Apr 2016 09:38:04 +0000 (09:38 +0000)]
Merge "Clean up OatQuickMethodHeader after Quick removal." am:
75563e3 am:
20153e1
am:
9359f6b
* commit '
9359f6b751902188e20ab28c8b94dfd78fa1eec3':
Clean up OatQuickMethodHeader after Quick removal.
Change-Id: I79fcff36bd084e0edc2472a7a555699a60279a32
Vladimir Marko [Tue, 5 Apr 2016 09:32:50 +0000 (09:32 +0000)]
Merge "Clean up OatQuickMethodHeader after Quick removal." am:
75563e3
am:
20153e1
* commit '
20153e118f7301282416e04cc335a13c74d433ae':
Clean up OatQuickMethodHeader after Quick removal.
Change-Id: Ifa40daca0093e714c4cd6edee59ecd799582bbf8
Vladimir Marko [Tue, 5 Apr 2016 09:30:16 +0000 (09:30 +0000)]
Merge "Clean up OatQuickMethodHeader after Quick removal."
am:
75563e3
* commit '
75563e34a4e64a8e805e6810b13e07f1cafec137':
Clean up OatQuickMethodHeader after Quick removal.
Change-Id: I41575dd094edc1c1246672a34678665b668a8f36
Vladimir Marko [Tue, 5 Apr 2016 09:23:52 +0000 (09:23 +0000)]
Merge "Clean up OatQuickMethodHeader after Quick removal."
Aart Bik [Mon, 4 Apr 2016 22:21:22 +0000 (22:21 +0000)]
Merge "Move DCHECK into loop." am:
a07be75 am:
4f3e438
am:
d9a3fc0
* commit '
d9a3fc05b8d79aaca38661625509151550c446f3':
Move DCHECK into loop.
Change-Id: Ib5686029eee203cd192cb96d9457bb55212508c4
Aart Bik [Mon, 4 Apr 2016 22:18:53 +0000 (22:18 +0000)]
Merge "Move DCHECK into loop." am:
a07be75
am:
4f3e438
* commit '
4f3e4380f38e853c6806f0dc5a6623310d5f38a5':
Move DCHECK into loop.
Change-Id: I679433b42ae6e7a66305ede534014fc9df86523f
Aart Bik [Mon, 4 Apr 2016 22:16:24 +0000 (22:16 +0000)]
Merge "Move DCHECK into loop."
am:
a07be75
* commit '
a07be75830af60ce50aba357e8de066e849aa21c':
Move DCHECK into loop.
Change-Id: Ia7bab5ec9fec82fb1d693b06357643518dfa19d6
Aart Bik [Mon, 4 Apr 2016 22:08:30 +0000 (22:08 +0000)]
Merge "Move DCHECK into loop."
Alex Light [Mon, 4 Apr 2016 21:55:36 +0000 (21:55 +0000)]
Merge "Fix issue with verification check failure on erroneous classes." am:
03bea09 am:
053490c
am:
0c34388
* commit '
0c343887e3b52b3748d4fee6c37b7fb41dd0796a':
Fix issue with verification check failure on erroneous classes.
Change-Id: I701df0c1c806432ee74818bcc6780257b813e03f
Alex Light [Mon, 4 Apr 2016 21:53:08 +0000 (21:53 +0000)]
Merge "Fix issue with verification check failure on erroneous classes." am:
03bea09
am:
053490c
* commit '
053490cedb8cb349cbcedbad652e7cf83c1b8a03':
Fix issue with verification check failure on erroneous classes.
Change-Id: If8df1134bcdd077bee4cf5285f470ef3a84fe8fc
Alex Light [Mon, 4 Apr 2016 21:50:41 +0000 (21:50 +0000)]
Merge "Fix issue with verification check failure on erroneous classes."
am:
03bea09
* commit '
03bea09898e81078e3d116f580e74d5b1911ea39':
Fix issue with verification check failure on erroneous classes.
Change-Id: I39a584f6c46653109617962661971872de08d7e8
Alex Light [Mon, 4 Apr 2016 21:46:30 +0000 (21:46 +0000)]
Merge "Fix issue with verification check failure on erroneous classes."
Andreas Gampe [Mon, 4 Apr 2016 21:43:21 +0000 (21:43 +0000)]
Merge "ART: Dump less maps" am:
23cb752 am:
51fc51e
am:
623cdfb
* commit '
623cdfbd672cda847afa535b94a19f675f6cdd4d':
ART: Dump less maps
Change-Id: Ifcfdb01d7065a2347825d42e0f5d39529b54c992
Andreas Gampe [Mon, 4 Apr 2016 21:40:50 +0000 (21:40 +0000)]
Merge "ART: Dump less maps" am:
23cb752
am:
51fc51e
* commit '
51fc51e4fb95f1911e4a52e95b0369feaf73ab19':
ART: Dump less maps
Change-Id: Ic4cd2ec698d79b65ef548335d8e64fca3ebe6876
Andreas Gampe [Mon, 4 Apr 2016 21:40:49 +0000 (21:40 +0000)]
Merge "ART: Dump less maps" into nyc-dev am:
657887e
am:
9b5b041
* commit '
9b5b0417588244061fd2e2edcc7d0ef3096db34b':
ART: Dump less maps
Change-Id: Ia0e31707d9e12fa7ed5418f9f0def5329b7e6fff
Andreas Gampe [Mon, 4 Apr 2016 21:38:23 +0000 (21:38 +0000)]
Merge "ART: Dump less maps"
am:
23cb752
* commit '
23cb752adb33e77864b7d8f5bc5a1d3a08ab2ac2':
ART: Dump less maps
Change-Id: Iaff4f923a8f875a764f5a8dc7c122d01ad765205
Andreas Gampe [Mon, 4 Apr 2016 21:38:23 +0000 (21:38 +0000)]
Merge "ART: Dump less maps" into nyc-dev
am:
657887e
* commit '
657887ebcd26cf0eae7c40d8ea35bd33186903e7':
ART: Dump less maps
Change-Id: I2e702ca2db8d280af3413a38ddb780efa3d9b0e8
Andreas Gampe [Mon, 4 Apr 2016 21:24:59 +0000 (21:24 +0000)]
Merge "ART: Dump less maps"
Andreas Gampe [Sat, 2 Apr 2016 00:20:49 +0000 (17:20 -0700)]
ART: Dump less maps
Security has been tightened, so there are situations where we can't
load our files, and produce "log spam."
Bug:
27925454
(cherry picked from commit
dfd7b70bbab8157fb385e4a6d6e4b55ae2e4e892)
Change-Id: Ia8c76184ea5087d625cf52d4459f8a557eebfafe
Andreas Gampe [Mon, 4 Apr 2016 21:22:13 +0000 (21:22 +0000)]
Merge "ART: Dump less maps" into nyc-dev
Aart Bik [Mon, 4 Apr 2016 21:19:01 +0000 (14:19 -0700)]
Move DCHECK into loop.
Rationale:
Since pointer is non-null on loop entry, moving the check
into the while loop (rather than after) gives a more friendly
error message in debug mode when something goes wrong.
BUG=
27825731
BUG=
27627004
Change-Id: I2ea67b3ab6c4edc6815fea38a436e5c3c194e540
Alex Light [Mon, 4 Apr 2016 20:23:14 +0000 (13:23 -0700)]
Fix issue with verification check failure on erroneous classes.
Bug:
27924355
Change-Id: I7d680e7196aeb9e2e6ef54139634564e058174d7
Mathieu Chartier [Mon, 4 Apr 2016 18:55:26 +0000 (18:55 +0000)]
Merge "Mark array classes as verification attempted" am:
2746c68 am:
32deff1
am:
949ae16
* commit '
949ae16cac8c94268a7603e15c9144e96b9a6309':
Mark array classes as verification attempted
Change-Id: I30db984bb9bbf42de386338f1830e1a66fce2180
Mathieu Chartier [Mon, 4 Apr 2016 18:53:05 +0000 (18:53 +0000)]
Merge "Mark array classes as verification attempted" am:
2746c68
am:
32deff1
* commit '
32deff171e4d0d1dfe8738c185d9edc7f2a35082':
Mark array classes as verification attempted
Change-Id: Ic4f5561ecd49b1d728101af5e25dfccd49915c23
Mathieu Chartier [Mon, 4 Apr 2016 18:50:12 +0000 (18:50 +0000)]
Merge "Mark array classes as verification attempted"
am:
2746c68
* commit '
2746c68840535294b1febc2224e81280f002909d':
Mark array classes as verification attempted
Change-Id: Ibfe84255283ee005f9317663fcd44fcffc525c5d
Mathieu Chartier [Mon, 4 Apr 2016 18:40:51 +0000 (18:40 +0000)]
Merge "Mark array classes as verification attempted"
Mathieu Chartier [Sat, 2 Apr 2016 00:33:31 +0000 (17:33 -0700)]
Mark array classes as verification attempted
We now initialize all array classes in the compiler driver. This in
turn will ensure they are marked verified in the image. This
prevents dirty pages in the image since we would otherwise set the
flags in the zygote.
On BusinessCard:
Reduces shared dirty from 636k -> 432k for boot.art, and dirty pages
from 183 to 132.
(cherry picked from commit
3b674098bef6eaf7d3fb731878293ef715fe1080)
Change-Id: If3093e4e3242e4ee3ea120abe5be7db028290260
Mathieu Chartier [Mon, 4 Apr 2016 18:29:24 +0000 (18:29 +0000)]
Mark array classes as verification attempted am:
3b67409
am:
0f78d8d
* commit '
0f78d8d35f11defc332dbfde61febdc68bd0b8cb':
Mark array classes as verification attempted
Change-Id: I0acaf1400540ed54b65bcc4653fb88e79f7cdb04
Mathieu Chartier [Mon, 4 Apr 2016 18:27:07 +0000 (18:27 +0000)]
Mark array classes as verification attempted
am:
3b67409
* commit '
3b674098bef6eaf7d3fb731878293ef715fe1080':
Mark array classes as verification attempted
Change-Id: Ib367d6dffe2df3fe7abdf8e6e65d61d7de83baff
David Brazdil [Mon, 4 Apr 2016 18:01:18 +0000 (18:01 +0000)]
Merge "Revert "Refactor HGraphBuilder and SsaBuilder to remove HLocals"" am:
7d9a5b0 am:
4082dea
am:
612ddbb
* commit '
612ddbb7f40552592dba5194302554de287ef796':
Revert "Refactor HGraphBuilder and SsaBuilder to remove HLocals"
Change-Id: Ib451fad56e4267d7089ff1ca801cf35911e15ca7
David Brazdil [Mon, 4 Apr 2016 17:59:04 +0000 (17:59 +0000)]
Merge "Revert "Refactor HGraphBuilder and SsaBuilder to remove HLocals"" am:
7d9a5b0
am:
4082dea
* commit '
4082deab827eb5c6cd4b8c6d10d494949d209a4f':
Revert "Refactor HGraphBuilder and SsaBuilder to remove HLocals"
Change-Id: Ifd13e4161873261b01aceb16321f72db0d315fa8
David Brazdil [Mon, 4 Apr 2016 17:56:46 +0000 (17:56 +0000)]
Merge "Revert "Refactor HGraphBuilder and SsaBuilder to remove HLocals""
am:
7d9a5b0
* commit '
7d9a5b0fbceef5806f059060d47533b9e699ec28':
Revert "Refactor HGraphBuilder and SsaBuilder to remove HLocals"
Change-Id: Ib027ac7dec02c175d50192f6b1ad15ed2fb19a28
Mathieu Chartier [Sat, 2 Apr 2016 00:33:31 +0000 (17:33 -0700)]
Mark array classes as verification attempted
We now initialize all array classes in the compiler driver. This in
turn will ensure they are marked verified in the image. This
prevents dirty pages in the image since we would otherwise set the
flags in the zygote.
On BusinessCard:
Reduces shared dirty from 636k -> 432k for boot.art, and dirty pages
from 183 to 132.
Bug:
27906566
Change-Id: I99fcaffe2cb7f0235a1a0845bebc44e2dc94cbf0
David Brazdil [Mon, 4 Apr 2016 17:48:02 +0000 (17:48 +0000)]
Merge "Revert "Refactor HGraphBuilder and SsaBuilder to remove HLocals""
David Brazdil [Mon, 4 Apr 2016 17:47:42 +0000 (17:47 +0000)]
Revert "Refactor HGraphBuilder and SsaBuilder to remove HLocals"
Bug:
27995065
This reverts commit
e3ff7b293be2a6791fe9d135d660c0cffe4bd73f.
Change-Id: I5363c7ce18f47fd422c15eed5423a345a57249d8
Roland Levillain [Mon, 4 Apr 2016 17:14:05 +0000 (17:14 +0000)]
Merge "Have Checker print lines of unmatched test cases." am:
75c221d am:
4077036
am:
ff29df7
* commit '
ff29df7a1f1e75044b26ac458675ee0b40a73a60':
Have Checker print lines of unmatched test cases.
Change-Id: I4f87c8cd9febca6efb2226cfcfe549d2d44c3e55
Roland Levillain [Mon, 4 Apr 2016 17:10:03 +0000 (17:10 +0000)]
Merge "Have Checker print lines of unmatched test cases." am:
75c221d
am:
4077036
* commit '
407703687ee9b402bf3e5d4e7e8c436d7a50123f':
Have Checker print lines of unmatched test cases.
Change-Id: I7eb9eee0bb318325ccf23452337c8c180e9a2271
Roland Levillain [Mon, 4 Apr 2016 17:06:31 +0000 (17:06 +0000)]
Merge "Have Checker print lines of unmatched test cases."
am:
75c221d
* commit '
75c221dcffab45e3c1e4ba8b8cd048c87497334f':
Have Checker print lines of unmatched test cases.
Change-Id: I37f42fa427a37dcddb077805f9eab316b759c71b
Roland Levillain [Mon, 4 Apr 2016 16:58:06 +0000 (16:58 +0000)]
Merge "Have Checker print lines of unmatched test cases."
Vladimir Marko [Thu, 31 Mar 2016 11:02:28 +0000 (12:02 +0100)]
Clean up OatQuickMethodHeader after Quick removal.
This reduces the size of the pre-header by 8 bytes, reducing
oat file size and mmapped .text section size. The memory
needed to store a CompiledMethod by dex2oat is also reduced,
for 32-bit dex2oat by 8B and for 64-bit dex2oat by 16B. The
aosp_flounder-userdebug 32-bit and 64-bit boot.oat are each
about 1.1MiB smaller.
Disable the broken StubTest.IMT, b/
27991555 .
Change-Id: I05fe45c28c8ffb7a0fa8b1117b969786748b1039
Roland Levillain [Mon, 4 Apr 2016 14:52:35 +0000 (14:52 +0000)]
Merge "Please Clang wrt stack frames in HInliner::TryBuildAndInlineHelper." am:
eb98c0d am:
d7e95b2
am:
ce5c6c1
* commit '
ce5c6c1da4579b7fb2f5c966968a3d1eb9140fdb':
Please Clang wrt stack frames in HInliner::TryBuildAndInlineHelper.
Change-Id: I4d7e424892fab6baeb0d563f2a88ac96aedaecad
Roland Levillain [Mon, 4 Apr 2016 14:48:28 +0000 (14:48 +0000)]
Merge "Please Clang wrt stack frames in HInliner::TryBuildAndInlineHelper." am:
eb98c0d
am:
d7e95b2
* commit '
d7e95b201f633d7499948b7e36d84b649b65e69c':
Please Clang wrt stack frames in HInliner::TryBuildAndInlineHelper.
Change-Id: I208a1e2e10e9445ea94642d8f920e3a7a6113dcf
Roland Levillain [Mon, 4 Apr 2016 14:44:57 +0000 (14:44 +0000)]
Merge "Please Clang wrt stack frames in HInliner::TryBuildAndInlineHelper."
am:
eb98c0d
* commit '
eb98c0ded592cfca8187c744393c82efd1020b2a':
Please Clang wrt stack frames in HInliner::TryBuildAndInlineHelper.
Change-Id: I6129f9834e5d45975f63100f7e230e6f92dbf577
Roland Levillain [Mon, 4 Apr 2016 14:36:12 +0000 (14:36 +0000)]
Merge "Please Clang wrt stack frames in HInliner::TryBuildAndInlineHelper."
Roland Levillain [Mon, 4 Apr 2016 14:34:31 +0000 (15:34 +0100)]
Please Clang wrt stack frames in HInliner::TryBuildAndInlineHelper.
This change enables Clang to compile ART on MIPS64 without
complaining about stack frames larger than what
`-Wframe-larger-than` allows.
Change-Id: I72f424922d9cb3d01f7b8ba4e5cb9170b82870d9
Roland Levillain [Mon, 4 Apr 2016 13:56:36 +0000 (14:56 +0100)]
Have Checker print lines of unmatched test cases.
Change-Id: I8ea7eee4c29f23ad10fb4d49ca927fdde39c1ef9
David Srbecky [Mon, 4 Apr 2016 13:50:00 +0000 (13:50 +0000)]
Merge "Use bit-level packing for InlineInfo in stackmaps as well." am:
2f92ec8 am:
934b58d
am:
8c3da35
* commit '
8c3da35c6829ac6ebae26952a9f6e86541f27439':
Use bit-level packing for InlineInfo in stackmaps as well.
Change-Id: I128cb1219aae5ad35bc49c04281f436d89afb3fc
David Srbecky [Mon, 4 Apr 2016 13:46:32 +0000 (13:46 +0000)]
Merge "Use bit-level packing for InlineInfo in stackmaps as well." am:
2f92ec8
am:
934b58d
* commit '
934b58d4f53490607e1a12a59f697c51c1797404':
Use bit-level packing for InlineInfo in stackmaps as well.
Change-Id: Id60a84511ceb94e3a9f0bb17464f0c75cef26a8c
David Srbecky [Mon, 4 Apr 2016 13:43:04 +0000 (13:43 +0000)]
Merge "Use bit-level packing for InlineInfo in stackmaps as well."
am:
2f92ec8
* commit '
2f92ec8a52faa4bc566af8fa34212f3e749e82c8':
Use bit-level packing for InlineInfo in stackmaps as well.
Change-Id: I548b78a3602f3aa9e9268bcd7188d683d153e6e3
Calin Juravle [Mon, 4 Apr 2016 13:35:53 +0000 (13:35 +0000)]
Merge "Use bit-level packing for InlineInfo in stackmaps as well."
Roland Levillain [Mon, 4 Apr 2016 13:08:31 +0000 (13:08 +0000)]
Merge "Fix BitCount intrinsics assertions." am:
75ee5c2 am:
0045917
am:
8a0171f
* commit '
8a0171f48ca5d534ef550a5960a2007f923c3c64':
Fix BitCount intrinsics assertions.
Change-Id: I80757b1089b67e407b06665d211cd11b09145a33
Roland Levillain [Mon, 4 Apr 2016 13:05:09 +0000 (13:05 +0000)]
Merge "Fix BitCount intrinsics assertions." am:
75ee5c2
am:
0045917
* commit '
0045917dbd18570ab54ebf49398baf5d27b33319':
Fix BitCount intrinsics assertions.
Change-Id: Ia52060327bdc6585927e3d0aa01d6fe97077d687
Roland Levillain [Mon, 4 Apr 2016 13:01:45 +0000 (13:01 +0000)]
Merge "Fix BitCount intrinsics assertions."
am:
75ee5c2
* commit '
75ee5c28ab583c532066b64d6337a5f78d6aa2ad':
Fix BitCount intrinsics assertions.
Change-Id: Ic13f9e6c95a6b74429f828a0f6c02066522e6a55
Roland Levillain [Mon, 4 Apr 2016 12:58:23 +0000 (12:58 +0000)]
Merge "Fix BitCount intrinsics assertions."
Roland Levillain [Mon, 4 Apr 2016 11:50:32 +0000 (11:50 +0000)]
Merge "Improve debugging in art/compiler/optimizing/common_arm64.h." am:
7e168f6 am:
21cf5b6
am:
ddb0d7f
* commit '
ddb0d7f4b14d255215c090e41facf3807a097e90':
Improve debugging in art/compiler/optimizing/common_arm64.h.
Change-Id: If09a9d9f6ecaa97f0d35b24ae4932ba2415e304c
Roland Levillain [Mon, 4 Apr 2016 11:47:09 +0000 (11:47 +0000)]
Merge "Improve debugging in art/compiler/optimizing/common_arm64.h." am:
7e168f6
am:
21cf5b6
* commit '
21cf5b6ee7873ceddd8e455944fa1761e5ad7ec6':
Improve debugging in art/compiler/optimizing/common_arm64.h.
Change-Id: I9bdc76afbdf1ef53a6b16b7c0a31c57e4be27cc2
Roland Levillain [Mon, 4 Apr 2016 11:43:47 +0000 (11:43 +0000)]
Merge "Improve debugging in art/compiler/optimizing/common_arm64.h."
am:
7e168f6
* commit '
7e168f65949e70069418148b0b60ac86d04339d0':
Improve debugging in art/compiler/optimizing/common_arm64.h.
Change-Id: I66af4fbaba2f922d7a5febc8b66b7054c15e9db0
Roland Levillain [Mon, 4 Apr 2016 11:37:58 +0000 (11:37 +0000)]
Merge "Improve debugging in art/compiler/optimizing/common_arm64.h."
David Brazdil [Mon, 4 Apr 2016 11:23:29 +0000 (11:23 +0000)]
Merge "Refactor HGraphBuilder and SsaBuilder to remove HLocals" am:
a999af4 am:
9bb6e43
am:
9f8c09f
* commit '
9f8c09f45290295a3dc14b5fc6d812090034ed24':
Refactor HGraphBuilder and SsaBuilder to remove HLocals
Change-Id: I39c60aa101175d5704a940a127f86acd04b51fd7
David Brazdil [Mon, 4 Apr 2016 11:23:28 +0000 (11:23 +0000)]
Merge "Build dominator tree before generating HInstructions" am:
a2013f6 am:
71a13d1
am:
d891b2e
* commit '
d891b2e6dacd64d7d9734a6467ad49e61c98f6ee':
Build dominator tree before generating HInstructions
Change-Id: Ie84c6bff3e3a6a16df8516bada526ba51187fcf1
David Brazdil [Mon, 4 Apr 2016 11:19:24 +0000 (11:19 +0000)]
Merge "Refactor HGraphBuilder and SsaBuilder to remove HLocals" am:
a999af4
am:
9bb6e43
* commit '
9bb6e432bdb063097c7aa65cce57613b43b75758':
Refactor HGraphBuilder and SsaBuilder to remove HLocals
Change-Id: I1370776033a23745b2f118877791423ed05542b7
David Brazdil [Mon, 4 Apr 2016 11:19:24 +0000 (11:19 +0000)]
Merge "Build dominator tree before generating HInstructions" am:
a2013f6
am:
71a13d1
* commit '
71a13d149b0a48b237f46c560ae9c9c4642de1c3':
Build dominator tree before generating HInstructions
Change-Id: Ibb5689a7580311bb0841cc2e82ec721e105235d5
David Brazdil [Mon, 4 Apr 2016 11:16:02 +0000 (11:16 +0000)]
Merge "Refactor HGraphBuilder and SsaBuilder to remove HLocals"
am:
a999af4
* commit '
a999af471f4288b7f7e03b59f66e2387839676bf':
Refactor HGraphBuilder and SsaBuilder to remove HLocals
Change-Id: Iee3a92cbfea2ff922277bb84960c370e033bd56c
David Brazdil [Mon, 4 Apr 2016 11:16:01 +0000 (11:16 +0000)]
Merge "Build dominator tree before generating HInstructions"
am:
a2013f6
* commit '
a2013f66442bfe429f027b6f8fb5f88635fe51d5':
Build dominator tree before generating HInstructions
Change-Id: I23b98c6fcd9deb2d0786e4a6dc9ec33c21ebb6b1
David Brazdil [Mon, 4 Apr 2016 11:12:14 +0000 (11:12 +0000)]
Merge "Refactor HGraphBuilder and SsaBuilder to remove HLocals"
David Brazdil [Mon, 4 Apr 2016 11:11:34 +0000 (11:11 +0000)]
Merge "Build dominator tree before generating HInstructions"
David Brazdil [Wed, 2 Mar 2016 16:48:20 +0000 (16:48 +0000)]
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%)
Bug:
27894376
Change-Id: Iefe28d40600c169c5d306fd2c77034ae19476d90
David Brazdil [Tue, 16 Feb 2016 09:26:07 +0000 (09:26 +0000)]
Build dominator tree before generating HInstructions
Second CL in the series of merging HGraphBuilder and SsaBuilder. This
patch refactors the builders so that dominator tree can be built
before any HInstructions are generated. This puts the SsaBuilder
removal of HLoadLocals/HStoreLocals straight after HGraphBuilder's
HInstruction generation phase. Next CL will therefore be able to
merge them.
This patch also adds util classes for iterating bytecode and switch
tables which allowed to simplify the code.
Bug:
27894376
Change-Id: Ic425d298b2e6e7980481ed697230b1a0b7904526
Andreas Gampe [Sat, 2 Apr 2016 00:20:49 +0000 (17:20 -0700)]
ART: Dump less maps
Security has been tightened, so there are situations where we can't
load our files, and produce "log spam."
Bug:
27925454
Change-Id: Ia8c76184ea5087d625cf52d4459f8a557eebfafe
Mathieu Chartier [Fri, 1 Apr 2016 23:56:09 +0000 (23:56 +0000)]
Merge "Dump different fields in imgdiag" am:
0cb5c86 am:
56ce407
am:
9ecf9c8
* commit '
9ecf9c8ad0f79441b801ad5651eb85d3bee49578':
Dump different fields in imgdiag
Change-Id: I79a8d05d13002459bb3bb9580bd82b54ab7d51ea
Mathieu Chartier [Fri, 1 Apr 2016 23:51:32 +0000 (23:51 +0000)]
Merge "Dump different fields in imgdiag" am:
0cb5c86
am:
56ce407
* commit '
56ce407581de011134763ca4d6e45bf77fc14bbf':
Dump different fields in imgdiag
Change-Id: Ife01ec90349eb804d31f5af4ebd62f5a89a69c1d
Mathieu Chartier [Fri, 1 Apr 2016 23:46:47 +0000 (23:46 +0000)]
Merge "Dump different fields in imgdiag"
am:
0cb5c86
* commit '
0cb5c86b7021e70cbf584c1455aad1ef383af786':
Dump different fields in imgdiag
Change-Id: I15d590b50a0a9ad7d04a99fe88612e71b4661dc5
Mathieu Chartier [Fri, 1 Apr 2016 23:36:19 +0000 (23:36 +0000)]
Merge "Dump different fields in imgdiag"
Mathieu Chartier [Fri, 1 Apr 2016 20:56:41 +0000 (13:56 -0700)]
Dump different fields in imgdiag
Dump which fields are different, also print field values.
(cherry picked from commit
ec1533880f3606546baceafe2db513d1a63c20da)
Change-Id: Ie91ea07fb8ff7822fb7a03227cd7139e5e54db0e
Mathieu Chartier [Fri, 1 Apr 2016 23:32:51 +0000 (23:32 +0000)]
Merge "Dump different fields in imgdiag" into nyc-dev am:
9a9f658
am:
cef7073
* commit '
cef70730d7d0cefde623b98960460a58111856ed':
Dump different fields in imgdiag
Change-Id: Id333ef9e6673a9f493d8944e90eae11f80bd6893
Mathieu Chartier [Fri, 1 Apr 2016 23:27:45 +0000 (23:27 +0000)]
Merge "Dump different fields in imgdiag" into nyc-dev
am:
9a9f658
* commit '
9a9f65808da11092a4018ed4063540baa6fd489e':
Dump different fields in imgdiag
Change-Id: Ic98f2169d8ae934cdd66c3d49cc23a6acae0253d
Mathieu Chartier [Fri, 1 Apr 2016 23:09:19 +0000 (23:09 +0000)]
Merge "Dump different fields in imgdiag" into nyc-dev
Mathieu Chartier [Fri, 1 Apr 2016 20:56:41 +0000 (13:56 -0700)]
Dump different fields in imgdiag
Dump which fields are different, also print field values.
Bug:
27906566
Change-Id: Ia7b49981b59ccf058f098edcff4c39c10448b89e
Alex Light [Fri, 1 Apr 2016 22:02:29 +0000 (22:02 +0000)]
Merge changes from topic \'bad-classpath\' into nyc-dev am:
9c13f5e
am:
6aed1fa
* commit '
6aed1fab98996402819ac33b73181cb7808d06ac':
Make test 146 run with secondary dex file in classpath.
Make InvokeInterfaceTrampoline check methods
Change-Id: I6b348204149c4e12a1625e51b318df91a0df9988
Alex Light [Fri, 1 Apr 2016 21:53:15 +0000 (21:53 +0000)]
Merge changes from topic \'bad-classpath\' into nyc-dev
am:
9c13f5e
* commit '
9c13f5e2e63e1c85c5bb79dc7b6545941c25567f':
Make test 146 run with secondary dex file in classpath.
Make InvokeInterfaceTrampoline check methods
Change-Id: I175c8dd60d1f036a2f5b69cae94e311e87a361e3
Alex Light [Fri, 1 Apr 2016 21:36:57 +0000 (21:36 +0000)]
Merge changes from topic 'bad-classpath' into nyc-dev
* changes:
Make test 146 run with secondary dex file in classpath.
Make InvokeInterfaceTrampoline check methods
Hiroshi Yamauchi [Fri, 1 Apr 2016 21:19:58 +0000 (21:19 +0000)]
Merge changes I297e2f20,Ia2e475e4,I9f1b4139 am:
d6cbfaf am:
ab1fe8b
am:
aed50b0
* commit '
aed50b033cc9ef7dafbdcb85443e2e6aa32ec54b':
Revert "Revert "Revert "ART: Improve JitProfile perf in arm/arm64 mterp"""
Revert "ART: Improve JitProfile perf in x86 mterp"
Revert "ART: Improve JitProfile perf in x86_64 mterp"
Change-Id: I2d6327366b60f76e20e8d7659d29d641dca7bade
Hiroshi Yamauchi [Fri, 1 Apr 2016 21:14:32 +0000 (21:14 +0000)]
Merge changes I297e2f20,Ia2e475e4,I9f1b4139 am:
d6cbfaf
am:
ab1fe8b
* commit '
ab1fe8bd5136e00903778cafafcb069790c40441':
Revert "Revert "Revert "ART: Improve JitProfile perf in arm/arm64 mterp"""
Revert "ART: Improve JitProfile perf in x86 mterp"
Revert "ART: Improve JitProfile perf in x86_64 mterp"
Change-Id: Ibacd6d00e2786cc5b966cc177bb6c12a625f5635
Hiroshi Yamauchi [Fri, 1 Apr 2016 21:09:48 +0000 (21:09 +0000)]
Merge changes I297e2f20,Ia2e475e4,I9f1b4139
am:
d6cbfaf
* commit '
d6cbfafe5615bab2f0548012a7d796ee0aaca14e':
Revert "Revert "Revert "ART: Improve JitProfile perf in arm/arm64 mterp"""
Revert "ART: Improve JitProfile perf in x86 mterp"
Revert "ART: Improve JitProfile perf in x86_64 mterp"
Change-Id: Iba60370423f9c5653fc505d6db0890905a664c32
Hiroshi Yamauchi [Fri, 1 Apr 2016 20:53:55 +0000 (20:53 +0000)]
Merge changes I297e2f20,Ia2e475e4,I9f1b4139
* changes:
Revert "Revert "Revert "ART: Improve JitProfile perf in arm/arm64 mterp"""
Revert "ART: Improve JitProfile perf in x86 mterp"
Revert "ART: Improve JitProfile perf in x86_64 mterp"
Alex Light [Fri, 1 Apr 2016 18:40:16 +0000 (11:40 -0700)]
Make test 146 run with secondary dex file in classpath.
Bug:
27931085
(cherry picked from commit
24a4fdf9aadd37c44438841e661dccfb24eeb8c1)
Change-Id: Ie0b15d5fc94c2bb6d3707ecf985f6f72110e4d68
Alex Light [Fri, 1 Apr 2016 19:04:06 +0000 (19:04 +0000)]
Merge "Make test 146 run with secondary dex file in classpath." am:
1669fe3 am:
233a587
am:
b45b738
* commit '
b45b738933fe913dfec10da7bd256e8b60b62297':
Make test 146 run with secondary dex file in classpath.
Change-Id: I4bc895d9b286a95b02f0547157d91a276e40ec6a
Hiroshi Yamauchi [Fri, 1 Apr 2016 19:02:58 +0000 (12:02 -0700)]
Revert "Revert "Revert "ART: Improve JitProfile perf in arm/arm64 mterp"""
This reverts commit
4a8ac9cee4312ac910fabf31c64d28d4c8362836.
570-checker-osr intermittently failing.
Bug:
27939339
Hiroshi Yamauchi [Fri, 1 Apr 2016 19:01:48 +0000 (12:01 -0700)]
Revert "ART: Improve JitProfile perf in x86 mterp"
This reverts commit
3e9edd1c63c1760f1bcffdbeaf721ebe3320f386.
570-checker-osr intermittently failing.
Bug:
27939339
Hiroshi Yamauchi [Fri, 1 Apr 2016 19:00:10 +0000 (12:00 -0700)]
Revert "ART: Improve JitProfile perf in x86_64 mterp"
This reverts commit
099a611a418df6f0695e3bcd32fe896043ca1398.
570-checker-osr intermittently failing.
Bug:
27939339
Change-Id: I9f1b4139118b1d803ea9c21319c3147d2f40fec9
Alex Light [Fri, 1 Apr 2016 18:59:20 +0000 (18:59 +0000)]
Merge "Make test 146 run with secondary dex file in classpath." am:
1669fe3
am:
233a587
* commit '
233a587e41101dc8de96d1942fbf7d10e97d31f0':
Make test 146 run with secondary dex file in classpath.
Change-Id: I8f5f9615178d9184fa5ca692fd23408218783a80
Andreas Gampe [Fri, 1 Apr 2016 18:59:20 +0000 (18:59 +0000)]
Merge "ART: Better support for arraycopy in unstarted runtime" into nyc-dev am:
ee0c502
am:
42caf2b
* commit '
42caf2bccb187bb1c799ca578faa96a66f801c48':
ART: Better support for arraycopy in unstarted runtime
Change-Id: I1c483957af4f318e4b764ca6ff5526db2e046f9b
Alex Light [Fri, 1 Apr 2016 18:54:51 +0000 (18:54 +0000)]
Merge "Make test 146 run with secondary dex file in classpath."
am:
1669fe3
* commit '
1669fe3219f295d14c43d5bd3b4e8d255e52be3f':
Make test 146 run with secondary dex file in classpath.
Change-Id: I88392959b63c6303d6a8da967cb93a2cfaa14f8d
Andreas Gampe [Fri, 1 Apr 2016 18:54:51 +0000 (18:54 +0000)]
Merge "ART: Better support for arraycopy in unstarted runtime" into nyc-dev
am:
ee0c502
* commit '
ee0c5029a96f1092549b0e72f0a25b2a40fd77af':
ART: Better support for arraycopy in unstarted runtime
Change-Id: I1ba25fdc6acf5820e6d7acaa0dbbf2006fae5d4b
Alex Light [Fri, 1 Apr 2016 18:42:25 +0000 (18:42 +0000)]
Merge "Make test 146 run with secondary dex file in classpath."