OSDN Git Service

android-x86/art.git
9 years agoam 02abb507: Merge "Fix jit tests"
Mathieu Chartier [Fri, 27 Feb 2015 21:08:41 +0000 (21:08 +0000)]
am 02abb507: Merge "Fix jit tests"

* commit '02abb5075f3085e69c0c81fb5724c066f6c845b7':
  Fix jit tests

9 years agoMerge "Fix jit tests"
Mathieu Chartier [Fri, 27 Feb 2015 20:55:16 +0000 (20:55 +0000)]
Merge "Fix jit tests"

9 years agoFix jit tests
Mathieu Chartier [Fri, 27 Feb 2015 18:39:48 +0000 (10:39 -0800)]
Fix jit tests

Missing image suffix was missing causing tests to fail.
Also added missing phony targets.

Bug: 19524713
Change-Id: Ib40d39b1fc16e1adfdc01744a199ae9b0b562664

9 years agoam 242026e2: Merge "Fix JIT direct call to interpreter bridge"
Mathieu Chartier [Fri, 27 Feb 2015 16:33:25 +0000 (16:33 +0000)]
am 242026e2: Merge "Fix JIT direct call to interpreter bridge"

* commit '242026e246a8b9efe098a0cce008fd525e011e5b':
  Fix JIT direct call to interpreter bridge

9 years agoMerge "Fix JIT direct call to interpreter bridge"
Mathieu Chartier [Fri, 27 Feb 2015 02:58:48 +0000 (02:58 +0000)]
Merge "Fix JIT direct call to interpreter bridge"

9 years agoFix JIT direct call to interpreter bridge
Mathieu Chartier [Fri, 27 Feb 2015 02:28:07 +0000 (18:28 -0800)]
Fix JIT direct call to interpreter bridge

FormulaEvaluationActions.EvaluateAndApplyChanges on hammerhead eng:
Before: 3550ms
After: 2540

Bug: 17950037
Change-Id: If7acaea20d4adb5418d00ef13192e2d4c29032af

9 years agoam 0a575f25: Merge "Change card cache mod-union table to use bitmaps"
Mathieu Chartier [Thu, 26 Feb 2015 23:13:35 +0000 (23:13 +0000)]
am 0a575f25: Merge "Change card cache mod-union table to use bitmaps"

* commit '0a575f25c56c8fff485a1dd497ed1efb1b5d3ea9':
  Change card cache mod-union table to use bitmaps

9 years agoMerge "Change card cache mod-union table to use bitmaps"
Mathieu Chartier [Thu, 26 Feb 2015 23:04:02 +0000 (23:04 +0000)]
Merge "Change card cache mod-union table to use bitmaps"

9 years agoChange card cache mod-union table to use bitmaps
Mathieu Chartier [Fri, 23 Jan 2015 21:18:53 +0000 (13:18 -0800)]
Change card cache mod-union table to use bitmaps

Previously used card sets, using bitmaps saves memory and slightly
increases performance.

Added mod union table test.

Performance EvaluateAndApplyChanges (minimal changes):

Before (card cache image mu table):
UpdateAndMarkImageModUnionTable: Avg: 524.320us
ImageModUnionClearCards: Avg: 54.580us
Native PSS: ~67500kB

After (card cache image mu table):
UpdateAndMarkImageModUnionTable: Avg: 515.600us
ImageModUnionClearCards: Avg: 53.780us
Native PSS: ~66014kB

Native PSS was higher before since the mod_union_table->SetCards()
which happens pre zygote fork was allocating a large amount of
std::nodes.

Bug: 11859910

Change-Id: I956b7e51d5572feec1393ffa618b7b7d8c147b28

9 years agoam e111f112: Merge "Add standard gc log for transition collections."
Hiroshi Yamauchi [Thu, 26 Feb 2015 22:28:14 +0000 (22:28 +0000)]
am e111f112: Merge "Add standard gc log for transition collections."

* commit 'e111f1128c4d7cf34e30c4c3c7e682a682e262c4':
  Add standard gc log for transition collections.

9 years agoMerge "Add standard gc log for transition collections."
Hiroshi Yamauchi [Thu, 26 Feb 2015 21:12:25 +0000 (21:12 +0000)]
Merge "Add standard gc log for transition collections."

9 years agoAdd standard gc log for transition collections.
Hiroshi Yamauchi [Thu, 26 Feb 2015 20:53:45 +0000 (12:53 -0800)]
Add standard gc log for transition collections.

