OSDN Git Service

android-x86/art.git
7 years agoMerge "ART: Use libbase logging" am: a4850b0fa1 am: fb7380297e
Andreas Gampe [Mon, 26 Sep 2016 20:02:53 +0000 (20:02 +0000)]
Merge "ART: Use libbase logging" am: a4850b0fa1 am: fb7380297e
am: faba08d0dd

Change-Id: I28989211b206ac207bae1bd730f39088389bd3ce

7 years agoMerge "ART: Use libbase logging" am: a4850b0fa1
Andreas Gampe [Mon, 26 Sep 2016 20:00:21 +0000 (20:00 +0000)]
Merge "ART: Use libbase logging" am: a4850b0fa1
am: fb7380297e

Change-Id: I21d20bd9d5b06045898f6c4395ffaeac0b32b501

7 years agoMerge "ART: Use libbase logging"
Andreas Gampe [Mon, 26 Sep 2016 19:56:19 +0000 (19:56 +0000)]
Merge "ART: Use libbase logging"
am: a4850b0fa1

Change-Id: Id19ac0187a9213fe6b2bd2135f994e60e772dc90

7 years agoMerge "ART: Use libbase logging"
Treehugger Robot [Mon, 26 Sep 2016 19:45:22 +0000 (19:45 +0000)]
Merge "ART: Use libbase logging"

7 years agoMake test for app-image loading. am: d3997bd98a
Alex Light [Mon, 26 Sep 2016 18:02:31 +0000 (18:02 +0000)]
Make test for app-image loading. am: d3997bd98a
am: 50d22272cb  -s ours

Change-Id: Ic084fa3a449887aced4ddb89a18dae4f928e83b8

7 years agoART: Use libbase logging
Andreas Gampe [Tue, 13 Sep 2016 17:47:28 +0000 (10:47 -0700)]
ART: Use libbase logging

Move most of our logging infrastructure over to system/core/base.
Retain VLOG.

Using unified Android infrastructure has two main advantages. First,
it reduces the complexity/maintenance burden in ART. Second, it
allows to detach logging for the cases where we do not want or need
a runtime, e.g., dexdump, the disassembler, etc. As a part of the
latter, libbase is also supported for all hosts (including Windows).

From a developer viewpoint, there are minor behavior changes for the
LOG statements (see above), but otherwise usage is the same. Explicit
severity enum items are in the android::base namespace now.

Bug: 31338270
Test: m test-art-host
Change-Id: I5abcb2f45f5b03d49951874c48544f72a283a91b

7 years agoMake test for app-image loading.
Alex Light [Mon, 26 Sep 2016 17:57:40 +0000 (17:57 +0000)]
Make test for app-image loading.
am: d3997bd98a

Change-Id: I19963f3dca87677b02e52dcc403c6c66b33f352c

7 years agoMerge "Fix CTS crash from DexFile refactoring" am: 0cfe19af3b am: 6bfb9db272
David Sehr [Mon, 26 Sep 2016 14:46:58 +0000 (14:46 +0000)]
Merge "Fix CTS crash from DexFile refactoring" am: 0cfe19af3b am: 6bfb9db272
am: 271551bd54

Change-Id: I7e8025f41c49bbf8053cb0e113a95fab5524720d

7 years agoMerge "Fix CTS crash from DexFile refactoring" am: 0cfe19af3b
David Sehr [Mon, 26 Sep 2016 14:44:57 +0000 (14:44 +0000)]
Merge "Fix CTS crash from DexFile refactoring" am: 0cfe19af3b
am: 6bfb9db272

Change-Id: I786f510874db68a794bd9e01632dc2012257752d

7 years agoMerge "Fix CTS crash from DexFile refactoring"
David Sehr [Mon, 26 Sep 2016 14:42:26 +0000 (14:42 +0000)]
Merge "Fix CTS crash from DexFile refactoring"
am: 0cfe19af3b

Change-Id: Ifd5c3e906c3175ba25dc179d6378be0f1aa80c84

7 years agoMerge "Fix CTS crash from DexFile refactoring"
David Sehr [Mon, 26 Sep 2016 14:34:49 +0000 (14:34 +0000)]
Merge "Fix CTS crash from DexFile refactoring"

7 years agoMerge "Compensate in compiler for verifier shortcomings." am: 3cc69a8944 am: b4907a888a
Nicolas Geoffray [Mon, 26 Sep 2016 12:51:23 +0000 (12:51 +0000)]
Merge "Compensate in compiler for verifier shortcomings." am: 3cc69a8944 am: b4907a888a
am: 2a5e211e8d

Change-Id: Ic4d1f7d7969758ef8c8fc59fb884b6daa0f2eab7

