OSDN Git Service

android-x86/art.git
7 years agoMerge "Write VerifierDeps into VDEX."
David Brazdil [Wed, 21 Sep 2016 16:54:16 +0000 (16:54 +0000)]
Merge "Write VerifierDeps into VDEX."
am: 85bf9def7f

Change-Id: I3c42cabe73265c6cae5a59a7f81e9f42afafb1bd

7 years agoWrite VerifierDeps into VDEX.
David Brazdil [Wed, 21 Sep 2016 16:54:15 +0000 (16:54 +0000)]
Write VerifierDeps into VDEX.
am: 5d5a36bddb

Change-Id: Ia7052d356c2a80689f23fce38ef08fac9cb85db0

7 years agoMerge "Write VerifierDeps into VDEX."
Treehugger Robot [Wed, 21 Sep 2016 16:51:57 +0000 (16:51 +0000)]
Merge "Write VerifierDeps into VDEX."

7 years agoMerge "ARM: VIXL32: Add an initial code generator that passes codegen_tests."
Roland Levillain [Wed, 21 Sep 2016 16:35:43 +0000 (16:35 +0000)]
Merge "ARM: VIXL32: Add an initial code generator that passes codegen_tests."
am: d26a0a64d0

Change-Id: I75172c710cdebd8f5b7fa1c7c19407ad6b0946a8

7 years agoMerge "ARM: VIXL32: Add an initial code generator that passes codegen_tests."
Roland Levillain [Wed, 21 Sep 2016 16:32:59 +0000 (16:32 +0000)]
Merge "ARM: VIXL32: Add an initial code generator that passes codegen_tests."

7 years agoMerge "Collapse ART's AbstractMethod class into Executable"
Neil Fuller [Wed, 21 Sep 2016 16:18:48 +0000 (16:18 +0000)]
Merge "Collapse ART's AbstractMethod class into Executable"
am: 7b0d9228e9

Change-Id: I8db4d6e25bb9a14fac0940b779852dd3bc4d4031

7 years agoCollapse ART's AbstractMethod class into Executable
Neil Fuller [Wed, 21 Sep 2016 16:16:53 +0000 (16:16 +0000)]
Collapse ART's AbstractMethod class into Executable
am: 0e8443995a

Change-Id: I69bcb686be32b3266af2c0491bca0937788f502a

7 years agoMerge "Collapse ART's AbstractMethod class into Executable"
Neil Fuller [Wed, 21 Sep 2016 16:01:56 +0000 (16:01 +0000)]
Merge "Collapse ART's AbstractMethod class into Executable"

7 years agoWrite VerifierDeps into VDEX.
David Brazdil [Wed, 14 Sep 2016 14:34:10 +0000 (15:34 +0100)]
Write VerifierDeps into VDEX.

This patch serializes VerifierDeps data and writes them into VDEX.
It also extends the VDEX header with sizes of the DEX and verifier
dependencies sections.

Bug: 30937355
Change-Id: I5aa5fc5eb8678533117138e445b757fa771973fb

7 years agoMerge "Re-enable jsr166.LinkedTransferQueueTest tests on the CC configuration."
Roland Levillain [Wed, 21 Sep 2016 14:52:02 +0000 (14:52 +0000)]
Merge "Re-enable jsr166.LinkedTransferQueueTest tests on the CC configuration."
am: abc41cb0e4

Change-Id: I2adeb9f913f3bf744ec657ecd0ca4655519d6a20

7 years agoMerge "Re-enable jsr166.LinkedTransferQueueTest tests on the CC configuration."
Roland Levillain [Wed, 21 Sep 2016 14:47:03 +0000 (14:47 +0000)]
Merge "Re-enable jsr166.LinkedTransferQueueTest tests on the CC configuration."

7 years agoRe-enable jsr166.LinkedTransferQueueTest tests on the CC configuration.
Roland Levillain [Wed, 21 Sep 2016 12:48:26 +0000 (13:48 +0100)]
Re-enable jsr166.LinkedTransferQueueTest tests on the CC configuration.

Test: art/tools/run-libcore-tests.sh --mode=host --variant=X32 --debug
Bug: 25883050
Bug: 12687968
Change-Id: I2eb40d70882cb3a6a3b5534c92d37a4b31b89859

7 years agoCollapse ART's AbstractMethod class into Executable
Neil Fuller [Thu, 8 Sep 2016 12:43:31 +0000 (13:43 +0100)]
Collapse ART's AbstractMethod class into Executable

After the OpenJDK 8 pull there is now a common base class
for Method and Constructor that can be used instead.

Methods that are abstract on Executable but on Android
were implemented in AbstractMethod are now consistently
renamed to "{method}Internal", declared final and
given package-protected access.

For consistency with all other private, natively
implemented methods, the method getDeclaredAnnotations()
has been renamed getDeclaredAnnotationsNative().

Bug: 28666126
Bug: 31052885
Test: make test-art-host and cts run of CtsLibcoreTestCases
Change-Id: Ibfe6af6a47fe0cfffd0859ffbe58980aeb84e053

