OSDN Git Service

android-x86/art.git
8 years agoMerge "Ongoing improvements in java fuzz testing" am: ebb5d0f3bc
Aart Bik [Tue, 23 Aug 2016 18:46:57 +0000 (18:46 +0000)]
Merge "Ongoing improvements in java fuzz testing" am: ebb5d0f3bc
am: e98546d04c

Change-Id: I51a24c4c4a5fced79092b7e9f22c78755ff81285

8 years agoMerge "Ongoing improvements in java fuzz testing"
Aart Bik [Tue, 23 Aug 2016 18:41:13 +0000 (18:41 +0000)]
Merge "Ongoing improvements in java fuzz testing"
am: ebb5d0f3bc

Change-Id: I93c227e2b33cea9d58647dd97754459be8152422

8 years agoMerge "Ongoing improvements in java fuzz testing"
Aart Bik [Tue, 23 Aug 2016 18:33:00 +0000 (18:33 +0000)]
Merge "Ongoing improvements in java fuzz testing"

8 years agoMerge "Revert "x86/x86-64: Avoid temporary for read barrier field load."" am: e3eb47133c
Vladimir Marko [Tue, 23 Aug 2016 18:16:54 +0000 (18:16 +0000)]
Merge "Revert "x86/x86-64: Avoid temporary for read barrier field load."" am: e3eb47133c
am: 4de0f16d15

Change-Id: I871d137b9ec00907b02478a4e8e81efd24baf0f2

8 years agoMerge "Revert "x86/x86-64: Avoid temporary for read barrier field load.""
Vladimir Marko [Tue, 23 Aug 2016 18:12:14 +0000 (18:12 +0000)]
Merge "Revert "x86/x86-64: Avoid temporary for read barrier field load.""
am: e3eb47133c

Change-Id: I0af6ed4c628b608ab2cf29954c670689b1420bbc

8 years agoMerge "Revert "x86/x86-64: Avoid temporary for read barrier field load.""
Vladimir Marko [Tue, 23 Aug 2016 17:53:23 +0000 (17:53 +0000)]
Merge "Revert "x86/x86-64: Avoid temporary for read barrier field load.""

8 years agoRevert "x86/x86-64: Avoid temporary for read barrier field load."
Vladimir Marko [Tue, 23 Aug 2016 17:48:38 +0000 (17:48 +0000)]
Revert "x86/x86-64: Avoid temporary for read barrier field load."

Fault handler does not recognize the instruction
    F6 /0 ib    TEST r/m8, imm8
so we get crashes instead of NPEs.

Bug: 29966877
Bug: 12687968

This reverts commit ccf06d8f19a37432de4a3b768747090adfbd18ec.

Change-Id: Ib7db3b59f44c0d3ed5e24a20b6c6ee596a89d709

8 years agoMerge "ART: Clean up interpreter includes" am: 6abf237391
Andreas Gampe [Tue, 23 Aug 2016 16:00:46 +0000 (16:00 +0000)]
Merge "ART: Clean up interpreter includes" am: 6abf237391
am: ee72591bba

Change-Id: Ic33bd9ca713e1b0ae4a4312c18b61e89b2d1e57d

8 years agoMerge "ART: Clean up interpreter includes"
Andreas Gampe [Tue, 23 Aug 2016 15:56:01 +0000 (15:56 +0000)]
Merge "ART: Clean up interpreter includes"
am: 6abf237391

Change-Id: I439817deae3d8de01158c0a4c81736877a651c2d

8 years agoMerge "ART: Clean up interpreter includes"
Treehugger Robot [Tue, 23 Aug 2016 15:35:14 +0000 (15:35 +0000)]
Merge "ART: Clean up interpreter includes"

8 years agoMerge "x86/x86-64: Avoid temporary for read barrier field load." am: 076ffd686c
Vladimir Marko [Tue, 23 Aug 2016 12:49:33 +0000 (12:49 +0000)]
Merge "x86/x86-64: Avoid temporary for read barrier field load." am: 076ffd686c
am: c88283fe2a

Change-Id: I317da39b9194035019c26f19dfe23339f1b24ddf

8 years agoMerge "x86/x86-64: Avoid temporary for read barrier field load."
Vladimir Marko [Tue, 23 Aug 2016 12:46:39 +0000 (12:46 +0000)]
Merge "x86/x86-64: Avoid temporary for read barrier field load."
am: 076ffd686c

Change-Id: I375a8c9e125f634c2bf16a081f6965a85077d2bb

8 years agoMerge "x86/x86-64: Avoid temporary for read barrier field load."
Treehugger Robot [Tue, 23 Aug 2016 12:36:53 +0000 (12:36 +0000)]
Merge "x86/x86-64: Avoid temporary for read barrier field load."