7 years agoMerge "Compensate in compiler for verifier shortcomings." am: 3cc69a8944
Nicolas Geoffray [Mon, 26 Sep 2016 12:48:19 +0000 (12:48 +0000)]
Merge "Compensate in compiler for verifier shortcomings." am: 3cc69a8944
am: b4907a888a

Change-Id: I969890a313fe82ce31a503990a176140daac1a03

7 years agoMerge "Compensate in compiler for verifier shortcomings."
Nicolas Geoffray [Mon, 26 Sep 2016 12:45:49 +0000 (12:45 +0000)]
Merge "Compensate in compiler for verifier shortcomings."
am: 3cc69a8944

Change-Id: I7b485879dbaee0feea345d2834fef348405eec83

7 years agoMerge "Compensate in compiler for verifier shortcomings."
Treehugger Robot [Mon, 26 Sep 2016 12:39:16 +0000 (12:39 +0000)]
Merge "Compensate in compiler for verifier shortcomings."

7 years agoCompensate in compiler for verifier shortcomings.
Nicolas Geoffray [Fri, 23 Sep 2016 14:40:41 +0000 (15:40 +0100)]
Compensate in compiler for verifier shortcomings.

The verifier does not differentiate zero and null, so a move-object
of zero can be used as a non-object later on.

Change the compiler to ignore the object conversion when the input
is zero or a phi (which might just hold zeros). The type propagation
will then do proper inferencing of the types.

Also remove some stalled comments in ssa_builder.cc.

bug:31313170
test: dex2oat b31313170.apk
test: run-test 800
test: m test-art-host-run-test
Change-Id: I579d667415a7decf8ff2c2238dae4c13eec5d0e0

7 years agoMerge "Add DCE check to test 458-checker-instruct-simplification" am: a1d66b9050...
Sebastien Hertz [Mon, 26 Sep 2016 07:19:29 +0000 (07:19 +0000)]
Merge "Add DCE check to test 458-checker-instruct-simplification" am: a1d66b9050 am: da2e93a8c2
am: d3d26f2690

Change-Id: I33cec39b64acd752f21b8ead8d970229aeb05faa

7 years agoMerge "Add DCE check to test 458-checker-instruct-simplification" am: a1d66b9050
Sebastien Hertz [Mon, 26 Sep 2016 07:16:26 +0000 (07:16 +0000)]
Merge "Add DCE check to test 458-checker-instruct-simplification" am: a1d66b9050
am: da2e93a8c2

Change-Id: Iae23a72f1acd13c99b79bb22768629702f592522

7 years agoMerge "Add DCE check to test 458-checker-instruct-simplification"
Sebastien Hertz [Mon, 26 Sep 2016 07:13:56 +0000 (07:13 +0000)]
Merge "Add DCE check to test 458-checker-instruct-simplification"
am: a1d66b9050

Change-Id: Ib44b71f95409e604f7c73ed68c1d8df0b39b853f

7 years agoMerge "Add DCE check to test 458-checker-instruct-simplification"
Sebastien Hertz [Mon, 26 Sep 2016 07:09:43 +0000 (07:09 +0000)]
Merge "Add DCE check to test 458-checker-instruct-simplification"

7 years agoMake test for app-image loading.
Alex Light [Tue, 3 May 2016 22:01:06 +0000 (15:01 -0700)]
Make test for app-image loading.

Bug: 26882072

(cherry picked from commit 2e960a075cd30a1fdfc31597c4a64f1fca026efd)

Test: test/run-test --host --no-relocate 596-app-images

Change-Id: I40a45e7944aec3a5ee28ef3d47e9881f61a7c9e6

7 years agoMerge "Use liblog for liblog (instead of libcutils)" am: ad1f0ad512 am: d0d94c01b2
Dimitry Ivanov [Sat, 24 Sep 2016 01:40:46 +0000 (01:40 +0000)]
Merge "Use liblog for liblog (instead of libcutils)" am: ad1f0ad512 am: d0d94c01b2
am: fa9b50f743

Change-Id: I4c6a0e1d519ef5c3ee77d174cfc379f3e4b863d0

7 years agoMerge "Use liblog for liblog (instead of libcutils)" am: ad1f0ad512
Dimitry Ivanov [Sat, 24 Sep 2016 01:38:42 +0000 (01:38 +0000)]
Merge "Use liblog for liblog (instead of libcutils)" am: ad1f0ad512
am: d0d94c01b2

Change-Id: I47fa72f1731dc517bdaed189ab2c22617d1ac356

7 years agoMerge "Use liblog for liblog (instead of libcutils)"
Dimitry Ivanov [Sat, 24 Sep 2016 01:36:43 +0000 (01:36 +0000)]
Merge "Use liblog for liblog (instead of libcutils)"
am: ad1f0ad512

Change-Id: Ifdfc800cfba522e9bf9465682f435935702f8f06