7 years agoMerge "Fix the target art method address within a method object"
David Sehr [Tue, 20 Sep 2016 23:17:47 +0000 (23:17 +0000)]
Merge "Fix the target art method address within a method object"
am: c4cb3d532d

Change-Id: I2940983654411585f66c8094b84f2933cac365e1

7 years agoMerge "Fix the target art method address within a method object"
David Sehr [Tue, 20 Sep 2016 23:15:18 +0000 (23:15 +0000)]
Merge "Fix the target art method address within a method object"

7 years agoMerge "Rework logcat handling"
Wojciech Staszkiewicz [Tue, 20 Sep 2016 22:03:01 +0000 (22:03 +0000)]
Merge "Rework logcat handling"
am: f6dc081999

Change-Id: Ic3ecfcb9a142852c3fbe5ecabbb2843bc5492d36

7 years agoMerge "Rework logcat handling"
Treehugger Robot [Tue, 20 Sep 2016 22:00:19 +0000 (22:00 +0000)]
Merge "Rework logcat handling"

7 years agoMerge "Rename several tests to be easier to read."
Alex Light [Tue, 20 Sep 2016 21:55:29 +0000 (21:55 +0000)]
Merge "Rename several tests to be easier to read."
am: ce644e8446

Change-Id: I54279c04857f228ae18895feebf68c8faaf83fee

7 years agoMerge "Rename several tests to be easier to read."
Treehugger Robot [Tue, 20 Sep 2016 21:52:18 +0000 (21:52 +0000)]
Merge "Rename several tests to be easier to read."

7 years agoMerge "Dexlayout changes to support offset/size output of items."
Jeff Hao [Tue, 20 Sep 2016 21:02:49 +0000 (21:02 +0000)]
Merge "Dexlayout changes to support offset/size output of items."
am: d050ec91c0

Change-Id: I4ee9dde68080152e8a8b95f46ce5e29dd3d9276e

7 years agoMerge "Dexlayout changes to support offset/size output of items."
Jeff Hao [Tue, 20 Sep 2016 20:56:09 +0000 (20:56 +0000)]
Merge "Dexlayout changes to support offset/size output of items."

7 years agoRework logcat handling
Wojciech Staszkiewicz [Fri, 16 Sep 2016 20:44:09 +0000 (13:44 -0700)]
Rework logcat handling

Only extract logs from dex2oat instances that were started by the
correct runtime. This is accomplished by getting pid of runtime
and then filtering logcat output based on dex2oat 'parent PID ='
messages.

Test: bisection_search.py -cp classes.dex --class Test
  --expected-output out --device

Change-Id: Ib1a5da6fac1560c57af8245e3a921d10bf464f2a

7 years agoFix the target art method address within a method object
Jing Ji [Thu, 1 Sep 2016 02:21:37 +0000 (21:21 -0500)]
Fix the target art method address within a method object

The target offset of art method within a method object should
take account of the offset of the image which is declaring this
method.

Bug: 31311504
Change-Id: Id6670dd3436b4bf5fb943d8d6234851fb336a4dc
(cherry picked from commit 1717159b07abefcf59d099bc81158644f0a0bffb)
Test: test-art-{host,target}

7 years agoRename several tests to be easier to read.
Alex Light [Tue, 20 Sep 2016 19:50:37 +0000 (12:50 -0700)]
Rename several tests to be easier to read.

Several tests had their names changed recently for file name length
reasons. This change makes several of the tests have more consistent
and easy to read names.

Bug: 31597671
Test: mma test-art-host
Change-Id: I166f03b604c200256f997c18f7cb091548002777

7 years agoMerge "Change remaining slow path throw entrypoints to save everything."
Vladimir Marko [Tue, 20 Sep 2016 19:05:25 +0000 (19:05 +0000)]
Merge "Change remaining slow path throw entrypoints to save everything."
am: 692cc74314

Change-Id: I6fa294b9d77e7ad31d4aad95b60122b632461eb8

7 years agoMerge "Change remaining slow path throw entrypoints to save everything."
Vladimir Marko [Tue, 20 Sep 2016 19:00:27 +0000 (19:00 +0000)]
Merge "Change remaining slow path throw entrypoints to save everything."

7 years agoMerge changes Id749f453,Ie3ce9dd8
Colin Cross [Tue, 20 Sep 2016 16:56:43 +0000 (16:56 +0000)]
Merge changes Id749f453,Ie3ce9dd8
am: 48d10ee126

Change-Id: I2eb81d725df21938a73b280a742db45a1ee85f86

7 years agoAlways run oatdumps tests
Colin Cross [Tue, 20 Sep 2016 16:56:43 +0000 (16:56 +0000)]
Always run oatdumps tests
am: b20be21233

Change-Id: Idf79e2950a06f32a4ebcb01de7885c080560fb87

7 years agoDisable oatdumps device build
Colin Cross [Tue, 20 Sep 2016 16:56:32 +0000 (16:56 +0000)]
Disable oatdumps device build
am: d2c2080539

Change-Id: Ic97b58e8f186d8da0aa759cc7499b31d2b07f5d1

