OSDN Git Service
Jeff Hao [Wed, 23 Jul 2014 20:51:27 +0000 (20:51 +0000)]
am
f4afc70f: am
0346b6be: Merge "Fix run-test --trace option if --host is specified after."
* commit '
f4afc70f8b31867587e12772465bb09489c3cebb':
Fix run-test --trace option if --host is specified after.
Jeff Hao [Wed, 23 Jul 2014 20:47:59 +0000 (20:47 +0000)]
am
0346b6be: Merge "Fix run-test --trace option if --host is specified after."
* commit '
0346b6bef939517b45216ee0eff4cf7a0c0667f4':
Fix run-test --trace option if --host is specified after.
Mathieu Chartier [Wed, 23 Jul 2014 20:28:14 +0000 (20:28 +0000)]
am
8060f68b: am
b76cac63: Revert "Revert "Disable adding main and non moving spaces to immune region in GSS""
* commit '
8060f68b0eb74acb0b89a0a32373fd1d66a9fc7f':
Revert "Revert "Disable adding main and non moving spaces to immune region in GSS""
Mathieu Chartier [Wed, 23 Jul 2014 20:24:12 +0000 (20:24 +0000)]
am
b76cac63: Revert "Revert "Disable adding main and non moving spaces to immune region in GSS""
* commit '
b76cac637691c29daa9c44e493b5bc26346ed116':
Revert "Revert "Disable adding main and non moving spaces to immune region in GSS""
Mathieu Chartier [Wed, 23 Jul 2014 20:02:30 +0000 (13:02 -0700)]
Revert "Revert "Disable adding main and non moving spaces to immune region in GSS""
This reverts commit
f85c2fb317399ab540854cd7551ac47690366543.
Andreas Gampe [Wed, 23 Jul 2014 19:08:24 +0000 (19:08 +0000)]
am
6590cb04: am
cf60db36: Merge "ART: Fix x86_64 instrumentation_exit, also movsd -> movq"
* commit '
6590cb04e7e889756f913bf4fdddce112ba471ab':
ART: Fix x86_64 instrumentation_exit, also movsd -> movq
Andreas Gampe [Wed, 23 Jul 2014 19:08:23 +0000 (19:08 +0000)]
am
40f53491: am
80b3f96e: Merge "Add test-art-*-run-test-###-test-name32/64 test targets."
* commit '
40f53491b67513fba358c685757ba5bcd846a4f7':
Add test-art-*-run-test-###-test-name32/64 test targets.
Andreas Gampe [Wed, 23 Jul 2014 19:08:23 +0000 (19:08 +0000)]
am
e1603a5f: am
b37576bb: Merge "ART: Fix erroneous output"
* commit '
e1603a5fec42cfc92b314e31a3abc05a7c48176a':
ART: Fix erroneous output
Andreas Gampe [Wed, 23 Jul 2014 19:04:34 +0000 (19:04 +0000)]
am
9871afaf: resolved conflicts for merge of
525f2f30 to lmp-dev-plus-aosp
* commit '
9871afafd29015856be3da4920809e77e1a1321b':
ART: Make run tests out of oat tests
Andreas Gampe [Wed, 23 Jul 2014 19:02:15 +0000 (19:02 +0000)]
am
cf60db36: Merge "ART: Fix x86_64 instrumentation_exit, also movsd -> movq"
* commit '
cf60db36f19943242fb14657dd5a452a650d42dc':
ART: Fix x86_64 instrumentation_exit, also movsd -> movq
Andreas Gampe [Wed, 23 Jul 2014 19:02:15 +0000 (19:02 +0000)]
am
80b3f96e: Merge "Add test-art-*-run-test-###-test-name32/64 test targets."
* commit '
80b3f96ec1e408f34b8e7b76b14774794fa1abd8':
Add test-art-*-run-test-###-test-name32/64 test targets.
Andreas Gampe [Wed, 23 Jul 2014 19:02:14 +0000 (19:02 +0000)]
am
b37576bb: Merge "ART: Fix erroneous output"
* commit '
b37576bbb133593387a0a5b7a03202e380798e64':
ART: Fix erroneous output
Andreas Gampe [Wed, 23 Jul 2014 18:58:02 +0000 (11:58 -0700)]
resolved conflicts for merge of
525f2f30 to lmp-dev-plus-aosp
Change-Id: I74f36b70583f4faf57befc9c6371ffd69e9a7cf8
Jeff Hao [Wed, 23 Jul 2014 20:41:11 +0000 (20:41 +0000)]
Merge "Fix run-test --trace option if --host is specified after."
Jeff Hao [Wed, 23 Jul 2014 18:52:52 +0000 (11:52 -0700)]
Fix run-test --trace option if --host is specified after.
Change-Id: I3911428ba762657c4433ab23e60f1771c9ddb2fe
Andreas Gampe [Wed, 23 Jul 2014 18:27:52 +0000 (18:27 +0000)]
am
0ebe2f82: am
f5881ed6: ART: Fix x86_64 instrumentation_exit, also movsd -> movq
* commit '
0ebe2f82849766ad0130bcc81ff906a1905b175e':
ART: Fix x86_64 instrumentation_exit, also movsd -> movq
Jeff Hao [Wed, 23 Jul 2014 18:27:52 +0000 (18:27 +0000)]
am
80a98c06: am
2c240f79: Fix x86 instrumentation exit entrypoint and trace size limit.
* commit '
80a98c068878e4a4301bdcb2677b07acd1a0558b':
Fix x86 instrumentation exit entrypoint and trace size limit.
Andreas Gampe [Wed, 23 Jul 2014 18:24:24 +0000 (18:24 +0000)]
am
f5881ed6: ART: Fix x86_64 instrumentation_exit, also movsd -> movq
* commit '
f5881ed68a05b371e7578966470ff3801b180578':
ART: Fix x86_64 instrumentation_exit, also movsd -> movq
Jeff Hao [Wed, 23 Jul 2014 18:24:24 +0000 (18:24 +0000)]
am
2c240f79: Fix x86 instrumentation exit entrypoint and trace size limit.
* commit '
2c240f7972dc4e6c7cbfb5d4ddcae64720230109':
Fix x86 instrumentation exit entrypoint and trace size limit.
Andreas Gampe [Wed, 23 Jul 2014 17:05:02 +0000 (10:05 -0700)]
ART: Fix x86_64 instrumentation_exit, also movsd -> movq
Change movd/movsd to movq.
Bug:
16386215
(cherry picked from commit
fea29016a79f39ac12a4ba4ebdcbc86800c03427)
Change-Id: Icca71ca2aeeb2917aff46043051d6046f04395d4
Jeff Hao [Wed, 23 Jul 2014 01:38:42 +0000 (18:38 -0700)]
Fix x86 instrumentation exit entrypoint and trace size limit.
The x86 instruction movd only copies a 32-bit value when used with a
memory location. movsd properly copies 64-bits.
Bug:
16386215
(cherry picked from commit
cf2e7b0621dfe7fcacd56555dffabab65d1130e7)
Change-Id: I102db8aaa5e8a6b3a88f01e545d1bb51b4f3d5d4
Ian Rogers [Wed, 23 Jul 2014 15:27:44 +0000 (15:27 +0000)]
am
a7dfd3c4: am
7dfc30b5: Merge "Use the TMPDIR environment variable for test directory if set."
* commit '
a7dfd3c4647b98d7fa792c39fa3f5fa2d0835ef2':
Use the TMPDIR environment variable for test directory if set.
Ian Rogers [Wed, 23 Jul 2014 15:24:34 +0000 (15:24 +0000)]
am
7dfc30b5: Merge "Use the TMPDIR environment variable for test directory if set."
* commit '
7dfc30b591aee167f0a38ab61a90894cc76f2066':
Use the TMPDIR environment variable for test directory if set.
Vladimir Marko [Wed, 23 Jul 2014 15:21:58 +0000 (15:21 +0000)]
am
51b24bf9: am
4490ff42: Merge "Rewrite topological sort order and improve GVN." into lmp-dev
* commit '
51b24bf94b452e6e39b303fc6597423721ef31ba':
Rewrite topological sort order and improve GVN.
Vladimir Marko [Wed, 23 Jul 2014 15:18:36 +0000 (15:18 +0000)]
am
4490ff42: Merge "Rewrite topological sort order and improve GVN." into lmp-dev
* commit '
4490ff42ecf8a22f4bda9cd49b889d6e4b2683ce':
Rewrite topological sort order and improve GVN.
Vladimir Marko [Wed, 23 Jul 2014 15:07:25 +0000 (15:07 +0000)]
am
20098526: am
293caab6: Fix null pointer check elimination for catch entries.
* commit '
200985267b05292aa2799047bc1fd97989fb607a':
Fix null pointer check elimination for catch entries.
Vladimir Marko [Wed, 23 Jul 2014 15:03:59 +0000 (15:03 +0000)]
am
293caab6: Fix null pointer check elimination for catch entries.
* commit '
293caab66e9b1e4129843f6bdeb31353bb77ccef':
Fix null pointer check elimination for catch entries.
Nicolas Geoffray [Wed, 23 Jul 2014 14:20:23 +0000 (14:20 +0000)]
am
4de0d3fe: am
0edcfd64: Merge "Fix implicit stack overflow check on optimizing/x86."
* commit '
4de0d3fe0d899f858c376b3544a3dd70d005521e':
Fix implicit stack overflow check on optimizing/x86.
Vladimir Marko [Wed, 23 Jul 2014 14:20:22 +0000 (14:20 +0000)]
am
93fcbaab: am
8bf67c21: Merge "Rewrite topological sort order and improve GVN."
* commit '
93fcbaab1adec6b3ce79ae9c06474006ad2adc46':
Rewrite topological sort order and improve GVN.
Nicolas Geoffray [Wed, 23 Jul 2014 14:20:21 +0000 (14:20 +0000)]
am
c518fae8: am
055fb15e: Merge "Use the correct HOST_ARCH for oat files."
* commit '
c518fae8ba05ae6dc91a2e51af744500800ba7e2':
Use the correct HOST_ARCH for oat files.
Vladimir Marko [Wed, 23 Jul 2014 14:20:20 +0000 (14:20 +0000)]
am
31d09c74: am
7c66c8df: Merge "Fix null pointer check elimination for catch entries."
* commit '
31d09c74caef1feed8d3c4d8931889d4fd07f8bc':
Fix null pointer check elimination for catch entries.
Nicolas Geoffray [Wed, 23 Jul 2014 14:16:01 +0000 (14:16 +0000)]
am
0edcfd64: Merge "Fix implicit stack overflow check on optimizing/x86."
* commit '
0edcfd64f5d187b9f571b00c0309be6e209d474e':
Fix implicit stack overflow check on optimizing/x86.
Vladimir Marko [Wed, 23 Jul 2014 14:15:57 +0000 (14:15 +0000)]
am
8bf67c21: Merge "Rewrite topological sort order and improve GVN."
* commit '
8bf67c21c6b5bc6c218cd5ab30fcb715b1aeb446':
Rewrite topological sort order and improve GVN.
Nicolas Geoffray [Wed, 23 Jul 2014 14:15:56 +0000 (14:15 +0000)]
am
055fb15e: Merge "Use the correct HOST_ARCH for oat files."
* commit '
055fb15e980347d7975d8f88c531b752c0f9b316':
Use the correct HOST_ARCH for oat files.
Vladimir Marko [Wed, 23 Jul 2014 14:15:55 +0000 (14:15 +0000)]
am
7c66c8df: Merge "Fix null pointer check elimination for catch entries."
* commit '
7c66c8dffeb299743e6180b36a74018fa563ab44':
Fix null pointer check elimination for catch entries.
Nicolas Geoffray [Wed, 23 Jul 2014 14:05:35 +0000 (14:05 +0000)]
am
f75cf7de: am
cdd185b8: Merge "Rules depend on DEX2OATD, not DEX2OATD_DEPENDENCY."
* commit '
f75cf7debc30335981772c77f74edf3e7180500d':
Rules depend on DEX2OATD, not DEX2OATD_DEPENDENCY.
Nicolas Geoffray [Wed, 23 Jul 2014 14:01:58 +0000 (14:01 +0000)]
am
cdd185b8: Merge "Rules depend on DEX2OATD, not DEX2OATD_DEPENDENCY."
* commit '
cdd185b893d3003236d9b79f3532201b2c5f32ca':
Rules depend on DEX2OATD, not DEX2OATD_DEPENDENCY.
Vladimir Marko [Wed, 23 Jul 2014 13:26:54 +0000 (13:26 +0000)]
am
8faf95fd: am
f9d6aede: Use vabs/fabs on arm/arm64 for intrinsic abs().
* commit '
8faf95fd835db35ed8584de29bc095069b3251db':
Use vabs/fabs on arm/arm64 for intrinsic abs().
Vladimir Marko [Fri, 11 Jul 2014 13:44:36 +0000 (14:44 +0100)]
Fix null pointer check elimination for catch entries.
Remove the special treatment of catch blocks for null
pointer check elimination and class initialization check
elimination. In both cases this can help optimizing
previously missed cases. In the null check case, this
avoids incorrect optimization as exposed by the new test.
Bug:
16230771
(cherry picked from
0a810d2eab27cd097ebd09a44f0ce83aa608285b)
Change-Id: I0764f47fa0aacfa89904a82e9528177b3ad67e31
Vladimir Marko [Wed, 23 Jul 2014 13:05:22 +0000 (13:05 +0000)]
am
f9d6aede: Use vabs/fabs on arm/arm64 for intrinsic abs().
* commit '
f9d6aede77c700118e225f8312cd888262b77862':
Use vabs/fabs on arm/arm64 for intrinsic abs().
Vladimir Marko [Wed, 23 Jul 2014 15:11:04 +0000 (15:11 +0000)]
Merge "Rewrite topological sort order and improve GVN." into lmp-dev
Vladimir Marko [Thu, 10 Jul 2014 11:42:52 +0000 (12:42 +0100)]
Rewrite topological sort order and improve GVN.
Rewrite the topological sort order to include a full loop
before the blocks that go after the loop. Add a new iterator
class LoopRepeatingTopologicalSortIterator that differs from
the RepeatingTopologicalSortIterator by repeating only loops
and repeating them early. It returns to the loop head if the
head needs recalculation when we reach the end of the loop.
In GVN, use the new loop-repeating topological sort iterator
and for a loop head merge only the preceding blocks' LVNs
if we're not currently recalculating this loop.
Also fix LocalValueNumbering::InPlaceIntersectMaps() which
was keeping only the last element of the intersection, avoid
some unnecessary processing during LVN merge and add some
missing braces to MIRGraph::InferTypeAndSize().
Bug:
16398693
(cherry picked from
55fff044d3a4f7196098e25bab1dad106d9b54a2)
Change-Id: Id7bcd99c8abed1b7500b9ef723313d4c5fc6f1e8
Vladimir Marko [Wed, 23 Jul 2014 12:12:24 +0000 (12:12 +0000)]
Merge "Rewrite topological sort order and improve GVN."
Vladimir Marko [Thu, 10 Jul 2014 11:42:52 +0000 (12:42 +0100)]
Rewrite topological sort order and improve GVN.
Rewrite the topological sort order to include a full loop
before the blocks that go after the loop. Add a new iterator
class LoopRepeatingTopologicalSortIterator that differs from
the RepeatingTopologicalSortIterator by repeating only loops
and repeating them early. It returns to the loop head if the
head needs recalculation when we reach the end of the loop.
In GVN, use the new loop-repeating topological sort iterator
and for a loop head merge only the preceding blocks' LVNs
if we're not currently recalculating this loop.
Also fix LocalValueNumbering::InPlaceIntersectMaps() which
was keeping only the last element of the intersection, avoid
some unnecessary processing during LVN merge and add some
missing braces to MIRGraph::InferTypeAndSize().
Bug:
16398693
Change-Id: I4e10d4acb626a5b8a28ec0de106a7b37f9cbca32
Nicolas Geoffray [Wed, 23 Jul 2014 12:07:12 +0000 (12:07 +0000)]
Merge "Use the correct HOST_ARCH for oat files."
Nicolas Geoffray [Wed, 23 Jul 2014 11:37:10 +0000 (12:37 +0100)]
Use the correct HOST_ARCH for oat files.
This typo explains why test-art-host-oat-optimizing-SignalTest32
would work on a 32bit host build and fail on a 64bit host build:
because dex2oat does not generate the code in the expected path
(x86_64 instead of x86), dalvikvm would re-generate it, with
the default settings (that is with quick compiler), and hence the
test would not fail.
Change-Id: I08b5ec316deb4d669fe76066d33a91fc3ed9e3f9
Vladimir Marko [Wed, 23 Jul 2014 12:05:26 +0000 (12:05 +0000)]
Merge "Fix null pointer check elimination for catch entries."
Nicolas Geoffray [Wed, 23 Jul 2014 12:26:17 +0000 (12:26 +0000)]
Merge "Fix implicit stack overflow check on optimizing/x86."
Nicolas Geoffray [Wed, 23 Jul 2014 11:57:19 +0000 (12:57 +0100)]
Fix implicit stack overflow check on optimizing/x86.
They need to happen before changing ESP, and require a suspend point.
Change-Id: Id41aa9c99714f7ab8591367ea5cb9ca105b17ce8
Nicolas Geoffray [Wed, 23 Jul 2014 09:12:11 +0000 (09:12 +0000)]
Merge "Rules depend on DEX2OATD, not DEX2OATD_DEPENDENCY."
Nicolas Geoffray [Wed, 23 Jul 2014 08:59:21 +0000 (09:59 +0100)]
Rules depend on DEX2OATD, not DEX2OATD_DEPENDENCY.
If dex2oatd changes, we need to re-run .oat/.art file generation.
Change-Id: I43487e024745b22b1681f4ff558bac6fd07d9881
Jeff Hao [Wed, 23 Jul 2014 02:01:38 +0000 (02:01 +0000)]
am
386f173b: am
d83d1a7e: Merge "Fix x86 instrumentation exit entrypoint and trace size limit."
* commit '
386f173b154578d704688629f808531c3e098e76':
Fix x86 instrumentation exit entrypoint and trace size limit.
Andreas Gampe [Wed, 23 Jul 2014 01:57:18 +0000 (01:57 +0000)]
am
97ef2475: am
ab9167bd: Merge "Changed default non-full tests to be prebuild."
* commit '
97ef2475f82fd1f3388f883741fd8251a9906f66':
Changed default non-full tests to be prebuild.
Jeff Hao [Wed, 23 Jul 2014 01:56:05 +0000 (01:56 +0000)]
am
d83d1a7e: Merge "Fix x86 instrumentation exit entrypoint and trace size limit."
* commit '
d83d1a7edf07c33336935faff918424b23247320':
Fix x86 instrumentation exit entrypoint and trace size limit.
Andreas Gampe [Wed, 23 Jul 2014 01:50:17 +0000 (01:50 +0000)]
am
ab9167bd: Merge "Changed default non-full tests to be prebuild."
* commit '
ab9167bd054eaa8469a73250e33034b5109a7b6e':
Changed default non-full tests to be prebuild.
Mathieu Chartier [Wed, 23 Jul 2014 01:19:20 +0000 (01:19 +0000)]
am
4e996f6d: am
2ac30da0: (-s ours) Merge "Recycle mem-maps for collector transitions."
* commit '
4e996f6dab895da9cfedd750ae674dea3b829761':
Recycle mem-maps for collector transitions.
Mathieu Chartier [Wed, 23 Jul 2014 01:15:23 +0000 (01:15 +0000)]
am
2ac30da0: (-s ours) Merge "Recycle mem-maps for collector transitions."
* commit '
2ac30da089ed9f2a27c177a972f4d67754454637':
Recycle mem-maps for collector transitions.
Mingyao Yang [Wed, 23 Jul 2014 00:49:50 +0000 (00:49 +0000)]
am
2ed7af23: am
7326ff0a: Merge "Fix build, missing spaces around =/<."
* commit '
2ed7af23676ee4b65740f8116b25e1acf258cb0f':
Fix build, missing spaces around =/<.
Mingyao Yang [Wed, 23 Jul 2014 00:45:22 +0000 (00:45 +0000)]
am
7326ff0a: Merge "Fix build, missing spaces around =/<."
* commit '
7326ff0a5a602ebefde76b2785a0c6c0401e815a':
Fix build, missing spaces around =/<.
Ian Rogers [Tue, 22 Jul 2014 22:16:10 +0000 (22:16 +0000)]
am
7d4c57b9: am
ddc21198: Merge "Put oat test output on stderr."
* commit '
7d4c57b903d89e1bd0d10be4df9e5be0477b76a3':
Put oat test output on stderr.
Mingyao Yang [Tue, 22 Jul 2014 22:16:09 +0000 (22:16 +0000)]
am
228b65b7: am
c389c97c: Merge "Set vtable in class object to null after linking."
* commit '
228b65b7687781b8d19e0e69a29619f150318ba2':
Set vtable in class object to null after linking.
Ian Rogers [Tue, 22 Jul 2014 22:12:09 +0000 (22:12 +0000)]
am
ddc21198: Merge "Put oat test output on stderr."
* commit '
ddc211980aa2f6149905d8d26f67201ac8e400b3':
Put oat test output on stderr.
Mingyao Yang [Tue, 22 Jul 2014 22:12:08 +0000 (22:12 +0000)]
am
c389c97c: Merge "Set vtable in class object to null after linking."
* commit '
c389c97ca93b73b3cb380cedfe438d153b524225':
Set vtable in class object to null after linking.
Andreas Gampe [Tue, 22 Jul 2014 21:50:44 +0000 (21:50 +0000)]
am
00b3a966: am
c836fcbb: Merge "Made sync-test actually wait for first thread to start."
* commit '
00b3a9660bc8b0b8c908cc7b75e07d1c449a57be':
Made sync-test actually wait for first thread to start.
Andreas Gampe [Tue, 22 Jul 2014 21:46:29 +0000 (21:46 +0000)]
am
c836fcbb: Merge "Made sync-test actually wait for first thread to start."
* commit '
c836fcbb52d99efdd9ed4f5c104aebd0c37cb121':
Made sync-test actually wait for first thread to start.
Andreas Gampe [Tue, 22 Jul 2014 21:28:50 +0000 (21:28 +0000)]
am
8e87e14d: am
f645a02c: Merge "ART: Fix checks for relocation delta"
* commit '
8e87e14d559a585840aac499a6fa4113b4dcb6d3':
ART: Fix checks for relocation delta
Andreas Gampe [Tue, 22 Jul 2014 21:28:50 +0000 (21:28 +0000)]
am
990f4e7d: am
306cd217: Merge "ART: Blacklist relocate option in oat tests"
* commit '
990f4e7d9d644956e8bdea7adf94a5b4a2786f6b':
ART: Blacklist relocate option in oat tests
Andreas Gampe [Tue, 22 Jul 2014 21:15:24 +0000 (21:15 +0000)]
am
f645a02c: Merge "ART: Fix checks for relocation delta"
* commit '
f645a02cc669232a33b2c2a3c309ed878615d4a9':
ART: Fix checks for relocation delta
Andreas Gampe [Tue, 22 Jul 2014 21:08:40 +0000 (21:08 +0000)]
am
306cd217: Merge "ART: Blacklist relocate option in oat tests"
* commit '
306cd2179fc73c0b187102b7e70abf12cb47debf':
ART: Blacklist relocate option in oat tests
Mathieu Chartier [Wed, 23 Jul 2014 01:01:30 +0000 (01:01 +0000)]
Merge "Recycle mem-maps for collector transitions."
Mathieu Chartier [Wed, 16 Jul 2014 20:28:58 +0000 (13:28 -0700)]
Recycle mem-maps for collector transitions.
We now create spaces when we need them for collector transitions or
homogeneous compaction by recycling mem maps. Change the bump
pointer space size to be as large as the heap capacity instead of
1/2 heap capacity like it used to be. For GSS, bump pointer spaces
are set to 32MB currently.
Changed GSS to have main space == non moving space since we don't
need to copy from the main space.
Fixes GC stress tests 074, 096.
Fixed test 080 oom throw with -Xmx2m for GC stress test, this was
broken since it was allocating a 4 MB array before starting the
OOM process.
Bug:
14059466
Bug:
16406852
Change-Id: I62877cfa24ec944a6f34ffac30334f454a8002fd
Vladimir Marko [Fri, 11 Jul 2014 13:44:36 +0000 (14:44 +0100)]
Fix null pointer check elimination for catch entries.
Remove the special treatment of catch blocks for null
pointer check elimination and class initialization check
elimination. In both cases this can help optimizing
previously missed cases. In the null check case, this
avoids incorrect optimization as exposed by the new test.
Bug:
16230771
Change-Id: I834b7a1835d9ca8572f4f8d8516d93913c701ad1
Nicolas Geoffray [Tue, 22 Jul 2014 17:32:46 +0000 (17:32 +0000)]
am
7cd14d4d: am
d2d90ecc: Merge "Make unit test tell if a method is a leaf."
* commit '
7cd14d4d25526b943b0ef2ca9815da15659ebdef':
Make unit test tell if a method is a leaf.
Nicolas Geoffray [Tue, 22 Jul 2014 17:19:22 +0000 (17:19 +0000)]
am
d2d90ecc: Merge "Make unit test tell if a method is a leaf."
* commit '
d2d90ecc099eee55b2c9b38c921951ff9288b020':
Make unit test tell if a method is a leaf.
Andreas Gampe [Wed, 23 Jul 2014 18:12:08 +0000 (18:12 +0000)]
Merge "ART: Fix x86_64 instrumentation_exit, also movsd -> movq"
Andreas Gampe [Wed, 23 Jul 2014 17:05:02 +0000 (10:05 -0700)]
ART: Fix x86_64 instrumentation_exit, also movsd -> movq
Change movd/movsd to movq.
Bug:
16386215
Change-Id: Icca71ca2aeeb2917aff46043051d6046f04395d4
Andreas Gampe [Wed, 23 Jul 2014 18:07:50 +0000 (18:07 +0000)]
Merge "Add test-art-*-run-test-###-test-name32/64 test targets."
Alex Light [Wed, 23 Jul 2014 17:31:34 +0000 (10:31 -0700)]
Add test-art-*-run-test-###-test-name32/64 test targets.
This allows one to run only a single architecture for one of the run-tests.
Change-Id: Icb06c2b36074cbec7f7808a2fcaba97ec5501578
Andreas Gampe [Tue, 22 Jul 2014 21:40:47 +0000 (21:40 +0000)]
Merge "Made sync-test actually wait for first thread to start."
Alex Light [Tue, 22 Jul 2014 21:04:31 +0000 (14:04 -0700)]
Made sync-test actually wait for first thread to start.
This makes sure that the threads execute in the order we expect.
Change-Id: I0c4976e72ef2eb9e5fd66184eb1cd4821ea1e42b
Andreas Gampe [Tue, 22 Jul 2014 21:09:07 +0000 (21:09 +0000)]
Merge "ART: Fix checks for relocation delta"
Andreas Gampe [Tue, 22 Jul 2014 21:04:34 +0000 (14:04 -0700)]
ART: Fix checks for relocation delta
Change < to <= and > to >=.
Change-Id: I7579e3c13dc1b33801ace3a0f8d85cadaee41e6e
Andreas Gampe [Tue, 22 Jul 2014 20:57:39 +0000 (20:57 +0000)]
Merge "ART: Blacklist relocate option in oat tests"
Andreas Gampe [Tue, 22 Jul 2014 18:46:28 +0000 (11:46 -0700)]
ART: Blacklist relocate option in oat tests
To avoid overwriting issues when running the relocate option for
oat tests, blacklist them.
Change-Id: I37685a761fd0949502da134690d88ba2a399ea44
Andreas Gampe [Wed, 23 Jul 2014 17:51:24 +0000 (17:51 +0000)]
Merge "ART: Fix erroneous output"
Andreas Gampe [Wed, 23 Jul 2014 17:47:54 +0000 (10:47 -0700)]
ART: Fix erroneous output
Make run-tests quiet.
Change-Id: I80da9ac04fa95a4094dee874c8703ea563acc1ee
Andreas Gampe [Wed, 23 Jul 2014 17:03:23 +0000 (17:03 +0000)]
Merge "ART: Make run tests out of oat tests"
Andreas Gampe [Wed, 23 Jul 2014 01:52:29 +0000 (18:52 -0700)]
ART: Make run tests out of oat tests
Transforms all former oat tests into run tests.
Change-Id: I190dd39456454c36e5538a2c044d993965a67533
Ian Rogers [Wed, 23 Jul 2014 15:18:54 +0000 (15:18 +0000)]
Merge "Use the TMPDIR environment variable for test directory if set."
Ian Rogers [Wed, 23 Jul 2014 15:03:36 +0000 (08:03 -0700)]
Use the TMPDIR environment variable for test directory if set.
Bug:
16499668
Change-Id: I7da5559c13597d7bca4e4037a1e9335f0b6d8230
Jeff Hao [Wed, 23 Jul 2014 01:50:09 +0000 (01:50 +0000)]
Merge "Fix x86 instrumentation exit entrypoint and trace size limit."
Jeff Hao [Wed, 23 Jul 2014 01:38:42 +0000 (18:38 -0700)]
Fix x86 instrumentation exit entrypoint and trace size limit.
The x86 instruction movd only copies a 32-bit value when used with a
memory location. movsd properly copies 64-bits.
Bug:
16386215
Change-Id: Ia59b2c2af72ce5202c7b62413687aedb48cfd25e
Andreas Gampe [Wed, 23 Jul 2014 01:43:30 +0000 (01:43 +0000)]
Merge "Changed default non-full tests to be prebuild."
Alex Light [Wed, 23 Jul 2014 01:07:12 +0000 (18:07 -0700)]
Changed default non-full tests to be prebuild.
Also added ability to turn off non-prebuild manually.
Change-Id: I0315ac43703a9c7e79812658523013799fb5d5dd
Mingyao Yang [Wed, 23 Jul 2014 00:35:01 +0000 (00:35 +0000)]
Merge "Fix build, missing spaces around =/<."
Mingyao Yang [Wed, 23 Jul 2014 00:33:25 +0000 (17:33 -0700)]
Fix build, missing spaces around =/<.
Change-Id: I2e7824075626a07eccb0a5eb77ef157214fe70fb
Ian Rogers [Tue, 22 Jul 2014 22:05:57 +0000 (22:05 +0000)]
Merge "Put oat test output on stderr."
Ian Rogers [Tue, 22 Jul 2014 21:22:22 +0000 (14:22 -0700)]
Put oat test output on stderr.
Change-Id: Iad318f63263dc5d264d8a84eacedf5065a4e5248
Mingyao Yang [Tue, 22 Jul 2014 22:05:50 +0000 (22:05 +0000)]
Merge "Set vtable in class object to null after linking."
Mingyao Yang [Wed, 16 Jul 2014 17:44:41 +0000 (10:44 -0700)]
Set vtable in class object to null after linking.
This is follow-up work of embedding imt and vtable for
faster interface/virtual call dispatching.
Once vtable becomes embedded, the original vtable is nulled.
Change-Id: I307696657d1e283654169dbecb8f7815c42bbabc