7 years agoMerge "Use liblog for liblog (instead of libcutils)"
Treehugger Robot [Sat, 24 Sep 2016 01:31:25 +0000 (01:31 +0000)]
Merge "Use liblog for liblog (instead of libcutils)"

7 years agoMerge "Smarter image layout" am: 48ec36f8a0 am: 0b67da2096
Mathieu Chartier [Sat, 24 Sep 2016 00:48:12 +0000 (00:48 +0000)]
Merge "Smarter image layout" am: 48ec36f8a0 am: 0b67da2096
am: d38e54eec4

Change-Id: I16b0d8367c33aac0816845bf93fc8ae5dbd560e7

7 years agoMerge "Smarter image layout" am: 48ec36f8a0
Mathieu Chartier [Sat, 24 Sep 2016 00:46:10 +0000 (00:46 +0000)]
Merge "Smarter image layout" am: 48ec36f8a0
am: 0b67da2096

Change-Id: I74d032530faeddfab5a80f69ee8d81f49f4d6eb9

7 years agoMerge "Smarter image layout"
Mathieu Chartier [Sat, 24 Sep 2016 00:44:09 +0000 (00:44 +0000)]
Merge "Smarter image layout"
am: 48ec36f8a0

Change-Id: I1c5001b9f1d891f67fa36fced91b049936ab64d7

7 years agoMerge "Smarter image layout"
Treehugger Robot [Sat, 24 Sep 2016 00:37:51 +0000 (00:37 +0000)]
Merge "Smarter image layout"

7 years agoUse liblog for liblog (instead of libcutils)
Dimitry Ivanov [Fri, 23 Sep 2016 23:52:05 +0000 (16:52 -0700)]
Use liblog for liblog (instead of libcutils)

Because one wouldn't use libcutils if there is a liblog.

Bug: http://b/31289077
Bug: http://b/27171986
Test: remove liblog from libcutils and make
Change-Id: I5e7eb3a67a483835933e1b5587d43b697e39ceac

7 years agoSmarter image layout
Mathieu Chartier [Tue, 20 Sep 2016 22:33:31 +0000 (15:33 -0700)]
Smarter image layout

Put strings in the dex file that resolves them.

Depth first traversal with overrides for class and dex cache. The
work list keeps track of what oat_index with each pushed item. This
means the static fields of a class will usually be in the same image.

Added layout test to image_test to make sure things are somewhat
reasonably attributed.

Bug: 28640955

Test: test-art-host

(cherry picked from commit 4e9c4e746617bad6a012d799d2f5cf9e01d24ea2)

Change-Id: I67a536c33aeed603b252d8e0f75622c9efbf2559

7 years agoSmarter image layout am: 4e9c4e7466
Mathieu Chartier [Fri, 23 Sep 2016 22:06:15 +0000 (22:06 +0000)]
Smarter image layout am: 4e9c4e7466
am: 93f17421b3  -s ours

Change-Id: I090e3389e5da0a6795d74c2c567d8416ccc737e4

7 years agoSmarter image layout
Mathieu Chartier [Fri, 23 Sep 2016 21:51:44 +0000 (21:51 +0000)]
Smarter image layout
am: 4e9c4e7466

Change-Id: Iba240ee3bbb768f258ab7bc3aa22325fd4d7992a

7 years agoFix CTS crash from DexFile refactoring
David Sehr [Thu, 22 Sep 2016 21:05:37 +0000 (14:05 -0700)]
Fix CTS crash from DexFile refactoring

Avoid path to nullptr access introduced by the previous refactoring.

Bug: 22322814
Change-Id: Id8874b26c072a11b0494e8126f8b0602a7c5b9e8
Test: m test-art-host, cts-tradefed run cts --skip-preconditions --skip-device-info --module vm-tests-tf

7 years agoMerge "Add CanWriteToDalvikCache() check before writing a boot marker or image cache...
Robert Sesek [Fri, 23 Sep 2016 17:13:26 +0000 (17:13 +0000)]
Merge "Add CanWriteToDalvikCache() check before writing a boot marker or image cache." am: c16672a026 am: cd9d8dc65c
am: 224c644aef

Change-Id: I6f568a6eaca6a889d117d249eb0d94630882b91c

7 years agoMerge "Add CanWriteToDalvikCache() check before writing a boot marker or image cache...
Robert Sesek [Fri, 23 Sep 2016 17:11:27 +0000 (17:11 +0000)]
Merge "Add CanWriteToDalvikCache() check before writing a boot marker or image cache." am: c16672a026
am: cd9d8dc65c

Change-Id: Ic69db48c2d95990886bf933ef512b79016b7ed3d

7 years agoMerge "Add CanWriteToDalvikCache() check before writing a boot marker or image cache."
Robert Sesek [Fri, 23 Sep 2016 17:09:56 +0000 (17:09 +0000)]
Merge "Add CanWriteToDalvikCache() check before writing a boot marker or image cache."
am: c16672a026