7 years agoMerge "Make javac always use Java 7 when running tests using javac and dx"
Nicolas Geoffray [Tue, 20 Sep 2016 16:56:14 +0000 (16:56 +0000)]
Merge "Make javac always use Java 7 when running tests using javac and dx"
am: 901669c8ff

Change-Id: I4f9f4f6503b7fb53347560d48f7261cfea597f6e

7 years agoMerge changes Id749f453,Ie3ce9dd8
Colin Cross [Tue, 20 Sep 2016 16:43:36 +0000 (16:43 +0000)]
Merge changes Id749f453,Ie3ce9dd8

* changes:
  Always run oatdumps tests
  Disable oatdumps device build

7 years agoMerge "Make javac always use Java 7 when running tests using javac and dx"
Nicolas Geoffray [Tue, 20 Sep 2016 16:41:24 +0000 (16:41 +0000)]
Merge "Make javac always use Java 7 when running tests using javac and dx"

7 years agoMerge "ARM: Use vstm/vldm for live floating point registers save/restore in SlowPathC...
Artem Serov [Tue, 20 Sep 2016 13:55:46 +0000 (13:55 +0000)]
Merge "ARM: Use vstm/vldm for live floating point registers save/restore in SlowPathCode."
am: 80eb0bc275

Change-Id: Iddab18919b4c81a988ea10a15df6bdd7a6b14ba4

7 years agoChange remaining slow path throw entrypoints to save everything.
Vladimir Marko [Wed, 14 Sep 2016 15:26:36 +0000 (16:26 +0100)]
Change remaining slow path throw entrypoints to save everything.

Change DivZeroCheck, BoundsCheck and explicit NullCheck
slow path entrypoints to conform to kSaveEverything.

On Nexus 9, AOSP ToT, the boot.oat size reduction is
  prebuilt multi-part boot image:
    - 32-bit boot.oat: -12KiB (-0.04%)
    - 64-bit boot.oat: -24KiB (-0.06%)
  on-device built single boot image:
    - 32-bit boot.oat: -8KiB (-0.03%)
    - 64-bit boot.oat: -16KiB (-0.04%)

Test: Run ART test suite including gcstress on host and Nexus 9.
Test: Manually disable implicit null checks and test as above.
Change-Id: If82a8082ea9ae571c5d03b5e545e67fcefafb163

7 years agoMerge "ARM: Use vstm/vldm for live floating point registers save/restore in SlowPathC...
Treehugger Robot [Tue, 20 Sep 2016 13:48:31 +0000 (13:48 +0000)]
Merge "ARM: Use vstm/vldm for live floating point registers save/restore in SlowPathCode."

7 years agoARM: Use vstm/vldm for live floating point registers save/restore in SlowPathCode.
Artem Serov [Fri, 15 Jul 2016 13:00:56 +0000 (14:00 +0100)]
ARM: Use vstm/vldm for live floating point registers save/restore in SlowPathCode.

Test: m test-art-target; m test-art-host

Change-Id: Id22271c572bb698728444bef90d5c7487ab84b1a

7 years agoMerge "ARM: Remove extra argument from RUNTIME_CURRENT uses."
Vladimir Marko [Tue, 20 Sep 2016 11:13:11 +0000 (11:13 +0000)]
Merge "ARM: Remove extra argument from RUNTIME_CURRENT uses."
am: ae9ed26e8d

Change-Id: Iaa0f6dfdf33e899940ff7d284cbbf5fbf4c1113a

7 years agoMerge "ARM: Remove extra argument from RUNTIME_CURRENT uses."
Treehugger Robot [Tue, 20 Sep 2016 11:08:05 +0000 (11:08 +0000)]
Merge "ARM: Remove extra argument from RUNTIME_CURRENT uses."

7 years agoMerge "ARM: Use stm/ldm for live registers save/restore in SlowPathCode."
Artem Serov [Tue, 20 Sep 2016 10:43:06 +0000 (10:43 +0000)]
Merge "ARM: Use stm/ldm for live registers save/restore in SlowPathCode."
am: 9364383522

Change-Id: I0898f8df4971917beac8626c22764181a575bcda

7 years agoMerge "ARM: Use stm/ldm for live registers save/restore in SlowPathCode."
Treehugger Robot [Tue, 20 Sep 2016 10:36:22 +0000 (10:36 +0000)]
Merge "ARM: Use stm/ldm for live registers save/restore in SlowPathCode."

7 years agoARM: Remove extra argument from RUNTIME_CURRENT uses.
Vladimir Marko [Tue, 20 Sep 2016 09:18:53 +0000 (10:18 +0100)]
ARM: Remove extra argument from RUNTIME_CURRENT uses.

Missed this in
    https://android-review.googlesource.com/238842

Test: Manually invoke clang as specified in bug 31607479.
Test: Rely on TreeHugger for the rest.
Bug: 31607479
Bug: 29259539
Change-Id: I540f7dcfffec5acb33b91e2bb4e0bb64708378e0

7 years agoMake javac always use Java 7 when running tests using javac and dx
Søren Gjesse [Mon, 19 Sep 2016 09:12:51 +0000 (11:12 +0200)]
Make javac always use Java 7 when running tests using javac and dx