Factor out the gc log logic into a function.

Note we still don't log in background as before but do for things like
OOME compactions in foreground.

Change-Id: Ifd35a796cf26aba2fba83bf07e72902357d91f8b

9 years agoam 0644b2da: Merge "Add missing JIT stuff in make files"
Mathieu Chartier [Thu, 26 Feb 2015 19:38:47 +0000 (19:38 +0000)]
am 0644b2da: Merge "Add missing JIT stuff in make files"

* commit '0644b2dae97d13bec14840cccb11b54697c34a34':
  Add missing JIT stuff in make files

9 years agoMerge "Add missing JIT stuff in make files"
Mathieu Chartier [Thu, 26 Feb 2015 19:30:35 +0000 (19:30 +0000)]
Merge "Add missing JIT stuff in make files"

9 years agoAdd missing JIT stuff in make files
Mathieu Chartier [Thu, 26 Feb 2015 18:58:08 +0000 (10:58 -0800)]
Add missing JIT stuff in make files

Was causing core.oat to not be created.

Bug: 19524713
Change-Id: I5da005fd36f9682623fdda9931280997b59c2681

9 years agoam f5c224cc: Merge "Update expectations for volantis."
Nicolas Geoffray [Thu, 26 Feb 2015 15:16:13 +0000 (15:16 +0000)]
am f5c224cc: Merge "Update expectations for volantis."

* commit 'f5c224cca603ef1dba9bb80952613facc22598fa':
  Update expectations for volantis.

9 years agoMerge "Update expectations for volantis."
Nicolas Geoffray [Thu, 26 Feb 2015 15:11:58 +0000 (15:11 +0000)]
Merge "Update expectations for volantis."

9 years agoUpdate expectations for volantis.
Nicolas Geoffray [Thu, 26 Feb 2015 14:53:03 +0000 (14:53 +0000)]
Update expectations for volantis.

Change-Id: Icd4aecd9b7a274febfd99bad6432bb9d46f9e1d3

9 years agoam 2433d1a1: Merge "ARM: Fix LIR flags in encoding map."
Vladimir Marko [Thu, 26 Feb 2015 12:22:42 +0000 (12:22 +0000)]
am 2433d1a1: Merge "ARM: Fix LIR flags in encoding map."

* commit '2433d1a12dadb90a1b1c1140156aaf72f5b52c5e':
  ARM: Fix LIR flags in encoding map.

9 years agoMerge "ARM: Fix LIR flags in encoding map."
Vladimir Marko [Thu, 26 Feb 2015 12:17:57 +0000 (12:17 +0000)]
Merge "ARM: Fix LIR flags in encoding map."

9 years agoam ff9b7475: Merge "JDWP: fix thread state on event suspension"
Sebastien Hertz [Thu, 26 Feb 2015 06:21:57 +0000 (06:21 +0000)]
am ff9b7475: Merge "JDWP: fix thread state on event suspension"

* commit 'ff9b747588e77f04b07dc76b2d39a82cbfc60441':
  JDWP: fix thread state on event suspension

9 years agoMerge "JDWP: fix thread state on event suspension"
Sebastien Hertz [Thu, 26 Feb 2015 06:17:12 +0000 (06:17 +0000)]
Merge "JDWP: fix thread state on event suspension"

9 years agoARM: Fix LIR flags in encoding map.
Ningsheng Jian [Wed, 4 Feb 2015 06:13:45 +0000 (14:13 +0800)]
ARM: Fix LIR flags in encoding map.

Also correct memory reference type for PC relative load.

Change-Id: I7a5258f2ed718448dc3e6e7fda6569b3f0c2fe46

9 years agoam f16fe893: Merge "Fix method_verifier_test with the SS collector."
Hiroshi Yamauchi [Thu, 26 Feb 2015 02:22:10 +0000 (02:22 +0000)]
am f16fe893: Merge "Fix method_verifier_test with the SS collector."

* commit 'f16fe893139345dad8b05b3db3e717c6f8d079d0':
  Fix method_verifier_test with the SS collector.

9 years agoMerge "Fix method_verifier_test with the SS collector."
Hiroshi Yamauchi [Thu, 26 Feb 2015 02:12:01 +0000 (02:12 +0000)]
Merge "Fix method_verifier_test with the SS collector."

9 years agoam b1de6a4d: Merge "Change already inline error to warning"
Mathieu Chartier [Thu, 26 Feb 2015 01:49:35 +0000 (01:49 +0000)]
am b1de6a4d: Merge "Change already inline error to warning"