Change-Id: I1e7e21dcac13cfdc42d7efdeae44a14971099dc7

7 years agoMerge "Add CanWriteToDalvikCache() check before writing a boot marker or image cache."
Treehugger Robot [Fri, 23 Sep 2016 17:05:40 +0000 (17:05 +0000)]
Merge "Add CanWriteToDalvikCache() check before writing a boot marker or image cache."

7 years agoSmarter image layout
Mathieu Chartier [Tue, 20 Sep 2016 22:33:31 +0000 (15:33 -0700)]
Smarter image layout

Put strings in the dex file that resolves them.

Depth first traversal with overrides for class and dex cache. The
work list keeps track of what oat_index with each pushed item. This
means the static fields of a class will usually be in the same image.

Added layout test to image_test to make sure things are somewhat
reasonably attributed.

Bug: 28640955

Test: test-art-host

Change-Id: I67a536c33aeed603b252d8e0f75622c9efbf2559

7 years agoMerge "Minor jfuzz improvements." am: 304533ed84 am: 96be6c973b
Aart Bik [Fri, 23 Sep 2016 15:26:49 +0000 (15:26 +0000)]
Merge "Minor jfuzz improvements." am: 304533ed84 am: 96be6c973b
am: 69d8d91827

Change-Id: Iedf49e0f82dd3f0fb5d57a927658ab2545139bad

7 years agoMerge "Minor jfuzz improvements." am: 304533ed84
Aart Bik [Fri, 23 Sep 2016 15:24:50 +0000 (15:24 +0000)]
Merge "Minor jfuzz improvements." am: 304533ed84
am: 96be6c973b

Change-Id: I131602f9e0641d49a0f479ca5904b9cafccf7cd8

7 years agoMerge "Minor jfuzz improvements."
Aart Bik [Fri, 23 Sep 2016 15:22:21 +0000 (15:22 +0000)]
Merge "Minor jfuzz improvements."
am: 304533ed84

Change-Id: I951fc02aad45d18502139610345e8f16b9c2ebf7

7 years agoMerge "Minor jfuzz improvements."
Aart Bik [Fri, 23 Sep 2016 15:18:21 +0000 (15:18 +0000)]
Merge "Minor jfuzz improvements."

7 years agoAdd DCE check to test 458-checker-instruct-simplification
Sebastien Hertz [Fri, 23 Sep 2016 14:51:42 +0000 (16:51 +0200)]
Add DCE check to test 458-checker-instruct-simplification

Follow-up to 9837caff9cbfb61e3dabc6fbecb398d4d659c017 by checking
that dead code is actually removed.

Test: make -j32 test-art-host
Change-Id: Ic7848be893c6fe5e65f5bcdd525597072bf67857

7 years agoMerge "Fix mips build after sharpening change." am: ae3016324f am: f3a8f7d9a9
Nicolas Geoffray [Fri, 23 Sep 2016 13:25:43 +0000 (13:25 +0000)]
Merge "Fix mips build after sharpening change." am: ae3016324f am: f3a8f7d9a9
am: 5305979eee

Change-Id: Id28997c957a680a03e766c61ed667b8d4993f44d

7 years agoMerge "Fix mips build after sharpening change." am: ae3016324f
Nicolas Geoffray [Fri, 23 Sep 2016 13:23:43 +0000 (13:23 +0000)]
Merge "Fix mips build after sharpening change." am: ae3016324f
am: f3a8f7d9a9

Change-Id: Ib217c40d71144b60de3bc2efbed046045fe04029

7 years agoMerge "Fix mips build after sharpening change."
Nicolas Geoffray [Fri, 23 Sep 2016 13:21:44 +0000 (13:21 +0000)]
Merge "Fix mips build after sharpening change."
am: ae3016324f

Change-Id: I70fcc86a9c2bbd1ecc8e4ac7cb0f5429305b88a7

7 years agoMerge "Fix mips build after sharpening change."
Treehugger Robot [Fri, 23 Sep 2016 13:17:32 +0000 (13:17 +0000)]
Merge "Fix mips build after sharpening change."

7 years agoFix mips build after sharpening change.
Nicolas Geoffray [Fri, 23 Sep 2016 11:37:48 +0000 (12:37 +0100)]
Fix mips build after sharpening change.

test: m build-art-target
Change-Id: Ie1866a944be351878c7f860c640923bc0029f697

7 years agoMerge "Clean-up sharpening and compiler driver." am: cbb651fdf2 am: a16472c789
Nicolas Geoffray [Fri, 23 Sep 2016 09:58:02 +0000 (09:58 +0000)]
Merge "Clean-up sharpening and compiler driver." am: cbb651fdf2 am: a16472c789
am: 6c693a504d

