OSDN Git Service
Nicolas Geoffray [Thu, 26 Jun 2014 12:37:24 +0000 (12:37 +0000)]
am
58fb36a8: Merge "Fix build rule."
* commit '
58fb36a876d2f8f646c7497514275344dd4e3b78':
Fix build rule.
Nicolas Geoffray [Thu, 26 Jun 2014 10:30:47 +0000 (10:30 +0000)]
am
b1cbf58b: Merge "Re-enable tests with the optimizing compiler."
* commit '
b1cbf58b4d0bfe58d1ac8716c1d5c4c646983478':
Re-enable tests with the optimizing compiler.
Sebastien Hertz [Thu, 26 Jun 2014 10:30:46 +0000 (10:30 +0000)]
am
0c173466: Merge "Fix memory leak in JDWP object registry"
* commit '
0c1734665c38b3116e38a90ad06c3f152d9316c5':
Fix memory leak in JDWP object registry
Andreas Gampe [Thu, 26 Jun 2014 10:30:45 +0000 (10:30 +0000)]
am
8803c1cb: Merge "ART: Use ANDROID_HOST_OUT for ANDROID_ROOT in Runtime tests"
* commit '
8803c1cb633de1b0e0a48ffea30ddd8fac201a0e':
ART: Use ANDROID_HOST_OUT for ANDROID_ROOT in Runtime tests
Andreas Gampe [Thu, 26 Jun 2014 03:05:50 +0000 (03:05 +0000)]
am
8a9f3ee5: Merge "ART: Native support for multidex"
* commit '
8a9f3ee5c955e4ff7cf9af6551fd432b454c4b13':
ART: Native support for multidex
Brian Carlstrom [Wed, 25 Jun 2014 21:35:38 +0000 (21:35 +0000)]
am
b849f6dd: Merge "Fix linux build."
* commit '
b849f6dd638fd1246724160cd5c01ab1a5ff33bd':
Fix linux build.
Brian Carlstrom [Wed, 25 Jun 2014 20:58:25 +0000 (20:58 +0000)]
am
e334cca5: Merge "Further refine gtest dependencies."
* commit '
e334cca5b9840a123a298efd1a00956f621341e4':
Further refine gtest dependencies.
Andreas Gampe [Wed, 25 Jun 2014 20:54:43 +0000 (20:54 +0000)]
am
b0947fcc: Merge "Copyright assignment"
* commit '
b0947fcc8257da852dafb6337bd41dab568c7ba5':
Copyright assignment
Ian Rogers [Wed, 25 Jun 2014 19:07:49 +0000 (19:07 +0000)]
am
3ee7b367: Merge "Fix the Mac build on x86-64."
* commit '
3ee7b36798d0f3042ca6198124186cb5e6b7f2bc':
Fix the Mac build on x86-64.
Sebastien Hertz [Wed, 25 Jun 2014 17:36:31 +0000 (17:36 +0000)]
am
e7248f2f: Merge "Really use GCC for ARM64"
* commit '
e7248f2f1835ed194296d4f989c56251d03b834b':
Really use GCC for ARM64
Brian Carlstrom [Wed, 25 Jun 2014 20:52:19 +0000 (20:52 +0000)]
Merge "Further refine gtest dependencies."
Brian Carlstrom [Wed, 25 Jun 2014 20:23:00 +0000 (13:23 -0700)]
Further refine gtest dependencies.
(cherry picked from commit
4ac5c69266a7deab188e65df0e528eadc66e1c06)
Change-Id: I3603776efbc697bae21e79f6976afbd21baf150d
Andreas Gampe [Thu, 26 Jun 2014 04:59:51 +0000 (04:59 +0000)]
Merge "ART: Use ANDROID_HOST_OUT for ANDROID_ROOT in Runtime tests"
Andreas Gampe [Thu, 26 Jun 2014 00:22:59 +0000 (17:22 -0700)]
ART: Use ANDROID_HOST_OUT for ANDROID_ROOT in Runtime tests
On the host, if ANDROID_ROOT is not set, first try ANDROID_HOST_OUT.
This will ensure that builds with OUT_DIR_COMMON_BASE will run the
gtests correctly, as icu will use ANDROID_ROOT to look for a file.
Change-Id: I8988901be32249c1c79f96b36947a647df5de041
Andreas Gampe [Thu, 26 Jun 2014 02:57:02 +0000 (02:57 +0000)]
Merge "ART: Native support for multidex"
Andreas Gampe [Thu, 22 May 2014 01:46:59 +0000 (18:46 -0700)]
ART: Native support for multidex
Native support for zip files with multiple classesX.dex.
Works by explicitly looking for those files in ascending order. As
these files have no file system representation for themselves,
introduce synthetic dex locations: the name of the originating file
plus a colon plus the name of the dex file, e.g., test.jar:classes2.dex.
Opening a zip dex file will return all dex files in this way. This
keeps the changes to dex2oat minimal.
To hide multidex/synthetic names from the Java layer, let the handle
of dalvik.system.DexFile refer to a vector of DexFile objects. When
opening a location, test possible synthetic names and add them to the
vector. Thus, the original multidex jar in the classpath will be
associated with all embedded dex files.
Change-Id: I0de107e1369cbc94416c544aca3b17525c9eac8b
Brian Carlstrom [Wed, 25 Jun 2014 21:23:35 +0000 (21:23 +0000)]
Merge "Fix linux build."
Brian Carlstrom [Wed, 25 Jun 2014 21:11:45 +0000 (14:11 -0700)]
Fix linux build.
Change-Id: Ic480b454fe7ecd435d1b2292971f2a59bd26d2bd
Andreas Gampe [Wed, 25 Jun 2014 20:39:13 +0000 (20:39 +0000)]
Merge "Copyright assignment"
Bernhard Rosenkraenzer [Wed, 25 Jun 2014 20:36:44 +0000 (22:36 +0200)]
Copyright assignment
Reassign the copyright on the Linaro-written file to the
Android Open Source Project
Change-Id: I0194056207567f51950c5a3acc46857409c66727
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Brian Carlstrom [Wed, 25 Jun 2014 17:04:06 +0000 (17:04 +0000)]
Brian Carlstrom [Wed, 25 Jun 2014 16:37:50 +0000 (16:37 +0000)]
am
ebeaf8f7: Merge "Treat larger than jint capacity in NewDirectByteBuffer as an error"
* commit '
ebeaf8f7c88af0917f4b7b1137dd78d56d66dd59':
Treat larger than jint capacity in NewDirectByteBuffer as an error
Nicolas Geoffray [Wed, 25 Jun 2014 14:24:36 +0000 (14:24 +0000)]
am
fe6bfba3: Merge "Revert "Re-enable tests with the optimizing compiler.""
* commit '
fe6bfba3153ab55dab3ec0d644d628136e5ff0a4':
Revert "Re-enable tests with the optimizing compiler."
Nicolas Geoffray [Wed, 25 Jun 2014 13:48:55 +0000 (13:48 +0000)]
am
84691ba2: Merge "Re-enable tests with the optimizing compiler."
* commit '
84691ba238225dd77c7b498a153db4dd306e9712':
Re-enable tests with the optimizing compiler.
Nicolas Geoffray [Wed, 25 Jun 2014 13:23:33 +0000 (13:23 +0000)]
am
ae43e2b1: Merge "Fix test-art-target error"
* commit '
ae43e2b11cc5af5b632700a9e4e4d9ed436b24dc':
Fix test-art-target error
Nicolas Geoffray [Wed, 25 Jun 2014 13:23:32 +0000 (13:23 +0000)]
am
89522f4b: Merge "Fix a bug in LiveInterval::FirstRegisterUseAfter."
* commit '
89522f4be204812d6efec245f4846f1285678b97':
Fix a bug in LiveInterval::FirstRegisterUseAfter.
Brian Carlstrom [Wed, 25 Jun 2014 09:56:24 +0000 (09:56 +0000)]
am
b5dc9444: Merge "Fix names of TEST_ART_TIMING_SENSITIVE_RUN_TESTS"
* commit '
b5dc9444777bb027b070d3ff3fcf7a2a3fb7e3dc':
Fix names of TEST_ART_TIMING_SENSITIVE_RUN_TESTS
Brian Carlstrom [Wed, 25 Jun 2014 09:56:22 +0000 (09:56 +0000)]
am
e043deb5: Merge "Add libjavacore dependency for oat tests"
* commit '
e043deb5e5e878ca11ca84fbc58a55a33546ef8a':
Add libjavacore dependency for oat tests
Ian Rogers [Wed, 25 Jun 2014 09:56:21 +0000 (09:56 +0000)]
am
3153895d: Merge "Weaken condition to dump a thread\'s stack in a debug build."
* commit '
3153895d020038cd89311ed6ee241ce9b9f18a59':
Weaken condition to dump a thread's stack in a debug build.
Ian Rogers [Wed, 25 Jun 2014 09:56:20 +0000 (09:56 +0000)]
am
ece10dbe: Merge "Define run-test targets."
* commit '
ece10dbe1ed59cf125d91401674b71626ae1e240':
Define run-test targets.
Ian Rogers [Wed, 25 Jun 2014 09:56:14 +0000 (09:56 +0000)]
am
b9d11f7e: Merge "x86_64: Fix wide argument increment"
* commit '
b9d11f7e2f60bdebfd2ece34e01ecc789921837d':
x86_64: Fix wide argument increment
Ian Rogers [Wed, 25 Jun 2014 09:56:13 +0000 (09:56 +0000)]
am
c6f0f60b: Merge "x86_64: int-to-long should ensure that int in kCoreReg"
* commit '
c6f0f60bf3d4e3402c6e30bb4a4b88b345530954':
x86_64: int-to-long should ensure that int in kCoreReg
Ian Rogers [Wed, 25 Jun 2014 09:56:10 +0000 (09:56 +0000)]
am
10fdc6af: Merge "Fix various test dependencies."
* commit '
10fdc6af15a8464fd10bd558a19f6395cf12345a':
Fix various test dependencies.
Brian Carlstrom [Wed, 25 Jun 2014 16:57:09 +0000 (16:57 +0000)]
Brian Carlstrom [Wed, 25 Jun 2014 16:30:52 +0000 (09:30 -0700)]
Address comments on change
45d26c86b00580593067ca42091ad66cf7dc4f7c
Change-Id: Ibb559ae41654660064f4a8df71274c4e4f16807a
Brian Carlstrom [Wed, 25 Jun 2014 08:15:52 +0000 (08:15 +0000)]
Merge "Add libjavacore dependency for oat tests"
Brian Carlstrom [Wed, 25 Jun 2014 07:57:36 +0000 (00:57 -0700)]
Add libjavacore dependency for oat tests
(cherry picked from commit
979942f123a2a9d1949f8be6672ff14101d9f214)
Change-Id: I8f29665259634226ed78fb26b35fb92323310698
Ian Rogers [Wed, 25 Jun 2014 06:21:28 +0000 (06:21 +0000)]
Merge "Define run-test targets."
Ian Rogers [Wed, 25 Jun 2014 06:15:34 +0000 (23:15 -0700)]
Define run-test targets.
Addressing review comment on https://android-review.googlesource.com/#/c/98456/11
Change-Id: I6ad031dcf53b63506ebb738e9c26cc15f0f10107
Ian Rogers [Wed, 25 Jun 2014 04:45:01 +0000 (04:45 +0000)]
Merge "Fix various test dependencies."
Ian Rogers [Wed, 25 Jun 2014 04:34:09 +0000 (21:34 -0700)]
Fix various test dependencies.
Change-Id: I2e4761f4cc061f74319a7b64ebe67c553d5297df
Ian Rogers [Wed, 25 Jun 2014 18:59:31 +0000 (18:59 +0000)]
Merge "Fix the Mac build on x86-64."
Ian Rogers [Wed, 25 Jun 2014 18:52:14 +0000 (11:52 -0700)]
Fix the Mac build on x86-64.
Change-Id: I4ed3783a96d844de0b0a295df26d0a48c02a3726
Brian Carlstrom [Wed, 25 Jun 2014 16:29:31 +0000 (16:29 +0000)]
Merge "Treat larger than jint capacity in NewDirectByteBuffer as an error"
Brian Carlstrom [Wed, 25 Jun 2014 06:36:28 +0000 (23:36 -0700)]
Treat larger than jint capacity in NewDirectByteBuffer as an error
Bug:
15854028
Change-Id: If78921f4ba2b38a9d0bb421acf9c8bca962ed42a
Brian Carlstrom [Wed, 25 Jun 2014 08:43:53 +0000 (08:43 +0000)]
Merge "Fix names of TEST_ART_TIMING_SENSITIVE_RUN_TESTS"
Brian Carlstrom [Wed, 25 Jun 2014 08:39:05 +0000 (01:39 -0700)]
Fix names of TEST_ART_TIMING_SENSITIVE_RUN_TESTS
(cherry picked from commit
c87deb01815638c69e30fa6787b0a9ea91ea8c29)
Change-Id: Iceff40c3bd22b5dacbdc9550ec894003c758fd86
Ian Rogers [Wed, 25 Jun 2014 06:22:30 +0000 (06:22 +0000)]
Merge "Weaken condition to dump a thread's stack in a debug build."
Ian Rogers [Wed, 25 Jun 2014 05:48:01 +0000 (22:48 -0700)]
Weaken condition to dump a thread's stack in a debug build.
If the current thread isn't suspended its also ok to dump the stack.
Bug:
14229281
Change-Id: I2810ea79bc4330bb6e9616436d74076b5997c20b
Ian Rogers [Wed, 25 Jun 2014 05:27:36 +0000 (05:27 +0000)]
Merge "x86_64: Fix wide argument increment"
Ian Rogers [Wed, 25 Jun 2014 05:11:55 +0000 (05:11 +0000)]
Merge "x86_64: int-to-long should ensure that int in kCoreReg"
Serguei Katkov [Tue, 24 Jun 2014 17:25:35 +0000 (00:25 +0700)]
x86_64: int-to-long should ensure that int in kCoreReg
it is possible that int in xmm so implementation of int-to-long
should ensure that src in core reg before usage of move with
sign extension which does not support xmm case.
Change-Id: Ibab9df7564f0f1c1f3e1f5ff67c38f1a5e3cdb69
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
Ian Rogers [Tue, 24 Jun 2014 23:58:39 +0000 (23:58 +0000)]
am
d377971c: Merge "Multilib ART host."
* commit '
d377971c505e8cfacc878b8c632cc40fcf7d88c5':
Multilib ART host.
Andreas Gampe [Tue, 24 Jun 2014 23:38:11 +0000 (23:38 +0000)]
am
ba778fae: Merge "AArch64: Add memcmp.S for Arm64."
* commit '
ba778fae99ec3b38d4f98262e6b7072bab0e9de4':
AArch64: Add memcmp.S for Arm64.
Hiroshi Yamauchi [Tue, 24 Jun 2014 22:43:16 +0000 (22:43 +0000)]
am
685d3526: Merge "Add more read barriers to the class linker."
* commit '
685d3526f5be8f5d0ffce67a04ecf35fb2b07b1d':
Add more read barriers to the class linker.
Mathieu Chartier [Tue, 24 Jun 2014 22:38:41 +0000 (22:38 +0000)]
am
fe7aee2d: Merge "More advanced timing loggers."
* commit '
fe7aee2d20b47dad6029a588e0c7394f0c75d080':
More advanced timing loggers.
Mathieu Chartier [Tue, 24 Jun 2014 22:10:50 +0000 (22:10 +0000)]
am
1f47b4d8: Merge "Add logging to monitor deflation."
* commit '
1f47b4d8c20e443fac7e8b8b7a77c723fb0be3a1':
Add logging to monitor deflation.
Andreas Gampe [Tue, 24 Jun 2014 22:06:18 +0000 (22:06 +0000)]
am
27113be9: Merge "Revert "Revert "ART: Split out more cases of Load/StoreRef, volatile as parameter"""
* commit '
27113be940950155164ca4513bc9f7b1fe050dac':
Revert "Revert "ART: Split out more cases of Load/StoreRef, volatile as parameter""
Brian Carlstrom [Tue, 24 Jun 2014 21:09:49 +0000 (14:09 -0700)]
resolved conflicts for merge of
50e7d733 to klp-modular-dev-plus-aosp
Change-Id: I7f12783da2f656fd2b8d53de737399b3f7f6b524
Chao-ying Fu [Tue, 24 Jun 2014 20:24:36 +0000 (13:24 -0700)]
x86_64: Fix wide argument increment
This patch fixes to always increment the index for a wide argument,
and fixes the index upper bound.
Otherwise, the mapping may be incorrect.
Change-Id: I0116d8fd0a0a5c1270a23129c73a9e3651132977
Signed-off-by: Chao-ying Fu <chao-ying.fu@intel.com>
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
Brian Carlstrom [Tue, 24 Jun 2014 19:35:36 +0000 (19:35 +0000)]
am
9658d24d: Merge "Fixed ImageWriter timings not being written out."
* commit '
9658d24deaa9bd07781bfac860d2a6dd89066d55':
Fixed ImageWriter timings not being written out.
Andreas Gampe [Tue, 24 Jun 2014 19:35:35 +0000 (19:35 +0000)]
am
fbd18f19: Merge "Revert "ART: Split out more cases of Load/StoreRef, volatile as parameter""
* commit '
fbd18f1923334f3208cfe6ba5f1d4f9eb421b063':
Revert "ART: Split out more cases of Load/StoreRef, volatile as parameter"
Andreas Gampe [Tue, 24 Jun 2014 19:35:29 +0000 (19:35 +0000)]
am
7e47f713: Merge "ART: Split out more cases of Load/StoreRef, volatile as parameter"
* commit '
7e47f713067b55e24b5d24f2c892ceefd7971ebf':
ART: Split out more cases of Load/StoreRef, volatile as parameter
Dave Allison [Tue, 24 Jun 2014 19:35:22 +0000 (19:35 +0000)]
am
1528b02c: Merge "Add some more instruction support to optimizing compiler."
* commit '
1528b02c4d5241e785bb680f13de70c355e67429':
Add some more instruction support to optimizing compiler.
Hiroshi Yamauchi [Tue, 24 Jun 2014 22:34:17 +0000 (22:34 +0000)]
Merge "Add more read barriers to the class linker."
Hiroshi Yamauchi [Tue, 24 Jun 2014 21:31:37 +0000 (14:31 -0700)]
Add more read barriers to the class linker.
This change makes it possible to concurrently scan the remaining roots
in the class linker (the non-class-table roots that are visited by
ClassLinker::VisitRoots()) by adding read barriers.
Bug:
12687968
Change-Id: I66fecf7a303eee7537429e018f38da8270b18c67
Mathieu Chartier [Tue, 24 Jun 2014 22:30:11 +0000 (22:30 +0000)]
Merge "More advanced timing loggers."
Mathieu Chartier [Fri, 20 Jun 2014 17:37:54 +0000 (10:37 -0700)]
More advanced timing loggers.
The new timing loggers have lower overhead since they only push into
a vector. The new format has two types, a start timing and a stop
timing. You can thing of these as brackets associated with a
timestamp. It uses these to construct various statistics when needed,
such as: Total time, exclusive time, and nesting depth.
Changed PrettyDuration to have a default of 3 digits after the decimal
point.
Exaple of a GC dump with exclusive / total times and indenting:
I/art (23546): GC iteration timing logger [Exclusive time] [Total time]
I/art (23546): 0ms InitializePhase
I/art (23546): 0.305ms/167.746ms MarkingPhase
I/art (23546): 0ms BindBitmaps
I/art (23546): 0ms FindDefaultSpaceBitmap
I/art (23546): 0ms/1.709ms ProcessCards
I/art (23546): 0.183ms ImageModUnionClearCards
I/art (23546): 0.916ms ZygoteModUnionClearCards
I/art (23546): 0.610ms AllocSpaceClearCards
I/art (23546): 1.373ms AllocSpaceClearCards
I/art (23546): 0.305ms/6.318ms MarkRoots
I/art (23546): 2.106ms MarkRootsCheckpoint
I/art (23546): 0.153ms MarkNonThreadRoots
I/art (23546): 4.287ms MarkConcurrentRoots
I/art (23546): 43.461ms UpdateAndMarkImageModUnionTable
I/art (23546): 0ms/112.712ms RecursiveMark
I/art (23546): 112.712ms ProcessMarkStack
I/art (23546): 0.610ms/2.777ms PreCleanCards
I/art (23546): 0.305ms/0.855ms ProcessCards
I/art (23546): 0.153ms ImageModUnionClearCards
I/art (23546): 0.610ms ZygoteModUnionClearCards
I/art (23546): 0.610ms AllocSpaceClearCards
I/art (23546): 0.549ms AllocSpaceClearCards
I/art (23546): 0.549ms MarkRootsCheckpoint
I/art (23546): 0.610ms MarkNonThreadRoots
I/art (23546): 0ms MarkConcurrentRoots
I/art (23546): 0.610ms ScanGrayImageSpaceObjects
I/art (23546): 0.305ms ScanGrayZygoteSpaceObjects
I/art (23546): 0.305ms ScanGrayAllocSpaceObjects
I/art (23546): 1.129ms ScanGrayAllocSpaceObjects
I/art (23546): 0ms ProcessMarkStack
I/art (23546): 0ms/0.977ms (Paused)PausePhase
I/art (23546): 0.244ms ReMarkRoots
I/art (23546): 0.672ms (Paused)ScanGrayObjects
I/art (23546): 0ms (Paused)ProcessMarkStack
I/art (23546): 0ms/0.610ms SwapStacks
I/art (23546): 0.610ms RevokeAllThreadLocalAllocationStacks
I/art (23546): 0ms PreSweepingGcVerification
I/art (23546): 0ms/10.621ms ReclaimPhase
I/art (23546): 0.610ms/0.702ms ProcessReferences
I/art (23546): 0.214ms/0.641ms EnqueueFinalizerReferences
I/art (23546): 0.427ms ProcessMarkStack
I/art (23546): 0.488ms SweepSystemWeaks
I/art (23546): 0.824ms/9.400ms Sweep
I/art (23546): 0ms SweepMallocSpace
I/art (23546): 0.214ms SweepZygoteSpace
I/art (23546): 0.122ms SweepMallocSpace
I/art (23546): 6.226ms SweepMallocSpace
I/art (23546): 0ms SweepMallocSpace
I/art (23546): 2.144ms SweepLargeObjects
I/art (23546): 0.305ms SwapBitmaps
I/art (23546): 0ms UnBindBitmaps
I/art (23546): 0.275ms FinishPhase
I/art (23546): GC iteration timing logger: end, 178.971ms
Change-Id: Ia55b65609468f212b3cd65cda66b843da42be645
Andreas Gampe [Tue, 24 Jun 2014 18:44:29 +0000 (18:44 +0000)]
Merge "Revert "ART: Split out more cases of Load/StoreRef, volatile as parameter""
Andreas Gampe [Tue, 24 Jun 2014 18:42:06 +0000 (18:42 +0000)]
Revert "ART: Split out more cases of Load/StoreRef, volatile as parameter"
This reverts commit
2689fbad6b5ec1ae8f8c8791a80c6fd3cf24144d.
Breaks the build.
Change-Id: I9faad4e9a83b32f5f38b2ef95d6f9a33345efa33
Ian Rogers [Tue, 24 Jun 2014 23:48:11 +0000 (23:48 +0000)]
Merge "Multilib ART host."
Ian Rogers [Tue, 17 Jun 2014 15:21:54 +0000 (08:21 -0700)]
Multilib ART host.
Build ART for the host as a multilib project with dalvikvm32 and dalvikvm64
running as 32 or 64-bit repsectfully. Note, currently multilib host builds
are not the default, you make the so by setting BUILD_HOST_64bit=1.
Extend tests to execute in both 32 and 64-bit modes. By default both 32 and
64-bit tests are run, add 32 or 64 to the end of a test name to run it in
purely that flavor.
Given the extra spam, modify oat tests to only generate console output when
the test fails.
Change the test harness so that common commands are run when a test should be
skipped, when it passes or when it fails. Use these commands to generate a
summary of passing, skipped and failing tests. Tests will be skipped if they
are known to be broken or if a test has already failed. Setting the variable
TEST_ART_KEEP_GOING=true will force working tests not to be skipped.
In this change all tests running on the optimizing compiler are marked broken
due to breakages running them in a multilib environment.
Break apart Android.common.mk into its constituent parts, along with other
pieces of reorganization.
Stylistic nit, we refer to make rule targets as targets thereby overloading
the term target. While consistent with make's terminology, its confusing with
the Android notion of target. I've switched to just calling targets rules to
avoid confusion in host tests.
Change-Id: I5190fc3de46800a949fbb06b3f4c258ca89ccde9
Andreas Gampe [Tue, 24 Jun 2014 23:27:32 +0000 (23:27 +0000)]
Merge "AArch64: Add memcmp.S for Arm64."
Mathieu Chartier [Tue, 24 Jun 2014 22:00:32 +0000 (22:00 +0000)]
Merge "Add logging to monitor deflation."
Mathieu Chartier [Tue, 24 Jun 2014 18:21:59 +0000 (11:21 -0700)]
Add logging to monitor deflation.
Change-Id: I0251ff19e0a3c3b9edc7c7e296f15eb3229f8f7c
Sebastien Hertz [Tue, 24 Jun 2014 14:26:41 +0000 (14:26 +0000)]
am
a76724f4: Merge "Use GCC on ARM64"
* commit '
a76724f4bc4a8d36c6c99243835b8e3ddf1eb2d7':
Use GCC on ARM64
Calin Juravle [Tue, 24 Jun 2014 11:05:34 +0000 (11:05 +0000)]
am
1bc67722: Merge "Log profile info only on debug builds."
* commit '
1bc67722c1bcf26934900768a60ca0bfb0a6d1a0':
Log profile info only on debug builds.
Calin Juravle [Tue, 24 Jun 2014 11:05:33 +0000 (11:05 +0000)]
am
7db22606: Merge "Always compile leafs during profile based compilation."
* commit '
7db22606228d21b3adba04851409a4a78e6b4263':
Always compile leafs during profile based compilation.
Dave Allison [Tue, 24 Jun 2014 09:26:02 +0000 (09:26 +0000)]
am
ad1e79fb: Merge "Move trampolines to thumb2 instead of ARM"
* commit '
ad1e79fb6871bee2b5e91560227ca7acddf99cb9':
Move trampolines to thumb2 instead of ARM
Mathieu Chartier [Tue, 24 Jun 2014 09:26:01 +0000 (09:26 +0000)]
am
cbb0e809: Merge "Use reader lock of bulk free lock when not freeing."
* commit '
cbb0e809c0a4e8a4e8b7f5d3768a1864cfb381bb':
Use reader lock of bulk free lock when not freeing.
Sebastien Hertz [Thu, 26 Jun 2014 06:49:48 +0000 (06:49 +0000)]
Merge "Fix memory leak in JDWP object registry"
Sebastien Hertz [Wed, 25 Jun 2014 20:06:12 +0000 (22:06 +0200)]
Fix memory leak in JDWP object registry
Deletes ObjectRegistryEntry objects before clearing the maps.
Change-Id: Iaa30941fb8768b7294366a8f9855580cb29dadf5
Nicolas Geoffray [Wed, 25 Jun 2014 13:14:06 +0000 (13:14 +0000)]
Merge "Fix test-art-target error"
Brian Carlstrom [Wed, 25 Jun 2014 09:15:31 +0000 (02:15 -0700)]
Fix test-art-target error
Change-Id: If1f800a056b3f95252037163784ab3ae26d9fa6d
Nicolas Geoffray [Wed, 25 Jun 2014 13:13:46 +0000 (13:13 +0000)]
Merge "Fix a bug in LiveInterval::FirstRegisterUseAfter."
Nicolas Geoffray [Thu, 19 Jun 2014 16:06:46 +0000 (17:06 +0100)]
Fix a bug in LiveInterval::FirstRegisterUseAfter.
Since the use list is shared amongst siblings, we must stop looking
for the user once we have reached the end position of the current
interval. The next uses are for the next sibling.
Change-Id: Ibba180161e94a705e2034abd0b95a29347950257
Sebastien Hertz [Tue, 24 Jun 2014 14:16:32 +0000 (14:16 +0000)]
Merge "Use GCC on ARM64"
Nicolas Geoffray [Wed, 25 Jun 2014 13:38:48 +0000 (13:38 +0000)]
Merge "Re-enable tests with the optimizing compiler."
Nicolas Geoffray [Wed, 25 Jun 2014 13:35:34 +0000 (14:35 +0100)]
Re-enable tests with the optimizing compiler.
Tests run ok on my host/target. I reverted the move to
using thumb2, because tests were crashing. But I could not
reproduce file limits issues.
Change-Id: I26bc4ec1eb6c227750d11210e012d9d3b1d824af
Nicolas Geoffray [Thu, 26 Jun 2014 12:29:49 +0000 (12:29 +0000)]
Merge "Fix build rule."
Nicolas Geoffray [Thu, 26 Jun 2014 12:24:34 +0000 (13:24 +0100)]
Fix build rule.
There is no such thing as 2ND_HOST_CORE_DEX_FILES.
Change-Id: I87187267effe239c898aa504b914138e4f722a80
Nicolas Geoffray [Thu, 26 Jun 2014 08:28:46 +0000 (08:28 +0000)]
Merge "Re-enable tests with the optimizing compiler."
Nicolas Geoffray [Wed, 25 Jun 2014 13:35:34 +0000 (14:35 +0100)]
Re-enable tests with the optimizing compiler.
Tests run ok on my host/target. I reverted the move to
using thumb2, because tests were crashing. But I could not
reproduce file limits issues.
Make SignalTest as crashing for optimizing. We need to implement
stack overflow checks.
Change-Id: Ieda575501eaf30af7aaa2c44e71544c9c467c24f
Sebastien Hertz [Wed, 25 Jun 2014 17:27:31 +0000 (17:27 +0000)]
Merge "Really use GCC for ARM64"
Sebastien Hertz [Wed, 25 Jun 2014 16:50:01 +0000 (18:50 +0200)]
Really use GCC for ARM64
Restores change https://android-review.googlesource.com/98911 lost in change
https://android-review.googlesource.com/98456.
Change-Id: Ie11f807c554dbfa812a70b8a183966f388018276
Nicolas Geoffray [Wed, 25 Jun 2014 14:15:46 +0000 (14:15 +0000)]
Merge "Revert "Re-enable tests with the optimizing compiler.""
Nicolas Geoffray [Wed, 25 Jun 2014 14:15:06 +0000 (14:15 +0000)]
Revert "Re-enable tests with the optimizing compiler."
This reverts commit
20550910e608ed7d86db97927d2ce9d2191061a4.
Change-Id: Ic28b719946c795378838a18162a2a2b2cf41a0e8
Calin Juravle [Tue, 24 Jun 2014 10:57:35 +0000 (10:57 +0000)]
Merge "Log profile info only on debug builds."
Calin Juravle [Tue, 24 Jun 2014 10:56:44 +0000 (10:56 +0000)]
Merge "Always compile leafs during profile based compilation."
Andreas Gampe [Tue, 24 Jun 2014 17:29:59 +0000 (17:29 +0000)]
Merge "ART: Split out more cases of Load/StoreRef, volatile as parameter"