OSDN Git Service

android-x86/art.git
8 years agoMerge "Use bit-level packing for InlineInfo in stackmaps as well." am: 2f92ec8 am...
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

8 years agoMerge "Use bit-level packing for InlineInfo in stackmaps as well." am: 2f92ec8
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

8 years agoMerge "Use bit-level packing for InlineInfo in stackmaps as well."
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

8 years agoMerge "Use bit-level packing for InlineInfo in stackmaps as well."
Calin Juravle [Mon, 4 Apr 2016 13:35:53 +0000 (13:35 +0000)]
Merge "Use bit-level packing for InlineInfo in stackmaps as well."

8 years agoMerge "Fix BitCount intrinsics assertions." am: 75ee5c2 am: 0045917
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

8 years agoMerge "Fix BitCount intrinsics assertions." am: 75ee5c2
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

8 years agoMerge "Fix BitCount intrinsics assertions."
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

8 years agoMerge "Fix BitCount intrinsics assertions."
Roland Levillain [Mon, 4 Apr 2016 12:58:23 +0000 (12:58 +0000)]
Merge "Fix BitCount intrinsics assertions."

8 years agoMerge "Improve debugging in art/compiler/optimizing/common_arm64.h." am: 7e168f6...
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

8 years agoMerge "Improve debugging in art/compiler/optimizing/common_arm64.h." am: 7e168f6
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

8 years agoMerge "Improve debugging in art/compiler/optimizing/common_arm64.h."
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

8 years agoMerge "Improve debugging in art/compiler/optimizing/common_arm64.h."
Roland Levillain [Mon, 4 Apr 2016 11:37:58 +0000 (11:37 +0000)]
Merge "Improve debugging in art/compiler/optimizing/common_arm64.h."

8 years agoMerge "Refactor HGraphBuilder and SsaBuilder to remove HLocals" am: a999af4 am: 9bb6e43
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

8 years agoMerge "Build dominator tree before generating HInstructions" am: a2013f6 am: 71a13d1
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

8 years agoMerge "Refactor HGraphBuilder and SsaBuilder to remove HLocals" am: a999af4
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

8 years agoMerge "Build dominator tree before generating HInstructions" am: a2013f6
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

8 years agoMerge "Refactor HGraphBuilder and SsaBuilder to remove HLocals"
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

8 years agoMerge "Build dominator tree before generating HInstructions"
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

8 years agoMerge "Refactor HGraphBuilder and SsaBuilder to remove HLocals"
David Brazdil [Mon, 4 Apr 2016 11:12:14 +0000 (11:12 +0000)]
Merge "Refactor HGraphBuilder and SsaBuilder to remove HLocals"

8 years agoMerge "Build dominator tree before generating HInstructions"
David Brazdil [Mon, 4 Apr 2016 11:11:34 +0000 (11:11 +0000)]
Merge "Build dominator tree before generating HInstructions"

8 years agoRefactor HGraphBuilder and SsaBuilder to remove HLocals
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

8 years agoBuild dominator tree before generating HInstructions
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

8 years agoMerge "Dump different fields in imgdiag" am: 0cb5c86 am: 56ce407
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

8 years agoMerge "Dump different fields in imgdiag" am: 0cb5c86
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

8 years agoMerge "Dump different fields in imgdiag"
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

8 years agoMerge "Dump different fields in imgdiag"
Mathieu Chartier [Fri, 1 Apr 2016 23:36:19 +0000 (23:36 +0000)]
Merge "Dump different fields in imgdiag"

8 years agoDump 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

8 years agoMerge "Dump different fields in imgdiag" into nyc-dev am: 9a9f658
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

8 years agoMerge "Dump different fields in imgdiag" into nyc-dev
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

8 years agoMerge "Dump different fields in imgdiag" into nyc-dev
Mathieu Chartier [Fri, 1 Apr 2016 23:09:19 +0000 (23:09 +0000)]
Merge "Dump different fields in imgdiag" into nyc-dev

8 years agoDump 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.

Bug: 27906566
Change-Id: Ia7b49981b59ccf058f098edcff4c39c10448b89e

8 years agoMerge changes from topic \'bad-classpath\' into nyc-dev am: 9c13f5e
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

8 years agoMerge changes from topic \'bad-classpath\' into nyc-dev
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

8 years agoMerge changes from topic 'bad-classpath' into nyc-dev
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

8 years agoMerge changes I297e2f20,Ia2e475e4,I9f1b4139 am: d6cbfaf am: ab1fe8b
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