* commit 'b1de6a4db50444530a459ad17987c50000eaa53a':
  Change already inline error to warning

9 years agoMerge "Change already inline error to warning"
Mathieu Chartier [Thu, 26 Feb 2015 01:41:57 +0000 (01:41 +0000)]
Merge "Change already inline error to warning"

9 years agoFix method_verifier_test with the SS collector.
Hiroshi Yamauchi [Wed, 25 Feb 2015 20:52:34 +0000 (12:52 -0800)]
Fix method_verifier_test with the SS collector.

Rename art_default_gc_type to ART_DEFAULT_GC_TYPE.

Bug: 19514492

Change-Id: I3c7920e7a84327c5908462e51e21199b89fb187d

9 years agoChange already inline error to warning
Mathieu Chartier [Thu, 26 Feb 2015 01:17:37 +0000 (17:17 -0800)]
Change already inline error to warning

There is a race condition in the JIT where the JIT and another
running thread can both verify the same method at the same time.
This causes the inline method to be added twice and the LOG(ERROR)
was causing occasional test failures.

Bug: 17950037
Bug: 18713034
Change-Id: I7f94384106ca5c621a5cf7d2ba36910d923d110c

9 years agoam 4f9bbe2a: Merge "Fix JIT for vmdebug test 99"
Mathieu Chartier [Thu, 26 Feb 2015 01:07:17 +0000 (01:07 +0000)]
am 4f9bbe2a: Merge "Fix JIT for vmdebug test 99"

* commit '4f9bbe2a654165aedab62041101ae41d54c04e39':
  Fix JIT for vmdebug test 99

9 years agoam b491375a: Merge "[MIPS] Fix mips32 trampoline problem."
Andreas Gampe [Thu, 26 Feb 2015 01:07:09 +0000 (01:07 +0000)]
am b491375a: Merge "[MIPS] Fix mips32 trampoline problem."

* commit 'b491375af0ffa7f0ee534b30d606d8748f7ad15f':
  [MIPS] Fix mips32 trampoline problem.

9 years agoam 42cfbb0a: Merge "Fix argument register allocation for mips32."
Andreas Gampe [Thu, 26 Feb 2015 01:07:06 +0000 (01:07 +0000)]
am 42cfbb0a: Merge "Fix argument register allocation for mips32."

* commit '42cfbb0afe15f425753e6b5e6c6c90fa73f2bbef':
  Fix argument register allocation for mips32.

9 years agoMerge "Fix JIT for vmdebug test 99"
Mathieu Chartier [Thu, 26 Feb 2015 00:34:11 +0000 (00:34 +0000)]
Merge "Fix JIT for vmdebug test 99"

9 years agoMerge "[MIPS] Fix mips32 trampoline problem."
Andreas Gampe [Thu, 26 Feb 2015 00:00:40 +0000 (00:00 +0000)]
Merge "[MIPS] Fix mips32 trampoline problem."

9 years agoMerge "Fix argument register allocation for mips32."
Andreas Gampe [Wed, 25 Feb 2015 23:58:29 +0000 (23:58 +0000)]
Merge "Fix argument register allocation for mips32."

9 years ago[MIPS] Fix mips32 trampoline problem.
Nikola Veljkovic [Fri, 20 Feb 2015 16:21:15 +0000 (17:21 +0100)]
[MIPS] Fix mips32 trampoline problem.

Reserve argument slots (for $a0-$a3) on the stack in the
InvokeTrampoline() function, for entrypoints that contain direct
reference to native implementation. Called function may use this
space to store $a0-$a3 regs.

This fixes the Settings app crash on mips32, when navigating to:
Settings->Apps->(swipe) On SD card.

Change-Id: If53ce822fd3ef6ef9839c89b556f76fac0792190

9 years agoFix JIT for vmdebug test 99
Mathieu Chartier [Wed, 25 Feb 2015 21:22:57 +0000 (13:22 -0800)]
Fix JIT for vmdebug test 99

Test was flaky due to JIT re-compiliation after deoptimization
resulting in some invalid PC offsets.

Bug: 17950037
Change-Id: I276c84c918579259ce47ef873892c3c5dcf0c977

9 years agoam 8db3d76b: Merge "ART: oatdump enhancements"
Andreas Gampe [Wed, 25 Feb 2015 19:59:24 +0000 (19:59 +0000)]
am 8db3d76b: Merge "ART: oatdump enhancements"