8 years agox86/x86-64: Avoid temporary for read barrier field load.
Vladimir Marko [Fri, 12 Aug 2016 12:37:55 +0000 (13:37 +0100)]
x86/x86-64: Avoid temporary for read barrier field load.

Add TEST instructions for memory and immediate. Use the byte
version to avoid a temporary in read barrier field load.

Test: Tested with ART_USE_READ_BARRIER=true on host.
Test: Tested with ART_USE_READ_BARRIER=true ART_HEAP_POISONING=true on host.
Bug: 29966877
Bug: 12687968
Change-Id: Ia415d3c2e1ae1ff6dff11d72bbb7d96d5deed6ee

8 years agoART: Clean up interpreter includes
Andreas Gampe [Tue, 23 Aug 2016 00:54:17 +0000 (17:54 -0700)]
ART: Clean up interpreter includes

Move goto-interpreter special-cased Clang declarations to goto
implementation file. Separate out declarations into their own
headers. Tag the declarations with thread safety annotations.

Minor compile-time impact when running with -j1.

Change-Id: I03664d4e7dc6361b2510a8c9beb693d23a657c9d
Test: m test-art-host
Test: m ART_TEST_INTERPRETER=true test-art-host

8 years agoMerge "Use full pass name when building optimizations" am: cf834d00de
Wojciech Staszkiewicz [Tue, 23 Aug 2016 03:08:27 +0000 (03:08 +0000)]
Merge "Use full pass name when building optimizations" am: cf834d00de
am: 04912510ae

Change-Id: I6badab91cd9ba88bce377cb312b89d45ba2fefcc

8 years agoMerge "Use full pass name when building optimizations"
Wojciech Staszkiewicz [Tue, 23 Aug 2016 03:05:36 +0000 (03:05 +0000)]
Merge "Use full pass name when building optimizations"
am: cf834d00de

Change-Id: I0c06484030c0900851c950360447b251efc9bc47

8 years agoMerge "MIPS32: Optimize R6 round(float) intrinsic." am: 5f81cd0413
Chris Larsen [Tue, 23 Aug 2016 03:00:26 +0000 (03:00 +0000)]
Merge "MIPS32: Optimize R6 round(float) intrinsic." am: 5f81cd0413
am: 09e87c60d0

Change-Id: Icf1d1fbf79d4451b0e3ecca36afaaabab9c45714

8 years agoMerge "MIPS32: Optimize R6 round(float) intrinsic."
Chris Larsen [Tue, 23 Aug 2016 02:57:33 +0000 (02:57 +0000)]
Merge "MIPS32: Optimize R6 round(float) intrinsic."
am: 5f81cd0413

Change-Id: I4931bada1206b9be2344a8af9d61b3403c5f1171

8 years agoMerge "Use full pass name when building optimizations"
Treehugger Robot [Tue, 23 Aug 2016 02:57:21 +0000 (02:57 +0000)]
Merge "Use full pass name when building optimizations"

8 years agoMerge "MIPS32: Optimize R6 round(float) intrinsic."
Treehugger Robot [Tue, 23 Aug 2016 02:49:26 +0000 (02:49 +0000)]
Merge "MIPS32: Optimize R6 round(float) intrinsic."

8 years agoMerge "Improve art_quick_resolve_string for arm64 CC" am: 38d4d54903
Mathieu Chartier [Tue, 23 Aug 2016 01:59:53 +0000 (01:59 +0000)]
Merge "Improve art_quick_resolve_string for arm64 CC" am: 38d4d54903
am: 098430680e

Change-Id: I57955293d3039e8a256330918b177af6987368c7

8 years agoMerge "Improve art_quick_resolve_string for arm64 CC"
Mathieu Chartier [Tue, 23 Aug 2016 01:56:10 +0000 (01:56 +0000)]
Merge "Improve art_quick_resolve_string for arm64 CC"
am: 38d4d54903

Change-Id: I469b2f930876de78cf2e176bd21a3a33fe309f29

8 years agoMerge "Improve art_quick_resolve_string for arm64 CC"
Mathieu Chartier [Tue, 23 Aug 2016 01:46:28 +0000 (01:46 +0000)]
Merge "Improve art_quick_resolve_string for arm64 CC"

8 years agoMerge "Fix build" am: 48d2b14feb
Colin Cross [Tue, 23 Aug 2016 01:33:20 +0000 (01:33 +0000)]
Merge "Fix build" am: 48d2b14feb
am: 017fb2931d

Change-Id: I16157bf9cd750cbc0d81f133dbbe63089512604b