This adds "-source 1.7 -target 1.7" to JAVAC when --build-with-javac-dx
is specified.

Also make sure that dx is not run when --jvm is passed.

Test: art/test/run-test --host --build-with-javac-dx 003-omnibus-opcodes
Test: art/test/run-test --host --build-with-javac-dx 005-annotations
Test: art/test/run-test --host --build-with-javac-dx 023-many-interfaces
Test: art/test/run-test --host --build-with-javac-dx 056-const-string-jumbo
Test: art/test/run-test --host --build-with-javac-dx 091-override-package-private-method
Test: art/test/run-test --host --build-with-javac-dx 111-unresolvable-exception
Test: art/test/run-test --host --build-with-javac-dx 113-multidex
Test: art/test/run-test --host --build-with-javac-dx 124-missing-classes
Test: art/test/run-test --host --build-with-javac-dx 126-miranda-multidex
Test: art/test/run-test --host --build-with-javac-dx 127-checker-secondarydex
Test: art/test/run-test --host --build-with-javac-dx 131-structural-change
Test: art/test/run-test --host --build-with-javac-dx 138-duplicate-classes-check2
Test: art/test/run-test --host --build-with-javac-dx 303-verification-stress
Test: art/test/run-test --host --build-with-javac-dx 551-checker-shifter-operand
Test: art/test/run-test --host --build-with-javac-dx 555-checker-regression-x86const

Test: art/test/run-test --host 003-omnibus-opcodes
Test: art/test/run-test --host 005-annotations
Test: art/test/run-test --host 023-many-interfaces
Test: art/test/run-test --host 056-const-string-jumbo
Test: art/test/run-test --host 091-override-package-private-method
Test: art/test/run-test --host 111-unresolvable-exception
Test: art/test/run-test --host 113-multidex
Test: art/test/run-test --host 124-missing-classes
Test: art/test/run-test --host 126-miranda-multidex
Test: art/test/run-test --host 127-checker-secondarydex
Test: art/test/run-test --host 131-structural-change
Test: art/test/run-test --host 138-duplicate-classes-check2
Test: art/test/run-test --host 303-verification-stress
Test: art/test/run-test --host 551-checker-shifter-operand
Test: art/test/run-test --host 555-checker-regression-x86const

Test: art/test/run-test --jvm 003-omnibus-opcodes
Test: art/test/run-test --jvm 005-annotations
Test: art/test/run-test --jvm 023-many-interfaces
Test: art/test/run-test --jvm 056-const-string-jumbo
Test: art/test/run-test --jvm 091-override-package-private-method
Test: art/test/run-test --jvm 111-unresolvable-exception
Test: art/test/run-test --jvm 113-multidex
Test: art/test/run-test --jvm 124-missing-classes
Test: art/test/run-test --jvm 126-miranda-multidex
Test: art/test/run-test --jvm 127-checker-secondarydex
Test: art/test/run-test --jvm 131-structural-change
Test: art/test/run-test --jvm 138-duplicate-classes-check2
Test: art/test/run-test --jvm 303-verification-stress
Test: art/test/run-test --jvm 551-checker-shifter-operand
Test: art/test/run-test --jvm 555-checker-regression-x86const

Change-Id: I60f8a973c0dd425988abe55223bdef426c772b97

7 years agoMerge "Increase host frame size limit for SANITIZE_HOST"
Colin Cross [Tue, 20 Sep 2016 02:43:41 +0000 (02:43 +0000)]
Merge "Increase host frame size limit for SANITIZE_HOST"
am: 0186b64cfc

Change-Id: I0b64f71843dfd10bc41dc68cd20e9e291dbe827a

7 years agoMerge "Integrate built-in bisection search with runtest"
Wojciech Staszkiewicz [Tue, 20 Sep 2016 02:43:21 +0000 (02:43 +0000)]
Merge "Integrate built-in bisection search with runtest"
am: adf4304877

Change-Id: Ie395967d066cfe1510c705f20da617141b2ff9aa

7 years agoMerge "Shorten long test names"
Aart Bik [Tue, 20 Sep 2016 02:43:02 +0000 (02:43 +0000)]
Merge "Shorten long test names"
am: 7bdc637f99

Change-Id: I58914e18b962a741e90e474a4e246998488bc3f9

7 years agoDexlayout changes to support offset/size output of items.
Jeff Hao [Sat, 10 Sep 2016 01:35:01 +0000 (18:35 -0700)]
Dexlayout changes to support offset/size output of items.

- Created offset & size fields for items, initially populated with
  values from original dex file.
- Created index field for indexed items in header.
- Created Item objects for StringData and TypeList.
- Created Collections container to hold unique_ptrs for all objects
- Reorganized EncodedArrayItems to make it easier to collect them
- Added relevant annotations-related items to Collections
- Some size calculations and section offsets left as TODO

Bug: 29921113
Test: mm test-art-host-gtest-dexlayout_test
Change-Id: Id812f104c1930a3ee381e885f353a9a49f29ac9b