* commit '8db3d76ba7061da80f5eb58079830c796e4dea61':
  ART: oatdump enhancements

9 years agoFix argument register allocation for mips32.
Douglas Leung [Sat, 14 Feb 2015 00:53:03 +0000 (16:53 -0800)]
Fix argument register allocation for mips32.

Change-Id: Ic21b0371d7cafb9b67217b92bb2edb735a43d1b0

9 years agoMerge "ART: oatdump enhancements"
Andreas Gampe [Wed, 25 Feb 2015 19:51:12 +0000 (19:51 +0000)]
Merge "ART: oatdump enhancements"

9 years agoART: oatdump enhancements
Anestis Bechtsoudis [Mon, 23 Feb 2015 06:32:57 +0000 (22:32 -0800)]
ART: oatdump enhancements

New features list includes:
- Class filter option to limit classes search space
- Method filter is applied only against the method
  name, instead of the entire signature. Can be
  combined with class filter for maximum efficiency.
- Bulk dump of class and method names list only.
  Can be combined with filters to limit results.
- Export embedded dex files from input oat files
  to filesystem (symlinks not supported as utils
  functions are utilized for os & fs operations).
- addr2instr option to locate the in-range method
  implementation and limit disassemble dumps. Input
  relative addr is added to oat executable offset to
  calculate the search offset. If method has been
  successfully located, code is dumped and program
  aborts further analysis of the input file. Methods
  located before the target address just print their
  signature, although skip all disassemble and other
  info. Calculated search offset is also printed as
  part of the initial header info.
- Little-endian dex instructions bytecode is printed
  in the same line before the instruction string.

Some minor re-orders have been also taken place for
more targeted results.

Change-Id: I3116ee3c99c258718f46faea8ea4295da6ae2bf7
Signed-off-by: Anestis Bechtsoudis <anestis@census-labs.com>
9 years agoam 01b7c431: Merge "ART: Print maps directly to log"
Andreas Gampe [Wed, 25 Feb 2015 18:16:35 +0000 (18:16 +0000)]
am 01b7c431: Merge "ART: Print maps directly to log"

* commit '01b7c431ed85e0eae4554f6fc0f79a78bc82f31f':
  ART: Print maps directly to log

9 years agoMerge "ART: Print maps directly to log"
Andreas Gampe [Wed, 25 Feb 2015 18:12:27 +0000 (18:12 +0000)]
Merge "ART: Print maps directly to log"

9 years agoJDWP: fix thread state on event suspension
Sebastien Hertz [Tue, 24 Feb 2015 13:56:59 +0000 (14:56 +0100)]
JDWP: fix thread state on event suspension

Before suspending event thread, we ensure its state is kSuspended
so the debugger sees it as RUNNING instead of WAIT.

Bug: 19103406
Change-Id: I58b4141a958bf6a3c360f6994967fad0078ea373

9 years agoam ec27dc12: Merge "ART: Nano optimization of LiveInterval"
David Brazdil [Wed, 25 Feb 2015 12:20:20 +0000 (12:20 +0000)]
am ec27dc12: Merge "ART: Nano optimization of LiveInterval"

* commit 'ec27dc12124d57283d8f86e5386c95896b01eb23':
  ART: Nano optimization of LiveInterval

9 years agoMerge "ART: Nano optimization of LiveInterval"
David Brazdil [Wed, 25 Feb 2015 12:14:17 +0000 (12:14 +0000)]
Merge "ART: Nano optimization of LiveInterval"

9 years agoART: Nano optimization of LiveInterval
David Brazdil [Wed, 25 Feb 2015 11:57:05 +0000 (11:57 +0000)]
ART: Nano optimization of LiveInterval

Shuffling the order of conditions in the FirstIntersectionWith method
of LiveInterval class can save a couple of comparisons. Even though
this is a tiny optimization, it can save some compilation time since
the method is heavily used during register allocation.

Change-Id: I1817bd95db2d0eb96cc06fb2e9e06ac1cea784fe

9 years agoam 2cfa9f27: Merge "ART: Update description of failing libcore tests"
David Brazdil [Wed, 25 Feb 2015 10:13:53 +0000 (10:13 +0000)]
am 2cfa9f27: Merge "ART: Update description of failing libcore tests"

* commit '2cfa9f2743f4a120070e83b1e34cbec22742780d':
  ART: Update description of failing libcore tests

9 years agoMerge "ART: Update description of failing libcore tests"
David Brazdil [Wed, 25 Feb 2015 09:29:55 +0000 (09:29 +0000)]
Merge "ART: Update description of failing libcore tests"

