OSDN Git Service
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: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: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
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"
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: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
Alex Light [Fri, 1 Apr 2016 18:42:25 +0000 (18:42 +0000)]
Merge "Make test 146 run with secondary dex file in classpath."
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: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
Alex Light [Fri, 1 Apr 2016 17:30:41 +0000 (17:30 +0000)]
Merge "Make InvokeInterfaceTrampoline check methods"
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: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: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: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 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:13:17 +0000 (01:13 +0000)]
Merge "ART: Actually run tests cross arch for oatdump"
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 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"
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 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
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"
Mathieu Chartier [Tue, 29 Mar 2016 21:02:55 +0000 (14:02 -0700)]
Obtain stack trace outside of critical section
Fixes deadlock if the stack walk does allocations, changed stack
trace format to prevent slowdown.
Added missing GetInterfaceMethodIfProxy to fix a crash in maps.
Bug:
27857910
(cherry picked from commit
23428587d32361736d4c5e0ba7270c7602695a43)
Change-Id: I64373bcd87a68fdd1b58fb855db2b16c9f6ed36b
Richard Uhler [Thu, 31 Mar 2016 19:32:59 +0000 (19:32 +0000)]
Merge "Refine OatFileAssistant.MakeUpToDate failure result."
am:
fd9ac38
* commit '
fd9ac384741435902d4fc03034f4cbaafaa85780':
Refine OatFileAssistant.MakeUpToDate failure result.
Change-Id: I58b3390da7f9d704405516873c2bf528c726c46d
Richard Uhler [Thu, 31 Mar 2016 19:27:54 +0000 (19:27 +0000)]
Merge "Refine OatFileAssistant.MakeUpToDate failure result."
Andreas Gampe [Thu, 31 Mar 2016 00:19:48 +0000 (17:19 -0700)]
ART: Add support for DexFile compiler filter function
Add support for getting a non-profile-guided version of a given
compiler filter.
Bug:
27921071
(cherry picked from commit
fd97429f258acde6ee24a6f74c9050b2343e40cd)
Change-Id: I54735b61732e6a5c9dc62425d04bc740dd365083
David Srbecky [Thu, 31 Mar 2016 17:17:59 +0000 (18:17 +0100)]
Fix thumb bit in the oatdump symbolizer.
MethodDebugInfo expects code address without the bit set.
Therefore we need to clear it before passing it to the DWARF writer.
Change-Id: I37586b19f2a3fc95107abb6204a34e95a3816936
Vladimir Marko [Thu, 31 Mar 2016 18:04:17 +0000 (18:04 +0000)]
Merge "Remove many `instrumentation` variables from goto interpreter."
am:
9590a53
* commit '
9590a5388ae80c7edba96de777eb5f96a896e681':
Remove many `instrumentation` variables from goto interpreter.
Change-Id: I8f119dbab35a9391a2de261e922cd4f7c52376c4
Vladimir Marko [Thu, 31 Mar 2016 17:53:44 +0000 (17:53 +0000)]
Merge "Remove many `instrumentation` variables from goto interpreter."
Vladimir Marko [Thu, 31 Mar 2016 17:38:23 +0000 (18:38 +0100)]
Remove many `instrumentation` variables from goto interpreter.
Clean up after
https://android-review.googlesource.com/210440 .
Change-Id: I7e7b1863a5627365de8d9a74f559ffe56cb4fdfa
Ying Wang [Thu, 31 Mar 2016 16:58:57 +0000 (16:58 +0000)]
Merge "Remove obsolete LOCAL_DX_FLAGS."
am:
eede886
* commit '
eede88620e4dc9f6363c0990c04b7c0c7dd7202e':
Remove obsolete LOCAL_DX_FLAGS.
Change-Id: Iee79119e73711cf7f20404fcca2720bb5c89272b
Ying Wang [Thu, 31 Mar 2016 16:52:56 +0000 (16:52 +0000)]
Merge "Remove obsolete LOCAL_DX_FLAGS."
Hans Boehm [Thu, 31 Mar 2016 16:46:47 +0000 (16:46 +0000)]
Merge "Only log excessive timeouts if those appear accidental"
am:
9f168cc
* commit '
9f168ccb8e77626fd99c4ee5c296a5ed82f8d541':
Only log excessive timeouts if those appear accidental
Change-Id: I519e12bb2ef5edd4aef66eb28846b99e1f952157
Hans Boehm [Thu, 31 Mar 2016 16:41:46 +0000 (16:41 +0000)]
Merge "Only log excessive timeouts if those appear accidental"
Serguei Katkov [Thu, 31 Mar 2016 15:39:35 +0000 (15:39 +0000)]
Merge "ART: Improve JitProfile perf in x86_64 mterp"
am:
87ad82e
* commit '
87ad82eb1e085ccc6ed3ec54945937582334dbbc':
ART: Improve JitProfile perf in x86_64 mterp
Change-Id: Ie0c5a82723b54297550246773e9099df4aa3500d
Serguei Katkov [Thu, 31 Mar 2016 15:39:35 +0000 (15:39 +0000)]
Merge "ART: Improve JitProfile perf in x86 mterp"
am:
a236234
* commit '
a23623447c44758ec0369af778d5bd1adae442e6':
ART: Improve JitProfile perf in x86 mterp
Change-Id: I89628928a67b1c14ec4ca0f6dae0582a0688bfb9
Vladimir Marko [Thu, 31 Mar 2016 15:39:34 +0000 (15:39 +0000)]
Merge "Fix silly gcc warning."
am:
f7cdec5
* commit '
f7cdec554371aad9dd8f40c6cd195a5635abc3d6':
Fix silly gcc warning.
Change-Id: Id962ef258d4faa8f6362f9e9e3774f308dd5043f
Roland Levillain [Thu, 31 Mar 2016 15:39:33 +0000 (15:39 +0000)]
Merge "Rename run-test 593-checker-boolean-to-integral-conversions."
am:
897886f
* commit '
897886f804fcad5634362e0a8c5b6d1682198af4':
Rename run-test 593-checker-boolean-to-integral-conversions.
Change-Id: I0fae951b69ae41631635d99de9a2f7833945c859
Bill Buzbee [Thu, 31 Mar 2016 14:21:18 +0000 (14:21 +0000)]
Merge "ART: Improve JitProfile perf in x86_64 mterp"
Bill Buzbee [Thu, 31 Mar 2016 14:07:15 +0000 (14:07 +0000)]
Merge "ART: Improve JitProfile perf in x86 mterp"
Vladimir Marko [Thu, 31 Mar 2016 13:24:15 +0000 (13:24 +0000)]
Merge "Fix silly gcc warning."
Vladimir Marko [Thu, 31 Mar 2016 11:34:48 +0000 (12:34 +0100)]
Fix silly gcc warning.
Explicitly specify the underlying type of LinkerPatch::Type
as uint8_t because gcc would select a bigger type and then
complain that
'art::LinkerPatch::patch_type_' is too small to hold all
values of 'enum class art::LinkerPatch::Type'
which is really ridiculous given that the enum contains only
a handful enumerators with default (small) values.
Change-Id: I4c4b21cde62e56b62488bae99d3690d900c3c29e
Roland Levillain [Thu, 31 Mar 2016 11:39:53 +0000 (11:39 +0000)]
Merge "Rename run-test 593-checker-boolean-to-integral-conversions."
Roland Levillain [Thu, 31 Mar 2016 11:32:07 +0000 (12:32 +0100)]
Rename run-test 593-checker-boolean-to-integral-conversions.
Shorten its name to "593-checker-boolean-to-integral-conv"
as some build configurations choke on too long filenames.
Bug:
27616343
Change-Id: I43439d7283920539817511249c6c1b430b3c9c95
Roland Levillain [Thu, 31 Mar 2016 10:46:19 +0000 (10:46 +0000)]
Merge "Fix Boolean to integral types conversions."
am:
b0170f0
* commit '
b0170f0457f60b81dd232bb3fa505b22f10f324c':
Fix Boolean to integral types conversions.
Change-Id: Ide620cd42daaa05553d7d16603d65f7105232637
Roland Levillain [Thu, 31 Mar 2016 10:39:52 +0000 (10:39 +0000)]
Merge "Fix Boolean to integral types conversions."
Serdjuk, Nikolay Y [Thu, 31 Mar 2016 10:13:07 +0000 (10:13 +0000)]
Merge "ART: Save or erase the file even if I/O failed"
am:
6656f30
* commit '
6656f30115c4a6a52ca01f46ca84df125179466a':
ART: Save or erase the file even if I/O failed
Change-Id: I0f4a5c3bf7b6a34a307a7eaf2fcf50c9c8c564f2
Vladimir Marko [Thu, 31 Mar 2016 10:10:07 +0000 (10:10 +0000)]
Merge "ART: Save or erase the file even if I/O failed"
Pavel Vyssotski [Thu, 31 Mar 2016 10:07:45 +0000 (10:07 +0000)]
Merge "ART: Fix TypeConversion from long const to float on x86_64"
am:
922b88c
* commit '
922b88cd4203482b66ea4bee28e9921717ad2e6a':
ART: Fix TypeConversion from long const to float on x86_64
Change-Id: I6bab607cad3e1d2bc81977c363531d942edbe4cd
David Brazdil [Thu, 31 Mar 2016 10:00:41 +0000 (10:00 +0000)]
Merge "ART: Fix TypeConversion from long const to float on x86_64"
Pavel Vyssotski [Wed, 16 Mar 2016 07:59:53 +0000 (13:59 +0600)]
ART: Fix TypeConversion from long const to float on x86_64
LocationsBuilderX86_64::VisitTypeConversion should load 32-bit
constant for float type.
Change-Id: I24335568af65e6b98bf07d36f90c8696497dd137
Signed-off-by: Pavel Vyssotski <pavel.n.vyssotski@intel.com>
Serguei Katkov [Tue, 29 Mar 2016 11:04:00 +0000 (17:04 +0600)]
ART: Improve JitProfile perf in x86_64 mterp
Change-Id: Ieae39e2cc8de8d381e6f9de0faa440c90e20a7a5
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
Serguei Katkov [Tue, 29 Mar 2016 06:09:06 +0000 (12:09 +0600)]
ART: Improve JitProfile perf in x86 mterp
Change-Id: Id4c1e52352da8f6b7ce2008bc4adf52bc08847b2
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
Sebastien Hertz [Thu, 31 Mar 2016 07:22:50 +0000 (09:22 +0200)]
Remove obsolete ANDROID_COMPILE_WITH_JACK
Removes the checks on ANDROID_COMPILE_WITH_JACK since it is going
to disappear and build tests with Jack by default.
Bug:
27400061
Change-Id: I1c08796a946411070e2aab6fe8c3c0262dfb4c52
Serdjuk, Nikolay Y [Tue, 22 Mar 2016 04:06:33 +0000 (10:06 +0600)]
ART: Save or erase the file even if I/O failed
It should close the file in any case.
Change-Id: Idb7db15bfecb0ac47839be3544cc2dce91096d7b
Signed-off-by: Serdjuk, Nikolay Y <nikolay.y.serdjuk@intel.com>
Ying Wang [Wed, 30 Mar 2016 20:55:33 +0000 (13:55 -0700)]
Remove obsolete LOCAL_DX_FLAGS.
Bug:
27400061
Change-Id: Iff834b58b47f8e5759e868159f85bab0f5c544ee
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
Change-Id: I184f8e89648183cba4ebe7a1dc5e0e6c8774c15b
Aart Bik [Wed, 30 Mar 2016 19:11:09 +0000 (19:11 +0000)]
Merge "Fix arm64 simplifier bug that tries to remove same statement twice. With fail-before/pass-after test (on arm64)."
am:
20eef17
* commit '
20eef176101924d5047895214bad4e73b8ae35ec':
Fix arm64 simplifier bug that tries to remove same statement twice. With fail-before/pass-after test (on arm64).
Change-Id: I3ed9c6d138c987981dd965d758cbb965c9ad0964
Aart Bik [Wed, 30 Mar 2016 18:59:27 +0000 (18:59 +0000)]
Merge "Fix arm64 simplifier bug that tries to remove same statement twice. With fail-before/pass-after test (on arm64)."
Andreas Gampe [Wed, 30 Mar 2016 18:27:36 +0000 (18:27 +0000)]
Merge "ART: Fix unstarted runtime for Security"
am:
13ce07a
* commit '
13ce07a99ac84ec5819dbb1d872e3eebc087e355':
ART: Fix unstarted runtime for Security
Change-Id: Ib3ec6bf0dc460e5160699f3fae0af1e986ca9e47
Andreas Gampe [Wed, 30 Mar 2016 18:20:01 +0000 (18:20 +0000)]
Merge "ART: Fix unstarted runtime for Security"
Aart Bik [Tue, 29 Mar 2016 20:54:53 +0000 (13:54 -0700)]
Fix arm64 simplifier bug that tries to remove same statement twice.
With fail-before/pass-after test (on arm64).
Rationale:
This visitor removes statement "forward", which is a bit unusual, and
exposes a bug if statement is revisited and qualifies for removal again.
BUG=
27851582
Change-Id: Ia8cddba32b4dfe9fd480852deb358eaa977f0e1f
Bill Buzbee [Wed, 30 Mar 2016 18:10:25 +0000 (18:10 +0000)]
Merge "Revert "Revert "ART: Improve JitProfile perf in arm/arm64 mterp"""
am:
77376a4
* commit '
77376a4126f01e04e396ab71383a55be934939b2':
Revert "Revert "ART: Improve JitProfile perf in arm/arm64 mterp""
Change-Id: I735e2459ffac61f6a15d1eba9147dfb224792d2e
Roland Levillain [Wed, 30 Mar 2016 18:09:03 +0000 (19:09 +0100)]
Fix Boolean to integral types conversions.
Bug:
27616343
Change-Id: I050f92045bca1b8b5d6da53547cc617f17be84b1