summaryrefslogtreecommitdiffstats
path: root/compiler/dex
Commit message (Collapse)AuthorAgeFilesLines
* Merge "ART: Release inputs in Long.reverse intrinsic in x86" into mnc-devAndreas Gampe2015-07-081-0/+15
|\
| * ART: Release inputs in Long.reverse intrinsic in x86Andreas Gampe2015-07-081-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | In the worst case we are using two temps each for input and output. Then we do not have a temp left over for the swap operations. The input is dead, however, after the first swap. So try to release it (a no-op if it isn't actually a temp). Bug: 22324327 (cherry picked from commit 575422fa5be7389bdaff5e2d25dd87b1d2d4de85) Change-Id: I1fc50159afdad14160e34abeaf4670958171d6b2
* | ART: Fix opsize in LoadArgDirectAndreas Gampe2015-07-071-1/+2
|/ | | | | | | | | | | If the destination register is a reference, use kReference for the op size. Bug: 22244733 (cherry picked from commit 185a5586c8b796e770e9b4b7ac2befa8ccdaca7e) Change-Id: Idf52f2ee4c65b5dc41cb66257d95281dc6f32255
* Add implicit null pointer and stack overflow checks for Mips.Douglas Leung2015-07-035-5/+48
| | | | | | | (cherry picked from commit 22bb5a2ebc1e2724179faf4660b2735dcb185f21) Bug: 21555893 Change-Id: I2a995be128a5603d08753c14956dd8c8240ac63c
* Quick: Disable GVN, DCE and LVN for type conflicts.Vladimir Marko2015-06-271-5/+11
| | | | | | | (cherry picked from commit f7e7327d7a873d21aaae01471f46a4d64d65433b) Bug: 22136903 Change-Id: I657d4b5e623696e1264c2c6c9ad4e7fd466d759c
* ART: Fix kEverything compiler filterbuzbee2015-06-251-2/+3
| | | | | | | | | | | Previously the kEverything filter failed to compile class initializers. Now it will. Bug: 19576257 (cherry picked from commit c83329952b4a313e747c8835a73699e2cae5a6e2) Change-Id: I189d2b5b379aee112c4e95f8d3e6c32abab6ed41
* Use a flag from the verifier to know if we should compile.Nicolas Geoffray2015-06-243-0/+11
| | | | | | | | | | | Only used for the lack of bottom type in the aget-object case for now. Could be used for more. bug:21865466 (cherry picked from commit 4824c27988c8eeb302791624bb3ce1d557b0db6c) Change-Id: I2bb7fe1d4737bd92c1076b5193607d74d8761ee7
* Merge "Fix GC map generation edge case" into mnc-devMathieu Chartier2015-06-191-5/+6
|\
| * Fix GC map generation edge caseMathieu Chartier2015-06-191-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | Previously we checked the number of bits, but then rounded up to a byte boundary. If ref_bitmap_bits was 65535, it would pass the check but not actually fit in the 13 bits for ref_bitmap_bytes since we rounded up to 8192 bytes. Regression test infeasible due to smali limitations. Bug: 21888453 Change-Id: If4b769431f27ecca14fe7852d017bcde01b3e146
* | Merge "ART stack unwinding fixes for libunwind/gdb/lldb." into mnc-devDavid Srbecky2015-06-193-6/+4
|\ \
| * | ART stack unwinding fixes for libunwind/gdb/lldb.David Srbecky2015-06-193-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dex2oat can already generate unwinding and symbol information which allows tools to create backtrace of mixed native and Java code. This is a cherry pick from aosp/master which fixes several issues. Most notably: * It enables generation of ELF-64 on 64-bit systems (in dex2oat, C compilers already produce ELF-64). Libunwind requires ELF-64 on 64-bit systems for backtraces to work. * It enables loading of ELF files with dlopen. This is required for libunwind to be able to generate backtrace of current process (i.e. the process requesting backtrace of itself). * It adds unit test to test the above (32 vs 64 bit, in-proces vs out-of-process, application code vs framework code). * Some other fixes or clean-ups which should not be of much significance but which are easier to include to make the important CLs cherry-pick cleanly. This is squash of the following commits from aosp/master: 7381010 ART: CFI Test e1bbed2 ART: Blacklist CFI test for non-compiled run-tests aab9f73 ART: Blacklist CFI test for JIT 4437219 ART: Blacklist CFI test for Heap Poisoning a3a49fe Switch to using ELF-64 for 64-bit architectures. 297ed22 Write 64-bit address in DWARF if we are on 64-bit architecture. 24981a1 Set correct size of PT_PHDR ELF segment. 1a146bf Link .dynamic to .dynstr 67a0653 Make some parts of ELF more (pointer) aligned. f50fa82 Enable 64-bit CFI tests. 49e1fab Use dlopen to load oat files. 5dedb80 Add more logging output for dlopen. aa03870 Find the dlopened file using address rather than file path. 82e73dc Release dummy MemMaps corresponding to dlopen. 5c40961 Test that we can unwind framework code. 020c543 Add more log output to the CFI test. 88da3b0 ART: Fix CFI test wrt/ PIC a70e5b9 CFI test: kill the other process in native code. ad5fa8c Support generation of CFI in .debug_frame format. 90688ae Fix build - large frame size of ElfWriterQuick<ElfTypes>::Write. 97dabb7 Fix build breakage in dwarf_test. 388d286 Generate just single ARM mapping symbol. f898087 Split .oat_patches to multiple sections. 491a7fe Fix build - large frame size of ElfWriterQuick<ElfTypes>::Write (again). 8363c77 Add --generate-debug-info flag and remove the other two flags. 461d72a Generate debug info for core.oat files. Bug: 21924613 Change-Id: I3f944a08dd2ed1df4d8a807da4fee423fdd35eb7
* | | Fix case where block has no predecessor for StringChange.Jeff Hao2015-06-191-7/+1
| |/ |/| | | | | | | | | | | | | Removes part that checks for throwing half of instruction. It's no longer necessary. Also adds regression test. Bug: 21902684 Change-Id: Ic600165e6b3719de3d83a73b8a1fa64473668fc8
* | Quick: Handle total high/low register overlap on arm/mips.Vladimir Marko2015-06-192-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | OpRegCopyWide() in arm and mips backends didn't handle the total register overlap when the registers holding the source and destination pairs are the same but in reverse order. Bug: 21897012 (cherry picked from commit 8958f7f8702327e713264d0538ab5dec586f3738) Change-Id: I20afce6cc3213e7f7b3edaef91f3ec29c469f877
* | Quick: Fix optimizations for empty if blocks.Vladimir Marko2015-06-194-34/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a block ending with if-eqz or if-nez has the same "taken" and "fallthrough", we cannot assume that the value has been checked against zero in one of the succesors. This affects the null check elimination pass as well as GVN. Refactor all those checks to a single function in BasicBlock and check that the "taken" and "falthrough" are different when needed. Bug: 21614284 (cherry picked from commit f11c420c448baffac6a70ac0884d481ab347e257) Change-Id: I062e0042de3470ce8680b586487b9c7acbd206bc
* | Quick: Don't expect move-exception in every catch block.Vladimir Marko2015-06-181-5/+6
| | | | | | | | | | | | | | | | | | | | | | The dalvik bytecode doesn't require a move-exception in a catch handler that ignores the exception. Bug: 21873167 (cherry picked from commit 2d1a0a408fd148f7b2a2d670e6942ec3d920f875) Change-Id: Ia00e5791fabdd1b88e9a63b741600ed63d918703
* | Quick: Fix marking unused registers in DCE.Vladimir Marko2015-06-182-2/+88
|/ | | | | | | | Bug: 21702651 (cherry picked from commit 511d408909b7fe9be3c95e032cc7f426f4a01e6e) Change-Id: I059e0b841543334cd08a27431e0ea853b42e4f35
* Quick: Fix LoopRepeatingTopologicalSortIterator.Vladimir Marko2015-06-093-4/+80
| | | | | | | | | | | | Always push the loop head on the loop head stack. This fixes a bug where we failed to return to an unnatural loop head to recalculate its GVN data. Bug: 17410955 (cherry picked from commit 67c8c942e9dfcabd548351db75e6d3b8b5165afa) Change-Id: I44b9a17cbcd7307d1cc70ac564b99e29803723c5
* Move mirror::ArtMethod to nativeMathieu Chartier2015-06-0230-156/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimizing + quick tests are passing, devices boot. TODO: Test and fix bugs in mips64. Saves 16 bytes per most ArtMethod, 7.5MB reduction in system PSS. Some of the savings are from removal of virtual methods and direct methods object arrays. Bug: 19264997 (cherry picked from commit e401d146407d61eeb99f8d6176b2ac13c4df1e33) Change-Id: I622469a0cfa0e7082a2119f3d6a9491eb61e3f3d Fix some ArtMethod related bugs Added root visiting for runtime methods, not currently required since the GcRoots in these methods are null. Added missing GetInterfaceMethodIfProxy in GetMethodLine, fixes --trace run-tests 005, 044. Fixed optimizing compiler bug where we used a normal stack location instead of double on ARM64, this fixes the debuggable tests. TODO: Fix JDWP tests. Bug: 19264997 Change-Id: I7c55f69c61d1b45351fd0dc7185ffe5efad82bd3 ART: Fix casts for 64-bit pointers on 32-bit compiler. Bug: 19264997 Change-Id: Ief45cdd4bae5a43fc8bfdfa7cf744e2c57529457 Fix JDWP tests after ArtMethod change Fixes Throwable::GetStackDepth for exception event detection after internal stack trace representation change. Adds missing ArtMethod::GetInterfaceMethodIfProxy call in case of proxy method. Bug: 19264997 Change-Id: I363e293796848c3ec491c963813f62d868da44d2 Fix accidental IMT and root marking regression Was always using the conflict trampoline. Also included fix for regression in GC time caused by extra roots. Most of the regression was IMT. Fixed bug in DumpGcPerformanceInfo where we would get SIGABRT due to detached thread. EvaluateAndApplyChanges: From ~2500 -> ~1980 GC time: 8.2s -> 7.2s due to 1s less of MarkConcurrentRoots Bug: 19264997 Change-Id: I4333e80a8268c2ed1284f87f25b9f113d4f2c7e0 Fix bogus image test assert Previously we were comparing the size of the non moving space to size of the image file. Now we properly compare the size of the image space against the size of the image file. Bug: 19264997 Change-Id: I7359f1f73ae3df60c5147245935a24431c04808a [MIPS64] Fix art_quick_invoke_stub argument offsets. ArtMethod reference's size got bigger, so we need to move other args and leave enough space for ArtMethod* and 'this' pointer. This fixes mips64 boot. Bug: 19264997 Change-Id: I47198d5f39a4caab30b3b77479d5eedaad5006ab
* ART: Clean up arm64 kNumberOfXRegisters usage.Vladimir Marko2015-05-2620-9/+22
| | | | | | | | | | | | | | | | | | | | | Avoid undefined behavior for arm64 stemming from 1u << 32 in loops with upper bound kNumberOfXRegisters. Create iterators for enumerating bits in an integer either from high to low or from low to high and use them for <arch>Context::FillCalleeSaves() on all architectures. Refactor runtime/utils.{h,cc} by moving all bit-fiddling functions to runtime/base/bit_utils.{h,cc} (together with the new bit iterators) and all time-related functions to runtime/base/time_utils.{h,cc}. Improve test coverage and fix some corner cases for the bit-fiddling functions. Bug: 13925192 (cherry picked from commit 80afd02024d20e60b197d3adfbb43cc303cf29e0) Change-Id: I905257a21de90b5860ebe1e39563758f721eab82
* Quick: Fix marking high words in DCE.Vladimir Marko2015-05-142-6/+55
| | | | | | | | | | | | | | This CL properly fixes the high word marking and reverts https://android-review.googlesource.com/150352 which was just covering up the underlying issue. A unit test for the encountered issue is provided, though it does not expose the deficiency in the cover-up CL. Bug: 20640451 (cherry picked from commit 9cacef6e811940c2f21e7e54055379a2c43f0d06) Change-Id: I4c4ca82fe4b2e34feb38090d88a5d5c754914f89
* Quick: Fix DCE, clear high word flag in RemoveChange().Vladimir Marko2015-05-121-1/+2
| | | | | | | | Bug: 20640451 (cherry picked from commit ade58e14582c6ab81978e9cfcbbf5e54cc23fe18) Change-Id: I8ac7fea3d9d2a434ee79fb917e68a4dc96e5482f
* Quick: Fix DCE to mark wide register overlaps correctly.Vladimir Marko2015-05-123-10/+73
| | | | | | | | | | | Previously we missed some cases of overlap with registers coming from previous blocks. Bug: 20640451 (cherry picked from commit 83d46ef1eaa8fdecadfdb9564d80e50b42646c37) Change-Id: I1be879edfbc900b70cee411d9e31e5a4b524530a
* Merge "Quick: Fix DCE to rename SSA regs for degenerate Phis." into mnc-devVladimir Marko2015-05-072-2/+62
|\
| * Quick: Fix DCE to rename SSA regs for degenerate Phis.Vladimir Marko2015-05-072-2/+62
| | | | | | | | | | | | | | | | | | | | | | If we're inserting a new Phi and all its inputs are the same SSA reg (for example, we allow a single-input Phi), some subsequent insn may actually refer to that reg, so we need to rename it to keep the graph in a consistent state. (cherry picked from commit f60715c2c0a2398822a143ffb6b75507bffca703) Change-Id: I46822b0db21c187601b79d2ff1a650494558772a
* | Quick: Abolish kMirOpCheckPart2.Vladimir Marko2015-05-076-41/+2
|/ | | | | | | | | | | | | | | | | | | | The tricks played with kMirOpCheckPart2 are making the native GC map generation unnecessarily complex. They have caused problems in the past and now there is bad interaction with the DCE. Rather than fixing it time and again, remove the pseudo-insn. (The whole purpose of those tricks seems to be to allow the register tracking to be used for the throwing insn before resetting the tracking for the next block. However, it's questionable whether that's better than processing the throwing insn with the subsequent instructions.) Bug: 20736048 (cherry picked from commit e299f167c9559401548eab71678d4b779e46c2fb) Change-Id: I8a60d26c5e6b6b608d68b8bb6b66d411f9a28f90
* In quick compiler, force string init invoke to be fast path.Jeff Hao2015-05-061-1/+2
| | | | | | | | | | | | Was running into an issue where a secondary dex file was falling back on the quick compiler, and IsFastInvoke returned 0 because the referrer_class was nullptr, causing the string init to be slow path. The string init technically does not have to be fast path, but there's no reason to duplicate the logic to call off a thread pointer on the slow path. Bug: 20870917 Change-Id: I47e1524d939eb7e9b1da8186092fafc6e925009e
* Merge "Fix for incorrect encode and parse of PEXTRW instruction"Vladimir Marko2015-04-292-1/+8
|\
| * Fix for incorrect encode and parse of PEXTRW instructionnikolay serdjuk2015-04-292-1/+8
| | | | | | | | | | | | | | | | | | The instruction PEXTRW encoded by sequence 66 0F 3A 15 was incorrectly encoded in compiler table and incorrectly parsed by disassembler. Change-Id: Ib4d4db923cb15a76e74f13f6b5514cb0d1cbe164 Signed-off-by: nikolay serdjuk <nikolay.y.serdjuk@intel.com>
* | Quick: Fix crash on fall-through out of method code.Calin Juravle2015-04-281-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Quick crash when the last insn has a fall-through out of the method's code. Allow creation of an out-of-method block and at the end of MIRGraph::InlineMethod() check if that block is reachable. If it is, punt to interpreter. Add tests for unreachable if-lt and packed-switch as the last insn. Also fix MIRGraph::ProcessCanSwitch() to treat the offset to the data as signed. Jumping over the data with a goto and using it from a switch further down is valid. This was also crashing (presumably only on 64-bit dex2oat). Thanks to Stephen Kyle (stephenckyle@googlemail.com) for the bug report. Bug: 19988134 Change-Id: I627f4137f61901897bfb9a5252741c6ded3a1adb
* | Merge "Quick: Avoid unnecessary GVN work in release builds."Vladimir Marko2015-04-284-16/+6
|\ \
| * | Quick: Avoid unnecessary GVN work in release builds.Vladimir Marko2015-04-274-16/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In GVN's post-processing phase, compare LVNs only in debug builds as they should be equal anyway. Remove the Gate() from GVN cleanup pass and remove the DCHECK() from MIRGraph::GlobalValueNumberingCleanup() to make it a no-op if the GVN didn't run. Bug: 16398693 Change-Id: Ia4f1e7e3ecf12d0305966c86e0e7dbae61dab0b7
* | | Merge "Revert "Revert "[optimizing] Replace FP divide by power of 2"""Nicolas Geoffray2015-04-281-20/+0
|\ \ \ | |_|/ |/| |
| * | Revert "Revert "[optimizing] Replace FP divide by power of 2""Nicolas Geoffray2015-04-271-20/+0
| | | | | | | | | | | | | | | | | | This reverts commit 067cae2c86627d2edcf01b918ee601774bc76aeb. Change-Id: Iaaa8772500ea7d3dce6ae0829dc0dc3bbc9c14ca
* | | Merge "Replace String CharArray with internal uint16_t array."Jeff Hao2015-04-2816-78/+518
|\ \ \ | |/ / |/| |
| * | Replace String CharArray with internal uint16_t array.Jeff Hao2015-04-2716-78/+518
| |/ | | | | | | | | | | | | | | | | | | | | | | Summary of high level changes: - Adds compiler inliner support to identify string init methods - Adds compiler support (quick & optimizing) with new invoke code path that calls method off the thread pointer - Adds thread entrypoints for all string init methods - Adds map to verifier to log when receiver of string init has been copied to other registers. used by compiler and interpreter Change-Id: I797b992a8feb566f9ad73060011ab6f51eb7ce01
* | Merge "Quick: Rely on inferred types in GVN/LVN/DCE."Vladimir Marko2015-04-277-131/+198
|\ \ | |/ |/|
| * Quick: Rely on inferred types in GVN/LVN/DCE.Vladimir Marko2015-04-277-131/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix LVN::GetEndingVregValueNumberImpl() to check whether the requested wideness matches the SSA register type as recorded in MIRGraph::reg_location_. Add DCHECKs that the wideness matches when getting/setting sreg values, update Phi handling in LVN/DCE to use the type from MIRGraph::reg_location_ instead of determining it from the sreg value maps which would now trigger the DCHECKs. Update tests to initialize MIRGraph::reg_location_. Reenable DCE. Bug: 20572509 Change-Id: I1a4d4e32cd57807ca8b56d2f3ed5e1288660b82e
* | Merge "ART: Fix addpd opcode, add Quick x86 assembler test"Andreas Gampe2015-04-264-5/+272
|\ \
| * | ART: Fix addpd opcode, add Quick x86 assembler testChao-ying Fu2015-04-254-5/+272
| |/ | | | | | | | | | | | | | | | | This patch fixes the addpd opcode that may be used by vectorizations, and adds an assembler test for the Quick x86 assembler, currently lightly testing addpd, subpd and mulpd. Change-Id: I29455a86212829c75fd75737679280f167da7b5b Signed-off-by: Chao-ying Fu <chao-ying.fu@intel.com>
* | ART: Fix missing dependency between GVN and other passesAndreas Gampe2015-04-253-1/+20
|/ | | | | | | | | | | | The GVN may be turned off completely, or skip running when the method is too complex. Turn off DCE in that case. The dependent cleanup pass is not an optimization pass, so can't be turned off that way. Check whether the GVN skipped in the gate function. A possible follow-up is proper dependencies between passes. Change-Id: I5b7951ecd6c74ebbfa5b23726a3d2f3ea1a23a47
* Disable Quick's GVN-based dead code elimination.Roland Levillain2015-04-251-1/+1
| | | | | | | Quick's GVN/DCE seems to trouble the builds. Bug: 20572509 Change-Id: I1e315b4eee4443f04c7cb2cef953d8e4eff619ce
* Merge "Quick: Fix and enable DCE and improve GVN/DCE cleanup."Vladimir Marko2015-04-248-13/+96
|\
| * Quick: Fix and enable DCE and improve GVN/DCE cleanup.Vladimir Marko2015-04-238-13/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | When eliminating a move by renaming its source register, check that it doesn't conflict with vreg usage by insns between the defining insn and the move. Improve the GVN/DCE cleanup so that it can handle cases where GVN or DCE is individually disabled in the pass driver but not in the disable_opt flags. Bug: 19419671 Change-Id: I49bb67b81509f51fbaf90c6016c509962be43736
* | Remove ArtMethod* parameter from dex cache entry points.Vladimir Marko2015-04-242-46/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load the ArtMethod* using an optimized stack walk instead. This reduces the size of the generated code. Three of the entry points are called only from a slow-path and the fourth (InitializeTypeAndVerifyAccess) is rare and already slow enough that the one or two extra loads (depending on whether we already have the ArtMethod* in a register) are insignificant. And as we're starting to use PC-relative addressing of the dex cache arrays (already done by Quick for the boot image), having the ArtMethod* in a register becomes less likely anyway. Change-Id: Ib19b9d204e355e13bf386662a8b158178bf8ad28
* | Quick: Fix out of temp regs in ArmMir2Lir::GenMulLong().Vladimir Marko2015-04-231-5/+7
|/ | | | | | | | | | | | | This fixes running out of temp registers for mul-long that needs a temporary to store the result, i.e. when it's stored to stack location [sp, #offset] with offset >= 1024. The bug is currently not reproducible because ARM_R4_SUSPEND_FLAG is off and thus we have the extra register available. However, the code generation could be cleaned up and make use of that extra register, so pre-emptively fix it anyway. Bug: 20110806 Change-Id: I8362c349961dbe28fc3ec8a9299b66fd72f26779
* Revert "Revert "Quick: Rewrite type inference pass.""Vladimir Marko2015-04-2317-549/+3641
| | | | | | | | | Fix the type of the ArtMethod* SSA register. Bug: 19419671 This reverts commit 1b717f63847de8762e7f7bdd6708fdfae9d24a67. Change-Id: Ie4da3c03a0e0334a39a24718f6dc31f9255cfb53
* Revert "Quick: Rewrite type inference pass."Andreas Gampe2015-04-2217-3634/+543
| | | | | | | | Breaks arm64, as the method register is not correctly flagged as ref and thus 32bit. Bug: 19419671 This reverts commit e490b01c12d33f3bd5c247b55b47e507cc9c8fab.
* Replace NULL with nullptrMathieu Chartier2015-04-2243-242/+247
| | | | | | | Also fixed some lines that were too long, and a few other minor details. Change-Id: I6efba5fb6e03eb5d0a300fddb2a75bf8e2f175cb
* Quick: Rewrite type inference pass.Vladimir Marko2015-04-2217-543/+3634
| | | | | | | | | | | Use method signatures, field types and types embedded in dex insns for type inference. Perform the type inference in two phases, first a simple pass that records all types implied by individual insns, and then an iterative pass to propagate those types further via phi, move, if-cc and aget/aput insns. Bug: 19419671 Change-Id: Id38579d48a44fc5eadd13780afb6d370093056f9
* Quick: Remove broken Mir2Lir::LocToRegClass().Vladimir Marko2015-04-229-48/+31
| | | | | | | | | | | | Its use in intrinsics has been bogus. In all other instances it's been used under the assumption that the inferred type matches the return type of associated calls. However, if the type inference identifies a type mismatch, the assumption doesn't hold and there isn't necessarily a valid value that the function could reasonably return. Bug: 19918641 Change-Id: I050934e6f9eb00427d0b888ee29ae9eeb509bb3f