9 years agoART: Update description of failing libcore tests
David Brazdil [Wed, 25 Feb 2015 09:16:34 +0000 (09:16 +0000)]
ART: Update description of failing libcore tests

One of the tests that was described as failing on volantis fails on
hammerhead too. It was moved to a new category.

Change-Id: Ie58266d51d3aa180a36a460035ea7f016c0b7e3d

9 years agoART: Print maps directly to log
Andreas Gampe [Tue, 24 Feb 2015 23:50:19 +0000 (15:50 -0800)]
ART: Print maps directly to log

Do not read proc maps into a string before printing them later back
to the log. In low-memory situations this can cause a bad_alloc.

External bug: http://b.android.com/153990
Bug: 19494774

Change-Id: Ie63d8788afe8c9da65b30b2f89c50d3dbb820755

9 years agoam 42f8c1c3: Merge "ART: Fix "unused parameters""
Andreas Gampe [Wed, 25 Feb 2015 05:01:29 +0000 (05:01 +0000)]
am 42f8c1c3: Merge "ART: Fix "unused parameters""

* commit '42f8c1c39b74aae50714488525d14de30f9722c9':
  ART: Fix "unused parameters"

9 years agoMerge "ART: Fix "unused parameters""
Andreas Gampe [Wed, 25 Feb 2015 04:56:43 +0000 (04:56 +0000)]
Merge "ART: Fix "unused parameters""

9 years agoART: Fix "unused parameters"
Andreas Gampe [Wed, 25 Feb 2015 04:55:16 +0000 (20:55 -0800)]
ART: Fix "unused parameters"

GCC 4.8 decides that parameters for functions implemented with
"= default" are unused. This currently only impacts x86, but remove
the parameter names anyways.

Change-Id: I01865faa81af68c4c0e0b1cb1fb19e88ef548769

9 years agoam 8fa836e1: Merge "Print thread name for attempting to unregister unattached thread"
Mathieu Chartier [Wed, 25 Feb 2015 03:01:24 +0000 (03:01 +0000)]
am 8fa836e1: Merge "Print thread name for attempting to unregister unattached thread"

* commit '8fa836e16e65aca3aeaa1c4784157207188e6373':
  Print thread name for attempting to unregister unattached thread

9 years agoMerge "Print thread name for attempting to unregister unattached thread"
Mathieu Chartier [Wed, 25 Feb 2015 02:57:41 +0000 (02:57 +0000)]
Merge "Print thread name for attempting to unregister unattached thread"

9 years agoam 79a3082b: Merge "Delete bad DCHECK"
Mathieu Chartier [Wed, 25 Feb 2015 01:57:54 +0000 (01:57 +0000)]
am 79a3082b: Merge "Delete bad DCHECK"

* commit '79a3082b1cf1f1e84d599f3c2d39178b8787db3f':
  Delete bad DCHECK

9 years agoMerge "Delete bad DCHECK"
Mathieu Chartier [Wed, 25 Feb 2015 01:53:10 +0000 (01:53 +0000)]
Merge "Delete bad DCHECK"

9 years agoDelete bad DCHECK
Mathieu Chartier [Tue, 24 Feb 2015 02:24:29 +0000 (18:24 -0800)]
Delete bad DCHECK

The declaring class of a super field could be in a different dex file.
Fixes sdk build.

Change-Id: I8258d64eeff6539afb52448595f5a6ec4c71a6bc

9 years agoPrint thread name for attempting to unregister unattached thread
Mathieu Chartier [Wed, 25 Feb 2015 01:20:30 +0000 (17:20 -0800)]
Print thread name for attempting to unregister unattached thread

Bug: 18713034
Change-Id: Ic0654c6569277e5bbd6d2582140595faaa36cded

9 years agoam 510be430: Merge "Revert "Revert "Add JIT"""
Mathieu Chartier [Wed, 25 Feb 2015 00:51:42 +0000 (00:51 +0000)]
am 510be430: Merge "Revert "Revert "Add JIT"""

* commit '510be430dc4e68c09b56e5636e97a76380927e1d':
  Revert "Revert "Add JIT""

9 years agoMerge "Revert "Revert "Add JIT"""
Mathieu Chartier [Wed, 25 Feb 2015 00:47:14 +0000 (00:47 +0000)]
Merge "Revert "Revert "Add JIT"""