8 years agoMerge "Fix build"
Colin Cross [Tue, 23 Aug 2016 01:30:26 +0000 (01:30 +0000)]
Merge "Fix build"
am: 48d2b14feb

Change-Id: I545501b86800329f2540b25a35cf1473f36e9076

8 years agoMerge "Fix build"
Treehugger Robot [Tue, 23 Aug 2016 01:18:58 +0000 (01:18 +0000)]
Merge "Fix build"

8 years agoMerge "ART: Fix x86_64 entrypoint breakage with SYMBOL()." am: 0585afa3ba
Mathieu Chartier [Tue, 23 Aug 2016 00:48:46 +0000 (00:48 +0000)]
Merge "ART: Fix x86_64 entrypoint breakage with SYMBOL()." am: 0585afa3ba
am: 441ee4006a

Change-Id: I391d7942f1dc06f7c6d786ed45f9ecf8c114afd8

8 years agoUse full pass name when building optimizations
Wojciech Staszkiewicz [Tue, 16 Aug 2016 23:33:00 +0000 (16:33 -0700)]
Use full pass name when building optimizations

If possible, use full pass name provided in --run-passes rather
than its base version.

Test: m test-art-host -j32

1. Prepare a run-passes file with content:
dead_code_elimination$initial
instruction_simplifier
x86_memory_operand_generation
2. Run art for a dex file like:
art -Xcompiler-option --run-passes=run-passes -Xcompiler-option
--dump-passes -classpath classes.dex Test
3. Verify that dead_code_elimination$initial string is present in
dump-passes output.

Change-Id: I92d9ed0c8b919ea03f625f549123f546dffe546b

8 years agoMerge "ART: Fix x86_64 entrypoint breakage with SYMBOL()."
Mathieu Chartier [Tue, 23 Aug 2016 00:44:19 +0000 (00:44 +0000)]
Merge "ART: Fix x86_64 entrypoint breakage with SYMBOL()."
am: 0585afa3ba

Change-Id: Icb7d7d3a74165f2802d2f2feeaa4f84aad239e38

8 years agoMerge "ART: Fix x86_64 entrypoint breakage with SYMBOL()."
Mathieu Chartier [Tue, 23 Aug 2016 00:36:19 +0000 (00:36 +0000)]
Merge "ART: Fix x86_64 entrypoint breakage with SYMBOL()."

8 years agoImprove art_quick_resolve_string for arm64 CC
Mathieu Chartier [Mon, 22 Aug 2016 22:38:08 +0000 (15:38 -0700)]
Improve art_quick_resolve_string for arm64 CC

Check gc_is_marking instead of the mark bit first, this makes it
that we don't go slow path if the GC is not running.

Also reduced the code by a few instructions.

EAAC CC: ~2000 -> 1256

Test: test-art-target-run-test -j4

Bug: 20323084
Change-Id: I57a1f7a52f1909e2e5dd1b2cfd2612b4a642fe37

8 years agoFix build
Colin Cross [Mon, 22 Aug 2016 23:00:07 +0000 (16:00 -0700)]
Fix build

Move instruction_simplifier_arm.cc to the arm source list to fix
full-eng builds.

Change-Id: Ic7fc884f5cc2acec5579dc417acece21b7e674aa

8 years agoMerge "ART: Test arena allocator alignment" am: 38daddf297
Andreas Gampe [Mon, 22 Aug 2016 23:06:39 +0000 (23:06 +0000)]
Merge "ART: Test arena allocator alignment" am: 38daddf297
am: 9e6a061f02

Change-Id: I2c1627686472c90cc2453450eb399f3faaceafcb

8 years agoMerge "ART: Test arena allocator alignment"
Andreas Gampe [Mon, 22 Aug 2016 23:03:42 +0000 (23:03 +0000)]
Merge "ART: Test arena allocator alignment"
am: 38daddf297

Change-Id: Idd624bfe391ea4bc9744b755d6250c8b0b9fec9b

8 years agoMerge "ART: String DexCache asm fast path for ARM64" am: 28715406f2
Mathieu Chartier [Mon, 22 Aug 2016 22:58:41 +0000 (22:58 +0000)]
Merge "ART: String DexCache asm fast path for ARM64" am: 28715406f2
am: bd05734e68

Change-Id: I4d8fdce6c156ac22116ae65b4064210c050dbf62

8 years agoMerge "ART: String DexCache asm fast path for ARM" am: fcd81d9dbc
Christina Wadsworth [Mon, 22 Aug 2016 22:58:41 +0000 (22:58 +0000)]
Merge "ART: String DexCache asm fast path for ARM" am: fcd81d9dbc
am: b070ebb9ac

