diff options
| author | 2015-01-15 19:31:46 +0000 | |
|---|---|---|
| committer | 2015-01-15 19:31:46 +0000 | |
| commit | 726078d229fdb2857f3d8794fa50783f571cb7a2 (patch) | |
| tree | 35e799129cf79e09f867d3757dcc6b8a26e8bd99 /compiler/optimizing/optimizing_compiler.cc | |
| parent | 88c7c58ecabe2174bc269bb8f41628348727460d (diff) | |
| parent | 71fb52fee246b7d511f520febbd73dc7a9bbca79 (diff) | |
Merge "ART: Optimizing compiler intrinsics"
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index eaecbb04ae..605637300f 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -25,6 +25,7 @@ #include "compiler.h" #include "constant_folding.h" #include "dead_code_elimination.h" +#include "dex/quick/dex_file_to_method_inliner_map.h" #include "driver/compiler_driver.h" #include "driver/dex_compilation_unit.h" #include "elf_writer_quick.h" @@ -32,6 +33,7 @@ #include "gvn.h" #include "inliner.h" #include "instruction_simplifier.h" +#include "intrinsics.h" #include "jni/quick/jni_compiler.h" #include "mirror/art_method-inl.h" #include "nodes.h" @@ -215,9 +217,12 @@ static void RunOptimizations(HGraph* graph, BoundsCheckElimination bce(graph); InstructionSimplifier simplify2(graph); + IntrinsicsRecognizer intrinsics(graph, dex_compilation_unit.GetDexFile(), driver); + HOptimization* optimizations[] = { &redundant_phi, &dead_phi, + &intrinsics, &dce, &fold, &simplify1, |