9 years agoam 17b01497: Merge "ART: Add -Wunused"
Andreas Gampe [Wed, 25 Feb 2015 00:31:58 +0000 (00:31 +0000)]
am 17b01497: Merge "ART: Add -Wunused"

* commit '17b01497b29f980a3d515a01adcb5f47df67ac63':
  ART: Add -Wunused

9 years agoMerge "ART: Add -Wunused"
Andreas Gampe [Wed, 25 Feb 2015 00:26:04 +0000 (00:26 +0000)]
Merge "ART: Add -Wunused"

9 years agoART: Add -Wunused
Andreas Gampe [Fri, 20 Feb 2015 02:21:24 +0000 (18:21 -0800)]
ART: Add -Wunused

Until the global CFLAGS are fixed, add Wunused. Fix declarations
in the optimizing compiler.

Change-Id: Ic4553f08e809dc54f3d82af57ac592622c98e000

9 years agoRevert "Revert "Add JIT""
Mathieu Chartier [Tue, 24 Feb 2015 17:37:21 +0000 (09:37 -0800)]
Revert "Revert "Add JIT""

Added missing EntryPointToCodePointer.

This reverts commit a5ca888d715cd0c6c421313211caa1928be3e399.

Change-Id: Ia74df0ef3a7babbdcb0466fd24da28e304e3f5af

9 years agoam 354d58ba: Merge "JDWP: assert no pending exception when using JNI"
Sebastien Hertz [Tue, 24 Feb 2015 17:51:57 +0000 (17:51 +0000)]
am 354d58ba: Merge "JDWP: assert no pending exception when using JNI"

* commit '354d58ba776866ea7b1c71f0d0848d5aaa013ae3':
  JDWP: assert no pending exception when using JNI

9 years agoMerge "JDWP: assert no pending exception when using JNI"
Sebastien Hertz [Tue, 24 Feb 2015 17:47:38 +0000 (17:47 +0000)]
Merge "JDWP: assert no pending exception when using JNI"

9 years agoam 91d67430: Merge "ART: Disable libcore crypto test failing on target"
David Brazdil [Tue, 24 Feb 2015 17:33:54 +0000 (17:33 +0000)]
am 91d67430: Merge "ART: Disable libcore crypto test failing on target"

* commit '91d6743016a513bbe8b288923aaa46a075aed133':
  ART: Disable libcore crypto test failing on target

9 years agoMerge "ART: Disable libcore crypto test failing on target"
David Brazdil [Tue, 24 Feb 2015 17:27:17 +0000 (17:27 +0000)]
Merge "ART: Disable libcore crypto test failing on target"

9 years agoART: Disable libcore crypto test failing on target
David Brazdil [Tue, 24 Feb 2015 17:01:19 +0000 (17:01 +0000)]
ART: Disable libcore crypto test failing on target

Another test failing due to missing loop network device on hammerhead
and volantis bots. We disable it until the device configuration issue
is fixed.

Change-Id: I5b4610d706a8e4bdf178764f64f2d4359a83682d

9 years agoJDWP: assert no pending exception when using JNI
Sebastien Hertz [Wed, 29 Oct 2014 11:06:51 +0000 (12:06 +0100)]
JDWP: assert no pending exception when using JNI

Checks there is no pending exception when creating new JDWP ids using
JNI routines. We can create JDWP ids when executing code and report
an event like a breakpoint.

Bug: 17491155
Change-Id: I4e5851bf2261510b7776a709a2388e7ff586a77c

9 years agoam 2cb551b1: Merge "not-int can also take non-int (byte and short) instructions."
Nicolas Geoffray [Tue, 24 Feb 2015 16:48:36 +0000 (16:48 +0000)]
am 2cb551b1: Merge "not-int can also take non-int (byte and short) instructions."

* commit '2cb551b1f9ef581b0eb1ef7cbee6bfdb6d9db4b3':
  not-int can also take non-int (byte and short) instructions.

9 years agoam 6726d200: Merge "ART: Fix run-test 118"
Andreas Gampe [Tue, 24 Feb 2015 16:48:35 +0000 (16:48 +0000)]
am 6726d200: Merge "ART: Fix run-test 118"

* commit '6726d200144a1c1be0058c57853f9831223991e6':
  ART: Fix run-test 118

9 years agoMerge "not-int can also take non-int (byte and short) instructions."
Nicolas Geoffray [Tue, 24 Feb 2015 16:26:54 +0000 (16:26 +0000)]
Merge "not-int can also take non-int (byte and short) instructions."