8 years agoMerge changes I297e2f20,Ia2e475e4,I9f1b4139 am: d6cbfaf
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

8 years agoMerge changes I297e2f20,Ia2e475e4,I9f1b4139
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

8 years agoMerge changes I297e2f20,Ia2e475e4,I9f1b4139
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"

8 years agoMake 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

(cherry picked from commit 24a4fdf9aadd37c44438841e661dccfb24eeb8c1)

Change-Id: Ie0b15d5fc94c2bb6d3707ecf985f6f72110e4d68

8 years agoMerge "Make test 146 run with secondary dex file in classpath." am: 1669fe3 am: 233a587
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

8 years agoRevert "Revert "Revert "ART: Improve JitProfile perf in arm/arm64 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

8 years agoRevert "ART: Improve JitProfile perf in x86 mterp"
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

8 years agoRevert "ART: Improve JitProfile perf in x86_64 mterp"
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

8 years agoMerge "Make test 146 run with secondary dex file in classpath." am: 1669fe3
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

8 years agoMerge "ART: Better support for arraycopy in unstarted runtime" into nyc-dev am: ee0c502
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

8 years agoMerge "Make test 146 run with secondary dex file in classpath."
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

8 years agoMerge "ART: Better support for arraycopy in unstarted runtime" into nyc-dev
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

8 years agoMerge "Make test 146 run with secondary dex file in classpath."
Alex Light [Fri, 1 Apr 2016 18:42:25 +0000 (18:42 +0000)]
Merge "Make test 146 run with secondary dex file in classpath."

8 years agoMerge "ART: Better support for arraycopy in unstarted runtime" into nyc-dev
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

8 years agoART: Better support for arraycopy in unstarted runtime
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

8 years agoMake 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

8 years agoMerge "Make InvokeInterfaceTrampoline check methods" am: cbfa105 am: b5e196d
Alex Light [Fri, 1 Apr 2016 17:51:18 +0000 (17:51 +0000)]
Merge "Make InvokeInterfaceTrampoline check methods" am: cbfa105 am: b5e196d
am: 37a0b62

* commit '37a0b620e0462291d29ff80818a84b8f6e3a906f':
  Make InvokeInterfaceTrampoline check methods

Change-Id: Ic0449b19c26aef6d9d879e6b132a63d63bd3ab45

8 years agoMerge "Make InvokeInterfaceTrampoline check methods" am: cbfa105
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

8 years agoMerge "Make InvokeInterfaceTrampoline check methods"
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

8 years agoImprove debugging in art/compiler/optimizing/common_arm64.h.
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

8 years agoMerge "Refine OatFileAssistant.MakeUpToDate failure result." into nyc-dev am: 06fe300
Richard Uhler [Fri, 1 Apr 2016 17:37:39 +0000 (17:37 +0000)]
Merge "Refine OatFileAssistant.MakeUpToDate failure result." into nyc-dev am: 06fe300
am: e964a55

* commit 'e964a55534c481ec60715fa0724b4539b0c0f43b':
  Refine OatFileAssistant.MakeUpToDate failure result.

Change-Id: Ic85fbc14a57c34b5bf5e866f7d944a6d93844dba

8 years agoMerge "Refine OatFileAssistant.MakeUpToDate failure result." into nyc-dev
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

8 years agoMake InvokeInterfaceTrampoline check methods
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

8 years agoMerge "Make InvokeInterfaceTrampoline check methods"
Alex Light [Fri, 1 Apr 2016 17:30:41 +0000 (17:30 +0000)]
Merge "Make InvokeInterfaceTrampoline check methods"

8 years agoMerge "Refine OatFileAssistant.MakeUpToDate failure result." into nyc-dev
Richard Uhler [Fri, 1 Apr 2016 17:26:18 +0000 (17:26 +0000)]
Merge "Refine OatFileAssistant.MakeUpToDate failure result." into nyc-dev

8 years agoFix BitCount intrinsics assertions.
Roland Levillain [Fri, 1 Apr 2016 17:21:55 +0000 (18:21 +0100)]
Fix BitCount intrinsics assertions.

Bug: 27852035
Change-Id: Iba43039aadd9ba288b476d53cc2306a58356465f

8 years agoMerge "ART: Better support for arraycopy in unstarted runtime" am: 01afcbb am: 93e9e5b
Andreas Gampe [Fri, 1 Apr 2016 17:19:11 +0000 (17:19 +0000)]
Merge "ART: Better support for arraycopy in unstarted runtime" am: 01afcbb am: 93e9e5b
am: a9bee5a