Change-Id: Ie3517e900c29a1a76f2e62c355735d659b1bae5c

7 years agoMerge "Clean-up sharpening and compiler driver." am: cbb651fdf2
Nicolas Geoffray [Fri, 23 Sep 2016 09:56:02 +0000 (09:56 +0000)]
Merge "Clean-up sharpening and compiler driver." am: cbb651fdf2
am: a16472c789

Change-Id: Ie6b18bccece3755af69b3333a4993e0fcc1e59b0

7 years agoMerge "Clean-up sharpening and compiler driver."
Nicolas Geoffray [Fri, 23 Sep 2016 09:54:02 +0000 (09:54 +0000)]
Merge "Clean-up sharpening and compiler driver."
am: cbb651fdf2

Change-Id: I5f0a556f72934a00dc24a0bdfb634d5baa0362e5

7 years agoMerge "Clean-up sharpening and compiler driver."
Treehugger Robot [Fri, 23 Sep 2016 09:49:47 +0000 (09:49 +0000)]
Merge "Clean-up sharpening and compiler driver."

7 years agoMerge "Use android_root instead of hard coded /system in test script." am: 411caada9b...
Nicolas Geoffray [Fri, 23 Sep 2016 08:27:27 +0000 (08:27 +0000)]
Merge "Use android_root instead of hard coded /system in test script." am: 411caada9b am: 5326e330ac
am: 1c1873f3ee

Change-Id: Ib7524d7feed3fd65bdd3df1c279a1de0f5397189

7 years agoMerge "Use android_root instead of hard coded /system in test script." am: 411caada9b
Nicolas Geoffray [Fri, 23 Sep 2016 08:25:26 +0000 (08:25 +0000)]
Merge "Use android_root instead of hard coded /system in test script." am: 411caada9b
am: 5326e330ac

Change-Id: Iddcf444f1af5f4610b8203a78bccef4a2ff69f50

7 years agoMerge "Use android_root instead of hard coded /system in test script."
Nicolas Geoffray [Fri, 23 Sep 2016 08:23:26 +0000 (08:23 +0000)]
Merge "Use android_root instead of hard coded /system in test script."
am: 411caada9b

Change-Id: I75157ade60a8f1088707a15b275cf3be8ab13025

7 years agoMerge "Use android_root instead of hard coded /system in test script."
Nicolas Geoffray [Fri, 23 Sep 2016 08:19:08 +0000 (08:19 +0000)]
Merge "Use android_root instead of hard coded /system in test script."

7 years agoClean-up sharpening and compiler driver.
Nicolas Geoffray [Thu, 22 Sep 2016 12:17:41 +0000 (13:17 +0100)]
Clean-up sharpening and compiler driver.

Remove dependency on compiler driver for sharpening
and dex2dex (the methods called on the compiler driver were
doing unnecessary work), and remove the now unused methods
in compiler driver.

Also remove test that is now invalid, as sharpening always
succeeds.

test: m test-art-host m test-art-target
Change-Id: I54e91c6839bd5b0b86182f2f43ba5d2c112ef908

7 years agoMerge "Prepare run_jfuzz_test.py to report bugs" am: ca8bad9136 am: 0f58982f33
Wojciech Staszkiewicz [Fri, 23 Sep 2016 06:44:20 +0000 (06:44 +0000)]
Merge "Prepare run_jfuzz_test.py to report bugs" am: ca8bad9136 am: 0f58982f33
am: ac5b7d8865

Change-Id: Ib014ca24ab1fc0db4bf693bb50694de4d388289f

7 years agoMerge "Prepare run_jfuzz_test.py to report bugs" am: ca8bad9136
Wojciech Staszkiewicz [Fri, 23 Sep 2016 06:42:20 +0000 (06:42 +0000)]
Merge "Prepare run_jfuzz_test.py to report bugs" am: ca8bad9136
am: 0f58982f33

Change-Id: I882e7e558bc1a40a55a31ed26d4d9dc613750caa

7 years agoMerge "Prepare run_jfuzz_test.py to report bugs"
Wojciech Staszkiewicz [Fri, 23 Sep 2016 06:40:50 +0000 (06:40 +0000)]
Merge "Prepare run_jfuzz_test.py to report bugs"
am: ca8bad9136

Change-Id: Iaa785870e47a5a9498def3e2a5a5271442456cd6

7 years agoMerge "Prepare run_jfuzz_test.py to report bugs"
Treehugger Robot [Fri, 23 Sep 2016 06:36:10 +0000 (06:36 +0000)]
Merge "Prepare run_jfuzz_test.py to report bugs"

7 years agoMerge "Disable test 902-hello-transformation on target" am: 35505bfe62 am: e725a76e9e
Alex Light [Fri, 23 Sep 2016 00:53:15 +0000 (00:53 +0000)]
Merge "Disable test 902-hello-transformation on target" am: 35505bfe62 am: e725a76e9e
am: cf681075c0