9 years agoMerge "ART: Fix run-test 118"
Andreas Gampe [Tue, 24 Feb 2015 16:07:56 +0000 (16:07 +0000)]
Merge "ART: Fix run-test 118"

9 years agoART: Fix run-test 118
Andreas Gampe [Tue, 24 Feb 2015 16:06:34 +0000 (08:06 -0800)]
ART: Fix run-test 118

Need to strip error logging for no-prebuild config.

Change-Id: I870bbbf3b6c7e92996e40e45b1bfa58c7e80f709

9 years agonot-int can also take non-int (byte and short) instructions.
Nicolas Geoffray [Tue, 24 Feb 2015 16:02:06 +0000 (16:02 +0000)]
not-int can also take non-int (byte and short) instructions.

So we should use the result-type instead if the input type
for knowning what instruction to use.

Bug: 19454010
Change-Id: I88782ad27ae8c8e1b7868afede5057d26f14685a

9 years agoam a48c573d: Merge "ART: Enable more libcore tests (crypto)"
David Brazdil [Tue, 24 Feb 2015 15:48:22 +0000 (15:48 +0000)]
am a48c573d: Merge "ART: Enable more libcore tests (crypto)"

* commit 'a48c573d2351177d878e36e003f0cdf4d7f9328f':
  ART: Enable more libcore tests (crypto)

9 years agoMerge "ART: Enable more libcore tests (crypto)"
David Brazdil [Tue, 24 Feb 2015 15:43:18 +0000 (15:43 +0000)]
Merge "ART: Enable more libcore tests (crypto)"

9 years agoam 995e7d49: Merge "Fix inlining in the presence of multiple returns."
Nicolas Geoffray [Tue, 24 Feb 2015 15:14:26 +0000 (15:14 +0000)]
am 995e7d49: Merge "Fix inlining in the presence of multiple returns."

* commit '995e7d495eb898b2812e14ad82d54597676e93fd':
  Fix inlining in the presence of multiple returns.

9 years agoMerge "Fix inlining in the presence of multiple returns."
Nicolas Geoffray [Tue, 24 Feb 2015 15:08:36 +0000 (15:08 +0000)]
Merge "Fix inlining in the presence of multiple returns."

9 years agoFix inlining in the presence of multiple returns.
Nicolas Geoffray [Tue, 24 Feb 2015 13:35:38 +0000 (13:35 +0000)]
Fix inlining in the presence of multiple returns.

One return could actually return a phi, so doing a phi check for
knowing if the result phi was already created was bogus.

Bug: 19454010

Change-Id: Iee703a2d1071ae263092354465eda368e5d6770d

9 years agoam b679039d: Merge "ART: Disable one more libcore test failing on hammerhead"
David Brazdil [Tue, 24 Feb 2015 14:23:22 +0000 (14:23 +0000)]
am b679039d: Merge "ART: Disable one more libcore test failing on hammerhead"

* commit 'b679039d4fdc739959623c2cb1dcc2efa9a1ebe6':
  ART: Disable one more libcore test failing on hammerhead

9 years agoMerge "ART: Disable one more libcore test failing on hammerhead"
David Brazdil [Tue, 24 Feb 2015 14:17:32 +0000 (14:17 +0000)]
Merge "ART: Disable one more libcore test failing on hammerhead"

9 years agoART: Disable one more libcore test failing on hammerhead
David Brazdil [Tue, 24 Feb 2015 14:13:05 +0000 (14:13 +0000)]
ART: Disable one more libcore test failing on hammerhead

One more test from the harmony package fails due to the locale issue
on hammerhead. This patch disables it.

Change-Id: I1f3941bfcc20d5b2e23fe5ae963676138eecccb8

9 years agoART: Enable more libcore tests (crypto)
David Brazdil [Tue, 24 Feb 2015 13:33:01 +0000 (13:33 +0000)]
ART: Enable more libcore tests (crypto)

This patch enables additional libcore tests run by the ART buildbots.
These are tests from the org.apache.harmony.crypto and
libcore.javax.crypto packages and take extra ~8 minutes to run on
target and ~2 minutes on host.

Change-Id: I7cd314eca654320104fee26d8c34437450814dc2

9 years agoam 27a3e615: Merge "ART: Disable libcore tests failing on bots"
David Brazdil [Tue, 24 Feb 2015 12:53:17 +0000 (12:53 +0000)]
am 27a3e615: Merge "ART: Disable libcore tests failing on bots"

* commit '27a3e6153df81dd8adbc9ace70fdb3e7922b72f8':
  ART: Disable libcore tests failing on bots