7 years agoMerge "Increase host frame size limit for SANITIZE_HOST"
Treehugger Robot [Tue, 20 Sep 2016 00:37:20 +0000 (00:37 +0000)]
Merge "Increase host frame size limit for SANITIZE_HOST"

7 years agoMerge "Integrate built-in bisection search with runtest"
Treehugger Robot [Tue, 20 Sep 2016 00:12:51 +0000 (00:12 +0000)]
Merge "Integrate built-in bisection search with runtest"

7 years agoMerge "Shorten long test names"
Aart Bik [Mon, 19 Sep 2016 23:35:23 +0000 (23:35 +0000)]
Merge "Shorten long test names"

7 years agoShorten long test names
Wojciech Staszkiewicz [Mon, 19 Sep 2016 17:06:09 +0000 (10:06 -0700)]
Shorten long test names

Long Android.run-test.mk targets cause testing framework to
misbehave. Issues occur in no-prebuild mode when --output-path
parameter generated by the make system is too long. When this
happens oat generation fails silently in oat_file_assistant.cc
during creation of empty vdex and oat files.

Creation fails because file names, which are as long as absolute path
to source dex file, are longer than 255 characters Linux file name
limit.

Because oat generation fails silently affected tests pass even though
they were effectively ran in interpreter mode, instead of intended
default mode.

This CL shortens test names to be at most 35 characters. This helps
make the tests more reliable.

Test: m test-art-run-test
Bug: 31597671
Change-Id: Ic68408ae0c98ffca0c64ca4f5535f4e683a296f0

7 years agoIntegrate built-in bisection search with runtest
Wojciech Staszkiewicz [Thu, 1 Sep 2016 21:43:39 +0000 (14:43 -0700)]
Integrate built-in bisection search with runtest

Adds a --bisection-search switch to run-test. When this switch
is enabled run-test performs bisection bug search for nonchecker
failing tests attempting to find faulty method and optimization.

Adds ART_TEST_BISECTION flag support to Android.run-test.mk.
When this flag is set to true, run-test will run in bisection
search mode.

Bisection search works in no-prebuild mode only.

Test: ART_TEST_BISECTION=true m test-art-run-test

Change-Id: Id2d664a0b35fed366f50a60ce96f1ca6bd123cd4

7 years agoAlways run oatdumps tests
Colin Cross [Mon, 19 Sep 2016 20:02:47 +0000 (13:02 -0700)]
Always run oatdumps tests

ART_BUILD_HOST_STATIC is meaningless now, the static tools are always
available.  Add oatdumpds as a dependency of the host oatdump tests, and
always enable the oatdump static tests.

Test: m -j test-art-host-gtest-oatdump_test
Change-Id: Id749f453f82489dc81a2c9042d3cc3120ea3d308

7 years agoDisable oatdumps device build
Colin Cross [Mon, 19 Sep 2016 19:57:18 +0000 (12:57 -0700)]
Disable oatdumps device build

oatdumps is only supposed to build for the host.

Test: mmma -j art
Change-Id: Ie3ce9dd8340bfc226e7f3125491875f9c18b388a

7 years agoIncrease host frame size limit for SANITIZE_HOST
Colin Cross [Mon, 19 Sep 2016 19:25:31 +0000 (12:25 -0700)]
Increase host frame size limit for SANITIZE_HOST

When SANITIZE_HOST=address, art/test/137-cfi/cfi.cc fails with:
error: stack frame size of 1944 bytes in function 'Java_Main_unwindInProcess'
Increase the frame size when SANITIZE_HOST is set, the same way it is
increased for device builds.

Test: m -j libarttest SANITIZE_HOST=address
Test: run-test --host 137
Change-Id: I08d8492e6629159b0e0306cb9499debbe6bb865c

7 years agoMerge "Improve sharpening for read barrier image HLoadClass"
Mathieu Chartier [Mon, 19 Sep 2016 20:17:14 +0000 (20:17 +0000)]
Merge "Improve sharpening for read barrier image HLoadClass"
am: 2722620b24

Change-Id: I874f1652f6a717e2c945f6eaf070d4d1c396a514

7 years agoMerge "Improve sharpening for read barrier image HLoadClass"
Treehugger Robot [Mon, 19 Sep 2016 20:04:19 +0000 (20:04 +0000)]
Merge "Improve sharpening for read barrier image HLoadClass"

7 years agoMerge "Fix mac build"
Colin Cross [Mon, 19 Sep 2016 20:01:04 +0000 (20:01 +0000)]
Merge "Fix mac build"
am: c520f85302

Change-Id: I5b79dd8a9d5035d8db240a9cab35de12a53367a1

7 years agoMerge "Fix mac build"
Treehugger Robot [Mon, 19 Sep 2016 19:47:40 +0000 (19:47 +0000)]
Merge "Fix mac build"

7 years agoMerge "Revert "Revert "test: Remove icu cleanup hack"""
Igor Murashkin [Mon, 19 Sep 2016 18:42:52 +0000 (18:42 +0000)]
Merge "Revert "Revert "test: Remove icu cleanup hack"""
am: 9aec85619f