* commit 'a9bee5a1b302292556fc1966678f2a5689bd2522':
  ART: Better support for arraycopy in unstarted runtime

Change-Id: I6cc9a4c87b43ce692453b59b9e75d3cf800ba166

8 years agoMerge "Fix thumb bit in the oatdump symbolizer." am: 85f5de0 am: 89a9c6f
David Srbecky [Fri, 1 Apr 2016 17:19:10 +0000 (17:19 +0000)]
Merge "Fix thumb bit in the oatdump symbolizer." am: 85f5de0 am: 89a9c6f
am: 1566a44

* commit '1566a4428f53a66e7bd285b748ad442b87635b3d':
  Fix thumb bit in the oatdump symbolizer.

Change-Id: Ib5ed49ca2e2223017c4c21c00ddc01fc995bc594

8 years agoMerge "ART: Better support for arraycopy in unstarted runtime" am: 01afcbb
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

8 years agoMerge "Fix thumb bit in the oatdump symbolizer." am: 85f5de0
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

8 years agoMerge "ART: Better support for arraycopy in unstarted runtime"
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

8 years agoMerge "Fix thumb bit in the oatdump symbolizer."
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

8 years agoMerge "ART: Better support for arraycopy in unstarted runtime"
Andreas Gampe [Fri, 1 Apr 2016 16:51:47 +0000 (16:51 +0000)]
Merge "ART: Better support for arraycopy in unstarted runtime"

8 years agoMake InvokeInterfaceTrampoline check methods
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

8 years agoMerge "Fix thumb bit in the oatdump symbolizer."
David Srbecky [Fri, 1 Apr 2016 16:46:32 +0000 (16:46 +0000)]
Merge "Fix thumb bit in the oatdump symbolizer."

8 years agoART: Better support for arraycopy in unstarted runtime
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

8 years agoUse bit-level packing for InlineInfo in stackmaps as well.
David Srbecky [Thu, 25 Feb 2016 21:55:03 +0000 (21:55 +0000)]
Use bit-level packing for InlineInfo in stackmaps as well.

Use the same approach as we do for stackmaps to reduce the size.

It saves 4.0 MB from non-debuggable boot.oat (AOSP).
It does not affect debuggable boot.oat.

It saves 3.6 MB (of 96.6 MB) from /system/framework/arm/ (GOOG).
It saves 0.6 MB (of 26.7 MB) from /system/framework/oat/arm/ (GOOG).

Field loads from inline-info get around 5% slower.
(based on the time it takes to load all inline-infos from boot.oat)

Change-Id: I67b0fa5eef74c1fdb013680d0231fd44ea696176

8 years agoMerge "Fix a test info referencing AMD64 instead of ARM64." am: cf0f856 am: fb8aa37
Vladimir Marko [Fri, 1 Apr 2016 15:02:57 +0000 (15:02 +0000)]
Merge "Fix a test info referencing AMD64 instead of ARM64." am: cf0f856 am: fb8aa37
am: db934a9

* commit 'db934a943cc274e3ed1da48ef5b76178d9e8d441':
  Fix a test info referencing AMD64 instead of ARM64.

Change-Id: Ie05ee31a915abf9278c3768dea66d47ac3cf1071

8 years agoMerge "Fix a test info referencing AMD64 instead of ARM64." am: cf0f856
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

8 years agoMerge "Fix a test info referencing AMD64 instead of ARM64."
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

8 years agoMerge "Fix a test info referencing AMD64 instead of ARM64."
Vladimir Marko [Fri, 1 Apr 2016 14:40:08 +0000 (14:40 +0000)]
Merge "Fix a test info referencing AMD64 instead of ARM64."

8 years agoFix 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

8 years agoMerge "Pack stack map entries on bit level to save space." am: fe2b137 am: 68b519e
David Srbecky [Fri, 1 Apr 2016 12:49:12 +0000 (12:49 +0000)]
Merge "Pack stack map entries on bit level to save space." am: fe2b137 am: 68b519e
am: 50a6287

* commit '50a6287c96e4e0561830daf23274bfbd2da33cae':
  Pack stack map entries on bit level to save space.

Change-Id: Ied0e6e672ddfb5d1f169186c3632f7939e5a6a90

8 years agoMerge "Pack stack map entries on bit level to save space." am: fe2b137
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

8 years agoMerge "Pack stack map entries on bit level to save space."
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