Change-Id: I202674592bbd912ae347a5446c038b005e12f1ae

8 years agoMerge "ART: Test arena allocator alignment"
Treehugger Robot [Mon, 22 Aug 2016 22:58:38 +0000 (22:58 +0000)]
Merge "ART: Test arena allocator alignment"

8 years agoART: Fix x86_64 entrypoint breakage with SYMBOL().
Christina Wadsworth [Mon, 22 Aug 2016 22:55:31 +0000 (15:55 -0700)]
ART: Fix x86_64 entrypoint breakage with SYMBOL().

Change-Id: Id42b6e9a7e5444536f6fb672ec40e9f37c77a649

8 years agoMerge "ART: String DexCache asm fast path for ARM64"
Mathieu Chartier [Mon, 22 Aug 2016 22:55:20 +0000 (22:55 +0000)]
Merge "ART: String DexCache asm fast path for ARM64"
am: 28715406f2

Change-Id: I8d924832747d8af4818f5cee693069c41241882e

8 years agoMerge "ART: String DexCache asm fast path for ARM"
Christina Wadsworth [Mon, 22 Aug 2016 22:55:18 +0000 (22:55 +0000)]
Merge "ART: String DexCache asm fast path for ARM"
am: fcd81d9dbc

Change-Id: Iee42c72bc6718f97bf2024104b7d1f772970f681

8 years agoMerge "ART: String DexCache asm fast path for ARM64"
Mathieu Chartier [Mon, 22 Aug 2016 22:50:04 +0000 (22:50 +0000)]
Merge "ART: String DexCache asm fast path for ARM64"

8 years agoMerge "ART: String DexCache asm fast path for ARM"
Treehugger Robot [Mon, 22 Aug 2016 22:33:42 +0000 (22:33 +0000)]
Merge "ART: String DexCache asm fast path for ARM"

8 years agoMerge "ART: String DexCache asm fast path for x86" am: 899d60b36a
Christina Wadsworth [Mon, 22 Aug 2016 22:15:36 +0000 (22:15 +0000)]
Merge "ART: String DexCache asm fast path for x86" am: 899d60b36a
am: 27c0eb9e6c

Change-Id: I97526697da9cfc981d2a735439d0e1dce09608b2

8 years agoMerge "Only compile device codegen for device architectures" am: 07b74307c4
Colin Cross [Mon, 22 Aug 2016 22:15:35 +0000 (22:15 +0000)]
Merge "Only compile device codegen for device architectures" am: 07b74307c4
am: da6fd7aeba

Change-Id: I0b11e589fd894b7eaa7767941d216c6ce2c969b1

8 years agoMerge "ART: String DexCache asm fast path for x86"
Christina Wadsworth [Mon, 22 Aug 2016 22:11:53 +0000 (22:11 +0000)]
Merge "ART: String DexCache asm fast path for x86"
am: 899d60b36a

Change-Id: Ia9f0cbb5cb429bdf577dee500dc1214928ae6761

8 years agoMerge "Only compile device codegen for device architectures"
Colin Cross [Mon, 22 Aug 2016 22:11:51 +0000 (22:11 +0000)]
Merge "Only compile device codegen for device architectures"
am: 07b74307c4

Change-Id: Ib8f6e355ea8413954408d4b41ed22accd41881bd

8 years agoMerge "ART: String DexCache asm fast path for x86"
Treehugger Robot [Mon, 22 Aug 2016 22:07:29 +0000 (22:07 +0000)]
Merge "ART: String DexCache asm fast path for x86"

8 years agoMerge "Only compile device codegen for device architectures"
Colin Cross [Mon, 22 Aug 2016 21:55:31 +0000 (21:55 +0000)]
Merge "Only compile device codegen for device architectures"

8 years agoMerge "ART: String DexCache asm fast path for x86_64" am: a8ed36609a
Christina Wadsworth [Mon, 22 Aug 2016 21:50:05 +0000 (21:50 +0000)]
Merge "ART: String DexCache asm fast path for x86_64" am: a8ed36609a
am: 67cd100910

Change-Id: I2336ad6cb50cfddffa71fd0378196e8ec4706737

8 years agoMerge "ART: String DexCache asm fast path for x86_64"
Christina Wadsworth [Mon, 22 Aug 2016 21:46:08 +0000 (21:46 +0000)]
Merge "ART: String DexCache asm fast path for x86_64"
am: a8ed36609a

Change-Id: I8121bc2eac91bc930c199477bdadd2112413ee35

8 years agoMerge "ART: String DexCache asm fast path for x86_64"
Treehugger Robot [Mon, 22 Aug 2016 21:38:58 +0000 (21:38 +0000)]
Merge "ART: String DexCache asm fast path for x86_64"