Change-Id: I0b2257617f6984542ade989825c2a4c3fbbf64a0

7 years agoMerge "Revert "Revert "test: Remove icu cleanup hack"""
Treehugger Robot [Mon, 19 Sep 2016 18:28:07 +0000 (18:28 +0000)]
Merge "Revert "Revert "test: Remove icu cleanup hack"""

7 years agoFix mac build
Colin Cross [Mon, 19 Sep 2016 17:40:05 +0000 (10:40 -0700)]
Fix mac build

Move darwin disabling to art_test_defaults to disable mac build for
libarttest.

Test: mmma -j art on mac
Change-Id: I972245ddbacea274087d9231e4788bd9f2d6fe6b

7 years agoImprove sharpening for read barrier image HLoadClass
Mathieu Chartier [Fri, 16 Sep 2016 21:16:42 +0000 (14:16 -0700)]
Improve sharpening for read barrier image HLoadClass

Handle MarkInBoot image for LoadKind::kReferrersClass. This reduces
read barriers for the boot image if the referring class is in
the boot image.

Only really helps CC case, TODO avoid doing the work for non CC?

ARM64 CC baker boot.oat: 48006064 -> 47916736

Bug: 29516974

Test: test-art-host CC baker

Change-Id: Ibfa0cf0a3b888ad0e53c2d95a38e330b79e7443c

7 years agoMerge "Ensure class is initialized when reading its fields from debugger."
Jeff Hao [Mon, 19 Sep 2016 17:39:38 +0000 (17:39 +0000)]
Merge "Ensure class is initialized when reading its fields from debugger."
am: 6a40fc9bbb

Change-Id: Iae28794d6ca5a59d699236ad0218960b3a2ca648

7 years agoMerge "Ensure class is initialized when reading its fields from debugger."
Treehugger Robot [Mon, 19 Sep 2016 17:34:41 +0000 (17:34 +0000)]
Merge "Ensure class is initialized when reading its fields from debugger."

7 years agoMerge "Convert art runtests to Android.bp"
Colin Cross [Mon, 19 Sep 2016 17:17:02 +0000 (17:17 +0000)]
Merge "Convert art runtests to Android.bp"
am: 904614f008

Change-Id: Ie9c606e11f31219b4ec86672509f3d103431b43c

7 years agoMerge "Convert art runtests to Android.bp"
Colin Cross [Mon, 19 Sep 2016 17:12:37 +0000 (17:12 +0000)]
Merge "Convert art runtests to Android.bp"

7 years agoConvert art runtests to Android.bp
Colin Cross [Fri, 16 Sep 2016 20:47:21 +0000 (13:47 -0700)]
Convert art runtests to Android.bp

Build the art runtest libraries with Android.bp.  The host test
libraries move from out/host/linux-x86/lib[64] to
out/host/linux-x86/nativetest[64], and the device test libraires from
/data/artest/${TARGET_ARCH} to /data/nativetest[64]/art/${TARGET_ARCH},
which requires adding nativetest to the library search path, and fixing
some tests to support multiple entries in library search paths.

Test: m -j test-art-host
Test: m -j test-art-target
Change-Id: I2118a3292f22f275954ddd7cdd4e12287fe47808

7 years agoMerge "Remove the `CanTriggerGC` side-effects on a few instructions."
Roland Levillain [Mon, 19 Sep 2016 17:07:30 +0000 (17:07 +0000)]
Merge "Remove the `CanTriggerGC` side-effects on a few instructions."
am: ec88abde59

Change-Id: I67986e0771206a5ddf0742ec0f51653983d38242

7 years agoMerge "Remove the `CanTriggerGC` side-effects on a few instructions."
Roland Levillain [Mon, 19 Sep 2016 16:59:14 +0000 (16:59 +0000)]
Merge "Remove the `CanTriggerGC` side-effects on a few instructions."

7 years agoRevert "Revert "test: Remove icu cleanup hack""
Igor Murashkin [Mon, 19 Sep 2016 16:12:22 +0000 (16:12 +0000)]
Revert "Revert "test: Remove icu cleanup hack""

This reverts commit 3c73829dbd9993b821171cdfe604d69a8330a20b.

Change-Id: Ib911f65456f522d0d8ac732aa3fa646217f126ca

7 years agoMerge "Include `nodes.h` in `nodes_shared.h` to help editing tools."
Alexandre Rames [Mon, 19 Sep 2016 16:17:21 +0000 (16:17 +0000)]
Merge "Include `nodes.h` in `nodes_shared.h` to help editing tools."
am: 8cb366a7ba

Change-Id: I3b2e4505aa016787100980a912c8cd7d13b3ad9a

7 years agoMerge "Include `nodes.h` in `nodes_shared.h` to help editing tools."
Treehugger Robot [Mon, 19 Sep 2016 16:06:00 +0000 (16:06 +0000)]
Merge "Include `nodes.h` in `nodes_shared.h` to help editing tools."

7 years agoMerge "Minor induction variable analysis changes."
Aart Bik [Mon, 19 Sep 2016 15:20:11 +0000 (15:20 +0000)]
Merge "Minor induction variable analysis changes."
am: 28079d33e1

