OSDN Git Service
Andreas Gampe [Fri, 12 Sep 2014 22:31:51 +0000 (22:31 +0000)]
Merge "ART: Allow quickening in the boot image" into lmp-dev
Andreas Gampe [Thu, 28 Aug 2014 21:41:02 +0000 (14:41 -0700)]
ART: Allow quickening in the boot image
Update the class linker to accept class status from the boot image
in compiler mode. Update compiler driver to allow quickening for
boot image classes. Update method verifier to accept quickened
instructions in compiler mode when we just want to dump. Update
oatdump to the new verifier API.
Bug:
17316928
Change-Id: I9ef1bfd78b0d93625b89b3d662131d7d6e5f2903
Andreas Gampe [Fri, 12 Sep 2014 20:49:25 +0000 (20:49 +0000)]
Merge "ART: Change access flag behavior in verifier" into lmp-dev
buzbee [Fri, 12 Sep 2014 19:49:26 +0000 (19:49 +0000)]
Merge "Quick compiler (arm64) Fix inline Math.round()" into lmp-dev
Mathieu Chartier [Fri, 12 Sep 2014 19:42:41 +0000 (19:42 +0000)]
Merge "Fix and re-enable FreeList large object space for 64 bit" into lmp-dev
buzbee [Fri, 12 Sep 2014 17:40:47 +0000 (10:40 -0700)]
Quick compiler (arm64) Fix inline Math.round()
Math.round is detected and inlined for arm64. However, the
arm64 backend incorrectly modified a source operand in place
during the round sequence. Depending on how registers are
allocated, that modification could persist. Changed to use a
temp register for the intermediate result.
Internal b/
17411468
Change-Id: I7c636f985e193f8ff838768fde3b741e443bb1bb
Andreas Gampe [Mon, 25 Aug 2014 22:05:04 +0000 (15:05 -0700)]
ART: Change access flag behavior in verifier
Note: this moves the miranda modifier to the upper 16 bit.
Bug:
16161620
Change-Id: I2f591d53b7d1559171e70aaaf22225d94b4882f5
Andreas Gampe [Fri, 12 Sep 2014 18:25:28 +0000 (18:25 +0000)]
Merge "Fix host 64-bit ISA string" into lmp-dev
Mathieu Chartier [Tue, 9 Sep 2014 00:42:48 +0000 (17:42 -0700)]
Fix and re-enable FreeList large object space for 64 bit
Not enabled on 32 bit due to virtual memory fragmentation concerns.
The new free list large object space ensures that allocations are
page aligned by using a side table for accounting data.
Bug:
17414549
Change-Id: Idbcbe75cb86b6d9b3d8b20f3048631a48c511458
Mathieu Chartier [Thu, 11 Sep 2014 23:51:03 +0000 (23:51 +0000)]
Merge "Add fast path to VMClassLoader.findLoadedClass" into lmp-dev
Mathieu Chartier [Thu, 11 Sep 2014 23:27:11 +0000 (23:27 +0000)]
Merge "Delete pin table" into lmp-dev
Brian Carlstrom [Thu, 11 Sep 2014 23:13:17 +0000 (23:13 +0000)]
Merge "Print the command line and ABI in stack dumps like debuggerd." into lmp-dev
Jeff Brown [Thu, 11 Sep 2014 01:41:18 +0000 (18:41 -0700)]
Print the command line and ABI in stack dumps like debuggerd.
Ensure the heading is "Cmd line:" just like debuggerd and
as it used to be in Dalvik.
Fix a missing newline.
Trim all training nulls from the command line.
Don't bother printing the original command line if unset.
Add the ABI to the dump to help the native stack symbol tool.
Bug:
17474152
Change-Id: Ie1da1bd4f38c92b13ea08c7122f4573d8ec8fc73
Jeff Brown [Thu, 11 Sep 2014 23:01:55 +0000 (23:01 +0000)]
Merge "Revert "Print the command line and ABI in stack dumps like debuggerd."" into lmp-dev
Jeff Brown [Thu, 11 Sep 2014 23:01:44 +0000 (23:01 +0000)]
Revert "Print the command line and ABI in stack dumps like debuggerd."
This reverts commit
38ac77b6fb1fc626299022fe0f16d5b6c365cb9b.
Change-Id: I8e4952b80d03ad61c3ff2afaf8a96b8c2e36f0c7
Jeff Brown [Thu, 11 Sep 2014 22:57:55 +0000 (22:57 +0000)]
Merge "Print the command line and ABI in stack dumps like debuggerd." into lmp-dev
Mathieu Chartier [Thu, 11 Sep 2014 21:21:41 +0000 (14:21 -0700)]
Add fast path to VMClassLoader.findLoadedClass
VMClassLoader.findLoadedClass now calls FindClassInPathClassLoader
as a fast path. Exclusive time results (trace view maps launch):
Before:
nativeFillInStackTrace 1.4%
defineClassNative 1.2%
findLoadedClass 0.2%
After:
nativeFillInStackTrace 0.5%
defineClassNative 0.0%
findLoadedClass 0.9%
Bug:
16828525
Change-Id: I1bde48effcd28529778c00ec0fa0dda4e32026a3
Jeff Brown [Thu, 11 Sep 2014 01:41:18 +0000 (18:41 -0700)]
Print the command line and ABI in stack dumps like debuggerd.
Ensure the heading is "Cmd line:" just like debuggerd and
as it used to be in Dalvik.
Fix a missing newline.
Trim all training nulls from the command line.
Don't bother printing the original command line if unset.
Add the ABI to the dump to help the native stack symbol tool.
Bug:
17474152
Change-Id: I19c585dbd7d31ef6c98270e469445cae40cbd518
Mathieu Chartier [Thu, 11 Sep 2014 20:14:31 +0000 (13:14 -0700)]
Delete pin table
The pin table was brought over from dalvik but not really needed
since ART doesn't support pinning in movable spaces. The only
thing it did was hold objects live for JNI functions.
This shouldn't be necessary since people keep jni references to
these objects or else they could never release the elements.
Bug:
17456946
Change-Id: Ibed0d029157ffb9e75ecd80d4d544d690986c090
Andreas Gampe [Thu, 11 Sep 2014 17:59:33 +0000 (10:59 -0700)]
ART: Fix preverified setting in VerifyClass
Make sure soft-failed classes cannot set methods to pre-verified.
Bug:
16828525,
17465185
Change-Id: I09c0a68ca722978459741311148eae7614f9ca49
Vladimir Marko [Thu, 11 Sep 2014 16:18:49 +0000 (16:18 +0000)]
Merge "Improve dex location canonicalization-related performance." into lmp-dev
Vladimir Marko [Thu, 11 Sep 2014 16:18:16 +0000 (16:18 +0000)]
Merge "Fix GetDexCanonicalLocation test for relative paths." into lmp-dev
Sebastien Hertz [Thu, 11 Sep 2014 14:23:44 +0000 (16:23 +0200)]
Fix crash when connected to DDMS
Restore init of WellKnownClasses::org_apache_harmony_dalvik_ddmc_Chunk_data and
removed duplicated line.
Bug:
17467328
Bug:
17463118
Change-Id: I64638e23615b7c20061b49c41a9c0e9f35a4d537
Sebastien Hertz [Thu, 11 Sep 2014 09:33:33 +0000 (09:33 +0000)]
Merge "Fix deadlock in VirtualMachine.AllThreads" into lmp-dev
Sebastien Hertz [Thu, 11 Sep 2014 08:04:30 +0000 (08:04 +0000)]
Merge "Don't hold any lock when visiting classes from JDWP" into lmp-dev
Brian Carlstrom [Thu, 11 Sep 2014 06:54:05 +0000 (06:54 +0000)]
Merge "Use WellKnownClasses in ThrowStackOverflowError to reduce changes of further stack overflow" into lmp-dev
Brian Carlstrom [Thu, 11 Sep 2014 06:10:47 +0000 (23:10 -0700)]
Use WellKnownClasses in ThrowStackOverflowError to reduce changes of further stack overflow
Bug:
17463118
Change-Id: Ic05b07803d2d3112e0b67064f380cd46ba9e293f
Andreas Gampe [Thu, 11 Sep 2014 02:48:05 +0000 (19:48 -0700)]
ART: Correctly make methods preverified
Bug:
16828525
Change-Id: I66756348b2aa50e41dacca59769b6810a91c73b0
Vladimir Marko [Fri, 5 Sep 2014 13:01:17 +0000 (14:01 +0100)]
Improve dex location canonicalization-related performance.
Eagerly add canonical dex file locations to the OatFile's
primary lookup map in Setup(). This moves the boot.oat work
from every app startup to the zygote initialization. Since
we always ended up initializing the canonical location map
anyway due to the way that we're loading dex files, the lazy
initialization didn't save anything.
Clean up dex file name canonicalization to make sure we
free() the memory returned by realpath() rather than using
std::unique_ptr<> with the default deleter.
Avoid some unnecessary duplicate OatDexFile lookups.
Bug:
16828525
Bug:
17346103
(cherry picked from commit
aa4497db59f1eeec954f2ba5da6d458fcdf9b3a4)
Change-Id: Icc4b14ebe903282ca91ce24e33a6d7c75dff991c
Calin Juravle [Thu, 7 Aug 2014 10:54:36 +0000 (11:54 +0100)]
Fix GetDexCanonicalLocation test for relative paths.
If the reference file is created with a relative path the test will
fail.
(cherry picked from commit
61281dc0aaa22730fd4fee268cac40776b193042)
Change-Id: Ie82b9d381bd884111dfc91cc235b46ad9f3225be
Brian Carlstrom [Wed, 10 Sep 2014 18:02:55 +0000 (18:02 +0000)]
Merge "Ensure class is linked before resolution" into lmp-dev
Sebastien Hertz [Wed, 10 Sep 2014 17:44:39 +0000 (19:44 +0200)]
Ensure class is linked before resolution
Adds a missing call to ClassLinker::EnsureResolved to ensure we did link the
class and retired the temp class (placeholder) before doing the resolution.
Bug:
17435441
Change-Id: Ib1a7181d6e5e814ca9299d0504e739a2b69475ef
Christopher Ferris [Wed, 10 Sep 2014 17:49:51 +0000 (17:49 +0000)]
Merge "Add proper cfi directives." into lmp-dev
Ian Rogers [Wed, 10 Sep 2014 14:31:36 +0000 (14:31 +0000)]
Merge "VisitClassesWithoutClassesLock isn't safe if classes move." into lmp-dev
Christopher Ferris [Tue, 9 Sep 2014 20:55:13 +0000 (13:55 -0700)]
Add proper cfi directives.
This function has a mix of arm and cfi directives. Since our unwinders
can work with both, remove the arm directives and fix the cfi directives.
Bug:
17392751
Change-Id: Ibd4859a4f0b8f2da751a0928a2f5f4afa3df7df8
Mathieu Chartier [Wed, 10 Sep 2014 00:26:58 +0000 (17:26 -0700)]
Increase dex2oat timeouts for debug builds
Should fix the 056-const-string-jumbo test.
Change-Id: I04d98dfd59003b964c1feee6eee31079f9f4a476
Mathieu Chartier [Tue, 9 Sep 2014 20:51:09 +0000 (13:51 -0700)]
Change Reference.get() intrinsic to Reference.getReferent().
The reference intrinsic was incorrectly inlining
PhantomReference.get(). We now get around this by adding a
layer of indirection. Reference.get() now calls getReferent()
which is intrinsified and inlined.
Requires:
https://android-review.googlesource.com/#/c/107100/
Bug:
17429865
(cherry picked from commit
cd48f2d86197d4fe87cc88077bc4af5ba66e5295)
Change-Id: Ie91e70abf43cedf3c707c7bb8a5059e19d2a2577
Jeff Hao [Tue, 9 Sep 2014 20:13:24 +0000 (20:13 +0000)]
Merge "Change 099-vmdebug test to use File.createTempFile." into lmp-dev
Jeff Hao [Tue, 9 Sep 2014 20:07:59 +0000 (13:07 -0700)]
Change 099-vmdebug test to use File.createTempFile.
Avoids issues with concurrency.
Bug:
17439227
Change-Id: I4a5956d9f26fad416a244216c2c77d5e6f072c62
Mathieu Chartier [Tue, 9 Sep 2014 17:39:37 +0000 (17:39 +0000)]
Merge "Temporarily disable LOS on 64 bit" into lmp-dev
Sebastien Hertz [Tue, 9 Sep 2014 10:08:49 +0000 (12:08 +0200)]
Fix deadlock in VirtualMachine.AllThreads
We cannot add any object in the JDWP object registry while holding the
Locks::thread_list_lock. Indeed we may need to suspend a thread and take it,
causing a deadlock by waiting for ourself on this lock.
Bug:
17343664
Change-Id: I2335c63e418c0d485daf2c35f8debcd52f943140
Andreas Gampe [Tue, 9 Sep 2014 06:39:45 +0000 (23:39 -0700)]
ART: Better error reporting on broken oat file
Do not blow up when in GetHashBucket if GetHashBucketNum is zero.
Instead back-step to ElfFileOpen, which prints which symbol was
missing from which file.
Bug:
17422404
Change-Id: I3b890dd1c31c08b1ccc0f7f668afcceee95f8d00
Brian Carlstrom [Tue, 9 Sep 2014 06:02:19 +0000 (06:02 +0000)]
Merge "Workaround Darwin ContainedWithinExistingMap issue" into lmp-dev
Brian Carlstrom [Tue, 9 Sep 2014 05:41:35 +0000 (22:41 -0700)]
Workaround Darwin ContainedWithinExistingMap issue
Bug:
16861075
Change-Id: I577a0c7ede919e610c356e7c40dd60d87914dd3a
Sebastien Hertz [Tue, 9 Sep 2014 05:12:55 +0000 (05:12 +0000)]
Merge "Fix monitor visit for class initializer" into lmp-dev
Andreas Gampe [Tue, 9 Sep 2014 05:07:38 +0000 (05:07 +0000)]
Merge "ART: Fix unchecked register index validity" into lmp-dev
Brian Carlstrom [Tue, 9 Sep 2014 04:37:39 +0000 (21:37 -0700)]
Fix darwin run-test problems
Bug:
17428908
Change-Id: Id74a0383fdae6753558e27cd447c1ca349819c91
Mathieu Chartier [Tue, 9 Sep 2014 02:49:50 +0000 (19:49 -0700)]
Temporarily disable LOS on 64 bit
Problem is that MAP_32BIT simulation can take seconds on large object
allocations in the worst case.
Bug:
17414549
Change-Id: I463bb0b728eed14847a32a27a93640ec6080f6b3
Mathieu Chartier [Tue, 9 Sep 2014 01:14:22 +0000 (01:14 +0000)]
Merge "Add fast path for FindClass using the type dex file." into lmp-dev
Mathieu Chartier [Fri, 5 Sep 2014 01:33:17 +0000 (18:33 -0700)]
Add fast path for FindClass using the type dex file.
If we are using the PathClassLoader with a BootClassLoader
parent, we can handle the common case in the FindClass function
without needing to go back to java code.
Around 10% speedup measured of maps launch, could be noise due to
large variation of app launch times. Eliminates defineClassNative
from being anywhere near the top of sampling profiles.
Bug:
17397179
Bug:
16828525
Change-Id: Ide0db2b5f6cf5b96fc46e89178e0799de667cb88
Andreas Gampe [Tue, 9 Sep 2014 00:41:35 +0000 (00:41 +0000)]
Merge "ART: Change ART for new native bridge sequence" into lmp-dev
Mathieu Chartier [Mon, 8 Sep 2014 23:01:52 +0000 (23:01 +0000)]
Merge "Add test for hashCode and System.identityHashCode." into lmp-dev
Jeff Hao [Mon, 8 Sep 2014 22:32:39 +0000 (15:32 -0700)]
Disable tracing if enabled by default for new tracing test.
Bug:
17412385
Change-Id: If963a9ba2214c72efbef673a840bbeb6fdbb1795
Jeff Hao [Mon, 8 Sep 2014 22:22:08 +0000 (22:22 +0000)]
Merge "Change when sampling thread is reset during shutdown to prevent races." into lmp-dev
Jeff Hao [Mon, 8 Sep 2014 16:38:18 +0000 (09:38 -0700)]
Change when sampling thread is reset during shutdown to prevent races.
Also adds some extra argument checking and testing for tracing.
Bug:
17412385
Change-Id: I876378d5bd17d75ab346584713b04dc0656d2120
Mathieu Chartier [Mon, 8 Sep 2014 21:48:25 +0000 (14:48 -0700)]
Add test for hashCode and System.identityHashCode.
(cherry picked from commit
bda2836af470c45e30c567b14d6747a7450c4741)
Change-Id: Ieba8f8eb09441ec145a176df00c293695eae0f47
Mathieu Chartier [Mon, 8 Sep 2014 20:35:11 +0000 (13:35 -0700)]
Ignore heap trim requests if we are the zygote
Done to prevent app launching lag due to sleep in heap trimmer
daemon.
Bug:
17310019
Change-Id: Ia593e7eced1c1583771985ec9e7b60ee0c0e7912
Mathieu Chartier [Mon, 8 Sep 2014 20:08:41 +0000 (20:08 +0000)]
Revert "Fix heap trimmer daemon sleeping."
This reverts commit
698b44634396e8111e96e1116586fde89a838347.
Change-Id: Ifa8c2d554b82289cc31803ad6027735d2c3c9be8
Andreas Gampe [Sun, 7 Sep 2014 20:06:12 +0000 (13:06 -0700)]
ART: Fix unchecked register index validity
The static check of index validity is against the type given by
the instruction, e.g., boolean for SPUT_BOOLEAN, but the target_type
is the resolved field type and can differ. An additional check is
necessary to avoid a read out of bounds.
Bug:
17411109
Change-Id: Ie4ed8bbda79f3f6403a24e727450a943447aa71d
Andreas Gampe [Wed, 3 Sep 2014 04:22:18 +0000 (21:22 -0700)]
ART: Change ART for new native bridge sequence
Initialize or unload after a fork.
(cherry picked from commit
6be67eeedbe60afce42300ae3e7f0e7180a96efa)
Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
Ian Rogers [Fri, 29 Aug 2014 22:40:08 +0000 (15:40 -0700)]
VisitClassesWithoutClassesLock isn't safe if classes move.
Which they do, so avoid by doing an array allocation.
Also, tidy member variables to the end of ClassLinker.
Remove unnecessary mutable. Tidy and fix a locks required/excluded.
Change-Id: I2404a9e7a1ea997d68ab1206f97d2a20dffbda06
(cherry picked from commit
dbf3be0f133c0bdf454f637fee2452dbb5f7c027)
Sebastien Hertz [Mon, 8 Sep 2014 08:15:19 +0000 (10:15 +0200)]
Fix monitor visit for class initializer
We do not hold class object's lock when invoking class initializer. Therefore
it is wrong to visit it when looking for monitors owned by a thread.
Bug:
17377924
Change-Id: I7fddcdb9a554301e040c571971eec9be6cba5eda
Brian Carlstrom [Fri, 5 Sep 2014 18:54:44 +0000 (18:54 +0000)]
Merge "Fix numerous issues with DdmVmInternal allocation tracking" into lmp-dev
Brian Carlstrom [Fri, 5 Sep 2014 05:15:18 +0000 (22:15 -0700)]
Fix numerous issues with DdmVmInternal allocation tracking
Issues addressed:
- Using without JDWP attached caused native crash.
- When buffer is full (64k entries), number of entries reported was 0.
- Disabling tracking after disabling tracking caused native crash.
- Asking for allocations after disabled caused native crash.
- Lock ordering issues between mutator lock and alloc tracker lock.
Adding 098-ddmc test to cover these cases.
Bug:
17392248
Change-Id: I45c0abbfb3dd7a7421aea3bbba2ea8d05225e48b
Calin Juravle [Fri, 5 Sep 2014 15:33:21 +0000 (15:33 +0000)]
Merge "Avoid recomputing the dex checksum during class loading" into lmp-dev
Calin Juravle [Tue, 2 Sep 2014 14:53:55 +0000 (15:53 +0100)]
Avoid recomputing the dex checksum during class loading
Thread the already computed checksum to VerifyOatAndDexFileChecksums and
LoadMultiDexFilesFromOatFile to avoid recomputing it.
Bug:
17346103
Change-Id: Ifa0c1cad952853751e98cbb3c999631b9909a9f9
Ian Rogers [Wed, 13 Aug 2014 21:37:26 +0000 (14:37 -0700)]
Ensure alternate signal stack is minimum size.
On Mac a sigaltstack may need to be 32KB, setting it to 16KB causes
sigaltstack to fail.
(cherry picked from commit
c24a1e00b13a7ebf10dd896f6a18b1ad09617ec7)
Change-Id: Ic06d80f1acf5c4eb3d2dd1156bfa2805ab0df492
Mathieu Chartier [Thu, 4 Sep 2014 17:38:39 +0000 (17:38 +0000)]
Merge "Fix heap trimmer daemon sleeping." into lmp-dev
Mathieu Chartier [Thu, 4 Sep 2014 04:26:36 +0000 (21:26 -0700)]
Fix heap trimmer daemon sleeping.
Problem:
Heap trimmer daemon sleeping caused app launch occasionally to take a
while due stopping the heap trimming thread taking a long time.
The heap trimmer thread now never sleeps, we prevent issues caused
by frequent back and forth process state changes by only
transitioning to background if it has been kCollectorTransitionWait
time since the last transition to background. Similar logic for heap
trimming.
Bug:
17310019
Change-Id: I23980421cc388f36b66a4c03ed15dd11d43f59b5
Jean Christophe Beyler [Thu, 4 Sep 2014 15:34:28 +0000 (08:34 -0700)]
ART: Fix x86_64 GenSelect case when destination is Ref
Reference in x86_64 is a 64-bit solo register. As a result, the invocation
of OpRegImm results in an error when Select opcode of the kind:
ref = boolean ? null : null;
because opRegImm does not support 64-bit destination for OpMov.
The case above is only possible for ref because no one other constant except
null is possible.
Bug:
17327895
Change-Id: I7541e744ec1c8619711712fd17be72764efcf3a8
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
(cherry picked from commit
3f51e7d942c22edaab3a7e703a1e6a2dd6a26f77)
Ian Rogers [Thu, 4 Sep 2014 15:53:16 +0000 (15:53 +0000)]
Merge "ART: Fix computation of frame size for direct proxy methods" into lmp-dev
Serguei Katkov [Fri, 29 Aug 2014 11:20:15 +0000 (18:20 +0700)]
ART: Fix computation of frame size for direct proxy methods
Proxy method has only one direct method and it is a constructor which
is cloned from java.lang.reflect.Proxy class together with code.
As a result its body is a compiled quick code and frame size should be
computed accordingly in contrast with other virtual methods which are
invoked through stub.
Change-Id: I0ac99b2f567b281c9342152bad1149dd6cd39480
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
(cherry picked from commit
805bab1738549b2477b3ad4d9d57fd7c681451b9)
Mathieu Chartier [Thu, 4 Sep 2014 04:23:13 +0000 (04:23 +0000)]
Merge "Fix native allocation watermark clamping." into lmp-dev
Mathieu Chartier [Wed, 3 Sep 2014 17:30:11 +0000 (10:30 -0700)]
Fix native allocation watermark clamping.
The main issue causing the test to fail is that
native_footprint_gc_watermark_ becoming > growth_limit_ due to no
clamping.
Temporary runFinalization fix is calling runFinalization 2x.
Bug:
17371542
Change-Id: I188cb530a44dd109e066a22091f12f8d2d4350c3
Mathieu Chartier [Thu, 4 Sep 2014 02:29:14 +0000 (02:29 +0000)]
Merge "Add exception check to AllocateInternalWithGc" into lmp-dev
Jeff Hao [Wed, 3 Sep 2014 20:48:16 +0000 (13:48 -0700)]
Fix stack overflow and duplicate methods while tracing.
Bug:
16386215
Change-Id: I0d0ae0113a3a00013ce84a1f5a110e2c52f19b86
Mathieu Chartier [Wed, 3 Sep 2014 18:21:08 +0000 (11:21 -0700)]
Add exception check to AllocateInternalWithGc
Trying to figure out if the pending exception comes before or during
AllocateInternalWithGc.
Bug:
17164348
Change-Id: Id46d82bfc0f84d16e5ffdafe41658aee4cc2c702
Junmo Park [Sat, 30 Aug 2014 11:13:02 +0000 (20:13 +0900)]
Fix SetupResourceMasks to pass correct parameters
Calling SetupTargetResourceMasks function with correct parameter.
SetupTargetResourceMasks(lir, flags, use_mask, def_mask) is correct order.
b/
17369806
(cherry-picked from commit sha
2a09504334a3a3b4c47100197df0827cc6740433)
Change-Id: I49118c3f2d3d06fac83fa3d5014b7fdaff6a2b00
buzbee [Wed, 3 Sep 2014 12:50:49 +0000 (12:50 +0000)]
Merge "Quick compiler: disable GVN DO NOT MERGE" into lmp-dev
Sebastien Hertz [Thu, 28 Aug 2014 12:41:50 +0000 (14:41 +0200)]
Don't hold any lock when visiting classes from JDWP
Computes reference type ids of all loaded classes without holding the class
linker lock. Because computing the JDWP reference type id can cause thread
suspension, we can't hold any lock. This is detected in debug build (using
libartd.so) and causes an abort.
Also adds missing thread safety annotations related to ObjectRegistry::lock_.
Bug:
17305632
Bug:
16720689
Change-Id: Id2cbd56624499c09e4755aaef7a9b15d2bdf4c91
buzbee [Wed, 3 Sep 2014 01:36:37 +0000 (18:36 -0700)]
Quick compiler: disable GVN DO NOT MERGE
Disable global value numbering optimization for lmp (but
keep on for master).
b/
16398693
Change-Id: I125c588c987a81db54a15da1eec9dee2b009956f
Mathieu Chartier [Wed, 3 Sep 2014 00:36:08 +0000 (17:36 -0700)]
Fix native allocation test.
Forgot to update with last CL.
Change-Id: Id2f57870b8d4f848cd93012d9da69beee5184be4
Andreas Gampe [Wed, 3 Sep 2014 00:24:14 +0000 (00:24 +0000)]
Merge "ART: Fix read-out-of-bounds in the compiler" into lmp-dev
Mathieu Chartier [Wed, 3 Sep 2014 00:07:28 +0000 (00:07 +0000)]
Merge "Change native allocations to use growth limit." into lmp-dev
Mathieu Chartier [Tue, 2 Sep 2014 23:21:01 +0000 (16:21 -0700)]
Change native allocations to use growth limit.
Previously native allocation tracking used a GC footprint limit
which would cause GC in the allocating thread. This prevented
excessive growth of the heap but could cause jank due to GC in
the allocating thread. The new behavior is using the growth_limit
instead of the native footprint limit.
Bug:
17006948
Change-Id: I40f30af09bb25596a9f57fa50e2a155fb947b5fe
Ian Rogers [Tue, 2 Sep 2014 23:56:37 +0000 (23:56 +0000)]
Merge "Pre-allocate the NoClassDefFoundError to be thrown for boot classes." into lmp-dev
Ian Rogers [Tue, 2 Sep 2014 23:56:14 +0000 (23:56 +0000)]
Merge "Reduce and speed-up class def searches." into lmp-dev
Andreas Gampe [Tue, 2 Sep 2014 23:51:42 +0000 (23:51 +0000)]
Merge "ART: Tighten verifier list reading and offsets" into lmp-dev
Ian Rogers [Wed, 4 Jun 2014 23:57:15 +0000 (16:57 -0700)]
Pre-allocate the NoClassDefFoundError to be thrown for boot classes.
Bring over a Dalvik "optimization".
Bug:
12804658
Bug:
16853450
Change-Id: I6419de7bd2ba18d91479cb52489104954f5c4524
(cherry picked from commit
63557459a4098294a9ff44d035241de2966047c0)
Ian Rogers [Sat, 30 Aug 2014 03:19:11 +0000 (20:19 -0700)]
Reduce and speed-up class def searches.
Use the class linker for descriptor lookups from the compile driver so that
dex caches are populated.
Reduce the scope of functions for scanning class paths to just the class
linker where they are performed.
If we see more than a threshold number of find class def misses on a dex file
lazily compute an index, so that future lookups are constant time (part of the
collection code is taken from
https://android-review.googlesource.com/#/c/103865/3). Note that we take a lazy
approach so that we don't serialize on loading dex files, this avoids the
reason the index was removed in
8b2c0b9abc3f520495f4387ea040132ba85cae69.
Remove an implicit and unnecessary std::string creation for PrintableString.
Single threaded interpret-only dex2oat performance is improved by roughly 10%.
Bug:
16853450
Change-Id: Icf72df76b0a4328f2a24075e81f4ff267b9401f4
(cherry picked from commit
68b56858367e29461ae290fd797443a1ef6d8005)
Mathieu Chartier [Tue, 2 Sep 2014 21:39:25 +0000 (21:39 +0000)]
Merge "Change intern table to unordered set." into lmp-dev
Mathieu Chartier [Tue, 2 Sep 2014 19:33:25 +0000 (12:33 -0700)]
Change heap transitions + hspace compation to use VLOG(heap)
VLOG(gc) is spammy since it is enabled.
Change-Id: I07d1d40e2f19134f885d6777b60533a9010ae164
Andreas Gampe [Tue, 2 Sep 2014 18:17:34 +0000 (11:17 -0700)]
ART: Tighten verifier list reading and offsets
Check offsets and sizes for header entries of a dex file.
Bug:
17347459
Change-Id: Ia1727c33dea51f7a8e345f3799f1ba414708239c
Andreas Gampe [Tue, 2 Sep 2014 17:22:20 +0000 (10:22 -0700)]
ART: Fix typo
Bug:
17327877
Change-Id: I6132a8afb4b69c8d22a01b477f6f324c789ed666
Andreas Gampe [Fri, 29 Aug 2014 23:07:49 +0000 (16:07 -0700)]
ART: Fix dex file verifier type-list handling
It is rare, but valid, to have an empty type list.
Bug:
17327877
Change-Id: Ib3a8ff3e5ccd8fe7c04b1e97485bf3e6de72aa4d
Mathieu Chartier [Sat, 30 Aug 2014 01:16:58 +0000 (18:16 -0700)]
Change intern table to unordered set.
Intern table active used bytes goes from 430k to 317k on system
server. Similar %wise savings on other apps.
Bug:
16238192
Change-Id: I92de72de3eae0b76629e9da83db2c2d0fa613052
Mathieu Chartier [Sat, 30 Aug 2014 01:17:19 +0000 (01:17 +0000)]
Merge "Add native memory accounting through custom allocator." into lmp-dev
Mathieu Chartier [Mon, 25 Aug 2014 20:08:22 +0000 (13:08 -0700)]
Add native memory accounting through custom allocator.
Added a custom allocator that lets you pass in a special tag which
specifices where the allocation came from. This is used when
dumping. The performance overhead is low since each allocation only
does a atomic add/sub for each allocation/free.
The measurements are dumped to traces.txt during SIGQUIT.
Example output:
I/art (27274): AllocatorTagHeap active=120 max=120 total=168
I/art (27274): AllocatorTagMonitorList active=1572 max=6240 total=11724
I/art (27274): AllocatorTagClassTable active=185208 max=185208 total=268608
I/art (27274): AllocatorTagInternTable active=430368 max=430368 total=436080
I/art (27274): AllocatorTagMaps active=5616 max=6168 total=34392
I/art (27274): AllocatorTagLOS active=1024 max=1536 total=2044
I/art (27274): AllocatorTagSafeMap active=0 max=51936 total=533688
I/art (27274): AllocatorTagLOSMaps active=144 max=1248 total=5760
I/art (27274): AllocatorTagReferenceTable active=10944 max=11840 total=19136
I/art (27274): AllocatorTagHeapBitmap active=32 max=40 total=56
I/art (27274): AllocatorTagHeapBitmapLOS active=8 max=8 total=8
I/art (27274): AllocatorTagVerifier active=0 max=18844 total=
1073156
I/art (27274): AllocatorTagModUnionCardSet active=5300 max=5920 total=56020
I/art (27274): AllocatorTagModUnionReferenceArray active=24864 max=24864 total=24864
I/art (27274): AllocatorTagJNILibrarires active=320 max=320 total=320
I/art (27274): AllocatorTagOatFile active=1400 max=1400 total=5852
Bug:
16238192
Change-Id: Ibb470ef2e9c9a24563bb46422d46a55799704d82
Dave Allison [Fri, 29 Aug 2014 18:18:53 +0000 (18:18 +0000)]
Merge "Fix mips build for nested signal handler" into lmp-dev
Dave Allison [Fri, 29 Aug 2014 18:05:17 +0000 (11:05 -0700)]
Fix mips build for nested signal handler
Bug:
17006816
Change-Id: If41c6d7a2f12f1822ca36d9e2f0f22b3ca854098