OSDN Git Service
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: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
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: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 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: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
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
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."
Andreas Gampe [Fri, 1 Apr 2016 18:41:13 +0000 (18:41 +0000)]
Merge "ART: Better support for arraycopy in unstarted runtime" into nyc-dev
Andreas Gampe [Thu, 31 Mar 2016 20:30:53 +0000 (13:30 -0700)]
ART: Better support for arraycopy in unstarted runtime
Extend the System.arraycopy() cutout in the unstarted runtime
to support arrays with differing component types.
Add tests.
Bug:
27805718
(cherry picked from commit
85a098af5fc8d2dd0e39d61c9f93fc6257d631c5)
Change-Id: Iaacd95a372e9bfa26e9055a06b0d8f0335b8d6d1
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
Change-Id: Ie0b15d5fc94c2bb6d3707ecf985f6f72110e4d68
Alex Light [Fri, 1 Apr 2016 17:46:40 +0000 (17:46 +0000)]
Merge "Make InvokeInterfaceTrampoline check methods" am:
cbfa105
am:
b5e196d
* commit '
b5e196df1b95d25c46eeba173808d284ff0ed463':
Make InvokeInterfaceTrampoline check methods
Change-Id: I7b19123435a50921de0e89f3001fb2845f33033a
Alex Light [Fri, 1 Apr 2016 17:42:01 +0000 (17:42 +0000)]
Merge "Make InvokeInterfaceTrampoline check methods"
am:
cbfa105
* commit '
cbfa10557ab6e2669747a1e21a87adf212ec44c2':
Make InvokeInterfaceTrampoline check methods
Change-Id: I8d8c148e4b06c76d848918448d0254066c490a3e
Roland Levillain [Fri, 1 Apr 2016 17:37:46 +0000 (18:37 +0100)]
Improve debugging in art/compiler/optimizing/common_arm64.h.
Change-Id: I44ff2cb64c1fd45390ed4a6517af2488fdbdaf41
Richard Uhler [Fri, 1 Apr 2016 17:32:48 +0000 (17:32 +0000)]
Merge "Refine OatFileAssistant.MakeUpToDate failure result." into nyc-dev
am:
06fe300
* commit '
06fe3008c1a1069fd4864a06271b73ad9c9d82a5':
Refine OatFileAssistant.MakeUpToDate failure result.
Change-Id: I507794b72484ca26d19ee0165765049b81d34461
Alex Light [Thu, 31 Mar 2016 21:34:33 +0000 (14:34 -0700)]
Make InvokeInterfaceTrampoline check methods
InvokeInterfaceTrampoline was causing problems by looking into the
ImtConflictTable of non-imt-conflict-methods. This makes it check for
that before doing so.
Bug:
27931085
(cherry picked from commit
9fc547ac3936fe88e9592f4a47afd7b134cb607c)
Change-Id: I993178a371f8f46535a752e5c4d46d74777cefaf
Alex Light [Fri, 1 Apr 2016 17:30:41 +0000 (17:30 +0000)]
Merge "Make InvokeInterfaceTrampoline check methods"
Richard Uhler [Fri, 1 Apr 2016 17:26:18 +0000 (17:26 +0000)]
Merge "Refine OatFileAssistant.MakeUpToDate failure result." into nyc-dev
Andreas Gampe [Fri, 1 Apr 2016 17:14:44 +0000 (17:14 +0000)]
Merge "ART: Better support for arraycopy in unstarted runtime" am:
01afcbb
am:
93e9e5b
* commit '
93e9e5b26a3f003e9b23f4c527abca98cb7ccc4d':
ART: Better support for arraycopy in unstarted runtime
Change-Id: I63f88e82f50a38189e5db0de0312b844c9102760
David Srbecky [Fri, 1 Apr 2016 17:14:44 +0000 (17:14 +0000)]
Merge "Fix thumb bit in the oatdump symbolizer." am:
85f5de0
am:
89a9c6f
* commit '
89a9c6f0d9d01ce4d2d17ebe6f6974426c09b7ec':
Fix thumb bit in the oatdump symbolizer.
Change-Id: Ifd4f61b08f731d22c19854f1fa0bf13cb2af319f
Andreas Gampe [Fri, 1 Apr 2016 16:57:03 +0000 (16:57 +0000)]
Merge "ART: Better support for arraycopy in unstarted runtime"
am:
01afcbb
* commit '
01afcbba19e40db984d41974086d63bbdd9cb955':
ART: Better support for arraycopy in unstarted runtime
Change-Id: Ie07033b1ece4b782aebe54053b3ef6b0f1c24b82
David Srbecky [Fri, 1 Apr 2016 16:57:03 +0000 (16:57 +0000)]
Merge "Fix thumb bit in the oatdump symbolizer."
am:
85f5de0
* commit '
85f5de08d02515b36e381834967d5d047d5bbcc4':
Fix thumb bit in the oatdump symbolizer.
Change-Id: I00b82e10fd47a07a5183fa4ee77f2fed03719185
Andreas Gampe [Fri, 1 Apr 2016 16:51:47 +0000 (16:51 +0000)]
Merge "ART: Better support for arraycopy in unstarted runtime"
Alex Light [Thu, 31 Mar 2016 21:34:33 +0000 (14:34 -0700)]
Make InvokeInterfaceTrampoline check methods
InvokeInterfaceTrampoline was causing problems by looking into the
ImtConflictTable of non-imt-conflict-methods. This makes it check for
that before doing so.
Bug:
27931085
Change-Id: I993178a371f8f46535a752e5c4d46d74777cefaf
David Srbecky [Fri, 1 Apr 2016 16:46:32 +0000 (16:46 +0000)]
Merge "Fix thumb bit in the oatdump symbolizer."
Andreas Gampe [Thu, 31 Mar 2016 20:30:53 +0000 (13:30 -0700)]
ART: Better support for arraycopy in unstarted runtime
Extend the System.arraycopy() cutout in the unstarted runtime
to support arrays with differing component types.
Add tests.
Bug:
27805718
Change-Id: Iaacd95a372e9bfa26e9055a06b0d8f0335b8d6d1
Vladimir Marko [Fri, 1 Apr 2016 14:58:39 +0000 (14:58 +0000)]
Merge "Fix a test info referencing AMD64 instead of ARM64." am:
cf0f856
am:
fb8aa37
* commit '
fb8aa3731618d4ac72847f4b00dfe4439efeffd8':
Fix a test info referencing AMD64 instead of ARM64.
Change-Id: Idc18f1e55771d8db3602b9f93a24ccdba6cc35f9
Vladimir Marko [Fri, 1 Apr 2016 14:54:15 +0000 (14:54 +0000)]
Merge "Fix a test info referencing AMD64 instead of ARM64."
am:
cf0f856
* commit '
cf0f8560f41467331427418584687830932e66ed':
Fix a test info referencing AMD64 instead of ARM64.
Change-Id: I671632338d20c41db344a50d1d0d95b0fc8670aa
Vladimir Marko [Fri, 1 Apr 2016 14:40:08 +0000 (14:40 +0000)]
Merge "Fix a test info referencing AMD64 instead of ARM64."
Vladimir Marko [Fri, 1 Apr 2016 13:35:01 +0000 (14:35 +0100)]
Fix a test info referencing AMD64 instead of ARM64.
Change-Id: I195551b984c9ad1dce2bbf978c78831c5b98c803
David Srbecky [Fri, 1 Apr 2016 12:44:52 +0000 (12:44 +0000)]
Merge "Pack stack map entries on bit level to save space." am:
fe2b137
am:
68b519e
* commit '
68b519ed51a8a5b878ea2eee146666f66e3ef04e':
Pack stack map entries on bit level to save space.
Change-Id: I3f0e56de158e1aed998df05c6f7b4be4878ff9b0
David Srbecky [Fri, 1 Apr 2016 12:40:37 +0000 (12:40 +0000)]
Merge "Pack stack map entries on bit level to save space."
am:
fe2b137
* commit '
fe2b13717879abae993603534a145372e3110aae':
Pack stack map entries on bit level to save space.
Change-Id: Ia9259d72fcb9359df456db94256a83f5d43c4f35
Calin Juravle [Fri, 1 Apr 2016 12:28:51 +0000 (12:28 +0000)]
Merge "Pack stack map entries on bit level to save space."
Narayan Kamath [Fri, 1 Apr 2016 11:37:15 +0000 (11:37 +0000)]
Merge "unstarted_runtime: Update references to decimal format classes." am:
5c26e43
am:
003f558
* commit '
003f558021b2fe523e85f1e294cc07cb84287c47':
unstarted_runtime: Update references to decimal format classes.
Change-Id: I931b28f729b5e60bf72577b493cefb463d8f2152
Narayan Kamath [Fri, 1 Apr 2016 11:37:15 +0000 (11:37 +0000)]
Merge "unstarted_runtime: Add additional cutouts" am:
739253e
am:
4f7473e
* commit '
4f7473e73555f46c48584ac2825bf456b8908dc9':
unstarted_runtime: Add additional cutouts
Change-Id: Ia17b7ac5e639f651d6946a83dac24daef695959e
Narayan Kamath [Fri, 1 Apr 2016 11:33:09 +0000 (11:33 +0000)]
Merge "unstarted_runtime: Update references to decimal format classes."
am:
5c26e43
* commit '
5c26e430fbeaf56e3a5da4e3f167ff35fbb71ef9':
unstarted_runtime: Update references to decimal format classes.
Change-Id: I432614698ea6cb09b30ed61a1ad4774d55ecf28f
Narayan Kamath [Fri, 1 Apr 2016 11:33:09 +0000 (11:33 +0000)]
Merge "unstarted_runtime: Add additional cutouts"
am:
739253e
* commit '
739253e0546b90a54d704324ce971b82cff84adc':
unstarted_runtime: Add additional cutouts
Change-Id: I5661c1cf92895c76980b156ae16c4637788c51ba
Narayan Kamath [Fri, 1 Apr 2016 11:26:45 +0000 (11:26 +0000)]
Merge "unstarted_runtime: Update references to decimal format classes."
Narayan Kamath [Wed, 30 Mar 2016 14:41:54 +0000 (15:41 +0100)]
unstarted_runtime: Update references to decimal format classes.
We had a few special cases for thread local buffers and instances
created by our formatters / parsers. Update them to point to the
OpenJdk equivalents of the same classes.
bug:
27265238
Change-Id: Ida36a89bf414aeabea64b25004e193c770f906c2
Narayan Kamath [Fri, 1 Apr 2016 11:25:58 +0000 (11:25 +0000)]
Merge "unstarted_runtime: Add additional cutouts"
Narayan Kamath [Wed, 30 Mar 2016 12:11:18 +0000 (13:11 +0100)]
unstarted_runtime: Add additional cutouts
These allow us to initialize a further 90 classes. getIntVolatile
was used by the static initializer for ThreadLocal, which is used
quite frequently. This class was compile time initializable for M.
java.lang.System.getSecurityManager : 5 classes
sun.misc.Unsafe.getIntVolatile : 85 classes
bug:
27265238
Change-Id: I7e9820112bc87aec47c9b1b40ec6ba4f56172916
Andreas Gampe [Fri, 1 Apr 2016 03:02:51 +0000 (03:02 +0000)]
Merge "Revert "ART: Resolve all classes even when verify-profile"" into nyc-dev
am:
c4d6084
* commit '
c4d608488630222f96257c720c92b60a7bdd99fa':
Revert "ART: Resolve all classes even when verify-profile"
Change-Id: I55ca1396d3cd72dc3cf8ed04db1a8d13c4a9b825
Andreas Gampe [Fri, 1 Apr 2016 02:58:09 +0000 (02:58 +0000)]
Merge "Revert "ART: Resolve all classes even when verify-profile"" into nyc-dev
Andreas Gampe [Fri, 1 Apr 2016 01:30:21 +0000 (01:30 +0000)]
Merge "ART: Actually run tests cross arch for oatdump" am:
afc4829
am:
71bde08
* commit '
71bde0810fdc7e1faa9e1f601bbcbf74a2db837d':
ART: Actually run tests cross arch for oatdump
Change-Id: I678e935a7ab2ec489d3f19e1639ca7dae03644fe
Andreas Gampe [Fri, 1 Apr 2016 01:26:06 +0000 (01:26 +0000)]
Merge "ART: Actually run tests cross arch for oatdump"
am:
afc4829
* commit '
afc4829d593c173e8e9bdca90257a4cc8a104537':
ART: Actually run tests cross arch for oatdump
Change-Id: I18204d0b9268456fd489d3d65c0a752dca5ea032
Andreas Gampe [Fri, 1 Apr 2016 01:21:37 +0000 (01:21 +0000)]
Merge "ART: Do not run verification under lock" into nyc-dev
am:
5f803f0
* commit '
5f803f0f7a5211ecda636293530e18c24b855d49':
ART: Do not run verification under lock
Change-Id: I109a0ddbff391510d600684cb51b8421505bb257
Andreas Gampe [Fri, 1 Apr 2016 01:13:17 +0000 (01:13 +0000)]
Merge "ART: Actually run tests cross arch for oatdump"
Andreas Gampe [Fri, 1 Apr 2016 01:08:44 +0000 (01:08 +0000)]
Merge "ART: Do not run verification under lock" into nyc-dev
Andreas Gampe [Fri, 1 Apr 2016 00:49:34 +0000 (17:49 -0700)]
Revert "ART: Resolve all classes even when verify-profile"
This reverts commit
82e8c1ff6d58e98a52725eeefc6c2407470239d2.
The deadlock is fixed by
884f3b83ed6b2a378535ac6b2be57d6b2e22de09.
Bug:
27924355
Andreas Gampe [Thu, 31 Mar 2016 02:52:58 +0000 (19:52 -0700)]
ART: Do not run verification under lock
Do not hold the object lock for the duration of the verification.
Instead, use the kStatusVerifying indicator to wait, similar to
resolution.
Bug:
27924355
(cherry picked from commit
884f3b83ed6b2a378535ac6b2be57d6b2e22de09)
Change-Id: Ie831f47dd830756a1b7002ca9c792f8ff67570dc
Mathieu Chartier [Thu, 31 Mar 2016 23:14:54 +0000 (23:14 +0000)]
Merge changes from topic \'image_verify\' am:
19a4784
am:
36d4ec6
* commit '
36d4ec60f1d5963b69326cc61e2a6db0fff54ea7':
Disable checks for b/
27493510
Add verification for image ArtMethod declaring classes
Change-Id: I33809874b914d560b214f7363e0f1d4aeeadc8a6
Mathieu Chartier [Thu, 31 Mar 2016 23:11:31 +0000 (23:11 +0000)]
Merge changes from topic \'image_verify\'
am:
19a4784
* commit '
19a4784ce1b9c6a0b3d3cdb91a182baa7adbb946':
Disable checks for b/
27493510
Add verification for image ArtMethod declaring classes
Change-Id: I6caf7ce96acbc0fade0010f9924f5b94f75ead45
Mathieu Chartier [Thu, 31 Mar 2016 23:03:07 +0000 (23:03 +0000)]
Merge changes from topic 'image_verify'
* changes:
Disable checks for b/
27493510
Add verification for image ArtMethod declaring classes
Andreas Gampe [Thu, 31 Mar 2016 23:01:50 +0000 (23:01 +0000)]
Merge "ART: Do not run verification under lock" am:
a455ec2
am:
ff5d050
* commit '
ff5d050631ff042283a18bfa37bec0057db2b450':
ART: Do not run verification under lock
Change-Id: Ibbbd44a0d6121ba4464a092a48ac15baeacaf5ec
Andreas Gampe [Thu, 31 Mar 2016 23:01:50 +0000 (23:01 +0000)]
Merge "ART: Add support for DexFile compiler filter function" am:
e669556
am:
efdf9fb
* commit '
efdf9fb98d356d40ead1f51397bba51ec27ddb96':
ART: Add support for DexFile compiler filter function
Change-Id: Ic7621816f9ea6fd54f37b890f224fdb97f29389e
Andreas Gampe [Thu, 31 Mar 2016 22:58:18 +0000 (22:58 +0000)]
Merge "ART: Do not run verification under lock"
am:
a455ec2
* commit '
a455ec2db2f4a59c524a7a3d3eabca046ed5dd29':
ART: Do not run verification under lock
Change-Id: Iab0d138734de8a5af733728ffe9e52dde8208fe0
Andreas Gampe [Thu, 31 Mar 2016 22:58:17 +0000 (22:58 +0000)]
Merge "ART: Add support for DexFile compiler filter function"
am:
e669556
* commit '
e6695569f086df8d0e9ab0d898aed13b1f1ea740':
ART: Add support for DexFile compiler filter function
Change-Id: Id5ef8876f37cc1048fa1f06a35e51122b3d3567e
Andreas Gampe [Thu, 31 Mar 2016 22:55:31 +0000 (22:55 +0000)]
Merge "ART: Do not run verification under lock"
Mathieu Chartier [Thu, 31 Mar 2016 22:05:45 +0000 (15:05 -0700)]
Disable checks for b/
27493510
Disabled for performance now that the bug is fixed. Still enabled
for debug builds.
Bug:
27493510
(cherry picked from commit
8790c7f9f7d684bff40d5731b2d8e3462ef8ed90)
Change-Id: I049d4319bca1114bd11a35bb13fc9d80c993260c
Andreas Gampe [Thu, 31 Mar 2016 02:52:58 +0000 (19:52 -0700)]
ART: Do not run verification under lock
Do not hold the object lock for the duration of the verification.
Instead, use the kStatusVerifying indicator to wait, similar to
resolution.
Bug:
27924355
Change-Id: Ie831f47dd830756a1b7002ca9c792f8ff67570dc
Mathieu Chartier [Tue, 8 Mar 2016 00:13:54 +0000 (16:13 -0800)]
Add verification for image ArtMethod declaring classes
Try and see if any ArtMethods in the image have declaring classes
that are not marked in the heap live bitmap. Trying to mark these
would cause a SIGSEGV since the bitmap is read only.
TODO: Disable for performance.
(cherry-picked from commit
03c1dd9858962071bf3f0c988abc39e0e6ed7a1e)
Bug:
27493510
Change-Id: I231b07b84d98dcd7ee1557c18956c86264058ee1
Andreas Gampe [Thu, 31 Mar 2016 22:52:51 +0000 (22:52 +0000)]
Merge "ART: Add support for DexFile compiler filter function"
Mathieu Chartier [Thu, 31 Mar 2016 22:47:19 +0000 (22:47 +0000)]
Disable checks for b/
27493510
am:
8790c7f
* commit '
8790c7f9f7d684bff40d5731b2d8e3462ef8ed90':
Disable checks for b/
27493510
Change-Id: If3a564e20bfd268e9660a1c972853dbe150d4917
Richard Uhler [Wed, 30 Mar 2016 19:17:55 +0000 (12:17 -0700)]
Refine OatFileAssistant.MakeUpToDate failure result.
Avoid misleading log messages if MakeUpToDate fails because we decided
not to compile dex code.
Bug:
27641809
(cherry picked from commit
1e860619cdcc9c0b6a202a247c50cf7633ac7b74)
Change-Id: Iab6f8ff2756393bfe3a7be4643e908be648bd10d
Sebastien Hertz [Thu, 31 Mar 2016 22:15:12 +0000 (22:15 +0000)]
Merge "Remove obsolete ANDROID_COMPILE_WITH_JACK" am:
835e023
am:
d07afb5
* commit '
d07afb559168765ee1fbb24f33314dfd329f3db9':
Remove obsolete ANDROID_COMPILE_WITH_JACK
Change-Id: If47a28193709bc6ce41e35e76b1a7923bcc08fec
Mathieu Chartier [Thu, 31 Mar 2016 22:15:12 +0000 (22:15 +0000)]
Merge "Add way to disable resolving for stack walk" am:
b1e4b48
am:
a611377
* commit '
a611377de7573b2fa38e3d6ab3ff6d81ff87d67e':
Add way to disable resolving for stack walk
Change-Id: I72ab04f95f2251fcf12d6d11cb9317cd17b7abb8
Mathieu Chartier [Thu, 31 Mar 2016 22:05:45 +0000 (15:05 -0700)]
Disable checks for b/
27493510
Disabled for performance now that the bug is fixed. Still enabled
for debug builds.
Bug:
27493510
Change-Id: I4838b63d79163b97b47e13b201349a72c352ff38
Sebastien Hertz [Thu, 31 Mar 2016 22:11:55 +0000 (22:11 +0000)]
Merge "Remove obsolete ANDROID_COMPILE_WITH_JACK"
am:
835e023
* commit '
835e02367727fd981330b64ba938ecd7f675b408':
Remove obsolete ANDROID_COMPILE_WITH_JACK
Change-Id: I6af8c6dacad62482cbee673df05d50ed7ea8d2f7
Mathieu Chartier [Thu, 31 Mar 2016 22:11:55 +0000 (22:11 +0000)]
Merge "Add way to disable resolving for stack walk"
am:
b1e4b48
* commit '
b1e4b48c97d79530c863d80453c3d5d9aab056cc':
Add way to disable resolving for stack walk
Change-Id: I45e1f29a5e50a8a51055b0839d919200774f92cd
Ying Wang [Thu, 31 Mar 2016 22:05:04 +0000 (22:05 +0000)]
Merge "Remove obsolete ANDROID_COMPILE_WITH_JACK"
Mathieu Chartier [Thu, 31 Mar 2016 21:59:35 +0000 (21:59 +0000)]
Merge "Add way to disable resolving for stack walk"
Mathieu Chartier [Thu, 31 Mar 2016 21:52:52 +0000 (21:52 +0000)]
Add way to disable resolving for stack walk
am:
be2892b
* commit '
be2892bf771435eb451c74297b553f7dc9fea4ca':
Add way to disable resolving for stack walk
Change-Id: Ib03ce9d113032af97fbf3093e58dacffd46b77f8
Mathieu Chartier [Thu, 31 Mar 2016 18:07:09 +0000 (11:07 -0700)]
Add way to disable resolving for stack walk
Only occurs for walking the inlined frames case.
Bug:
27857910
(cherry picked from commit
be2892bf771435eb451c74297b553f7dc9fea4ca)
Change-Id: Ied92be96f2f74ba02c02168f704443b95e7a4b04
Mathieu Chartier [Thu, 31 Mar 2016 21:13:45 +0000 (21:13 +0000)]
Merge "Obtain stack trace outside of critical section" am:
6872412
am:
e9bc522
* commit '
e9bc5227dae30d8589d6e53f8876e7b7bbf2463f':
Obtain stack trace outside of critical section
Change-Id: I15ee74349d9002d93ff064a26a1eb55a0c215b53
David Srbecky [Fri, 12 Feb 2016 21:58:43 +0000 (21:58 +0000)]
Pack stack map entries on bit level to save space.
Use only the minimum number of bits required to store stack map data.
For example, if native_pc needs 5 bits and dex_pc needs 3 bits, they
will share the first byte of the stack map entry.
The header is changed to store bit offsets of the fields rather than
byte sizes. Offsets also make it easier to access later fields without
calculating sum of all previous sizes.
All of the header fields are byte sized or encoded as ULEB128 instead
of the previous fixed size encoding. This shrinks it by about half.
It saves 3.6 MB from non-debuggable boot.oat (AOSP).
It saves 3.1 MB from debuggable boot.oat (AOSP).
It saves 2.8 MB (of 99.4 MB) from /system/framework/arm/ (GOOG).
It saves 1.0 MB (of 27.8 MB) from /system/framework/oat/arm/ (GOOG).
Field loads from stackmaps seem to get around 10% faster.
(based on the time it takes to load all stackmap entries from boot.oat)
Bug:
27640410
Change-Id: I8bf0996b4eb24300c1b0dfc6e9d99fe85d04a1b7
Mathieu Chartier [Thu, 31 Mar 2016 21:10:31 +0000 (21:10 +0000)]
Merge "Obtain stack trace outside of critical section"
am:
6872412
* commit '
68724122b444e531d65413b1d9039f6e5fca52b3':
Obtain stack trace outside of critical section
Change-Id: If75300fc1ea558b5f838e5c521d10cf96a325750
Mathieu Chartier [Thu, 31 Mar 2016 21:05:30 +0000 (21:05 +0000)]
Merge "Obtain stack trace outside of critical section"