8 years agoMerge "Revert "Revert "Improve the thread flip.""" am: 0b10387ced
Hiroshi Yamauchi [Mon, 22 Aug 2016 21:17:32 +0000 (21:17 +0000)]
Merge "Revert "Revert "Improve the thread flip.""" am: 0b10387ced
am: 7e6df6e5fb

Change-Id: I2844fe5aef26c4ee4078d9b5dfb359d417fd5f26

8 years agoMerge "Revert "Revert "Improve the thread flip."""
Hiroshi Yamauchi [Mon, 22 Aug 2016 21:13:36 +0000 (21:13 +0000)]
Merge "Revert "Revert "Improve the thread flip."""
am: 0b10387ced

Change-Id: I4695d621868558df12e072bf7055a9f78e752b58

8 years agoMerge "Revert "Revert "Improve the thread flip."""
Treehugger Robot [Mon, 22 Aug 2016 21:07:31 +0000 (21:07 +0000)]
Merge "Revert "Revert "Improve the thread flip."""

8 years agoART: Test arena allocator alignment
Andreas Gampe [Mon, 22 Aug 2016 21:03:10 +0000 (14:03 -0700)]
ART: Test arena allocator alignment

Add tests for Alloc and Realloc alignment.

Change-Id: If17b1d898200752a6a1ae25f436c73e5b7eb23f7
Test: m test-art-host-gtest-arena_allocator_test

8 years agoMerge "Fix debugger missing handle between adding and tagging object." am: dffbbb6baa
Jeff Hao [Mon, 22 Aug 2016 20:31:08 +0000 (20:31 +0000)]
Merge "Fix debugger missing handle between adding and tagging object." am: dffbbb6baa
am: af2f2b90fd

Change-Id: I01af8b18a2c86fbf636df1a8aab61ce584807bd5

8 years agoMerge "Add define needed by new vixl" am: 621a27ed21
Colin Cross [Mon, 22 Aug 2016 20:31:06 +0000 (20:31 +0000)]
Merge "Add define needed by new vixl" am: 621a27ed21
am: 57de217dac

Change-Id: Iac9a94aa09eacc2cbbc176de609ffb310326a36c

8 years agoART: String DexCache asm fast path for ARM64
Christina Wadsworth [Mon, 8 Aug 2016 20:08:05 +0000 (13:08 -0700)]
ART: String DexCache asm fast path for ARM64

In the entrypoints, before a string is looked up in the slow path (in
the intern table), I added assembly to check the dex cache and return a
string pointer if the string is already in the dex cache.

Test: test-art-host

Change-Id: Ic9a724848c61e4fa66e82334e2c7b20b13bf8e6c

8 years agoART: String DexCache asm fast path for ARM
Christina Wadsworth [Fri, 19 Aug 2016 18:24:48 +0000 (11:24 -0700)]
ART: String DexCache asm fast path for ARM

In the entrypoints, before a string is looked up in the slow path (in
the intern table), I added assembly to check the dex cache and return a
string pointer if the string is already in the dex cache.

Test: test-art-host

Change-Id: I245946b3efa9c2e4fa56f761effb90963ac22ec4

8 years agoMerge "Fix debugger missing handle between adding and tagging object."
Jeff Hao [Mon, 22 Aug 2016 20:27:10 +0000 (20:27 +0000)]
Merge "Fix debugger missing handle between adding and tagging object."
am: dffbbb6baa

Change-Id: Id894f1d2f72d00f3af4295bccae6f9050f609e1c

8 years agoMerge "Add define needed by new vixl"
Colin Cross [Mon, 22 Aug 2016 20:27:02 +0000 (20:27 +0000)]
Merge "Add define needed by new vixl"
am: 621a27ed21

Change-Id: If7d59f6d9bc859b88e333b5316ffbd275bc2a49a

8 years agoMerge "Fix debugger missing handle between adding and tagging object."
Jeff Hao [Mon, 22 Aug 2016 20:26:20 +0000 (20:26 +0000)]
Merge "Fix debugger missing handle between adding and tagging object."

8 years agoART: String DexCache asm fast path for x86
Christina Wadsworth [Mon, 22 Aug 2016 20:22:36 +0000 (13:22 -0700)]
ART: String DexCache asm fast path for x86

In the entrypoints, before a string is looked up in the slow path (in
the intern table), I added assembly to check the dex cache and return a
string pointer if the string is already in the dex cache.

Test: test-art-host

Change-Id: Id0c337b380adc0b2bde5325745c928290d9da1b0