8 years agoMerge "Pack stack map entries on bit level to save space."
Calin Juravle [Fri, 1 Apr 2016 12:28:51 +0000 (12:28 +0000)]
Merge "Pack stack map entries on bit level to save space."

8 years agoMerge "unstarted_runtime: Update references to decimal format classes." am: 5c26e43...
Narayan Kamath [Fri, 1 Apr 2016 11:41:30 +0000 (11:41 +0000)]
Merge "unstarted_runtime: Update references to decimal format classes." am: 5c26e43 am: 003f558
am: 3e234a2

* commit '3e234a2076d4e26debe9bdff14ce1912efea3a7e':
  unstarted_runtime: Update references to decimal format classes.

Change-Id: If0eb6a62311100354ba7da39c3b14dc4908010c5

8 years agoMerge "unstarted_runtime: Add additional cutouts" am: 739253e am: 4f7473e
Narayan Kamath [Fri, 1 Apr 2016 11:41:30 +0000 (11:41 +0000)]
Merge "unstarted_runtime: Add additional cutouts" am: 739253e am: 4f7473e
am: 486a931

* commit '486a931f038f760c54092929c00e32499870debf':
  unstarted_runtime: Add additional cutouts

Change-Id: I598cc35b68967e402922addf80e9c5a480e96cb9

8 years agoMerge "unstarted_runtime: Update references to decimal format classes." am: 5c26e43
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

8 years agoMerge "unstarted_runtime: Add additional cutouts" am: 739253e
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

8 years agoMerge "unstarted_runtime: Update references to decimal format classes."
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

8 years agoMerge "unstarted_runtime: Add additional cutouts"
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

8 years agoMerge "unstarted_runtime: Update references to decimal format classes."
Narayan Kamath [Fri, 1 Apr 2016 11:26:45 +0000 (11:26 +0000)]
Merge "unstarted_runtime: Update references to decimal format classes."

8 years agounstarted_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

8 years agoMerge "unstarted_runtime: Add additional cutouts"
Narayan Kamath [Fri, 1 Apr 2016 11:25:58 +0000 (11:25 +0000)]
Merge "unstarted_runtime: Add additional cutouts"

8 years agounstarted_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

8 years agoMerge "Revert "ART: Resolve all classes even when verify-profile"" into nyc-dev am...
Andreas Gampe [Fri, 1 Apr 2016 03:06:51 +0000 (03:06 +0000)]
Merge "Revert "ART: Resolve all classes even when verify-profile"" into nyc-dev am: c4d6084
am: a826afb

* commit 'a826afbddc6c49538613b1562b7ddfafc7e7ea75':
  Revert "ART: Resolve all classes even when verify-profile"

Change-Id: I66414df78e1639baef50cea21d9ecd4605e99ba4

8 years agoMerge "Revert "ART: Resolve all classes even when verify-profile"" into nyc-dev
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

8 years agoMerge "Revert "ART: Resolve all classes even when verify-profile"" into nyc-dev
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

8 years agoMerge "ART: Actually run tests cross arch for oatdump" am: afc4829 am: 71bde08
Andreas Gampe [Fri, 1 Apr 2016 01:34:27 +0000 (01:34 +0000)]
Merge "ART: Actually run tests cross arch for oatdump" am: afc4829 am: 71bde08
am: 5da7cb7

* commit '5da7cb76dd7b5cde1edd93aae75cb79ecae464ce':
  ART: Actually run tests cross arch for oatdump

Change-Id: I869a6cbe25e7c42c9bea9e2fbc24d82940a39b7b

8 years agoMerge "ART: Actually run tests cross arch for oatdump" am: afc4829
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

8 years agoMerge "ART: Actually run tests cross arch for oatdump"
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

8 years agoMerge "ART: Do not run verification under lock" into nyc-dev am: 5f803f0
Andreas Gampe [Fri, 1 Apr 2016 01:26:06 +0000 (01:26 +0000)]
Merge "ART: Do not run verification under lock" into nyc-dev am: 5f803f0
am: 896781f

* commit '896781f0b1bf6034ca5cdb8fe087e8ecd71d23ec':
  ART: Do not run verification under lock

Change-Id: I1af5662ce056eb16ddc6584ae0040c73f567301d

8 years agoMerge "ART: Do not run verification under lock" into nyc-dev
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

8 years agoMerge "ART: Actually run tests cross arch for oatdump"
Andreas Gampe [Fri, 1 Apr 2016 01:13:17 +0000 (01:13 +0000)]
Merge "ART: Actually run tests cross arch for oatdump"