9 years agoMerge "ART: Disable libcore tests failing on bots"
David Brazdil [Tue, 24 Feb 2015 12:47:42 +0000 (12:47 +0000)]
Merge "ART: Disable libcore tests failing on bots"

9 years agoam 2d043b35: Merge "[optimizing] Add if-context sensitivity for null popagation."
Calin Juravle [Tue, 24 Feb 2015 12:43:59 +0000 (12:43 +0000)]
am 2d043b35: Merge "[optimizing] Add if-context sensitivity for null popagation."

* commit '2d043b356d2e5c911892badf78aa56b843c5c3a6':
  [optimizing] Add if-context sensitivity for null popagation.

9 years agoMerge "[optimizing] Add if-context sensitivity for null popagation."
Calin Juravle [Tue, 24 Feb 2015 12:39:53 +0000 (12:39 +0000)]
Merge "[optimizing] Add if-context sensitivity for null popagation."

9 years agoART: Disable libcore tests failing on bots
David Brazdil [Tue, 24 Feb 2015 12:36:03 +0000 (12:36 +0000)]
ART: Disable libcore tests failing on bots

Some tests in previous commits are failing on the testing devices.
Tests dependent on DateTimeFormatter fail on hammerhead due to
misconfigured locales and tests with a server running on localhost
fail due to the loop device being switched off on volantisg. These
problems will be further investigated but this patch disables them
for the time being.

Change-Id: I2dde178925de555f26a4d532be15487f499571b4

9 years ago[optimizing] Add if-context sensitivity for null popagation.
Calin Juravle [Mon, 23 Feb 2015 16:46:57 +0000 (16:46 +0000)]
[optimizing] Add if-context sensitivity for null popagation.

Change-Id: I3725b6c6a6cf44440c34a1bfb67e623531e665d6

9 years agoam 0b6daeb0: Merge "ART: Enable more libcore tests (harmony package)"
David Brazdil [Tue, 24 Feb 2015 10:59:13 +0000 (10:59 +0000)]
am 0b6daeb0: Merge "ART: Enable more libcore tests (harmony package)"

* commit '0b6daeb0f0014474b542cbba1f713eb0dbefb7f9':
  ART: Enable more libcore tests (harmony package)

9 years agoMerge "ART: Enable more libcore tests (harmony package)"
David Brazdil [Tue, 24 Feb 2015 10:52:45 +0000 (10:52 +0000)]
Merge "ART: Enable more libcore tests (harmony package)"

9 years agoART: Enable more libcore tests (harmony package)
David Brazdil [Tue, 24 Feb 2015 10:44:29 +0000 (10:44 +0000)]
ART: Enable more libcore tests (harmony package)

This patch enables additional libcore tests run by the ART buildbots.
These are tests from the org.apache.harmony.* packages and take extra
~5 minutes to run on target and ~2 minutes on host.

Change-Id: Idb9fc09ac7df460bd4337bc5151301adddea4b97

9 years agoam 69f46525: Merge "ART: Enable more libcore tests (libcore.* package)"
David Brazdil [Tue, 24 Feb 2015 10:27:33 +0000 (10:27 +0000)]
am 69f46525: Merge "ART: Enable more libcore tests (libcore.* package)"

* commit '69f46525c7238f43eaefdb844106c2e97181c498':
  ART: Enable more libcore tests (libcore.* package)

9 years agoMerge "ART: Enable more libcore tests (libcore.* package)"
David Brazdil [Tue, 24 Feb 2015 10:21:43 +0000 (10:21 +0000)]
Merge "ART: Enable more libcore tests (libcore.* package)"

9 years agoART: Enable more libcore tests (libcore.* package)
David Brazdil [Tue, 24 Feb 2015 10:12:06 +0000 (10:12 +0000)]
ART: Enable more libcore tests (libcore.* package)

This patch enables additional libcore tests run by the ART buildbots.
These are tests from the libcore.* packages and take extra ~3 minutes
to run on both host and target.

Change-Id: I89512836adb87b20ed5f9446d3b3ee245f9162dc

9 years agoam 893bee6c: Merge "JDWP: update thread synchronization"
Sebastien Hertz [Tue, 24 Feb 2015 10:08:18 +0000 (10:08 +0000)]
am 893bee6c: Merge "JDWP: update thread synchronization"

* commit '893bee6c8f05fdf7345bf348a8f9d24e9300bf8e':
  JDWP: update thread synchronization