Change-Id: Ic7bfc3c6ad0b551f859b1efd71caa6d88eec2b36

7 years agoMerge "Minor induction variable analysis changes."
Aart Bik [Mon, 19 Sep 2016 15:11:36 +0000 (15:11 +0000)]
Merge "Minor induction variable analysis changes."

7 years agoMerge "ARM: VIXL32: Implement a disassembler."
Roland Levillain [Mon, 19 Sep 2016 14:23:30 +0000 (14:23 +0000)]
Merge "ARM: VIXL32: Implement a disassembler."
am: 932e7d89ad

Change-Id: I1ca4882a776fb4a7e8fade6ac2bbc0b5773953bb

7 years agoMerge "ARM: VIXL32: Implement a disassembler."
Roland Levillain [Mon, 19 Sep 2016 14:17:04 +0000 (14:17 +0000)]
Merge "ARM: VIXL32: Implement a disassembler."

7 years agoARM: Use stm/ldm for live registers save/restore in SlowPathCode.
Artem Serov [Mon, 11 Jul 2016 09:41:45 +0000 (10:41 +0100)]
ARM: Use stm/ldm for live registers save/restore in SlowPathCode.

In case when there is more than 4 register to save/restore in the
SlowPathCode stm/ldm can save some code size.

Test: m test-art-target; m test-art-host

Change-Id: I2d5b44bab58b67207105302cd7d8ee3300b9040a

7 years agoInclude `nodes.h` in `nodes_shared.h` to help editing tools.
Alexandre Rames [Mon, 19 Sep 2016 12:56:18 +0000 (13:56 +0100)]
Include `nodes.h` in `nodes_shared.h` to help editing tools.

This include does not change anything to compilation, but it helps
editing tools (e.g. YouCompleteMe) to show proper error messages when
editing that file.

Test: mma -j40

Change-Id: I5ebd03040cfc90daa41faf85f273a86525207f19

7 years agoRemove the `CanTriggerGC` side-effects on a few instructions.
Alexandre Rames [Mon, 19 Sep 2016 12:54:30 +0000 (13:54 +0100)]
Remove the `CanTriggerGC` side-effects on a few instructions.

The side-effect was specified for these instructions as they call
runtime. We now have a list of entrypoints that we know cannot trigger
GC. We can avoid requiring the side-effect for those.

Test: Run ART test suite on Nexus 5X and host.

Change-Id: I0e0e6a4d701ce6c75aff486cb0d1bc7fe2e8dda4

7 years agoMerge "MIPS64: Fix overlapping use of "in" & "out" registers."
Nicolas Geoffray [Mon, 19 Sep 2016 12:45:42 +0000 (12:45 +0000)]
Merge "MIPS64: Fix overlapping use of "in" & "out" registers."
am: f65366918e

Change-Id: I24d120adc95b63d4fb6a746cade3fc14926d5261

7 years agoMerge "MIPS64: Fix overlapping use of "in" & "out" registers."
Nicolas Geoffray [Mon, 19 Sep 2016 12:38:05 +0000 (12:38 +0000)]
Merge "MIPS64: Fix overlapping use of "in" & "out" registers."

7 years agoMerge "Move ART_HOST_TEST_DIR to Android.common_test.mk"
Dan Willemsen [Mon, 19 Sep 2016 11:48:31 +0000 (11:48 +0000)]
Merge "Move ART_HOST_TEST_DIR to Android.common_test.mk"
am: 834582c4b0

Change-Id: I28dd222a6f43995609fb0489f494a136e0effab9

7 years agoMerge "Move ART_HOST_TEST_DIR to Android.common_test.mk"
Treehugger Robot [Mon, 19 Sep 2016 11:41:32 +0000 (11:41 +0000)]
Merge "Move ART_HOST_TEST_DIR to Android.common_test.mk"

7 years agoMerge "MIPS32: Improve storing of constants in fields and array elements"
Alexey Frunze [Mon, 19 Sep 2016 09:27:05 +0000 (09:27 +0000)]
Merge "MIPS32: Improve storing of constants in fields and array elements"
am: 855c7eb6b4

Change-Id: I47a2f35d0a589132f5ed42215cdfe58cda21b966

7 years agoMerge "MIPS32: Improve storing of constants in fields and array elements"
Treehugger Robot [Mon, 19 Sep 2016 09:20:18 +0000 (09:20 +0000)]
Merge "MIPS32: Improve storing of constants in fields and array elements"

7 years agoMerge "Revert "test: Remove icu cleanup hack""
Colin Cross [Mon, 19 Sep 2016 08:41:27 +0000 (08:41 +0000)]
Merge "Revert "test: Remove icu cleanup hack""
am: 53c5337b04

Change-Id: Ic37957922c05b6b1dbe4a5cd3cfd4b5c53b7dbb0

7 years agoMerge "Revert "test: Remove icu cleanup hack""
Treehugger Robot [Mon, 19 Sep 2016 08:30:51 +0000 (08:30 +0000)]
Merge "Revert "test: Remove icu cleanup hack""