Change-Id: I47d3f6c848ff30ab1e336de2501b2e66348c9253

7 years agoMerge "Disable test 902-hello-transformation on target" am: 35505bfe62
Alex Light [Fri, 23 Sep 2016 00:51:14 +0000 (00:51 +0000)]
Merge "Disable test 902-hello-transformation on target" am: 35505bfe62
am: e725a76e9e

Change-Id: Ib71cc9ed51479633c8f18715cfd7fadbb079a463

7 years agoMerge "Disable test 902-hello-transformation on target"
Alex Light [Fri, 23 Sep 2016 00:48:44 +0000 (00:48 +0000)]
Merge "Disable test 902-hello-transformation on target"
am: 35505bfe62

Change-Id: Ib06711ac0e6d7dd4a8d1d961ffbea6efd7726e65

7 years agoMerge "Disable test 902-hello-transformation on target"
Treehugger Robot [Fri, 23 Sep 2016 00:43:24 +0000 (00:43 +0000)]
Merge "Disable test 902-hello-transformation on target"

7 years agoMinor jfuzz improvements.
Aart Bik [Thu, 22 Sep 2016 20:50:11 +0000 (13:50 -0700)]
Minor jfuzz improvements.

Rationale:
Added simple class hierarchy to jfuzz output (still rather
rudimentary, but at least covers all method invocation kinds).
Also cleaned up the array dimensions logic.
Finally, increased granularity of time-based seeding.

Test: ./tools/jfuzz/run_jfuzz_test.py
Change-Id: I6582a75e5be593ba56146e1cd56f801e85f051c5

7 years agoMerge "Pass --root to cpplint." am: 79bd5992ae am: 2882087356
Sen Jiang [Thu, 22 Sep 2016 22:16:27 +0000 (22:16 +0000)]
Merge "Pass --root to cpplint." am: 79bd5992ae am: 2882087356
am: 020dafe844

Change-Id: I2c53a39854173a91bdf1579cb334e8988a227cc7

7 years agoMerge "Revert "Revert "ARM: VIXL32: Add an initial code generator that passes codegen...
Roland Levillain [Thu, 22 Sep 2016 22:16:12 +0000 (22:16 +0000)]
Merge "Revert "Revert "ARM: VIXL32: Add an initial code generator that passes codegen_tests.""" am: 9e5f321be4 am: e77248f867
am: d598f6e5d1

Change-Id: I7393ec79f9b6de21187c83e871244cd78cf7a24f

7 years agoMerge "Ensure Jack generates annotations for test 005-annotations" am: 7e242e2972...
Benoit Lamarche [Thu, 22 Sep 2016 22:14:28 +0000 (22:14 +0000)]
Merge "Ensure Jack generates annotations for test 005-annotations" am: 7e242e2972 am: d0c95ba5a8
am: 62f7a12b1d

Change-Id: Id0c374bfbd3782dc2bf4154c16ef0428b61a9305

7 years agoMerge "Update art tests" am: 4670b99a26 am: e1c27a7094
Benoit Lamarche [Thu, 22 Sep 2016 22:14:07 +0000 (22:14 +0000)]
Merge "Update art tests" am: 4670b99a26 am: e1c27a7094
am: a4a91b5cee

Change-Id: I477741e7dd975f876d03f730c64f9a8e6bb56810

7 years agoMerge "Don't warn for frame size in tests." am: 45026e4548 am: 0deea9af3a
Dan Albert [Thu, 22 Sep 2016 22:13:32 +0000 (22:13 +0000)]
Merge "Don't warn for frame size in tests." am: 45026e4548 am: 0deea9af3a
am: 676511153b

Change-Id: I076c0cf9237408b54cb27bb9eb49460bf0dfd84e

7 years agoMerge "Renaming tool: jfuzz" am: eb82e99525 am: 2617c7aa92
Aart Bik [Thu, 22 Sep 2016 22:13:15 +0000 (22:13 +0000)]
Merge "Renaming tool: jfuzz" am: eb82e99525 am: 2617c7aa92
am: cd0dcbed7d

Change-Id: I995fa375e1dad3dfdcf2211c29a6e330f25f4ab2

7 years agoMerge "Make image test multi image" am: 764f38f939 am: 935482f629
Mathieu Chartier [Thu, 22 Sep 2016 22:13:00 +0000 (22:13 +0000)]
Merge "Make image test multi image" am: 764f38f939 am: 935482f629
am: 7f6fdbdee1

Change-Id: Ie92ad3b420b445a4c67e474c7d4a09098053f245

