OSDN Git Service
Calin Juravle [Fri, 25 Mar 2016 14:09:55 +0000 (14:09 +0000)]
Merge "Discard corrupted or out of date profiles" into nyc-dev
Calin Juravle [Thu, 24 Mar 2016 20:33:22 +0000 (20:33 +0000)]
Discard corrupted or out of date profiles
Until now we bailed out if the previous profile contained invalid data.
This CLs forces the save and clears any data in a profile that has the
wrong version or contains bad data.
Bug:
27081617
Change-Id: I0424025e37c7b4b817da791996436dd4a932c2cd
Mathieu Chartier [Fri, 25 Mar 2016 00:22:52 +0000 (17:22 -0700)]
Only call jit_load after the zygote fork
Otherwise we always get that enable_debug_features is false since
that flag passed as a compiler option post zygote fork.
No significant change to libart-compiler PSS on calculator.
Bug:
27810774
Change-Id: I9854716902c79e16bdfd64754cc1ed05e852a5de
Mathieu Chartier [Thu, 24 Mar 2016 20:06:02 +0000 (20:06 +0000)]
Merge "Load jit compiler pre zygote fork" into nyc-dev
Mathieu Chartier [Thu, 24 Mar 2016 18:07:06 +0000 (11:07 -0700)]
Load jit compiler pre zygote fork
Reduces PSS for libart-compiler.so from 115KB to 2KB per app.
Also some clean-up.
Bug:
27810774
Change-Id: I9938b022e90c58e7978c5038338d0bcbe2a1dc2b
Calin Juravle [Thu, 24 Mar 2016 16:59:00 +0000 (16:59 +0000)]
Merge "Extend profman to be able to dump profile content." into nyc-dev
Calin Juravle [Thu, 24 Mar 2016 16:16:34 +0000 (16:16 +0000)]
Extend profman to be able to dump profile content.
With the move to binary format it gets harder to debug profiles. This
adds a simple dumping mechanism to make profiles human readable.
Bug:
27600652
Change-Id: Idc968601cdf6e371822aa98e316605e30749e2e8
Calin Juravle [Thu, 24 Mar 2016 16:14:29 +0000 (16:14 +0000)]
Merge "Update and improve profiles format" into nyc-dev
Calin Juravle [Mon, 21 Mar 2016 14:37:55 +0000 (14:37 +0000)]
Update and improve profiles format
- add profile version in the header
- change the profile format to a binary format (saves more than 50% of
space)
- improve error handling during parsing
- improve corner cases handling (all methods/classes in the
file)
- improve error reporting
Bug:
27600652
Bug:
27081617
Change-Id: I54dfbf73fbc943ff6fc3d67f389c658d833cded9
Andreas Gampe [Thu, 24 Mar 2016 01:59:22 +0000 (01:59 +0000)]
Merge "ART: Update DexFile for compiler-filter pass-down" into nyc-dev
Hiroshi Yamauchi [Thu, 24 Mar 2016 00:19:25 +0000 (00:19 +0000)]
Merge "Add RosAlloc stats dump." into nyc-dev
Hiroshi Yamauchi [Wed, 23 Mar 2016 22:29:37 +0000 (22:29 +0000)]
Merge "Use smaller rosalloc run sizes." into nyc-dev
Andreas Gampe [Wed, 23 Mar 2016 22:03:46 +0000 (15:03 -0700)]
ART: Update DexFile for compiler-filter pass-down
Update getDexOptNeeded. Add implementations for isValidCompilerFilter
and isProfileGuidedCompilerFilter.
Bug:
27689078
Change-Id: I20dca2b5b3ddb891c19e2a4f86dc78dbab592b72
Hiroshi Yamauchi [Wed, 23 Mar 2016 19:53:26 +0000 (12:53 -0700)]
Add RosAlloc stats dump.
For better understanding of the RosAlloc space.
Bug:
27744947
Bug:
9986565
Change-Id: I02a8028b9728f6862e5e78588a368b8029bb5c1a
Andreas Gampe [Wed, 23 Mar 2016 15:31:51 +0000 (15:31 +0000)]
Revert "Revert "Use compiler filter to determine oat file status.""
This reverts commit
845e5064580bd37ad5014f7aa0d078be7265464d.
Add an option to change what OatFileManager considers up-to-date.
In our tests we're allowed to write to the dalvik-cache, so it
cannot be kSpeed.
(cherry picked from commit
29d38e77c553c6cf71fc4dafe2d22b4e3f814872)
Bug:
27689078
Change-Id: I6274188610f31dcd9d086fc080b2be93afae5a6b
Hiroshi Yamauchi [Wed, 23 Mar 2016 17:54:59 +0000 (10:54 -0700)]
Use smaller rosalloc run sizes.
Use 1/1/1/2/4 instead of 1/4/8/16/32 to save memory footprint.
No regressions in BinaryTrees, Ritz MemAlocTest, Ritz EAAC.
Bug:
27744947
Bug:
9986565
Change-Id: If26dfae073df86b8c6e6b411c22e50cd808599ef
Calin Juravle [Wed, 23 Mar 2016 17:04:45 +0000 (17:04 +0000)]
Merge remote-tracking branch 'goog/master' into mege
Roland Levillain [Wed, 23 Mar 2016 16:52:36 +0000 (16:52 +0000)]
Merge "Ensure object ArraySet with null value does not need a type check."
am:
7ee5bc5
* commit '
7ee5bc54fbe1bf5218696e63a80e76cd0c8ea387':
Ensure object ArraySet with null value does not need a type check.
Roland Levillain [Wed, 23 Mar 2016 16:01:27 +0000 (16:01 +0000)]
Merge "Ensure object ArraySet with null value does not need a type check."
Nicolas Geoffray [Wed, 23 Mar 2016 15:36:43 +0000 (15:36 +0000)]
Merge "Relax too strong DCHECK."
am:
dba2b19
* commit '
dba2b19c845f6bccb43a036fa8602197c3248ff2':
Relax too strong DCHECK.
Nicolas Geoffray [Wed, 23 Mar 2016 15:36:43 +0000 (15:36 +0000)]
Merge "Revert "ART: Weaken DCHECK""
am:
3920099
* commit '
3920099f578fd8015777bc3c1c7392a08b1e08e7':
Revert "ART: Weaken DCHECK"
Nicolas Geoffray [Wed, 23 Mar 2016 15:36:42 +0000 (15:36 +0000)]
Merge "Revert "ART: Temporarily disable test""
am:
3504ca2
* commit '
3504ca23eb2f5846d464f0da5b122d284e00641d':
Revert "ART: Temporarily disable test"
Sebastien Hertz [Wed, 23 Mar 2016 15:36:42 +0000 (15:36 +0000)]
Merge "Update run-test 097-duplicate-method"
am:
e9b6bea
* commit '
e9b6bea979ee9a450ebc4b5611514ba3f82f24d8':
Update run-test 097-duplicate-method
Nicolas Geoffray [Wed, 23 Mar 2016 15:36:41 +0000 (15:36 +0000)]
Merge "Revert "Use compiler filter to determine oat file status.""
am:
7ddf7e9
* commit '
7ddf7e944121528239dc8afc70cbc14027f561ac':
Revert "Use compiler filter to determine oat file status."
Nicolas Geoffray [Wed, 23 Mar 2016 14:52:28 +0000 (14:52 +0000)]
Merge "Relax too strong DCHECK."
Calin Juravle [Wed, 23 Mar 2016 12:47:21 +0000 (12:47 +0000)]
Merge "Improve ProfileSaver to cache data and do minimal I/O" into nyc-dev
am:
c7bb728
* commit '
c7bb72887b0cbad6b8c6a550baa6524011d91c76':
Improve ProfileSaver to cache data and do minimal I/O
Roland Levillain [Wed, 23 Mar 2016 12:40:35 +0000 (12:40 +0000)]
Ensure object ArraySet with null value does not need a type check.
The art::PrepareForRegisterAllocation visitor can remove an
art::BoundType instruction as value input of an
art::ArraySet instruction, possibly replacing it with an
art::NullConstant. If this happens, remove the need for a
type check in this art::ArraySet.
Bug:
27638110
Change-Id: I6270f8a8e22822a24d8a5919df427ca9c64d121b
Calin Juravle [Wed, 23 Mar 2016 12:35:26 +0000 (12:35 +0000)]
Merge "Improve ProfileSaver to cache data and do minimal I/O" into nyc-dev
Calin Juravle [Fri, 18 Mar 2016 16:23:40 +0000 (16:23 +0000)]
Improve ProfileSaver to cache data and do minimal I/O
This CLs introducing caching to further optimize the I/O performed by
the ProfileSaver. The cache stats are also recorded.
Resolved classes are captured and cached after 2 seconds but written
later during application lifetime.
Methods are also cached and the write got smarter to avoid
reading/writing them if it's not needed.
On non scientific experiments the size of the cache reaches just a few
hundreds uint16_t values kept in set, so its impact is minimal.
In terms of how much data we write. In the same non scientific
experiments this reduces the total bytes written by at least 2-3x. In
the first few minutes of after the boot gmscore writes ~3KB (down from
9kb) and quicksearchlauncher writes ~20KB (down from 40KB).
Bug:
27600652
Change-Id: I3a4e7051ccf04ac8fbd5896d328692db773e979d
Yohann Roussel [Wed, 23 Mar 2016 08:23:35 +0000 (08:23 +0000)]
Let tests inform Jack of the min api version
am:
38c0da4
* commit '
38c0da49e93309378f14babb9c9bf92691b4f76d':
Let tests inform Jack of the min api version
Nicolas Geoffray [Wed, 23 Mar 2016 08:22:29 +0000 (08:22 +0000)]
Merge "Revert "ART: Weaken DCHECK""
Nicolas Geoffray [Wed, 23 Mar 2016 08:22:12 +0000 (08:22 +0000)]
Revert "ART: Weaken DCHECK"
Change that triggered this got reverted. This "fix" needs more investigation.
This reverts commit
1ee29d3dd3fbbf5df7821b70f45c49275c878e63.
Change-Id: Iee9e88f0e993edc0c7212e36d48ded1d31209156
Nicolas Geoffray [Wed, 23 Mar 2016 08:21:35 +0000 (08:21 +0000)]
Merge "Revert "ART: Temporarily disable test""
Nicolas Geoffray [Wed, 23 Mar 2016 08:21:19 +0000 (08:21 +0000)]
Revert "ART: Temporarily disable test"
Offending change has been reverted.
Bug:
27689078
This reverts commit
51135830a760ff647e5eb164d744abc769b006a7.
Change-Id: I794127eb9f2c0dfb08039eecffd777b7d94f0ed6
Sebastien Hertz [Wed, 23 Mar 2016 08:04:17 +0000 (08:04 +0000)]
Merge "Update run-test 097-duplicate-method"
Nicolas Geoffray [Wed, 23 Mar 2016 06:42:39 +0000 (06:42 +0000)]
Merge "Revert "Use compiler filter to determine oat file status.""
Nicolas Geoffray [Wed, 23 Mar 2016 06:42:05 +0000 (06:42 +0000)]
Revert "Use compiler filter to determine oat file status."
Bots are red. Tentative reverting as this is likely the offender.
Bug:
27689078
This reverts commit
a62d2f04a6ecf804f8a78e722a6ca8ccb2dfa931.
Change-Id: I3ec6947a5a4be878ff81f26f17dc36a209734e2a
Andreas Gampe [Wed, 23 Mar 2016 05:52:06 +0000 (05:52 +0000)]
Merge "ART: Weaken DCHECK"
am:
3e86d67
* commit '
3e86d670e478459e3f82ac3e41dd7de809caed50':
ART: Weaken DCHECK
Andreas Gampe [Wed, 23 Mar 2016 05:52:06 +0000 (05:52 +0000)]
Merge "ART: Temporarily disable test"
am:
0197bb5
* commit '
0197bb59a87583c2363cedd85a72bd401f38338b':
ART: Temporarily disable test
Andreas Gampe [Wed, 23 Mar 2016 05:05:36 +0000 (05:05 +0000)]
Merge "ART: Weaken DCHECK"
Andreas Gampe [Wed, 23 Mar 2016 05:03:46 +0000 (22:03 -0700)]
ART: Weaken DCHECK
Returns may be either plain or quickened.
Change-Id: Iee343c02fe3e02512c0ed60508525495a7cd5efb
Andreas Gampe [Wed, 23 Mar 2016 05:02:50 +0000 (05:02 +0000)]
Merge "ART: Temporarily disable test"
Andreas Gampe [Wed, 23 Mar 2016 04:29:59 +0000 (21:29 -0700)]
ART: Temporarily disable test
For investigation.
Bug:
27689078
Change-Id: Ibcd24f90f68ac64119dfad9b17a42bed252ff009
Mathieu Chartier [Wed, 23 Mar 2016 01:21:38 +0000 (01:21 +0000)]
Merge "Delete too spammy VLOG(heap) in ReleasePrimitiveArray"
am:
be4f66c
* commit '
be4f66c498a5b3da4af5171e948aa1688d1093d2':
Delete too spammy VLOG(heap) in ReleasePrimitiveArray
Mathieu Chartier [Wed, 23 Mar 2016 01:01:56 +0000 (01:01 +0000)]
Merge "Delete too spammy VLOG(heap) in ReleasePrimitiveArray"
Richard Uhler [Wed, 23 Mar 2016 01:00:23 +0000 (01:00 +0000)]
Merge "Use compiler filter to determine oat file status."
am:
317a3d8
* commit '
317a3d8077410680e0cca57d83b8cafeddd5ba62':
Use compiler filter to determine oat file status.
Nicolas Geoffray [Wed, 23 Mar 2016 01:00:22 +0000 (01:00 +0000)]
Merge "Rename test to avoid too long file names."
am:
fb98df3
* commit '
fb98df39c6265d13002137203c6457c00ba5e63e':
Rename test to avoid too long file names.
Nicolas Geoffray [Wed, 23 Mar 2016 01:00:22 +0000 (01:00 +0000)]
Merge "Disable test for now."
am:
2794b41
* commit '
2794b41641c36af5af92fa79f260968a8cffd8d3':
Disable test for now.
Vladimir Marko [Wed, 23 Mar 2016 01:00:22 +0000 (01:00 +0000)]
Merge "Optimizing: Reduce GraphChecker memory usage."
am:
48e7224
* commit '
48e722432bb6e19df7bba02427e4a707e671af06':
Optimizing: Reduce GraphChecker memory usage.
Vladimir Marko [Wed, 23 Mar 2016 01:00:21 +0000 (01:00 +0000)]
Merge "ART: Clean up arena allocation memory tracking."
am:
9a3c1fa
* commit '
9a3c1fa119350ebd390c63cc464e0a373dd296dd':
ART: Clean up arena allocation memory tracking.
Roland Levillain [Wed, 23 Mar 2016 01:00:20 +0000 (01:00 +0000)]
Merge "Tighten art::HNeg type constraints on its input."
am:
6fa06e6
* commit '
6fa06e6f5a92cd318021afad9b036126438b2de4':
Tighten art::HNeg type constraints on its input.
Alexey Frunze [Wed, 23 Mar 2016 01:00:20 +0000 (01:00 +0000)]
Merge "MIPS32: Implement UnsafeCASInt and UnsafeCASObject intrinsics."
am:
2a07b80
* commit '
2a07b80dfbfb869aabe96c88b10e07d26c0ce137':
MIPS32: Implement UnsafeCASInt and UnsafeCASObject intrinsics.
Roland Levillain [Wed, 23 Mar 2016 01:00:19 +0000 (01:00 +0000)]
Merge "Fix missing header inclusion in art/runtime/thread.cc."
am:
db17ce1
* commit '
db17ce13157bb2d8562d1b09682ee55fe69088e4':
Fix missing header inclusion in art/runtime/thread.cc.
Nicolas Geoffray [Wed, 23 Mar 2016 01:00:18 +0000 (01:00 +0000)]
Merge "Rename test to avoid too long filenames."
am:
c507fb6
* commit '
c507fb6d11c38065c4898e79e4cfaaf3ef904079':
Rename test to avoid too long filenames.
Nicolas Geoffray [Wed, 23 Mar 2016 01:00:17 +0000 (01:00 +0000)]
Merge "Add an ImtConflictTable to better resolve IMT conflicts."
am:
1f4364d
* commit '
1f4364d180d231a7d086eb0641deec30f71d02e6':
Add an ImtConflictTable to better resolve IMT conflicts.
Richard Uhler [Wed, 23 Mar 2016 00:28:32 +0000 (00:28 +0000)]
Merge "Use compiler filter to determine oat file status."
Richard Uhler [Fri, 18 Mar 2016 22:05:30 +0000 (15:05 -0700)]
Use compiler filter to determine oat file status.
Record the compiler filter in the oat header. Use that to determine
when the oat file is up-to-date with respect to a target compiler
filter level.
New xxx-profile filter levels are added to specify if a profile should
be used instead of testing for the presence of a profile file.
This change should allow for different compiler-filters to be set for
different package manager use cases.
Bug:
27689078
Change-Id: Id6706d0ed91b45f307142692ea4316aa9713b023
Nicolas Geoffray [Tue, 22 Mar 2016 22:25:52 +0000 (22:25 +0000)]
Merge "Rename test to avoid too long file names."
Nicolas Geoffray [Tue, 22 Mar 2016 22:25:01 +0000 (22:25 +0000)]
Rename test to avoid too long file names.
Change-Id: Ife227f73c7baf1d05bcc6949faadf92753332f8d
Mathieu Chartier [Tue, 22 Mar 2016 22:19:47 +0000 (15:19 -0700)]
Delete too spammy VLOG(heap) in ReleasePrimitiveArray
Change-Id: I7a482ba366d7ad3e5d1689ae615dbcacbc7a41a6
Nicolas Geoffray [Tue, 22 Mar 2016 21:50:13 +0000 (21:50 +0000)]
Merge "Disable test for now."
Nicolas Geoffray [Tue, 22 Mar 2016 21:47:16 +0000 (21:47 +0000)]
Disable test for now.
bug:
27794971
Change-Id: I31e1b2472271c6f54c9e0b7bf75fbdf7ebeba73d
Vladimir Marko [Tue, 22 Mar 2016 19:02:00 +0000 (19:02 +0000)]
Merge "Optimizing: Reduce GraphChecker memory usage."
Vladimir Marko [Tue, 22 Mar 2016 18:38:46 +0000 (18:38 +0000)]
Merge "ART: Clean up arena allocation memory tracking."
Vladimir Marko [Tue, 22 Mar 2016 17:51:29 +0000 (17:51 +0000)]
Optimizing: Reduce GraphChecker memory usage.
Bug:
27690481
Change-Id: I15ce5524d94fc1780da02e6471bede66b3a1b82a
Roland Levillain [Tue, 22 Mar 2016 16:38:18 +0000 (16:38 +0000)]
Merge "Tighten art::HNeg type constraints on its input."
Vladimir Marko [Tue, 22 Mar 2016 16:26:33 +0000 (16:26 +0000)]
ART: Clean up arena allocation memory tracking.
Remove unused allocation types, mostly from removed Quick.
Move logging one level up to capture memory used by stack
maps during AOT compilation. Raise the reporting threshold
to 8MiB to limit the output to the worst offenders.
Change-Id: I8c7a01bfa90bc8ec5eab66187eb6850a022f3543
Roland Levillain [Tue, 22 Mar 2016 16:19:02 +0000 (16:19 +0000)]
Merge "MIPS32: Implement UnsafeCASInt and UnsafeCASObject intrinsics."
Roland Levillain [Tue, 22 Mar 2016 16:01:54 +0000 (16:01 +0000)]
Merge "Fix missing header inclusion in art/runtime/thread.cc."
Roland Levillain [Tue, 22 Mar 2016 15:52:22 +0000 (15:52 +0000)]
Fix missing header inclusion in art/runtime/thread.cc.
The file art/runtime/thread.cc was missing an #include of
art/runtime/gc/accounting/heap_bitmap-inl.h, which is
required by art::ReferenceMapVisitor::VisitDeclaringClass to
find the (inlined) implementation of
art::gc::accounting::HeapBitmap::Test.
This fixes the MIPS32 build.
Change-Id: I00a8bc85d8b32cfed02309e13e437f0cfd0d493e
Nicolas Geoffray [Tue, 22 Mar 2016 15:38:56 +0000 (15:38 +0000)]
Merge "Rename test to avoid too long filenames."
Nicolas Geoffray [Tue, 22 Mar 2016 15:38:11 +0000 (15:38 +0000)]
Rename test to avoid too long filenames.
Change-Id: Ic969c3f303fe7a0c415f670f268421906496ab39
Nicolas Geoffray [Tue, 22 Mar 2016 15:34:36 +0000 (15:34 +0000)]
Merge "Add an ImtConflictTable to better resolve IMT conflicts."
Nicolas Geoffray [Sun, 13 Mar 2016 22:22:31 +0000 (22:22 +0000)]
Add an ImtConflictTable to better resolve IMT conflicts.
- Attach a ImtConflictTable to conflict runtime ArtMethod.
- Initially 0, a new one will be created at the first hit of
the conflict method.
- If the assembly code does not find a target method in the table,
we will create a new one again, copying the data from the previous
table and adding the new mapping.
Implemented for arm/arm64/x86/x64.
bug:
27556801
bug:
24769046
Change-Id: Ie74d1c77cf73d451a1142bdc5e3683f9f84bb4e7
Nicolas Geoffray [Tue, 22 Mar 2016 15:12:07 +0000 (15:12 +0000)]
Relax too strong DCHECK.
There may be a lifetime hole in the interval, which means the interval
does not cover the given position.
bug:
27617589
Change-Id: Iabd2b3d82936bed498f87be1a01760210954f97e
Vladimir Marko [Tue, 22 Mar 2016 14:03:33 +0000 (14:03 +0000)]
Merge "Optimizing: Fix a new valgrind error in image_test."
am:
0339bee
* commit '
0339bee5b1be39669606c4ba57edd42a0bacf0ff':
Optimizing: Fix a new valgrind error in image_test.
Vladimir Marko [Tue, 22 Mar 2016 13:55:17 +0000 (13:55 +0000)]
Merge "Optimizing: Fix a new valgrind error in image_test."
Nicolas Geoffray [Tue, 22 Mar 2016 13:03:29 +0000 (13:03 +0000)]
Merge "Disable two tests for no-prebuild."
am:
1aafce4
* commit '
1aafce4bb4b158349dcac1166aa049960461a686':
Disable two tests for no-prebuild.
Roland Levillain [Tue, 22 Mar 2016 12:57:27 +0000 (12:57 +0000)]
Merge "Revamp run-test 431-optimizing-arith-shifts."
am:
948a2a7
* commit '
948a2a7df4d818b7c1b07cd02aa21797f1c5fc58':
Revamp run-test 431-optimizing-arith-shifts.
Nicolas Geoffray [Tue, 22 Mar 2016 12:56:22 +0000 (12:56 +0000)]
Merge "Disable two tests for no-prebuild."
Nicolas Geoffray [Tue, 22 Mar 2016 12:55:30 +0000 (12:55 +0000)]
Disable two tests for no-prebuild.
bug:
27784033
Change-Id: Ib4fc86cf970e6f008da006cad1bf18e58fb84346
Roland Levillain [Tue, 22 Mar 2016 12:49:54 +0000 (12:49 +0000)]
Merge "Revamp run-test 431-optimizing-arith-shifts."
Vladimir Marko [Tue, 22 Mar 2016 12:31:54 +0000 (12:31 +0000)]
Optimizing: Fix a new valgrind error in image_test.
Bug:
27651442
Bug:
27151098
Change-Id: I23a428be68ccf9f9557df01ee7e920eeeb8da2ba
Roland Levillain [Tue, 22 Mar 2016 11:54:37 +0000 (11:54 +0000)]
Tighten art::HNeg type constraints on its input.
Ensure art::HNeg is only passed a type having the kind of
its input. For a boolean, byte, short, or char input, it
means HNeg's type should be int.
Bug:
27684275
Change-Id: Ic8442c62090a8ab65590754874a14a0deb7acd8d
Nicolas Geoffray [Tue, 22 Mar 2016 11:49:58 +0000 (11:49 +0000)]
Merge "Fix braino in JitCodeCache."
am:
0c25da0
* commit '
0c25da0276f5b6f6119793ae9d45d1bca8172c2b':
Fix braino in JitCodeCache.
Nicolas Geoffray [Tue, 22 Mar 2016 11:38:50 +0000 (11:38 +0000)]
Merge "Fix braino in JitCodeCache."
Yohann Roussel [Mon, 21 Mar 2016 15:26:02 +0000 (16:26 +0100)]
Let tests inform Jack of the min api version
This is necessarry for compiling source code with default method.
Bug:
27371864
(cherry picked from commit
4b49567218c41e80c3448bbbcaa7e944f789780e)
Change-Id: I78ce48ce8f5224e20e0d75f63f10033721ad06e8
buzbee [Tue, 22 Mar 2016 11:28:23 +0000 (11:28 +0000)]
Merge "ART: remove nested include in arch_test"
am:
eecf60d
* commit '
eecf60d51b481647c8508f22b3d6ce437773ea0c':
ART: remove nested include in arch_test
Nicolas Geoffray [Tue, 22 Mar 2016 11:25:20 +0000 (11:25 +0000)]
Fix braino in JitCodeCache.
A OatQuickMethodHeader can never have its entry point be the
interpreter entrypoint.
Clear hotness counter of methods in more relevant places.
Change-Id: I0563a57eace2e0e4fe2abc76f5e293ddf47b25e3
Bill Buzbee [Tue, 22 Mar 2016 11:20:32 +0000 (11:20 +0000)]
Merge "ART: remove nested include in arch_test"
Nicolas Geoffray [Tue, 22 Mar 2016 11:19:43 +0000 (11:19 +0000)]
Merge "Revert "Revert "Enable compilation of secondary dex files"""
am:
a373a33
* commit '
a373a33d33b8a5b4fd0d4c35645e2e4353ebde9b':
Revert "Revert "Enable compilation of secondary dex files""
Nicolas Geoffray [Tue, 22 Mar 2016 11:09:36 +0000 (11:09 +0000)]
Merge "Revert "Revert "Enable compilation of secondary dex files"""
Nicolas Geoffray [Tue, 22 Mar 2016 10:59:54 +0000 (10:59 +0000)]
Merge "Update Makefile and scripts after Quick removal."
am:
e2aad5d
* commit '
e2aad5d8dba805e510476ded22737a2adffbef72':
Update Makefile and scripts after Quick removal.
Nicolas Geoffray [Tue, 22 Mar 2016 10:52:46 +0000 (10:52 +0000)]
Merge "Update Makefile and scripts after Quick removal."
Goran Jakovljevic [Tue, 22 Mar 2016 10:43:18 +0000 (10:43 +0000)]
Merge "Suppress MIPS32 assembler warnings"
am:
e989fe0
* commit '
e989fe08717ae6725d6bf7655289b6d0005126ae':
Suppress MIPS32 assembler warnings
Nicolas Geoffray [Tue, 22 Mar 2016 10:43:01 +0000 (10:43 +0000)]
Update Makefile and scripts after Quick removal.
Change-Id: I7610b34da337d81d9176ceca74e55ab85642a72b
Roland Levillain [Tue, 22 Mar 2016 10:35:59 +0000 (10:35 +0000)]
Merge "Suppress MIPS32 assembler warnings"
Sebastien Hertz [Tue, 22 Mar 2016 07:32:34 +0000 (08:32 +0100)]
Update run-test 097-duplicate-method
Runs the test with a precompiled classes.dex and re-enables it.
We need to build a dex file with duplicate methods. We cannot do that
with Jack (this is invalid) or smali (it does not keep duplicate
methods, only one is in the dex). Therefore, having a precompiled
dex file allows to run the test on whatever toolchain.
In the future, we could update the test if a tool allows to generate
it again.
Change-Id: I3803aa0c2e99ca61d58b36e088d9bbe199e07d3c
Nicolas Geoffray [Tue, 22 Mar 2016 09:52:40 +0000 (09:52 +0000)]
Revert "Revert "Enable compilation of secondary dex files""
Bug:
26719109
This reverts commit
d98a52f0bc6c58e8e538de8335ab9bcb6ae73aa7.
Change-Id: I523675eb6d647fe773dd57b6e1cc398927bb066e
Nicolas Geoffray [Tue, 22 Mar 2016 09:49:15 +0000 (09:49 +0000)]
Merge "Remove Quick from tree."
am:
2fac35e
* commit '
2fac35e21a3c0a0510cb1e5a824cf2cf4e4097ac':
Remove Quick from tree.