8 years agoMerge "Add define needed by new vixl"
Treehugger Robot [Mon, 22 Aug 2016 20:19:06 +0000 (20:19 +0000)]
Merge "Add define needed by new vixl"

8 years agoOngoing improvements in java fuzz testing
Aart Bik [Fri, 19 Aug 2016 22:45:11 +0000 (15:45 -0700)]
Ongoing improvements in java fuzz testing

Added --device option to runner to define target in case
        multiple devices are attached

Added more cases to JavaFuzz, removed a few cases that
are likely to hang the program (such as changing loop
variables) since throughput is more important for fuzzing

Test: run_java_fuzz_test.py

BUG=30610121

Change-Id: I0cd6f5d3b7fb35ddb91d91c0c0c00afaf83218d8

8 years agoFix debugger missing handle between adding and tagging object.
Jeff Hao [Mon, 22 Aug 2016 18:34:41 +0000 (11:34 -0700)]
Fix debugger missing handle between adding and tagging object.

Bug: 30951794
Change-Id: Ic9c5f296efe839a8961ab00d08afc54c5443bc17

8 years agoRevert "Revert "Improve the thread flip.""
Hiroshi Yamauchi [Sat, 20 Aug 2016 00:03:27 +0000 (17:03 -0700)]
Revert "Revert "Improve the thread flip.""

This reverts commit db3204f87c3f7c4de89762ce9e8502a9dc25c2d8.

Improve the thread flip.

- In addition to the threads that are suspended in FullSuspendCheck(),
  prioritize the resume of threads that are blocking for the thread
  flip at the JNI critical section entry and threads are about to
  transition to runnable (eg. blocking at the SOA entry from JNI).
- Shorten the length of the thread flip critical
  section (ThreadFlipBegin/End).
- Add some systrace scopes.
- Add a read barrier for the locked objects during the thread dump in
  case the thread is in the middle of flipping.

Bug: 30980189
Bug: 29517059
Bug: 12687968
Test: test-art-host, Ritz EAAC, N9 libartd boot
Change-Id: I3a903c47c0fcc746664ec376cc31dee8af3c3ecb

8 years agoMerge "ART: Adding asm support for string dex cache" am: 82a4c22ef4
Christina Wadsworth [Mon, 22 Aug 2016 18:17:18 +0000 (18:17 +0000)]
Merge "ART: Adding asm support for string dex cache" am: 82a4c22ef4
am: f6167363d3

Change-Id: Ib20b17e586c59538656938cdb05f3633d5a01989

8 years agoMerge "ART: Adding asm support for string dex cache"
Christina Wadsworth [Mon, 22 Aug 2016 18:12:50 +0000 (18:12 +0000)]
Merge "ART: Adding asm support for string dex cache"
am: 82a4c22ef4

Change-Id: Ic81762140ae52b21cf52df69c39fba903346293f

8 years agoMerge "ART: Adding asm support for string dex cache"
Treehugger Robot [Mon, 22 Aug 2016 18:09:06 +0000 (18:09 +0000)]
Merge "ART: Adding asm support for string dex cache"

8 years agoART: String DexCache asm fast path for x86_64
Christina Wadsworth [Mon, 22 Aug 2016 17:46:55 +0000 (10:46 -0700)]
ART: String DexCache asm fast path for x86_64

In the entrypoints, before a string is looked up in the slow
path (in the intern table), I added assembly to check the dex cache and return a
string pointer if the string is already in the dex cache.

Test: test-art-host

Change-Id: Id1b0314d597c2abff3f7d332f4ab66271f026dc1

8 years agoART: Adding asm support for string dex cache
Christina Wadsworth [Fri, 19 Aug 2016 18:23:48 +0000 (11:23 -0700)]
ART: Adding asm support for string dex cache

Added constants and offsets for the string dex cache fast paths that
will be introduced into entrypoints in subsequent commits.

Test: test-art-host

Change-Id: I19f97526e06cbedc782d5ef11359796731cdad82

8 years agoAdd define needed by new vixl
Colin Cross [Sat, 20 Aug 2016 05:35:58 +0000 (22:35 -0700)]
Add define needed by new vixl

vixl now requires -DVIXL_INCLUDE_SIMULATOR_AARCH64 when including
simulator-aarch64.h.

Tests: mmma -j art, m -j build-art-tests
Change-Id: I9b9bb7ca618ccbb505de943825f5e9517542fa1b

8 years agoMerge "Fix debugger calling new String()." am: 786bce8aec
Jeff Hao [Mon, 22 Aug 2016 16:57:42 +0000 (16:57 +0000)]
Merge "Fix debugger calling new String()." am: 786bce8aec
am: a16a4d59c8