7 years agoRevert "test: Remove icu cleanup hack"
Colin Cross [Sun, 18 Sep 2016 00:27:24 +0000 (17:27 -0700)]
Revert "test: Remove icu cleanup hack"

This reverts commit d4b294c14bd4e1654b276b931ee035b895b8e6cd.
Without this hack, the gCommonICUDataArray seems to
non-deterministically accumulate entries, and sometimes overflows,
causing test failures.

Bug: 31469648
Test: gdb /data/nativetest64/art/arm64/art_runtime_compiler_tests/reflection_test
Change-Id: Ie5a5b7b957de79758a227bfd2919b4cd0155cde8

7 years agoMerge "Remove TypeLookupTable from DexFile."
David Sehr [Sat, 17 Sep 2016 20:44:02 +0000 (20:44 +0000)]
Merge "Remove TypeLookupTable from DexFile."
am: 6a4abc633f

Change-Id: Id26c8ab42a7282582937939f9d700523c30975bd

7 years agoMerge "Remove TypeLookupTable from DexFile."
Treehugger Robot [Sat, 17 Sep 2016 20:29:44 +0000 (20:29 +0000)]
Merge "Remove TypeLookupTable from DexFile."

7 years agoMerge "Fix 2ND arch gtest testing."
Nicolas Geoffray [Sat, 17 Sep 2016 13:45:49 +0000 (13:45 +0000)]
Merge "Fix 2ND arch gtest testing."
am: 8d0e6c5c18

Change-Id: Id04e0c3149b6280e5cfd67b609276ac297020072

7 years agoMerge "Fix 2ND arch gtest testing."
Nicolas Geoffray [Sat, 17 Sep 2016 13:39:09 +0000 (13:39 +0000)]
Merge "Fix 2ND arch gtest testing."

7 years agoMove ART_HOST_TEST_DIR to Android.common_test.mk
Dan Willemsen [Sat, 17 Sep 2016 00:11:36 +0000 (17:11 -0700)]
Move ART_HOST_TEST_DIR to Android.common_test.mk

I'm improving Kati's re-run detection, and this $(shell echo $$PPID) now
now causes us to reparse all of the makefiles every time, since it
really does change on each execution. But if you aren't running the ART
tests, this doesn't actually get used.

So punt this over to only executing when you're including the test
runner -- it's not ideal, since you'll be reparsing the makefiles every
time you want to run the tests. Depending on the desired behavior, this
should be able to be implemented without depending on the PID of Kati,
or the test runner can be moved out of the build system, since most of
the builds here have moved to Soong now.

Bug: 30947985
Test: Compare build.ninja before and after this change, only change is
      the valgrind-test-art-target* targets.
Test: m -j test-art-host
Change-Id: Ibbc0f20e407bf70bce64d3428be5808d78bdaf91

7 years agoRemove TypeLookupTable from DexFile.
David Sehr [Fri, 16 Sep 2016 01:13:52 +0000 (18:13 -0700)]
Remove TypeLookupTable from DexFile.

One more step towards removing runtime dependencies from the DexFile
API.  This severs the ties to OatFile.  Work remains to move MemMap out
of DexFile.

Bug: 22322814
Change-Id: I29e7ad8fd292c7919ed2689dc754b958b88d6819
Test: test-art-host

7 years agoMerge "Add a comment to dex2oat's parent pid logging"
Aart Bik [Fri, 16 Sep 2016 21:35:54 +0000 (21:35 +0000)]
Merge "Add a comment to dex2oat's parent pid logging"
am: 47c22ff721

Change-Id: Id0ca435c27d91048f8071a5f6eee24b769d876c7

7 years agoMinor induction variable analysis changes.
Aart Bik [Fri, 16 Sep 2016 17:15:19 +0000 (10:15 -0700)]
Minor induction variable analysis changes.

Rationale:
Few extra comments, added replacement of loop control functionality.
All in preparation of bigger loop optimizations CL.

Change-Id: Ie2243c3c8b57b2901654b05fb200e9d80a0cb641
Test: test-art

7 years agoMerge "Add a comment to dex2oat's parent pid logging"
Aart Bik [Fri, 16 Sep 2016 21:30:54 +0000 (21:30 +0000)]
Merge "Add a comment to dex2oat's parent pid logging"

7 years agoFix 2ND arch gtest testing.
Nicolas Geoffray [Fri, 16 Sep 2016 15:41:43 +0000 (16:41 +0100)]
Fix 2ND arch gtest testing.

Change-Id: I944feac324c49a95904f69d7b03b072e7150c134

7 years agoMerge "Fix a deadlock in the CC collector."
Hiroshi Yamauchi [Fri, 16 Sep 2016 18:04:58 +0000 (18:04 +0000)]
Merge "Fix a deadlock in the CC collector."
am: be3a3ee02f

Change-Id: If75da5e6e72d7ba7556c800d31c7bfa830a7a211

7 years agoMerge "Fix a deadlock in the CC collector."
Treehugger Robot [Fri, 16 Sep 2016 17:59:09 +0000 (17:59 +0000)]
Merge "Fix a deadlock in the CC collector."