OSDN Git Service
Nicolas Geoffray [Wed, 22 Jun 2016 13:18:05 +0000 (13:18 +0000)]
Merge \"Revert \"Revert \"Revert \"Revert \"Disable 149-suspend-all-stress, its output is flaky.\"\"\"\"\"
am:
739dc72773
Change-Id: I8d553a1122a801c92ff13311c6a342df7640a003
Nicolas Geoffray [Wed, 22 Jun 2016 13:14:21 +0000 (13:14 +0000)]
Merge "Revert "Revert "Revert "Revert "Disable 149-suspend-all-stress, its output is flaky."""""
Nicolas Geoffray [Wed, 22 Jun 2016 13:13:59 +0000 (13:13 +0000)]
Revert "Revert "Revert "Revert "Disable 149-suspend-all-stress, its output is flaky.""""
Bug:
29387050
This reverts commit
0b8a91477a3cd3357e89c20d78726728cf897246.
Change-Id: Ie349d70ee489fd4b9065df4a445bbf8ef42ae911
Christina Wadsworth [Tue, 21 Jun 2016 21:48:00 +0000 (21:48 +0000)]
Merge \"Number of unique strings loaded from dex code added to oatdump\"
am:
12e6e9f3f1
Change-Id: I45b0660d4864d4721fe6327f7d55c5cc2cc28bb8
Mathieu Chartier [Tue, 21 Jun 2016 21:39:06 +0000 (21:39 +0000)]
Merge "Number of unique strings loaded from dex code added to oatdump"
Christina Wadsworth [Mon, 20 Jun 2016 22:01:32 +0000 (15:01 -0700)]
Number of unique strings loaded from dex code added to oatdump
bug:
20323084
(cherry picked from commit
c0bf6a678fcf6c8aa230ea3401093ed162225f85)
Change-Id: I8dfb6c8e8cae1a9eb7cc209390062ea84092a824
Aart Bik [Tue, 21 Jun 2016 19:59:53 +0000 (19:59 +0000)]
Merge \"Added a dexdump test containing every DEX instruction\"
am:
5f5560dbce
Change-Id: I1360035879b2f4afaf2e761e0ca55fb85169c957
Aart Bik [Tue, 21 Jun 2016 19:47:25 +0000 (19:47 +0000)]
Merge "Added a dexdump test containing every DEX instruction"
Goran Jakovljevic [Tue, 21 Jun 2016 17:02:04 +0000 (17:02 +0000)]
Merge \"MIPS64: Unblock callee-save registers\"
am:
abc9f689d3
Change-Id: I27b553198b96043ae03a041899b0bd0a0098eb35
Treehugger Robot [Tue, 21 Jun 2016 16:54:17 +0000 (16:54 +0000)]
Merge "MIPS64: Unblock callee-save registers"
Vladimir Marko [Tue, 21 Jun 2016 16:23:25 +0000 (16:23 +0000)]
Merge \"Replace String.charAt() with HIR.\"
am:
4692c35c15
Change-Id: I445a603d8c25caaa6ddc4c56b80d452dbc7f449b
Vladimir Marko [Tue, 21 Jun 2016 16:18:10 +0000 (16:18 +0000)]
Merge "Replace String.charAt() with HIR."
Vladimir Marko [Tue, 21 Jun 2016 15:17:06 +0000 (15:17 +0000)]
Merge \"Improve HLoadClass code generation.\"
am:
f6d4f6e0e6
Change-Id: Iaefb899c1f55077072f2be4c9313ac811afc5f99
Vladimir Marko [Tue, 21 Jun 2016 15:12:24 +0000 (15:12 +0000)]
Merge "Improve HLoadClass code generation."
Vladimir Marko [Tue, 21 Jun 2016 14:26:04 +0000 (14:26 +0000)]
Merge \"x86: Fix CFI info for FOUR_ARG_DOWNCALL.\"
am:
2150d94b5a
Change-Id: Ifc8ee429da31647927ed0c928c36760f55b0ff6a
Vladimir Marko [Tue, 21 Jun 2016 14:21:08 +0000 (14:21 +0000)]
Merge "x86: Fix CFI info for FOUR_ARG_DOWNCALL."
Vladimir Marko [Thu, 28 Apr 2016 14:52:11 +0000 (15:52 +0100)]
Replace String.charAt() with HIR.
Replace String.charAt() with HArrayLength, HBoundsCheck and
HArrayGet. This allows GVN on the HArrayLength and BCE on
the HBoundsCheck as well as using the infrastructure for
HArrayGet, i.e. better handling of constant indexes than
the old intrinsic and using the HArm64IntermediateAddress.
Bug:
28330359
Change-Id: I32bf1da7eeafe82537a60416abf6ac412baa80dc
Vladimir Marko [Wed, 30 Mar 2016 12:23:58 +0000 (13:23 +0100)]
Improve HLoadClass code generation.
For classes in the boot image, use either direct pointers
or PC-relative addresses. For other classes, use PC-relative
access to the dex cache arrays for AOT and direct address of
the type's dex cache slot for JIT.
For aosp_flounder-userdebug:
- 32-bit boot.oat: -252KiB (-0.3%)
- 64-bit boot.oat: -412KiB (-0.4%)
- 32-bit dalvik cache total: -392KiB (-0.4%)
- 64-bit dalvik-cache total: -2312KiB (-1.0%)
(contains more files than the 32-bit dalvik cache)
For aosp_flounder-userdebug forced to compile PIC:
- 32-bit boot.oat: -124KiB (-0.2%)
- 64-bit boot.oat: -420KiB (-0.5%)
- 32-bit dalvik cache total: -136KiB (-0.1%)
- 64-bit dalvik-cache total: -1136KiB (-0.5%)
(contains more files than the 32-bit dalvik cache)
Bug:
27950288
Change-Id: I4da991a4b7e53c63c92558b97923d18092acf139
Nicolas Geoffray [Tue, 21 Jun 2016 12:14:28 +0000 (12:14 +0000)]
Merge \"Fix braino in the test to make it work on target.\"
am:
b94b5706f0
Change-Id: I8877ecceb98659247afa67e1126aa029aee5f106
Goran Jakovljevic [Tue, 21 Jun 2016 10:39:04 +0000 (12:39 +0200)]
MIPS64: Unblock callee-save registers
Callee-save registers shouldn't be blocked, except floating point
registers if the graph is debuggable.
Change-Id: I325ab403752c6b9cd788147cb8b21d42aaff629e
Nicolas Geoffray [Tue, 21 Jun 2016 12:06:50 +0000 (12:06 +0000)]
Merge "Fix braino in the test to make it work on target."
Nicolas Geoffray [Tue, 21 Jun 2016 12:05:24 +0000 (13:05 +0100)]
Fix braino in the test to make it work on target.
Change-Id: I074b93e8ceca9ca8cc49fa47af19484f522a78af
Vladimir Marko [Tue, 21 Jun 2016 10:24:47 +0000 (11:24 +0100)]
x86: Fix CFI info for FOUR_ARG_DOWNCALL.
Follow-up to
https://android-review.googlesource.com/237073
Bug:
28348339
Change-Id: I586828acf1269a6677128a0ded48cb8039024143
Vladimir Marko [Tue, 21 Jun 2016 11:26:01 +0000 (11:26 +0000)]
Merge \"Catch additional OOME in ThreadStress.\"
am:
9a8620e45e
Change-Id: I0b4fbd2e578194a357be4d9ed7479c7cf8220a3f
Nicolas Geoffray [Tue, 21 Jun 2016 11:26:00 +0000 (11:26 +0000)]
Merge \"Release the thread_list lock while waiting for daemons.\"
am:
bbcf0728f0
Change-Id: Icf9b891a9efe2c7108f8b2a37c44f58b039b57b8
Vladimir Marko [Tue, 21 Jun 2016 11:20:49 +0000 (11:20 +0000)]
Merge "Catch additional OOME in ThreadStress."
Nicolas Geoffray [Tue, 21 Jun 2016 11:19:54 +0000 (11:19 +0000)]
Merge "Release the thread_list lock while waiting for daemons."
Vladimir Marko [Tue, 21 Jun 2016 09:38:23 +0000 (10:38 +0100)]
Catch additional OOME in ThreadStress.
And use pthread_sigmask() instead of sigprocmask() because
the latter is unspecified in a multithreaded process.
Bug:
27371304
Change-Id: Ia511ff62d38c0fcd985421442e506cdc5f8f30bf
Nicolas Geoffray [Mon, 20 Jun 2016 14:58:32 +0000 (15:58 +0100)]
Release the thread_list lock while waiting for daemons.
Daemons might be in a state where they are actually waiting for
it (for example Thread.isInterrupted). If the shutdown thread
doesn't release the lock, such daemon cannot make progress.
bug:
27353286
Change-Id: Ib7f4c7d1b56d73a829d01d5bfc0ab663fbb80b46
Andreas Gampe [Mon, 20 Jun 2016 23:48:02 +0000 (23:48 +0000)]
Merge \"ART: Use null for the BootClassLoader in LoadLibrary\"
am:
ec02795d89
Change-Id: I9de1b34725db8a70235411368953b30eb72be981
Treehugger Robot [Mon, 20 Jun 2016 23:41:51 +0000 (23:41 +0000)]
Merge "ART: Use null for the BootClassLoader in LoadLibrary"
Andreas Gampe [Fri, 17 Jun 2016 19:46:14 +0000 (12:46 -0700)]
ART: Use null for the BootClassLoader in LoadLibrary
We must translate the fake BootClassLoader object to the internally
used null when loading libraries.
Bug:
29449194
Test: test-art-host
(cherry picked from commit
f7e0db0ce1170b88043f7eb6afcc93c861c4611d)
Change-Id: I823d34e209149b5b96529a423c60a1d77bf8e9d1
Aart Bik [Mon, 20 Jun 2016 21:14:43 +0000 (14:14 -0700)]
Added a dexdump test containing every DEX instruction
Rationale:
To get full dexdump coverage, every DEX instruction should at
least be tested once. Since it is hard to construct Java tests
that eventually yield every possible instruction, smali has been
used to construct the all.dex file with every DEX opcode.
NOTE that the DEX file does not verify (or even makes sense).
It is merely intended as test input to dexdump to ensure each
opcode renders well.
Change-Id: I44d534d5ea076a3dbc16233e27cb8940f00c1d57
Aart Bik [Mon, 20 Jun 2016 18:13:36 +0000 (18:13 +0000)]
Merge \"Implemented annotations display in dexdump.\"
am:
e059b5b612
Change-Id: Ifbc4c721cf8f08d9bd2dc5422089d4f8ff48108d
Aart Bik [Mon, 20 Jun 2016 18:08:44 +0000 (18:08 +0000)]
Merge "Implemented annotations display in dexdump."
Mathieu Chartier [Sat, 18 Jun 2016 00:38:06 +0000 (00:38 +0000)]
Merge \"Revert \"Revert \"Revert \"Disable 149-suspend-all-stress, its output is flaky.\"\"\"\"
am:
34cfc661a5
Change-Id: Ibfb1cfe870ec55a0764e5d02a733cbfbddb7dcf7
Mathieu Chartier [Sat, 18 Jun 2016 00:27:47 +0000 (00:27 +0000)]
Merge "Revert "Revert "Revert "Disable 149-suspend-all-stress, its output is flaky.""""
Mathieu Chartier [Sat, 18 Jun 2016 00:03:23 +0000 (17:03 -0700)]
Revert "Revert "Revert "Disable 149-suspend-all-stress, its output is flaky."""
Bug:
29387050
This reverts commit
64ed882e0787014e5a0e5d62fe049dbfce150f92.
Change-Id: I09a5e0773dffccae741d7534405e7c1a7aa222ed
Christopher Ferris [Sat, 18 Jun 2016 00:05:21 +0000 (00:05 +0000)]
Merge \"Add lock when iterating over BacktraceMap.\"
am:
58c0b44694
Change-Id: I9cef369f5927addb32b1c264a1dc91616f1831cb
Christopher Ferris [Fri, 17 Jun 2016 23:57:14 +0000 (23:57 +0000)]
Merge "Add lock when iterating over BacktraceMap."
Aart Bik [Fri, 10 Jun 2016 23:04:03 +0000 (16:04 -0700)]
Implemented annotations display in dexdump.
Rationale:
Showing this in true dexdump style as a separate construct
under switch -a (rather than interpreting the data and showing
each annotation where it is used). Also added new test to
cover many more value encodings in static fields.
BUG=
28981655
Change-Id: I6d7d44cbd358d9880aab78812471bdb0dc6b6ad8
Mathieu Chartier [Fri, 17 Jun 2016 18:49:49 +0000 (18:49 +0000)]
Merge changes I25d9ac3e,I783dac75
am:
83eab26cf2
Change-Id: Ibe5fd16e2c7737bca240fe3da633363f3ff5564c
Mathieu Chartier [Fri, 17 Jun 2016 18:49:49 +0000 (18:49 +0000)]
Merge \"Use collector specific helper classes\"
am:
dca4d5d2bf
Change-Id: I537fd415cce0329e59596d706e3fc721b83f1123
Mathieu Chartier [Fri, 17 Jun 2016 18:41:28 +0000 (18:41 +0000)]
Merge changes I25d9ac3e,I783dac75
* changes:
Revert "Revert "Skip DumpForSigQuit if debugger is active""
Revert "Skip DumpForSigQuit if debugger is active"
Mathieu Chartier [Fri, 17 Jun 2016 18:39:15 +0000 (11:39 -0700)]
Revert "Revert "Skip DumpForSigQuit if debugger is active""
Bug:
26118154
This reverts commit
539f7fb0964a184b24bf40c729577be76dd7749a.
Mathieu Chartier [Fri, 17 Jun 2016 00:02:52 +0000 (17:02 -0700)]
Revert "Skip DumpForSigQuit if debugger is active"
Bug:
26118154
This reverts commit
0b8f1bfdfc721a41d98d13e12c4c67f62f698dfc.
(cherry picked from commit
6017782485d30c4e440e53107dde03dc20d56a9a)
Change-Id: I783dac75b97a424c2d770e0d69e6f346c915a754
Mathieu Chartier [Fri, 17 Jun 2016 18:37:41 +0000 (18:37 +0000)]
Merge "Use collector specific helper classes"
Mathieu Chartier [Thu, 16 Jun 2016 18:44:28 +0000 (11:44 -0700)]
Use collector specific helper classes
Changed to use inner classes. Also changed some visitors to lambdas.
Bug:
29413717
Bug:
19534862
Change-Id: I631c8bfe5f795eda4623c5bb4f357f2dd12358e2
Scott Wakeling [Fri, 17 Jun 2016 12:08:20 +0000 (12:08 +0000)]
Merge \"ARM: Improve String.getCharsNoCheck intrinsic.\"
am:
d5aa626b28
Change-Id: Id36110686dfd9efb5eeb65fe8d515a4acf036b8f
Vladimir Marko [Fri, 17 Jun 2016 12:02:41 +0000 (12:02 +0000)]
Merge "ARM: Improve String.getCharsNoCheck intrinsic."
Scott Wakeling [Mon, 25 Apr 2016 10:32:37 +0000 (11:32 +0100)]
ARM: Improve String.getCharsNoCheck intrinsic.
- Optimize for short retrievals.
- Improve performance of longer retrievals with unrolled LDR/STR.
Change-Id: I24ec52067104b2f68799c04aebb61d20fff94020
Christopher Ferris [Fri, 17 Jun 2016 06:19:36 +0000 (23:19 -0700)]
Add lock when iterating over BacktraceMap.
In order to avoid a race condition in the maps data, acquire
a read lock while iterating over the maps data.
Bug:
29387050
Change-Id: I7d484cac11503be060a9309bc886d1e5441a57b2
Matthew Gharrity [Fri, 17 Jun 2016 01:54:17 +0000 (01:54 +0000)]
Merge \"Change IMT size from 64 to 43\"
am:
30564fd3c9
Change-Id: Ie93335158b40b6924f6b020c2372662f7bf416ff
Treehugger Robot [Fri, 17 Jun 2016 01:12:35 +0000 (01:12 +0000)]
Merge "Change IMT size from 64 to 43"
Matthew Gharrity [Thu, 16 Jun 2016 18:49:23 +0000 (11:49 -0700)]
Change IMT size from 64 to 43
Data shows that this change can save around 2MB with an estimated
less than 2% regression in interface method invokation speed.
Further investigation is needed to measure the performance impact
in practice, particularly for much smaller IMT sizes. We are making
this initial change to 43 to see if it affects runtime perf benchmarks.
Change-Id: Ic0e036091c5da0e6b93f519fc695e9b48ab5ec46
Jeff Hao [Thu, 16 Jun 2016 20:12:30 +0000 (20:12 +0000)]
Merge \"For deadlock test, print out any unexpected exceptions.\"
am:
8651203072
Change-Id: I71a3c2548f807727cacd98a718bd72accc878ba1
Treehugger Robot [Thu, 16 Jun 2016 20:01:33 +0000 (20:01 +0000)]
Merge "For deadlock test, print out any unexpected exceptions."
Jeff Hao [Thu, 16 Jun 2016 18:29:42 +0000 (11:29 -0700)]
For deadlock test, print out any unexpected exceptions.
Bug:
28663029
Change-Id: Icd10cabdde282f292fd997c3a8ad9dd6d1a14e0e
Andreas Gampe [Thu, 16 Jun 2016 18:25:31 +0000 (18:25 +0000)]
Merge changes I7d3ba051,I2dc96535
am:
76b7919ca3
Change-Id: Id403ac9f47ff87b1b6d97cd46cdbed5caf9e565f
Treehugger Robot [Thu, 16 Jun 2016 18:15:17 +0000 (18:15 +0000)]
Merge changes I7d3ba051,I2dc96535
* changes:
ART: Fix ImageSpace::Init
Revert "Reduce ImageSpace::Init frame size"
Mathieu Chartier [Thu, 16 Jun 2016 17:51:37 +0000 (17:51 +0000)]
Merge \"Avoid duplicate class for mark compact\"
am:
3fa401661e
Change-Id: Ibc263ea7d114d62515c951ab45dc460ca74c6565
Mathieu Chartier [Thu, 16 Jun 2016 17:43:31 +0000 (17:43 +0000)]
Merge "Avoid duplicate class for mark compact"
Mathieu Chartier [Thu, 16 Jun 2016 17:28:43 +0000 (10:28 -0700)]
Avoid duplicate class for mark compact
Renamed BitmapSetSlowPathVisitor to MCBitmapSetSlowPathVisitor for
the mark compact case.
Bug:
29413717
Change-Id: Ibb85acc8e796c0b8208b13c468b5510b0cec47e1
Nicolas Geoffray [Thu, 16 Jun 2016 14:14:34 +0000 (14:14 +0000)]
Merge \"Ensure we get a ProfilingInfo object before compiling.\"
am:
48f9f28c9b
Change-Id: I4886b150e1b83a5319996fc2d9c96745db9502fb
Treehugger Robot [Thu, 16 Jun 2016 14:04:52 +0000 (14:04 +0000)]
Merge "Ensure we get a ProfilingInfo object before compiling."
Nicolas Geoffray [Thu, 16 Jun 2016 13:09:03 +0000 (14:09 +0100)]
Ensure we get a ProfilingInfo object before compiling.
Otherwise, the compiler could decide not to JIT compile
the method.
Change-Id: I6e92224748861317c5ac629395ea180df4e51f8b
Chris Larsen [Thu, 16 Jun 2016 12:29:47 +0000 (12:29 +0000)]
Merge \"MIPS32: Assembler tests for MIPS32R6\"
am:
80fdcfc127
Change-Id: If3bd579ecb941aff88c19bdde53abd8c2f0b1619
Treehugger Robot [Thu, 16 Jun 2016 12:21:30 +0000 (12:21 +0000)]
Merge "MIPS32: Assembler tests for MIPS32R6"
Jeff Hao [Thu, 16 Jun 2016 01:28:31 +0000 (01:28 +0000)]
Merge \"Use a barrier instead of sleep for flaky deadlock test.\"
am:
61b370e455
Change-Id: I583c4ee37503e5a81297b7f9018ceb05a37bec20
Treehugger Robot [Thu, 16 Jun 2016 01:23:32 +0000 (01:23 +0000)]
Merge "Use a barrier instead of sleep for flaky deadlock test."
Andreas Gampe [Thu, 16 Jun 2016 00:45:01 +0000 (17:45 -0700)]
ART: Fix ImageSpace::Init
Refactor ImageSpace::Init. Fix a case of using nullptr for error_msg
where it was unsafe. Instead fix the remaining case of verbose map
dumping.
Also fixes the stack frame size issue on x86-64.
Change-Id: I7d3ba05100592b5a44a29b34349edd8a44b4a72f
Mathieu Chartier [Thu, 16 Jun 2016 01:04:28 +0000 (01:04 +0000)]
Merge \"Propagate flags to ShouldHaveEmbeddedVTable\"
am:
641466b022
Change-Id: I11ac74b1ad13b5e873c3de6c3ee2f9c3770e9e38
Mathieu Chartier [Thu, 16 Jun 2016 00:57:19 +0000 (00:57 +0000)]
Merge "Propagate flags to ShouldHaveEmbeddedVTable"
Mathieu Chartier [Wed, 15 Jun 2016 22:07:03 +0000 (15:07 -0700)]
Propagate flags to ShouldHaveEmbeddedVTable
Pass kVerifyFlags and kReadBarrierrOption to ShouldHaveEmbeddedVTable
from ShouldHaveImt.
Bug:
29188168
Change-Id: Ibddd6e744a2f313b4048719987c41f2da04a4e0a
Andreas Gampe [Thu, 16 Jun 2016 00:44:21 +0000 (17:44 -0700)]
Revert "Reduce ImageSpace::Init frame size"
This reverts commit
a67a49a9758c2055cb544bfecdbb50dba2c502d1.
Change is unnecessary, regular cleanup gives us the improvement.
Matthew Gharrity [Thu, 16 Jun 2016 00:36:30 +0000 (00:36 +0000)]
Merge \"Refactor GetIMTIndex\"
am:
8a0b9bf88a
Change-Id: I7cf1dc4ffd730edbb8ff13b3dd2e6678a29f2fdd
Jeff Hao [Wed, 15 Jun 2016 23:20:34 +0000 (16:20 -0700)]
Use a barrier instead of sleep for flaky deadlock test.
Bug:
28663029
Change-Id: Ia94372c719f8014b4ee739ebc6a93c4f3548f717
Treehugger Robot [Thu, 16 Jun 2016 00:28:15 +0000 (00:28 +0000)]
Merge "Refactor GetIMTIndex"
Mathieu Chartier [Wed, 15 Jun 2016 20:43:29 +0000 (20:43 +0000)]
Merge \"Reduce ImageSpace::Init frame size\"
am:
edbcf54199
Change-Id: Idb36f9ecbcd7cb29a5560502b952bf7db8621493
Mathieu Chartier [Wed, 15 Jun 2016 20:28:21 +0000 (20:28 +0000)]
Merge "Reduce ImageSpace::Init frame size"
Mathieu Chartier [Wed, 15 Jun 2016 20:11:40 +0000 (13:11 -0700)]
Reduce ImageSpace::Init frame size
Fixes x86_64 build.
Change-Id: Ib636a1274e255a60bda47607570fedbe92a5e2cd
Nelli Kim [Wed, 15 Jun 2016 17:55:38 +0000 (17:55 +0000)]
Merge \"Optimize IMT\"
am:
abdda2fb52
Change-Id: Ifac59a3c2f4a701bf6c856338973b691dd4216cd
Mathieu Chartier [Wed, 15 Jun 2016 17:44:14 +0000 (17:44 +0000)]
Merge "Optimize IMT"
Matthew Gharrity [Tue, 14 Jun 2016 18:31:04 +0000 (11:31 -0700)]
Refactor GetIMTIndex
This allows us to more easily maintain and experiment with
interface method table indexing and hashing.
Change-Id: I719920fae7490dcedcda7c1c36db225c2b8b16df
Nicolas Geoffray [Wed, 15 Jun 2016 13:57:28 +0000 (13:57 +0000)]
Merge \"Also compile libnetd_client for target testing.\"
am:
2b87a47c09
Change-Id: I8cde16e52f10769529ffee841a45d70c32b2e847
Nicolas Geoffray [Wed, 15 Jun 2016 13:52:39 +0000 (13:52 +0000)]
Merge "Also compile libnetd_client for target testing."
Nicolas Geoffray [Wed, 15 Jun 2016 12:06:52 +0000 (12:06 +0000)]
Merge \"Revert \"Revert \"Disable 149-suspend-all-stress, its output is flaky.\"\"\"
am:
06c0b5d93b
Change-Id: I4555a596f6c653fa3317681eb9dd60c623908f48
Nicolas Geoffray [Wed, 15 Jun 2016 11:57:35 +0000 (11:57 +0000)]
Merge "Revert "Revert "Disable 149-suspend-all-stress, its output is flaky."""
Nicolas Geoffray [Wed, 15 Jun 2016 11:57:22 +0000 (11:57 +0000)]
Revert "Revert "Disable 149-suspend-all-stress, its output is flaky.""
Still flaky.
bug:
28988206
This reverts commit
06cb9b25e09c10530ba4f3659b54161b1c76c932.
Change-Id: I13626a8959db27fd566f6db56fab469312422e70
Vladimir Marko [Wed, 15 Jun 2016 10:46:42 +0000 (10:46 +0000)]
Merge \"ARM: Use GOT_PREL references for Runtime::Current().\"
am:
453134813e
Change-Id: I7d4e311834a3ca2b88571054e4293ad15b9b66b5
Vladimir Marko [Wed, 15 Jun 2016 10:38:23 +0000 (10:38 +0000)]
Merge "ARM: Use GOT_PREL references for Runtime::Current()."
Mathieu Chartier [Wed, 15 Jun 2016 02:44:42 +0000 (02:44 +0000)]
Merge \"Visit invalid roots of only suspended threads\"
am:
93f26bed24
Change-Id: Ibb58c2a33ea756b777229b1cc9d67d18d6c18e87
Mathieu Chartier [Wed, 15 Jun 2016 02:35:09 +0000 (02:35 +0000)]
Merge "Visit invalid roots of only suspended threads"
Andreas Gampe [Wed, 15 Jun 2016 01:46:15 +0000 (01:46 +0000)]
Merge \"ART: Empty out sa_mask in ArmInstructionSetFeatures\"
am:
98dd28e79d
Change-Id: I633ab79afeb3c44ccf0c5a0f7e2840f20f6e0a7b
Treehugger Robot [Wed, 15 Jun 2016 01:29:25 +0000 (01:29 +0000)]
Merge "ART: Empty out sa_mask in ArmInstructionSetFeatures"
Mathieu Chartier [Wed, 15 Jun 2016 00:08:47 +0000 (17:08 -0700)]
Visit invalid roots of only suspended threads
Since this always happens with suspended threads or self, you can
just visit these threads and do not require a suspend all. This
will not miss any roots if the caller was marking a thread root.
Fixes issues like transitioning to suspended and back blocking on a
thread suspension request from another thread. This could cause
deadlocks previously.
Bug:
29062271
Change-Id: I2fef149387aacf0cdc9a773d4f172c42fa53e4dc
Andreas Gampe [Wed, 15 Jun 2016 00:24:51 +0000 (17:24 -0700)]
ART: Empty out sa_mask in ArmInstructionSetFeatures
For sdiv hardware detection by signal, empty out sa_mask.
Bug:
29282211
Change-Id: I7c85273f95089fcce75319843e5921842ea6df4d
Mathieu Chartier [Tue, 14 Jun 2016 22:27:42 +0000 (22:27 +0000)]
Merge \"Change test 149 to run for 10 seconds\"
am:
336f697941
Change-Id: Icf9d860e6656a2f51a29df66992b906fbe58cef8
Mathieu Chartier [Tue, 14 Jun 2016 22:19:58 +0000 (22:19 +0000)]
Merge "Change test 149 to run for 10 seconds"
Andreas Gampe [Tue, 14 Jun 2016 21:46:09 +0000 (21:46 +0000)]
Merge \"ART: Add setenv to Valgrind target suppressions\"
am:
4070f3fb51
Change-Id: I7b5389ac3f2d3bd0ee6e302c2ff2cf3550068eca