Change-Id: I943ed7899118d76db916603c13e4c3de01fb31f8

8 years agoMerge "Fix debugger calling new String()."
Jeff Hao [Mon, 22 Aug 2016 16:53:32 +0000 (16:53 +0000)]
Merge "Fix debugger calling new String()."
am: 786bce8aec

Change-Id: I16f869c85b1db84ca6aaa6a77437a23445203a56

8 years agoMerge "ARM/ARM64: Improve comments for kSaveEverything assembly." am: c97bfd4512
Vladimir Marko [Mon, 22 Aug 2016 16:53:11 +0000 (16:53 +0000)]
Merge "ARM/ARM64: Improve comments for kSaveEverything assembly." am: c97bfd4512
am: b1f90d499e

Change-Id: Iba2a6f578b8ba291e447bb7c3fd6d543912444ed

8 years agoMerge "ARM/ARM64: Improve comments for kSaveEverything assembly."
Vladimir Marko [Mon, 22 Aug 2016 16:49:17 +0000 (16:49 +0000)]
Merge "ARM/ARM64: Improve comments for kSaveEverything assembly."
am: c97bfd4512

Change-Id: If51fb9cf83ff6a3a5f51d88d7bc20880649f67dd

8 years agoMerge "Fix debugger calling new String()."
Jeff Hao [Mon, 22 Aug 2016 16:47:43 +0000 (16:47 +0000)]
Merge "Fix debugger calling new String()."

8 years agoMerge "ARM/ARM64: Improve comments for kSaveEverything assembly."
Treehugger Robot [Mon, 22 Aug 2016 16:39:20 +0000 (16:39 +0000)]
Merge "ARM/ARM64: Improve comments for kSaveEverything assembly."

8 years agoARM/ARM64: Improve comments for kSaveEverything assembly.
Vladimir Marko [Mon, 22 Aug 2016 15:02:12 +0000 (16:02 +0100)]
ARM/ARM64: Improve comments for kSaveEverything assembly.

Addresses post-submit comments for
    https://android-review.googlesource.com/255290

Test: Rely on TreeHugger (just adds comments).
Bug: 30212852
Change-Id: I6ccc004774e18bbd83e3940e908cfc6c521142db

8 years agoMerge "ART: Add thread offset printing hook to disassembler" am: 792c98bb77
Andreas Gampe [Mon, 22 Aug 2016 15:10:35 +0000 (15:10 +0000)]
Merge "ART: Add thread offset printing hook to disassembler" am: 792c98bb77
am: 455b5cb525

Change-Id: Ie76d32d4d57d61691272f676653f081bf9ac7bbf

8 years agoMerge "Do not run 537-checker-arraycopy on non-Baker read barrier configs." am: 449fe...
Roland Levillain [Mon, 22 Aug 2016 15:10:34 +0000 (15:10 +0000)]
Merge "Do not run 537-checker-arraycopy on non-Baker read barrier configs." am: 449fe8790c
am: a0f30d50d6

Change-Id: I87f76181682d2769b36c3886266ba3ee83ed4393

8 years agoMerge "ART: Add thread offset printing hook to disassembler"
Andreas Gampe [Mon, 22 Aug 2016 15:06:40 +0000 (15:06 +0000)]
Merge "ART: Add thread offset printing hook to disassembler"
am: 792c98bb77

Change-Id: Icb25b5da5df28bef2324bcc0542abbf30abf3ea2

8 years agoMerge "Do not run 537-checker-arraycopy on non-Baker read barrier configs."
Roland Levillain [Mon, 22 Aug 2016 15:06:38 +0000 (15:06 +0000)]
Merge "Do not run 537-checker-arraycopy on non-Baker read barrier configs."
am: 449fe8790c

Change-Id: I1279844e28564d9e70771e9d366f683d7af9e5ea

8 years agoMerge "ART: Add thread offset printing hook to disassembler"
Treehugger Robot [Mon, 22 Aug 2016 15:01:24 +0000 (15:01 +0000)]
Merge "ART: Add thread offset printing hook to disassembler"

8 years agoMerge "Do not run 537-checker-arraycopy on non-Baker read barrier configs."
Roland Levillain [Mon, 22 Aug 2016 14:58:05 +0000 (14:58 +0000)]
Merge "Do not run 537-checker-arraycopy on non-Baker read barrier configs."

8 years agoDo not run 537-checker-arraycopy on non-Baker read barrier configs.
Roland Levillain [Mon, 22 Aug 2016 12:59:21 +0000 (13:59 +0100)]
Do not run 537-checker-arraycopy on non-Baker read barrier configs.