7 years agoMerge "Get a basic modification of dex file working" am: 4b55b4b39a am: 5ddce99415
Alex Light [Thu, 22 Sep 2016 22:12:43 +0000 (22:12 +0000)]
Merge "Get a basic modification of dex file working" am: 4b55b4b39a am: 5ddce99415
am: 37a9c75f4d

Change-Id: I1d17b4b1a59706faa524fa46dae9e0b7272b0f71

7 years agoDisable test 902-hello-transformation on target
Alex Light [Thu, 22 Sep 2016 21:54:33 +0000 (14:54 -0700)]
Disable test 902-hello-transformation on target

This test doesn't work on device at the moment due to restrictions on
the android linker.

Bug: 31681198
Test: mma -j40 test-art-target-run-test-902-hello-transformation
Change-Id: I0ce72aa938a5c274083bcb0c60be5370a2bb02c3

7 years agoUse android_root instead of hard coded /system in test script.
Nicolas Geoffray [Thu, 22 Sep 2016 21:55:58 +0000 (22:55 +0100)]
Use android_root instead of hard coded /system in test script.

The buildbot uses its own ANDROID_ROOT.

Spotted while debugging 902 test failures on target.

Change-Id: I9b2047ce510e93f205771f7384f644450b0325e6

7 years agoPrepare run_jfuzz_test.py to report bugs
Wojciech Staszkiewicz [Wed, 21 Sep 2016 22:12:54 +0000 (15:12 -0700)]
Prepare run_jfuzz_test.py to report bugs

Adds --report_script and --fuzz_arg switches.

Report script is called for every divergence with title of
divergence, a comment and potentially bisection search output file.

Fuzz args are passed to jfuzz. They can be used to reproduce
previously discovered divergence.

Also add a -v switch to jfuzz. If present jfuzz will print its
version and exit.

Test: ./tools/jfuzz/run_jfuzz_test.py --report_script
$HOME/report_issue.py --fuzz_arg='-s 1470736838'
Change-Id: I25fd305304edfe21071a81d6e1b1b47ae8703007

7 years agoMerge "Pass --root to cpplint." am: 79bd5992ae
Sen Jiang [Thu, 22 Sep 2016 19:28:32 +0000 (19:28 +0000)]
Merge "Pass --root to cpplint." am: 79bd5992ae
am: 2882087356

Change-Id: If372fdc9a813af1e21b9f6b7459d2610484cb10b

7 years agoMerge "Pass --root to cpplint."
Sen Jiang [Thu, 22 Sep 2016 17:54:51 +0000 (17:54 +0000)]
Merge "Pass --root to cpplint."
am: 79bd5992ae

Change-Id: I8b10e75da388670fbb45f37e02543590e16bc5c1

7 years agoMerge "Pass --root to cpplint."
Sen Jiang [Thu, 22 Sep 2016 17:49:44 +0000 (17:49 +0000)]
Merge "Pass --root to cpplint."

7 years agoMerge "Revert "Revert "ARM: VIXL32: Add an initial code generator that passes codegen...
Roland Levillain [Thu, 22 Sep 2016 12:07:04 +0000 (12:07 +0000)]
Merge "Revert "Revert "ARM: VIXL32: Add an initial code generator that passes codegen_tests.""" am: 9e5f321be4
am: e77248f867

Change-Id: I2cd8ca51fe2e0e55d19d5db845bef3e6de022f03

7 years agoMerge "Revert "Revert "ARM: VIXL32: Add an initial code generator that passes codegen...
Roland Levillain [Thu, 22 Sep 2016 12:03:32 +0000 (12:03 +0000)]
Merge "Revert "Revert "ARM: VIXL32: Add an initial code generator that passes codegen_tests."""
am: 9e5f321be4

Change-Id: If37b172c62b3bb1671dacb9ce72325101f9203b0

7 years agoMerge "Revert "Revert "ARM: VIXL32: Add an initial code generator that passes codegen...
Roland Levillain [Thu, 22 Sep 2016 11:55:19 +0000 (11:55 +0000)]
Merge "Revert "Revert "ARM: VIXL32: Add an initial code generator that passes codegen_tests."""

7 years agoMerge "Ensure Jack generates annotations for test 005-annotations" am: 7e242e2972
Benoit Lamarche [Thu, 22 Sep 2016 11:45:52 +0000 (11:45 +0000)]
Merge "Ensure Jack generates annotations for test 005-annotations" am: 7e242e2972
am: d0c95ba5a8

Change-Id: I7cd169ab9bb70785b718a7a1dc970ada05706c73

7 years agoMerge "Update art tests" am: 4670b99a26
Benoit Lamarche [Thu, 22 Sep 2016 11:45:33 +0000 (11:45 +0000)]
Merge "Update art tests" am: 4670b99a26
am: e1c27a7094

Change-Id: I7f7fa346121884ffbb18e64a4fcff00fb03ba95c

