OSDN Git Service
Hiroshi Yamauchi [Thu, 31 Jul 2014 22:28:53 +0000 (22:28 +0000)]
am
59a5525e: Merge "Add read barriers for the roots in the verifier."
* commit '
59a5525e72d723c8598b6271c7b09845999beeb0':
Add read barriers for the roots in the verifier.
Narayan Kamath [Thu, 31 Jul 2014 18:14:23 +0000 (18:14 +0000)]
am
2eb3769c: Merge "Make ImageSpace skip validation if we are using a relocated image"
* commit '
2eb3769cf75724ce84dcb1b11bddcc1247444799':
Make ImageSpace skip validation if we are using a relocated image
Narayan Kamath [Thu, 31 Jul 2014 17:18:41 +0000 (17:18 +0000)]
am
1175aec5: Merge "Fix image not regenerating on changes to bootclasspath"
* commit '
1175aec5f686b9e3d429282d7d4022c39436f71f':
Fix image not regenerating on changes to bootclasspath
Vladimir Marko [Thu, 31 Jul 2014 14:28:47 +0000 (14:28 +0000)]
am
07206af3: Reduce time and memory usage of GVN.
* commit '
07206af370746e6d7cf528e655b4854e7a865cfa':
Reduce time and memory usage of GVN.
Bill Buzbee [Thu, 31 Jul 2014 14:15:48 +0000 (14:15 +0000)]
am
00d1ef41: Merge "ART: LoadConstWide should clobber temp reg"
* commit '
00d1ef41d0d0d438d604d102183a6bfac58643e7':
ART: LoadConstWide should clobber temp reg
Vladimir Marko [Thu, 31 Jul 2014 13:26:38 +0000 (13:26 +0000)]
am
70f7d48b: Merge "Reduce time and memory usage of GVN."
* commit '
70f7d48b9f2ad768c1e1a5bd96979870379f05e2':
Reduce time and memory usage of GVN.
Andreas Gampe [Thu, 31 Jul 2014 13:26:31 +0000 (13:26 +0000)]
am
36b111c7: Merge "ART: Build fix"
* commit '
36b111c7d3d635e262114dabde4c26952c7dcbe6':
ART: Build fix
Ian Rogers [Thu, 31 Jul 2014 13:26:15 +0000 (13:26 +0000)]
am
cc75c1b3: Merge "1. Fix CFI for quick compiled code in x86 & x86_64; 2. Emit CFI in .eh_frame instead of .debug_frame."
* commit '
cc75c1b38e811cc1cb93ce8f8fcc9a83e20844fb':
1. Fix CFI for quick compiled code in x86 & x86_64; 2. Emit CFI in .eh_frame instead of .debug_frame.
Ian Rogers [Thu, 31 Jul 2014 13:26:14 +0000 (13:26 +0000)]
am
9900a610: Merge "Add --always-clean flag to run-test."
* commit '
9900a610fbb40c49b0503183b79c4bbb376c4128':
Add --always-clean flag to run-test.
Vladimir Marko [Tue, 29 Jul 2014 11:04:10 +0000 (12:04 +0100)]
Reduce time and memory usage of GVN.
Filter out dead sregs in GVN. Reclaim memory after each LVN
in the GVN modification phase.
Bug:
16398693
(cherry picked from commit
b19955d3c8fbd9588f7e17299e559d02938154b6)
Change-Id: I33c7912258a768b4c99d787056979fbc3b023b3b
Andreas Gampe [Thu, 31 Jul 2014 03:59:42 +0000 (03:59 +0000)]
am
b99b8d6c: ART: Fix verifier mishandling erroneous array component types
* commit '
b99b8d6cffe08d8c9d30175c936e5c88d3101802':
ART: Fix verifier mishandling erroneous array component types
Andreas Gampe [Thu, 31 Jul 2014 03:48:14 +0000 (03:48 +0000)]
am
e34e467f: Merge "ART: Fix verifier mishandling erroneous array component types"
* commit '
e34e467f9adf59ba7febdc22b6329ef4b853e123':
ART: Fix verifier mishandling erroneous array component types
Andreas Gampe [Thu, 31 Jul 2014 01:59:05 +0000 (18:59 -0700)]
ART: Fix verifier mishandling erroneous array component types
The verifier must not assume that component types are not erroneous.
Bug:
16661259
(cherry picked from commit
aa910d5ef43256102809e397de305c23f1c315e6)
Change-Id: I6d607310593ac337616581bfdff5eb29a8dd1b9d
Mathieu Chartier [Thu, 31 Jul 2014 00:39:58 +0000 (00:39 +0000)]
am
6bff7130: Add support for bump pointer spaces to DdmSendHeapSegments.
* commit '
6bff7130878128c9836a21ae58d0cfdb0075b1b5':
Add support for bump pointer spaces to DdmSendHeapSegments.
Mathieu Chartier [Thu, 31 Jul 2014 00:26:19 +0000 (00:26 +0000)]
am
da4a1264: Merge "Add support for bump pointer spaces to DdmSendHeapSegments."
* commit '
da4a1264cd7d5db9ed01cfd1eeaed71cb11c6c71':
Add support for bump pointer spaces to DdmSendHeapSegments.
Mathieu Chartier [Wed, 30 Jul 2014 21:59:56 +0000 (14:59 -0700)]
Add support for bump pointer spaces to DdmSendHeapSegments.
Added support for bump pointer spaces as well as
differentiating between DlMallocSpaces and RosAllocSpaces.
Added logic to reset the start of next chunk to prevent
inbetween space regions counted as free.
Fixed a debug build bug where we were doing an mprotect after
creating a rosalloc space. In debug builds, this writes a magic
value in the page. This was faulting since it was set to PROT_NONE.
The fix moves the mprotect before the RosAlloc space creation.
Bug:
16408851
(cherry picked from commit
36dab3607e77505ce139eacef1c62a1c4bc4affd)
Change-Id: I5095feb01fa7e248178a2833da7f821f4fd52c89
Andreas Gampe [Thu, 31 Jul 2014 06:24:06 +0000 (06:24 +0000)]
Merge "ART: Build fix"
Andreas Gampe [Thu, 31 Jul 2014 06:21:36 +0000 (23:21 -0700)]
ART: Build fix
Make lint happy, as comments should be separated from code.
Change-Id: I4bfd88357302be9a6a104f1152e3b1fda386371e
Andreas Gampe [Thu, 31 Jul 2014 03:39:34 +0000 (03:39 +0000)]
Merge "ART: Fix verifier mishandling erroneous array component types"
Andreas Gampe [Thu, 31 Jul 2014 01:59:05 +0000 (18:59 -0700)]
ART: Fix verifier mishandling erroneous array component types
The verifier must not assume that component types are not erroneous.
Bug:
16661259
Change-Id: I23b2f517259ca9c0b8a1aa38f6348fcd61e0b22e
Mathieu Chartier [Thu, 31 Jul 2014 00:15:37 +0000 (00:15 +0000)]
Merge "Add support for bump pointer spaces to DdmSendHeapSegments."
Mathieu Chartier [Wed, 30 Jul 2014 21:59:56 +0000 (14:59 -0700)]
Add support for bump pointer spaces to DdmSendHeapSegments.
Added support for bump pointer spaces as well as
differentiating between DlMallocSpaces and RosAllocSpaces.
Added logic to reset the start of next chunk to prevent
inbetween space regions counted as free.
Fixed a debug build bug where we were doing an mprotect after
creating a rosalloc space. In debug builds, this writes a magic
value in the page. This was faulting since it was set to PROT_NONE.
The fix moves the mprotect before the RosAlloc space creation.
Bug:
16408851
Change-Id: Ibe18198d05ff353fbb57d10b2f7719fdcbf1c5f0
Brian Carlstrom [Wed, 30 Jul 2014 17:49:42 +0000 (17:49 +0000)]
am
01a0ebb6: Merge "Make 32bit run-tests work correctly on 64bit default devices."
* commit '
01a0ebb6b96c32879dcad99d515fc0cd8de2a266':
Make 32bit run-tests work correctly on 64bit default devices.
Jeff Hao [Wed, 30 Jul 2014 16:42:18 +0000 (16:42 +0000)]
am
c7c6d18a: Stop thread from reattaching during runtime shutdown while tracing.
* commit '
c7c6d18a90079b67a7592d3f2cb3d4c6f0081512':
Stop thread from reattaching during runtime shutdown while tracing.
Jeff Hao [Wed, 30 Jul 2014 16:41:54 +0000 (16:41 +0000)]
am
78b367a6: Merge "Submitted wrong changelist!" into lmp-dev
* commit '
78b367a666deb0325b5f509021b14a53625d3786':
Submitted wrong changelist!
Jeff Hao [Wed, 30 Jul 2014 16:41:54 +0000 (16:41 +0000)]
am
fb74d873: Merge "Stop thread from reattaching during runtime shutdown while tracing." into lmp-dev
* commit '
fb74d873bde1ea396f5e8603f2c193e7b539345f':
Stop thread from reattaching during runtime shutdown while tracing.
Andreas Gampe [Wed, 30 Jul 2014 16:38:51 +0000 (16:38 +0000)]
am
5cac343e: ART: Check for duplicate class definitions in dex file verifier
* commit '
5cac343e28fe28d4bc9ccc6db5cab38db1f2b59d':
ART: Check for duplicate class definitions in dex file verifier
Andreas Gampe [Wed, 30 Jul 2014 15:31:53 +0000 (15:31 +0000)]
am
ef57ed72: Merge "ART: Remove bogus dcheck"
* commit '
ef57ed72a3ac856f6115ae89c609d4fd892e8c41':
ART: Remove bogus dcheck
Andreas Gampe [Wed, 30 Jul 2014 14:14:58 +0000 (14:14 +0000)]
am
eaa6da1b: ART: Bump oat version for embedded vtable
* commit '
eaa6da1b8381bc7cb9076e90b7ec06812b9d0d2d':
ART: Bump oat version for embedded vtable
Mingyao Yang [Wed, 30 Jul 2014 14:14:57 +0000 (14:14 +0000)]
am
9854fe24: Fix build, missing spaces around =/<.
* commit '
9854fe24d3e22a2e232597b4334ac93205ff17ed':
Fix build, missing spaces around =/<.
Mingyao Yang [Wed, 30 Jul 2014 04:47:26 +0000 (21:47 -0700)]
resolved conflicts for merge of
e19f2b00 to lmp-dev-plus-aosp
Change-Id: I678a541f0bcef726db44ccb50cb6feb71ec498e5
Jeff Hao [Tue, 29 Jul 2014 01:35:38 +0000 (18:35 -0700)]
Stop thread from reattaching during runtime shutdown while tracing.
Bug:
16024763
(cherry picked from commit
c5d824a20c225763761a6dff43294b229ff35469)
Change-Id: Ideab9adedabf3c58f5162e43e79c72af0642bdfa
Andreas Gampe [Tue, 29 Jul 2014 23:26:04 +0000 (23:26 +0000)]
am
f90283f6: Merge "ART: Check for duplicate class definitions in dex file verifier"
* commit '
f90283f61d6ca37abf3a9fb8447d05e79caf0160':
ART: Check for duplicate class definitions in dex file verifier
Andreas Gampe [Tue, 29 Jul 2014 08:22:07 +0000 (01:22 -0700)]
ART: Check for duplicate class definitions in dex file verifier
Reject dex files that try to define two classes with the same type id.
Bug:
16016492
(cherry picked from commit
0ba238dcc21ae3544e1e8cb5d108725db8a1c134)
Change-Id: Ie04a684b41b50313449b87c5c3574e89f800e254
Narayan Kamath [Thu, 31 Jul 2014 18:06:57 +0000 (18:06 +0000)]
Merge "Make ImageSpace skip validation if we are using a relocated image"
Alex Light [Thu, 31 Jul 2014 17:48:46 +0000 (10:48 -0700)]
Make ImageSpace skip validation if we are using a relocated image
Change-Id: I0682d1870f5b3e27adb9c9de803fbb7d364ad00d
Narayan Kamath [Thu, 31 Jul 2014 16:56:26 +0000 (16:56 +0000)]
Merge "Fix image not regenerating on changes to bootclasspath"
Alex Light [Thu, 31 Jul 2014 16:32:13 +0000 (09:32 -0700)]
Fix image not regenerating on changes to bootclasspath
Bug:
16367410
Change-Id: I10e81d068ffc2ab712a287f88ef67f6a1be4df4c
Jeff Hao [Tue, 29 Jul 2014 22:21:52 +0000 (22:21 +0000)]
am
58e17cea: Merge "Stop thread from reattaching during runtime shutdown while tracing."
* commit '
58e17cea2da3e541610e9bcdf8ef3efd983e1390':
Stop thread from reattaching during runtime shutdown while tracing.
Hiroshi Yamauchi [Tue, 29 Jul 2014 22:21:51 +0000 (22:21 +0000)]
am
f2e92073: Merge "Add GcRoot to clean up and enforce read barriers."
* commit '
f2e920734dddbc0eee35c3ba27b88b732df4f82c':
Add GcRoot to clean up and enforce read barriers.
Andreas Gampe [Tue, 29 Jul 2014 21:45:33 +0000 (14:45 -0700)]
ART: Bump oat version for embedded vtable
Change-Id: Ieb84a8d9486a3d99d48e8395ef3634a365142f2f
Mingyao Yang [Wed, 23 Jul 2014 00:33:25 +0000 (17:33 -0700)]
Fix build, missing spaces around =/<.
(cherry picked from commit
1a12858eb15a14788478c4aca82c052bc84fcafa)
Change-Id: Id2d276cd1fb8bb95c46ff5ceacc7cfe1f5acf192
Mingyao Yang [Wed, 16 Jul 2014 17:44:41 +0000 (10:44 -0700)]
Set vtable in class object to null after linking.
This is follow-up work of embedding imt and vtable for
faster interface/virtual call dispatching.
Once vtable becomes embedded, the original vtable is nulled.
(cherry picked from commit
2cdbad7c62f126581ec5177104de961c4d71adaa)
Change-Id: I6acdcd1ee560d387fb77c55c58bbe3598c197ba1
Hiroshi Yamauchi [Thu, 31 Jul 2014 18:32:43 +0000 (18:32 +0000)]
Merge "Add read barriers for the roots in the verifier."
Hiroshi Yamauchi [Wed, 30 Jul 2014 21:26:22 +0000 (14:26 -0700)]
Add read barriers for the roots in the verifier.
Note: Because the roots (the class references in RegType objects) can
be updated by the read barriers, a lot of uses of type "const RegType"
were replaced with "RegType".
Bug:
12687968
Change-Id: I6cf37a87f352938d43fb51560a8d927ada104f50
Bill Buzbee [Thu, 31 Jul 2014 14:08:33 +0000 (14:08 +0000)]
Merge "ART: LoadConstWide should clobber temp reg"
Alexei Zavjalov [Wed, 30 Jul 2014 12:31:04 +0000 (19:31 +0700)]
ART: LoadConstWide should clobber temp reg
If we have 2+ LoadConstWide(FP) calls in one method it is possible
that LoadConstWide will load the method poiner only once. In some
cases, for example, if we have branches, initialization might not be
done and it may lead to a segmentation fault.
Change-Id: If45fc2d1109d7ce9bd272f5c56446b2a6884daac
Signed-off-by: Alexei Zavjalov <alexei.zavjalov@intel.com>
Ian Rogers [Thu, 31 Jul 2014 04:21:44 +0000 (04:21 +0000)]
Merge "1. Fix CFI for quick compiled code in x86 & x86_64; 2. Emit CFI in .eh_frame instead of .debug_frame."
Tong Shen [Wed, 30 Jul 2014 16:31:22 +0000 (09:31 -0700)]
1. Fix CFI for quick compiled code in x86 & x86_64;
2. Emit CFI in .eh_frame instead of .debug_frame.
With CFI, we can correctly unwind past quick generated code.
Now gdb should unwind to main() for both x86 & x86_64 host-side ART.
Note that it does not work with relocation yet.
Testing:
1. art/test/run-test --host --gdb [--64] --no-relocate 005
2. In gdb, run 'b art_quick_invoke_stub', then 'r', then 'c' a few times
3. In gdb, run 'bt'. You should see stack frames down to main()
Change-Id: I5350d4097dc3d360a60cb17c94f1d02b99bc58bb
Ian Rogers [Thu, 31 Jul 2014 03:56:05 +0000 (03:56 +0000)]
Merge "Add --always-clean flag to run-test."
Alex Light [Wed, 30 Jul 2014 16:41:21 +0000 (09:41 -0700)]
Add --always-clean flag to run-test.
This flag makes run-test remove the test-artifacts even if it fails. Also
enable this option by default when doing run-tests with make. Add
a ART_TEST_RUN_TEST_ALWAYS_CLEAN environment variable to control this
option.
Change-Id: I7867b400d570d8d679d9822d1fa65f49eb3522ae
Brian Carlstrom [Wed, 30 Jul 2014 17:41:27 +0000 (17:41 +0000)]
Merge "Make 32bit run-tests work correctly on 64bit default devices."
Alex Light [Wed, 30 Jul 2014 01:31:18 +0000 (18:31 -0700)]
Make 32bit run-tests work correctly on 64bit default devices.
Change-Id: I7a5ca303ab91dec0df95358435e4a56c18a7fce3
Jeff Hao [Wed, 30 Jul 2014 00:59:08 +0000 (00:59 +0000)]
Merge "Submitted wrong changelist!" into lmp-dev
Jeff Hao [Wed, 30 Jul 2014 00:58:19 +0000 (00:58 +0000)]
Submitted wrong changelist!
Revert "Stop thread from reattaching during runtime shutdown while tracing."
This reverts commit
c96657c4243e04888d5948fa023d78cc9213800b.
Change-Id: I859347f93704a94d23f72ef7d483298b08bbed0d
Jeff Hao [Tue, 29 Jul 2014 01:35:38 +0000 (18:35 -0700)]
Stop thread from reattaching during runtime shutdown while tracing.
Bug:
16024763
(cherry picked from commit
c5d824a20c225763761a6dff43294b229ff35469)
Change-Id: Id5dcd4c8a131b93de00023c3ae9f518ea182614a
Jeff Hao [Wed, 30 Jul 2014 00:57:59 +0000 (00:57 +0000)]
Merge "Stop thread from reattaching during runtime shutdown while tracing." into lmp-dev
Vladimir Marko [Thu, 31 Jul 2014 09:31:40 +0000 (09:31 +0000)]
Merge "Reduce time and memory usage of GVN."
Vladimir Marko [Tue, 29 Jul 2014 11:04:10 +0000 (12:04 +0100)]
Reduce time and memory usage of GVN.
Filter out dead sregs in GVN. Reclaim memory after each LVN
in the GVN modification phase.
Bug:
16398693
Change-Id: I8c88c3009663754e1b66c0ef3f62c3b93276e385
Nicolas Geoffray [Tue, 29 Jul 2014 14:23:29 +0000 (14:23 +0000)]
am
8df73882: Merge "Revert "Fix proxy tracing and enable tests that now work with tracing.""
* commit '
8df73882c60451e7f789bf9b1f3db2d7dc228640':
Revert "Fix proxy tracing and enable tests that now work with tracing."
Nicolas Geoffray [Tue, 29 Jul 2014 14:23:28 +0000 (14:23 +0000)]
am
01be6e3c: Merge "Fix braino in Makefile."
* commit '
01be6e3c4e4f083842ac9a6f8f9e6c2c937b8a15':
Fix braino in Makefile.
Nicolas Geoffray [Tue, 29 Jul 2014 14:23:27 +0000 (14:23 +0000)]
am
2dd6f729: Merge "Add a variable to disable PREBUILD in run-tests."
* commit '
2dd6f729c05ff9a6c687888707c68e7894392c38':
Add a variable to disable PREBUILD in run-tests.
Andreas Gampe [Tue, 29 Jul 2014 14:23:26 +0000 (14:23 +0000)]
am
9d2f0100: Merge "AArch64: Clean up CalleeSaveMethod frame and the use of temp registers."
* commit '
9d2f0100840a41ed6c6c95f92994db7975a8a211':
AArch64: Clean up CalleeSaveMethod frame and the use of temp registers.
Jeff Hao [Tue, 29 Jul 2014 01:40:37 +0000 (01:40 +0000)]
am
2815f124: Merge "Fix proxy tracing and enable tests that now work with tracing."
* commit '
2815f1242c6c3ea1fc2df7bb5e4bd1924f4e75f7':
Fix proxy tracing and enable tests that now work with tracing.
Andreas Gampe [Mon, 28 Jul 2014 23:16:22 +0000 (23:16 +0000)]
am
4c6427a7: ART: Reject array-length on non-reference register
* commit '
4c6427a757cae2b1c79aafca71be780e54620e68':
ART: Reject array-length on non-reference register
Andreas Gampe [Mon, 28 Jul 2014 22:47:58 +0000 (22:47 +0000)]
am
e5647289: Merge "ART: Fix missing initialization in stack_map_stream.h"
* commit '
e5647289ccc7dafd8b91771a7bd1cd19416aed66':
ART: Fix missing initialization in stack_map_stream.h
Jeff Hao [Tue, 29 Jul 2014 22:06:32 +0000 (22:06 +0000)]
Merge "Stop thread from reattaching during runtime shutdown while tracing."
Jeff Hao [Tue, 29 Jul 2014 01:35:38 +0000 (18:35 -0700)]
Stop thread from reattaching during runtime shutdown while tracing.
Bug:
16024763
Change-Id: Iad5ba180241ff74b15baf5c3a15ed2d2ed60fcf0
Hiroshi Yamauchi [Tue, 29 Jul 2014 22:00:56 +0000 (22:00 +0000)]
Merge "Add GcRoot to clean up and enforce read barriers."
Hiroshi Yamauchi [Wed, 23 Jul 2014 01:08:23 +0000 (18:08 -0700)]
Add GcRoot to clean up and enforce read barriers.
Introduce a value-type wrapper around Object* for GC roots so that 1)
we won't have to directly add the read barrier code in many places and
2) we can avoid accidentally bypassing/missing read barriers on GC
roots (the GcRoot interface ensures that the read barrier is executed
on a read).
The jdwp test passed.
Bug:
12687968
Change-Id: Ib167c7c325b3c7e3900133578815f04d219972a1
Andreas Gampe [Tue, 29 Jul 2014 07:45:01 +0000 (07:45 +0000)]
Merge "AArch64: Clean up CalleeSaveMethod frame and the use of temp registers."
Zheng Xu [Fri, 25 Jul 2014 03:49:42 +0000 (11:49 +0800)]
AArch64: Clean up CalleeSaveMethod frame and the use of temp registers.
CalleeSaveMethod frame size changes :
SaveAll : 368 -> 176
RefOnly : 176 -> 96
RefsAndArgs : 304 -> 224
JNI register spill size changes :
160 -> 88
In the transition assembly, use registers following the rules:
1. x0-x7 as temp/argument registers.
2. IP0, IP1 as scratch registers.
3. After correct type of callee-save-frame has been setup, all registers
are scratch-able(probably except xSELF and xSUSPEND).
4. When restore callee-save-frame, IP0 and IP1 should be untouched.
5. From C to managed code, we assume all callee save register in AAPCS
will be restored by managed code except x19(SUSPEND).
In quick compiler:
1. Use IP0, IP1 as scratch register.
2. Use IP1 as hidden argument register(IP0 will be scratched by
trampoline.)
Change-Id: I05ed9d418b01b9e87218a7608536f57e7a286e4c
Jeff Hao [Tue, 29 Jul 2014 01:34:08 +0000 (01:34 +0000)]
Merge "Fix proxy tracing and enable tests that now work with tracing."
Jeff Hao [Thu, 24 Jul 2014 23:26:09 +0000 (16:26 -0700)]
Fix proxy tracing and enable tests that now work with tracing.
Bug:
16386215
Change-Id: Iec2a372c921caceb050c6baf72d48b3d822899a4
Andreas Gampe [Mon, 28 Jul 2014 20:40:31 +0000 (20:40 +0000)]
am
daa31c58: Merge "ART: Reject array-length on non-reference register"
* commit '
daa31c58ec2fec209f8fdc383bf10dd2e2c64512':
ART: Reject array-length on non-reference register
Andreas Gampe [Mon, 28 Jul 2014 20:14:34 +0000 (13:14 -0700)]
ART: Reject array-length on non-reference register
It should be a hard verifier failure if we detect an array-length
instruction over a non-reference-type register.
Bug:
16595896
(cherry picked from commit
65c9db8dfbeea3f708f95f058f4fed7c2af71052)
Change-Id: I56babcbe95d50fd66a132cf4434cf5fa780beb4e
Andreas Gampe [Mon, 28 Jul 2014 16:46:17 +0000 (16:46 +0000)]
am
3f49507c: Merge "ART: Rework quick entrypoint code in Mir2Lir, cleanup"
* commit '
3f49507c333b7c8d36620870522a7a1055987ef8':
ART: Rework quick entrypoint code in Mir2Lir, cleanup
Nicolas Geoffray [Mon, 28 Jul 2014 16:40:20 +0000 (16:40 +0000)]
am
37f1c7c6: Merge "Implement array get and array put in optimizing."
* commit '
37f1c7c6e084c1160eb1b156ab63ac114a82625a':
Implement array get and array put in optimizing.
Andreas Gampe [Sun, 27 Jul 2014 22:03:49 +0000 (22:03 +0000)]
am
98cc1e55: Merge "ART: Fix target test paths"
* commit '
98cc1e552c2ccbe5d51bc81d49e79119280f5416':
ART: Fix target test paths
Ian Rogers [Sun, 27 Jul 2014 18:37:29 +0000 (18:37 +0000)]
am
b3bf7afc: Merge "Remove the per-project FDO support. Use the common FDO support from build/core. LOCAL_FDO_SUPPORT indicates if the module should enable FDO builds."
* commit '
b3bf7afc4288f97f9b591d19f03362e0577ed0ec':
Remove the per-project FDO support. Use the common FDO support from build/core. LOCAL_FDO_SUPPORT indicates if the module should enable FDO builds.
Bill Buzbee [Sun, 27 Jul 2014 17:56:10 +0000 (17:56 +0000)]
am
4483fbfd: Merge "Revert "Enable Load Store Elimination for ARM and ARM64""
* commit '
4483fbfdf17fd7230a52cc54bc5f7fbca82bbd75':
Revert "Enable Load Store Elimination for ARM and ARM64"
Bill Buzbee [Sun, 27 Jul 2014 17:36:41 +0000 (17:36 +0000)]
am
123c5743: Merge "Enable Load Store Elimination for ARM and ARM64"
* commit '
123c5743374137711163346e75aaad587d142317':
Enable Load Store Elimination for ARM and ARM64
Bill Buzbee [Sun, 27 Jul 2014 02:53:49 +0000 (02:53 +0000)]
am
a65d63e4: Merge "SetConstantWide should mark both SSA regs as constant"
* commit '
a65d63e4eb81605fd798f1ca038d651b0faa29eb':
SetConstantWide should mark both SSA regs as constant
Bill Buzbee [Sun, 27 Jul 2014 02:53:49 +0000 (02:53 +0000)]
am
5e3f45bd: Merge "ART: ReEnable check for a gap between method\'s arg "in" vregs and rest of its vregs"
* commit '
5e3f45bdb987ba7fe7a4114cb5fe8483432015b6':
ART: ReEnable check for a gap between method's arg "in" vregs and rest of its vregs
Andreas Gampe [Sun, 27 Jul 2014 01:43:52 +0000 (01:43 +0000)]
am
b97df048: Merge "ART: Native bridge command-line parameter"
* commit '
b97df0488b5391564b5ea195a0765c943787f88d':
ART: Native bridge command-line parameter
Andreas Gampe [Sun, 27 Jul 2014 01:39:57 +0000 (01:39 +0000)]
am
22e59fd2: ART: Allow arrays with erroneous component type
* commit '
22e59fd2861a4aab16adb2b80a1d5166382a6617':
ART: Allow arrays with erroneous component type
Andreas Gampe [Sun, 27 Jul 2014 01:38:09 +0000 (01:38 +0000)]
am
0db2c431: Merge "ART: Allow arrays with erroneous component type"
* commit '
0db2c431a3971781a52629be62f572cc5b0d35df':
ART: Allow arrays with erroneous component type
Andreas Gampe [Thu, 24 Jul 2014 03:18:36 +0000 (20:18 -0700)]
ART: Allow arrays with erroneous component type
Array classes must tolerate having component type classes that are
erroneous. Change CreateArrayClass to use LookupClass when FindClass
failed.
Bug:
16019155
(cherry picked from commit
dc13d7df5da49e93963035633a82699c68fa0971)
Change-Id: I506250949a1802898433e9099dcb8ef31dd89659
Andreas Gampe [Sat, 26 Jul 2014 20:06:46 +0000 (20:06 +0000)]
am
0237ac84: ART: Special-case cb(n)z even for in-reg constant
* commit '
0237ac84b1459cb1718dce23f3572ae2fe1bd77e':
ART: Special-case cb(n)z even for in-reg constant
Andreas Gampe [Sat, 26 Jul 2014 20:05:21 +0000 (20:05 +0000)]
am
c4a5f588: Merge "ART: Special-case cb(n)z even for in-reg constant"
* commit '
c4a5f588c5c17ae226b56d25539ea4672f0ea9a3':
ART: Special-case cb(n)z even for in-reg constant
Andreas Gampe [Sat, 26 Jul 2014 08:40:39 +0000 (01:40 -0700)]
ART: Special-case cb(n)z even for in-reg constant
Call out to OpCmpImmBranch in GenCompareAndBranch if the constant
is zero and we are testing == or !=, even when zero has been loaded
to a register already. This avoids a register size mismatch on 64b
architectures when basically doing a null check, and generally
squashes a cmp + branch to a cbz or cbnz on Arm and Mips. X86 is
not degraded.
Bug:
16562601
(cherry picked from commit
b07c1f9f4d6088ca2d4c1a10819e57b19acf7f22)
Change-Id: I42701e827feb848470aa991297755d808fa0a077
Andreas Gampe [Sat, 26 Jul 2014 13:14:46 +0000 (13:14 +0000)]
am
9646172b: Merge "ART: Rewrite ParallelGC run-test"
* commit '
9646172b4e04f981a3b1cd3af0e8c9e8a610bfd1':
ART: Rewrite ParallelGC run-test
Andreas Gampe [Sat, 26 Jul 2014 13:14:45 +0000 (13:14 +0000)]
am
ff9d95d5: Merge "Tweaks to patchoat and other related things."
* commit '
ff9d95d58ea9c36d26b96f52c9a7ac4bf92fed2d':
Tweaks to patchoat and other related things.
Andreas Gampe [Sat, 26 Jul 2014 04:18:01 +0000 (04:18 +0000)]
am
f071e86c: Merge "ART: Use array-inl.h in reference_table_test" into lmp-dev
* commit '
f071e86c901a230f55e76bc6b55e19cca16a74cb':
ART: Use array-inl.h in reference_table_test
Ian Rogers [Sun, 27 Jul 2014 18:32:40 +0000 (18:32 +0000)]
Merge "Remove the per-project FDO support. Use the common FDO support from build/core. LOCAL_FDO_SUPPORT indicates if the module should enable FDO builds."
Dehao Chen [Thu, 24 Jul 2014 23:12:59 +0000 (16:12 -0700)]
Remove the per-project FDO support. Use the common FDO support from build/core.
LOCAL_FDO_SUPPORT indicates if the module should enable FDO builds.
Change-Id: I1eab8bf418b7ceb060eea18bdd304a06597af3d3
Bill Buzbee [Sun, 27 Jul 2014 17:49:57 +0000 (17:49 +0000)]
Merge "Revert "Enable Load Store Elimination for ARM and ARM64""
Bill Buzbee [Sun, 27 Jul 2014 17:49:42 +0000 (17:49 +0000)]
Revert "Enable Load Store Elimination for ARM and ARM64"
On extended testing, I'm seeing a CHECK failure at utility_arm.cc:1201.
This reverts commit
fcc36ba2a2b8fd10e6eebd21ecb6329606443ded.
Change-Id: Icae3d49cd7c8fcab09f2f989cbcb1d7e5c6d137a
Serban Constantinescu [Tue, 15 Jul 2014 16:44:21 +0000 (17:44 +0100)]
Enable Load Store Elimination for ARM and ARM64
This patch refactors the implementation of the LoadStoreElimination
optimisation pass. Please note that this pass was disabled and not
functional for any of the backends.
The current implementation tracks aliases and handles DalvikRegs as well
as Heap memory regions. It has been tested and it is known to optimise
out the following:
* Load - Load
* Store - Load
* Store - Store
* Load Literals
Change-Id: Iefae9b696f87f833ef35c451ed4d49c5a1b6fde0
Andreas Gampe [Fri, 25 Jul 2014 23:50:07 +0000 (23:50 +0000)]
am
3bcac48f: Merge "ART: Fix run-test 114 ParallelGC to account for OOM"
* commit '
3bcac48f23094fa0f46315a080ec47fc368fd4c2':
ART: Fix run-test 114 ParallelGC to account for OOM