Test: ART_USE_READ_BARRIER=true ART_READ_BARRIER_TYPE=TABLELOOKUP make test-art-host-run-test-537-checker-arraycopy
Bug: 29516905
Bug: 12687968
Change-Id: Ie77f3a7ce19f3ff78d2132ca70fb10b595eb54d5

8 years agoMerge "ART: Enforce arena alignment in Realloc" am: ce999e7c8a
Andreas Gampe [Sat, 20 Aug 2016 05:41:16 +0000 (05:41 +0000)]
Merge "ART: Enforce arena alignment in Realloc" am: ce999e7c8a
am: b82a56c486

Change-Id: I0e0cfe4987f71292e08e230e14a59c5f88e0474c

8 years agoMerge "ART: Enforce arena alignment in Realloc"
Andreas Gampe [Sat, 20 Aug 2016 05:31:27 +0000 (05:31 +0000)]
Merge "ART: Enforce arena alignment in Realloc"
am: ce999e7c8a

Change-Id: I5203de97e4b74bc854f13d83c4fee35a69df49bf

8 years agoMerge "ART: Enforce arena alignment in Realloc"
Treehugger Robot [Sat, 20 Aug 2016 05:19:15 +0000 (05:19 +0000)]
Merge "ART: Enforce arena alignment in Realloc"

8 years agoART: Enforce arena alignment in Realloc
Andreas Gampe [Sat, 20 Aug 2016 03:22:19 +0000 (20:22 -0700)]
ART: Enforce arena alignment in Realloc

Enforce the expected alignment in Realloc when the given buffer
can be expanded.

Add debug checks to prove alignment guarantees.

Change-Id: I7dbaf3ca0896f714cff07ff08f067a7c088a6c8d
Test: m test-art-host

8 years agoFix debugger calling new String().
Jeff Hao [Sat, 20 Aug 2016 01:31:39 +0000 (18:31 -0700)]
Fix debugger calling new String().

Used to return an empty string instead of the newly created String.
Requires accompanying jdwp test fix to test String contents.

Bug: 30951794
Change-Id: I27a8e0afcbe7e32a14dd3c394e44b6cd4d3c58f6
Test: mm -j24 run-jdwp-tests-host

8 years agoMerge "ART: Added DCHECKS to find alignment breakage." am: da0f5e72cc
Christina Wadsworth [Sat, 20 Aug 2016 00:39:57 +0000 (00:39 +0000)]
Merge "ART: Added DCHECKS to find alignment breakage." am: da0f5e72cc
am: 966c9dbcbe

Change-Id: Iaad545eeba7e6f3c9447c7c6d5ae0c9ee06ef59e

8 years agoMerge "ART: Added DCHECKS to find alignment breakage."
Christina Wadsworth [Sat, 20 Aug 2016 00:35:45 +0000 (00:35 +0000)]
Merge "ART: Added DCHECKS to find alignment breakage."
am: da0f5e72cc

Change-Id: I53087c9339afe916c86a1af8efc430069c4a0104

8 years agoMerge "ART: Added DCHECKS to find alignment breakage."
Treehugger Robot [Sat, 20 Aug 2016 00:26:36 +0000 (00:26 +0000)]
Merge "ART: Added DCHECKS to find alignment breakage."

8 years agoART: Add thread offset printing hook to disassembler
Andreas Gampe [Fri, 19 Aug 2016 17:49:06 +0000 (10:49 -0700)]
ART: Add thread offset printing hook to disassembler

To prepare separation of disassembler from libart, add a function
hook to the disassembler options for thread offset name printing.

Bug: 15436106
Change-Id: I9e9b7e565ae923952c64026f675ac527b560f51b

8 years agoART: Added DCHECKS to find alignment breakage.
Christina Wadsworth [Fri, 19 Aug 2016 22:58:05 +0000 (15:58 -0700)]
ART: Added DCHECKS to find alignment breakage.

Change-Id: I47aed866ec3c3858dc3ee27cb84cfaddf44009d1

8 years agoMerge "Revert "Improve the thread flip."" am: bf042503dc
Hiroshi Yamauchi [Fri, 19 Aug 2016 22:22:30 +0000 (22:22 +0000)]
Merge "Revert "Improve the thread flip."" am: bf042503dc
am: ec70e9623e

Change-Id: Ie70c3bf9bc64aac2940a30a8831c69246ef46c0f

8 years agoMerge "Revert "Improve the thread flip.""
Hiroshi Yamauchi [Fri, 19 Aug 2016 22:18:36 +0000 (22:18 +0000)]
Merge "Revert "Improve the thread flip.""
am: bf042503dc

Change-Id: I12000152e9c2752b64d75297328f9521bb26b56a