7 years agoMerge "Don't warn for frame size in tests." am: 45026e4548
Dan Albert [Thu, 22 Sep 2016 11:43:40 +0000 (11:43 +0000)]
Merge "Don't warn for frame size in tests." am: 45026e4548
am: 0deea9af3a

Change-Id: I68005494ae886fe3f4fb0391bd07799f7faf5241

7 years agoMerge "Renaming tool: jfuzz" am: eb82e99525
Aart Bik [Thu, 22 Sep 2016 11:43:27 +0000 (11:43 +0000)]
Merge "Renaming tool: jfuzz" am: eb82e99525
am: 2617c7aa92

Change-Id: Ie9ed188bbd4455c30bd009b29039e1b50b390746

7 years agoMerge "Make image test multi image" am: 764f38f939
Mathieu Chartier [Thu, 22 Sep 2016 11:43:13 +0000 (11:43 +0000)]
Merge "Make image test multi image" am: 764f38f939
am: 935482f629

Change-Id: I3abee7d0cb759aedeb722663e0da7dddb1c53a92

7 years agoMerge "Get a basic modification of dex file working" am: 4b55b4b39a
Alex Light [Thu, 22 Sep 2016 11:42:59 +0000 (11:42 +0000)]
Merge "Get a basic modification of dex file working" am: 4b55b4b39a
am: 5ddce99415

Change-Id: I42e6da2474bb0ef2873ebd13b6a0e5889f8152a4

7 years agoRevert "Revert "ARM: VIXL32: Add an initial code generator that passes codegen_tests.""
Scott Wakeling [Thu, 22 Sep 2016 09:24:38 +0000 (10:24 +0100)]
Revert "Revert "ARM: VIXL32: Add an initial code generator that passes codegen_tests.""

This VIXL32-based code generator is not enabled in the optimizing
compiler by default. Changes in codegen_test.cc test it in parallel with
the existing ARM backend.

This patch provides a base for further work, the new backend will not
be enabled in the optimizing compiler until parity is proven with the
current ARM backend and assembler.

Test: gtest-codegen_test on host and target

This reverts commit 7863a2152865a12ad9593d8caad32698264153c1.

Change-Id: Ia09627bac22e78732ca982d207dc0b00bda435bb

7 years agoMerge "Ensure Jack generates annotations for test 005-annotations"
Benoit Lamarche [Thu, 22 Sep 2016 09:41:12 +0000 (09:41 +0000)]
Merge "Ensure Jack generates annotations for test 005-annotations"
am: 7e242e2972

Change-Id: I8796f2a962efb1c2d610178f326a8a23de07a025

7 years agoMerge "Update art tests"
Benoit Lamarche [Thu, 22 Sep 2016 09:40:57 +0000 (09:40 +0000)]
Merge "Update art tests"
am: 4670b99a26

Change-Id: I73a4f08f0bee709b2168616d980fcfcd04a87375

7 years agoMerge "Ensure Jack generates annotations for test 005-annotations"
Benoit Lamarche [Thu, 22 Sep 2016 09:34:26 +0000 (09:34 +0000)]
Merge "Ensure Jack generates annotations for test 005-annotations"

7 years agoMerge "Update art tests"
Benoit Lamarche [Thu, 22 Sep 2016 09:34:26 +0000 (09:34 +0000)]
Merge "Update art tests"

7 years agoMerge "Don't warn for frame size in tests."
Dan Albert [Thu, 22 Sep 2016 08:18:31 +0000 (08:18 +0000)]
Merge "Don't warn for frame size in tests."
am: 45026e4548

Change-Id: I7fc12cda5a729607a7ad2a52208241d94d525d4e

7 years agoMerge "Renaming tool: jfuzz"
Aart Bik [Thu, 22 Sep 2016 08:18:16 +0000 (08:18 +0000)]
Merge "Renaming tool: jfuzz"
am: eb82e99525

Change-Id: I4d4603d0c2d47dac3232265342836d9dd3fed705

7 years agoMerge "Make image test multi image"
Mathieu Chartier [Thu, 22 Sep 2016 08:18:01 +0000 (08:18 +0000)]
Merge "Make image test multi image"
am: 764f38f939

Change-Id: Ib5e074340af35292d903c798fe8a00fc99a610f9

7 years agoMerge "Get a basic modification of dex file working"
Alex Light [Thu, 22 Sep 2016 08:17:46 +0000 (08:17 +0000)]
Merge "Get a basic modification of dex file working"
am: 4b55b4b39a

Change-Id: I7c015be6efb9a7f824f91212ea3d3865f4e19ec3

7 years agoMerge "Don't warn for frame size in tests."
Treehugger Robot [Thu, 22 Sep 2016 05:38:51 +0000 (05:38 +0000)]
Merge "Don't warn for frame size in tests."