buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (C) 2011 The Android Open Source Project |
| 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. |
| 6 | * You may obtain a copy of the License at |
| 7 | * |
| 8 | * http://www.apache.org/licenses/LICENSE-2.0 |
| 9 | * |
| 10 | * Unless required by applicable law or agreed to in writing, software |
| 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
| 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. |
| 15 | */ |
| 16 | |
Ian Rogers | e77493c | 2014-08-20 15:08:45 -0700 | [diff] [blame] | 17 | #include "base/bit_vector-inl.h" |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 18 | #include "compiler_internals.h" |
Ian Rogers | 6a3c1fc | 2014-10-31 00:33:20 -0700 | [diff] [blame] | 19 | #include "dataflow_iterator-inl.h" |
Vladimir Marko | 95a0597 | 2014-05-30 10:01:32 +0100 | [diff] [blame] | 20 | #include "global_value_numbering.h" |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 21 | #include "local_value_numbering.h" |
Vladimir Marko | af6925b | 2014-10-31 16:37:32 +0000 | [diff] [blame] | 22 | #include "mir_field_info.h" |
Ian Rogers | 6a3c1fc | 2014-10-31 00:33:20 -0700 | [diff] [blame] | 23 | #include "quick/dex_file_method_inliner.h" |
| 24 | #include "quick/dex_file_to_method_inliner_map.h" |
Andreas Gampe | 53c913b | 2014-08-12 23:19:23 -0700 | [diff] [blame] | 25 | #include "stack.h" |
Vladimir Marko | 69f08ba | 2014-04-11 12:28:11 +0100 | [diff] [blame] | 26 | #include "utils/scoped_arena_containers.h" |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 27 | |
| 28 | namespace art { |
| 29 | |
Brian Carlstrom | 2ce745c | 2013-07-17 17:44:30 -0700 | [diff] [blame] | 30 | static unsigned int Predecessors(BasicBlock* bb) { |
Vladimir Marko | e39c54e | 2014-09-22 14:50:02 +0100 | [diff] [blame] | 31 | return bb->predecessors.size(); |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 32 | } |
| 33 | |
| 34 | /* Setup a constant value for opcodes thare have the DF_SETS_CONST attribute */ |
Razvan A Lupusoru | d04d309 | 2014-08-04 12:30:20 -0700 | [diff] [blame] | 35 | void MIRGraph::SetConstant(int32_t ssa_reg, int32_t value) { |
buzbee | 862a760 | 2013-04-05 10:58:54 -0700 | [diff] [blame] | 36 | is_constant_v_->SetBit(ssa_reg); |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 37 | constant_values_[ssa_reg] = value; |
| 38 | } |
| 39 | |
Razvan A Lupusoru | d04d309 | 2014-08-04 12:30:20 -0700 | [diff] [blame] | 40 | void MIRGraph::SetConstantWide(int32_t ssa_reg, int64_t value) { |
buzbee | 862a760 | 2013-04-05 10:58:54 -0700 | [diff] [blame] | 41 | is_constant_v_->SetBit(ssa_reg); |
Serguei Katkov | 597da1f | 2014-07-15 17:25:46 +0700 | [diff] [blame] | 42 | is_constant_v_->SetBit(ssa_reg + 1); |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 43 | constant_values_[ssa_reg] = Low32Bits(value); |
| 44 | constant_values_[ssa_reg + 1] = High32Bits(value); |
| 45 | } |
| 46 | |
Jean Christophe Beyler | 4e97c53 | 2014-01-07 10:07:18 -0800 | [diff] [blame] | 47 | void MIRGraph::DoConstantPropagation(BasicBlock* bb) { |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 48 | MIR* mir; |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 49 | |
| 50 | for (mir = bb->first_mir_insn; mir != NULL; mir = mir->next) { |
Alexei Zavjalov | 9d89466 | 2014-04-21 20:45:24 +0700 | [diff] [blame] | 51 | // Skip pass if BB has MIR without SSA representation. |
Jean Christophe Beyler | cc794c3 | 2014-05-02 09:34:13 -0700 | [diff] [blame] | 52 | if (mir->ssa_rep == nullptr) { |
Alexei Zavjalov | 9d89466 | 2014-04-21 20:45:24 +0700 | [diff] [blame] | 53 | return; |
| 54 | } |
| 55 | |
Jean Christophe Beyler | cc794c3 | 2014-05-02 09:34:13 -0700 | [diff] [blame] | 56 | uint64_t df_attributes = GetDataFlowAttributes(mir); |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 57 | |
Ian Rogers | 29a2648 | 2014-05-02 15:27:29 -0700 | [diff] [blame] | 58 | MIR::DecodedInstruction* d_insn = &mir->dalvikInsn; |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 59 | |
| 60 | if (!(df_attributes & DF_HAS_DEFS)) continue; |
| 61 | |
| 62 | /* Handle instructions that set up constants directly */ |
| 63 | if (df_attributes & DF_SETS_CONST) { |
| 64 | if (df_attributes & DF_DA) { |
| 65 | int32_t vB = static_cast<int32_t>(d_insn->vB); |
| 66 | switch (d_insn->opcode) { |
| 67 | case Instruction::CONST_4: |
| 68 | case Instruction::CONST_16: |
| 69 | case Instruction::CONST: |
| 70 | SetConstant(mir->ssa_rep->defs[0], vB); |
| 71 | break; |
| 72 | case Instruction::CONST_HIGH16: |
| 73 | SetConstant(mir->ssa_rep->defs[0], vB << 16); |
| 74 | break; |
| 75 | case Instruction::CONST_WIDE_16: |
| 76 | case Instruction::CONST_WIDE_32: |
| 77 | SetConstantWide(mir->ssa_rep->defs[0], static_cast<int64_t>(vB)); |
| 78 | break; |
| 79 | case Instruction::CONST_WIDE: |
Brian Carlstrom | b1eba21 | 2013-07-17 18:07:19 -0700 | [diff] [blame] | 80 | SetConstantWide(mir->ssa_rep->defs[0], d_insn->vB_wide); |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 81 | break; |
| 82 | case Instruction::CONST_WIDE_HIGH16: |
| 83 | SetConstantWide(mir->ssa_rep->defs[0], static_cast<int64_t>(vB) << 48); |
| 84 | break; |
| 85 | default: |
| 86 | break; |
| 87 | } |
| 88 | } |
| 89 | /* Handle instructions that set up constants directly */ |
| 90 | } else if (df_attributes & DF_IS_MOVE) { |
| 91 | int i; |
| 92 | |
| 93 | for (i = 0; i < mir->ssa_rep->num_uses; i++) { |
buzbee | 862a760 | 2013-04-05 10:58:54 -0700 | [diff] [blame] | 94 | if (!is_constant_v_->IsBitSet(mir->ssa_rep->uses[i])) break; |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 95 | } |
| 96 | /* Move a register holding a constant to another register */ |
| 97 | if (i == mir->ssa_rep->num_uses) { |
| 98 | SetConstant(mir->ssa_rep->defs[0], constant_values_[mir->ssa_rep->uses[0]]); |
| 99 | if (df_attributes & DF_A_WIDE) { |
| 100 | SetConstant(mir->ssa_rep->defs[1], constant_values_[mir->ssa_rep->uses[1]]); |
| 101 | } |
| 102 | } |
| 103 | } |
| 104 | } |
| 105 | /* TODO: implement code to handle arithmetic operations */ |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 106 | } |
| 107 | |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 108 | /* Advance to next strictly dominated MIR node in an extended basic block */ |
buzbee | 0d82948 | 2013-10-11 15:24:55 -0700 | [diff] [blame] | 109 | MIR* MIRGraph::AdvanceMIR(BasicBlock** p_bb, MIR* mir) { |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 110 | BasicBlock* bb = *p_bb; |
| 111 | if (mir != NULL) { |
| 112 | mir = mir->next; |
| 113 | if (mir == NULL) { |
buzbee | 0d82948 | 2013-10-11 15:24:55 -0700 | [diff] [blame] | 114 | bb = GetBasicBlock(bb->fall_through); |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 115 | if ((bb == NULL) || Predecessors(bb) != 1) { |
| 116 | mir = NULL; |
| 117 | } else { |
| 118 | *p_bb = bb; |
| 119 | mir = bb->first_mir_insn; |
| 120 | } |
| 121 | } |
| 122 | } |
| 123 | return mir; |
| 124 | } |
| 125 | |
| 126 | /* |
| 127 | * To be used at an invoke mir. If the logically next mir node represents |
| 128 | * a move-result, return it. Else, return NULL. If a move-result exists, |
| 129 | * it is required to immediately follow the invoke with no intervening |
| 130 | * opcodes or incoming arcs. However, if the result of the invoke is not |
| 131 | * used, a move-result may not be present. |
| 132 | */ |
Brian Carlstrom | 2ce745c | 2013-07-17 17:44:30 -0700 | [diff] [blame] | 133 | MIR* MIRGraph::FindMoveResult(BasicBlock* bb, MIR* mir) { |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 134 | BasicBlock* tbb = bb; |
| 135 | mir = AdvanceMIR(&tbb, mir); |
| 136 | while (mir != NULL) { |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 137 | if ((mir->dalvikInsn.opcode == Instruction::MOVE_RESULT) || |
| 138 | (mir->dalvikInsn.opcode == Instruction::MOVE_RESULT_OBJECT) || |
| 139 | (mir->dalvikInsn.opcode == Instruction::MOVE_RESULT_WIDE)) { |
| 140 | break; |
| 141 | } |
| 142 | // Keep going if pseudo op, otherwise terminate |
Jean Christophe Beyler | 2ab40eb | 2014-06-02 09:03:14 -0700 | [diff] [blame] | 143 | if (MIR::DecodedInstruction::IsPseudoMirOp(mir->dalvikInsn.opcode)) { |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 144 | mir = AdvanceMIR(&tbb, mir); |
buzbee | 35ba7f3 | 2014-05-31 08:59:01 -0700 | [diff] [blame] | 145 | } else { |
| 146 | mir = NULL; |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 147 | } |
| 148 | } |
| 149 | return mir; |
| 150 | } |
| 151 | |
buzbee | 0d82948 | 2013-10-11 15:24:55 -0700 | [diff] [blame] | 152 | BasicBlock* MIRGraph::NextDominatedBlock(BasicBlock* bb) { |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 153 | if (bb->block_type == kDead) { |
| 154 | return NULL; |
| 155 | } |
| 156 | DCHECK((bb->block_type == kEntryBlock) || (bb->block_type == kDalvikByteCode) |
| 157 | || (bb->block_type == kExitBlock)); |
buzbee | 0d82948 | 2013-10-11 15:24:55 -0700 | [diff] [blame] | 158 | BasicBlock* bb_taken = GetBasicBlock(bb->taken); |
| 159 | BasicBlock* bb_fall_through = GetBasicBlock(bb->fall_through); |
buzbee | 1da1e2f | 2013-11-15 13:37:01 -0800 | [diff] [blame] | 160 | if (((bb_fall_through == NULL) && (bb_taken != NULL)) && |
buzbee | 0d82948 | 2013-10-11 15:24:55 -0700 | [diff] [blame] | 161 | ((bb_taken->block_type == kDalvikByteCode) || (bb_taken->block_type == kExitBlock))) { |
buzbee | cbcfaf3 | 2013-08-19 07:37:40 -0700 | [diff] [blame] | 162 | // Follow simple unconditional branches. |
buzbee | 0d82948 | 2013-10-11 15:24:55 -0700 | [diff] [blame] | 163 | bb = bb_taken; |
buzbee | cbcfaf3 | 2013-08-19 07:37:40 -0700 | [diff] [blame] | 164 | } else { |
| 165 | // Follow simple fallthrough |
buzbee | 0d82948 | 2013-10-11 15:24:55 -0700 | [diff] [blame] | 166 | bb = (bb_taken != NULL) ? NULL : bb_fall_through; |
buzbee | cbcfaf3 | 2013-08-19 07:37:40 -0700 | [diff] [blame] | 167 | } |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 168 | if (bb == NULL || (Predecessors(bb) != 1)) { |
| 169 | return NULL; |
| 170 | } |
| 171 | DCHECK((bb->block_type == kDalvikByteCode) || (bb->block_type == kExitBlock)); |
| 172 | return bb; |
| 173 | } |
| 174 | |
Brian Carlstrom | 2ce745c | 2013-07-17 17:44:30 -0700 | [diff] [blame] | 175 | static MIR* FindPhi(BasicBlock* bb, int ssa_name) { |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 176 | for (MIR* mir = bb->first_mir_insn; mir != NULL; mir = mir->next) { |
| 177 | if (static_cast<int>(mir->dalvikInsn.opcode) == kMirOpPhi) { |
| 178 | for (int i = 0; i < mir->ssa_rep->num_uses; i++) { |
| 179 | if (mir->ssa_rep->uses[i] == ssa_name) { |
| 180 | return mir; |
| 181 | } |
| 182 | } |
| 183 | } |
| 184 | } |
| 185 | return NULL; |
| 186 | } |
| 187 | |
Brian Carlstrom | 2ce745c | 2013-07-17 17:44:30 -0700 | [diff] [blame] | 188 | static SelectInstructionKind SelectKind(MIR* mir) { |
Chao-ying Fu | 8ac41af | 2014-10-01 16:53:04 -0700 | [diff] [blame] | 189 | // Work with the case when mir is nullptr. |
| 190 | if (mir == nullptr) { |
| 191 | return kSelectNone; |
| 192 | } |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 193 | switch (mir->dalvikInsn.opcode) { |
| 194 | case Instruction::MOVE: |
| 195 | case Instruction::MOVE_OBJECT: |
| 196 | case Instruction::MOVE_16: |
| 197 | case Instruction::MOVE_OBJECT_16: |
| 198 | case Instruction::MOVE_FROM16: |
| 199 | case Instruction::MOVE_OBJECT_FROM16: |
| 200 | return kSelectMove; |
Brian Carlstrom | 6f485c6 | 2013-07-18 15:35:35 -0700 | [diff] [blame] | 201 | case Instruction::CONST: |
| 202 | case Instruction::CONST_4: |
| 203 | case Instruction::CONST_16: |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 204 | return kSelectConst; |
Brian Carlstrom | 6f485c6 | 2013-07-18 15:35:35 -0700 | [diff] [blame] | 205 | case Instruction::GOTO: |
| 206 | case Instruction::GOTO_16: |
| 207 | case Instruction::GOTO_32: |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 208 | return kSelectGoto; |
Brian Carlstrom | 02c8cc6 | 2013-07-18 15:54:44 -0700 | [diff] [blame] | 209 | default: |
| 210 | return kSelectNone; |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 211 | } |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 212 | } |
| 213 | |
Vladimir Marko | a1a7074 | 2014-03-03 10:28:05 +0000 | [diff] [blame] | 214 | static constexpr ConditionCode kIfCcZConditionCodes[] = { |
| 215 | kCondEq, kCondNe, kCondLt, kCondGe, kCondGt, kCondLe |
| 216 | }; |
| 217 | |
Andreas Gampe | 785d2f2 | 2014-11-03 22:57:30 -0800 | [diff] [blame] | 218 | static_assert(arraysize(kIfCcZConditionCodes) == Instruction::IF_LEZ - Instruction::IF_EQZ + 1, |
| 219 | "if_ccz_ccodes_size1"); |
Vladimir Marko | a1a7074 | 2014-03-03 10:28:05 +0000 | [diff] [blame] | 220 | |
Vladimir Marko | a1a7074 | 2014-03-03 10:28:05 +0000 | [diff] [blame] | 221 | static constexpr ConditionCode ConditionCodeForIfCcZ(Instruction::Code opcode) { |
| 222 | return kIfCcZConditionCodes[opcode - Instruction::IF_EQZ]; |
| 223 | } |
| 224 | |
Andreas Gampe | 785d2f2 | 2014-11-03 22:57:30 -0800 | [diff] [blame] | 225 | static_assert(ConditionCodeForIfCcZ(Instruction::IF_EQZ) == kCondEq, "if_eqz ccode"); |
| 226 | static_assert(ConditionCodeForIfCcZ(Instruction::IF_NEZ) == kCondNe, "if_nez ccode"); |
| 227 | static_assert(ConditionCodeForIfCcZ(Instruction::IF_LTZ) == kCondLt, "if_ltz ccode"); |
| 228 | static_assert(ConditionCodeForIfCcZ(Instruction::IF_GEZ) == kCondGe, "if_gez ccode"); |
| 229 | static_assert(ConditionCodeForIfCcZ(Instruction::IF_GTZ) == kCondGt, "if_gtz ccode"); |
| 230 | static_assert(ConditionCodeForIfCcZ(Instruction::IF_LEZ) == kCondLe, "if_lez ccode"); |
Vladimir Marko | a1a7074 | 2014-03-03 10:28:05 +0000 | [diff] [blame] | 231 | |
Brian Carlstrom | 2ce745c | 2013-07-17 17:44:30 -0700 | [diff] [blame] | 232 | int MIRGraph::GetSSAUseCount(int s_reg) { |
Vladimir Marko | e39c54e | 2014-09-22 14:50:02 +0100 | [diff] [blame] | 233 | DCHECK_LT(static_cast<size_t>(s_reg), ssa_subscripts_.size()); |
| 234 | return raw_use_counts_[s_reg]; |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 235 | } |
| 236 | |
Razvan A Lupusoru | 8d0d03e | 2014-06-06 17:04:52 -0700 | [diff] [blame] | 237 | size_t MIRGraph::GetNumBytesForSpecialTemps() const { |
| 238 | // This logic is written with assumption that Method* is only special temp. |
| 239 | DCHECK_EQ(max_available_special_compiler_temps_, 1u); |
| 240 | return sizeof(StackReference<mirror::ArtMethod>); |
Razvan A Lupusoru | da7a69b | 2014-01-08 15:09:50 -0800 | [diff] [blame] | 241 | } |
| 242 | |
Razvan A Lupusoru | 8d0d03e | 2014-06-06 17:04:52 -0700 | [diff] [blame] | 243 | size_t MIRGraph::GetNumAvailableVRTemps() { |
| 244 | // First take into account all temps reserved for backend. |
| 245 | if (max_available_non_special_compiler_temps_ < reserved_temps_for_backend_) { |
| 246 | return 0; |
| 247 | } |
| 248 | |
| 249 | // Calculate remaining ME temps available. |
| 250 | size_t remaining_me_temps = max_available_non_special_compiler_temps_ - reserved_temps_for_backend_; |
| 251 | |
| 252 | if (num_non_special_compiler_temps_ >= remaining_me_temps) { |
| 253 | return 0; |
| 254 | } else { |
| 255 | return remaining_me_temps - num_non_special_compiler_temps_; |
| 256 | } |
| 257 | } |
Bill Buzbee | 00e1ec6 | 2014-02-27 23:44:13 +0000 | [diff] [blame] | 258 | |
| 259 | // FIXME - will probably need to revisit all uses of this, as type not defined. |
Razvan A Lupusoru | da7a69b | 2014-01-08 15:09:50 -0800 | [diff] [blame] | 260 | static const RegLocation temp_loc = {kLocCompilerTemp, |
buzbee | 091cc40 | 2014-03-31 10:14:40 -0700 | [diff] [blame] | 261 | 0, 1 /*defined*/, 0, 0, 0, 0, 0, 1 /*home*/, |
Bill Buzbee | 00e1ec6 | 2014-02-27 23:44:13 +0000 | [diff] [blame] | 262 | RegStorage(), INVALID_SREG, INVALID_SREG}; |
Razvan A Lupusoru | da7a69b | 2014-01-08 15:09:50 -0800 | [diff] [blame] | 263 | |
| 264 | CompilerTemp* MIRGraph::GetNewCompilerTemp(CompilerTempType ct_type, bool wide) { |
Razvan A Lupusoru | 8d0d03e | 2014-06-06 17:04:52 -0700 | [diff] [blame] | 265 | // Once the compiler temps have been committed, new ones cannot be requested anymore. |
| 266 | DCHECK_EQ(compiler_temps_committed_, false); |
| 267 | // Make sure that reserved for BE set is sane. |
| 268 | DCHECK_LE(reserved_temps_for_backend_, max_available_non_special_compiler_temps_); |
| 269 | |
| 270 | bool verbose = cu_->verbose; |
| 271 | const char* ct_type_str = nullptr; |
| 272 | |
| 273 | if (verbose) { |
| 274 | switch (ct_type) { |
| 275 | case kCompilerTempBackend: |
| 276 | ct_type_str = "backend"; |
| 277 | break; |
| 278 | case kCompilerTempSpecialMethodPtr: |
| 279 | ct_type_str = "method*"; |
| 280 | break; |
| 281 | case kCompilerTempVR: |
| 282 | ct_type_str = "VR"; |
| 283 | break; |
| 284 | default: |
| 285 | ct_type_str = "unknown"; |
| 286 | break; |
Razvan A Lupusoru | da7a69b | 2014-01-08 15:09:50 -0800 | [diff] [blame] | 287 | } |
Razvan A Lupusoru | 8d0d03e | 2014-06-06 17:04:52 -0700 | [diff] [blame] | 288 | LOG(INFO) << "CompilerTemps: A compiler temp of type " << ct_type_str << " that is " |
| 289 | << (wide ? "wide is being requested." : "not wide is being requested."); |
Razvan A Lupusoru | da7a69b | 2014-01-08 15:09:50 -0800 | [diff] [blame] | 290 | } |
| 291 | |
| 292 | CompilerTemp *compiler_temp = static_cast<CompilerTemp *>(arena_->Alloc(sizeof(CompilerTemp), |
Vladimir Marko | 83cc7ae | 2014-02-12 18:02:05 +0000 | [diff] [blame] | 293 | kArenaAllocRegAlloc)); |
Razvan A Lupusoru | da7a69b | 2014-01-08 15:09:50 -0800 | [diff] [blame] | 294 | |
| 295 | // Create the type of temp requested. Special temps need special handling because |
| 296 | // they have a specific virtual register assignment. |
| 297 | if (ct_type == kCompilerTempSpecialMethodPtr) { |
Razvan A Lupusoru | 8d0d03e | 2014-06-06 17:04:52 -0700 | [diff] [blame] | 298 | // This has a special location on stack which is 32-bit or 64-bit depending |
| 299 | // on mode. However, we don't want to overlap with non-special section |
| 300 | // and thus even for 64-bit, we allow only a non-wide temp to be requested. |
Razvan A Lupusoru | da7a69b | 2014-01-08 15:09:50 -0800 | [diff] [blame] | 301 | DCHECK_EQ(wide, false); |
Razvan A Lupusoru | da7a69b | 2014-01-08 15:09:50 -0800 | [diff] [blame] | 302 | |
Razvan A Lupusoru | 8d0d03e | 2014-06-06 17:04:52 -0700 | [diff] [blame] | 303 | // The vreg is always the first special temp for method ptr. |
| 304 | compiler_temp->v_reg = GetFirstSpecialTempVR(); |
| 305 | |
| 306 | } else if (ct_type == kCompilerTempBackend) { |
| 307 | requested_backend_temp_ = true; |
| 308 | |
| 309 | // Make sure that we are not exceeding temps reserved for BE. |
| 310 | // Since VR temps cannot be requested once the BE temps are requested, we |
| 311 | // allow reservation of VR temps as well for BE. We |
| 312 | size_t available_temps = reserved_temps_for_backend_ + GetNumAvailableVRTemps(); |
| 313 | if (available_temps <= 0 || (available_temps <= 1 && wide)) { |
| 314 | if (verbose) { |
| 315 | LOG(INFO) << "CompilerTemps: Not enough temp(s) of type " << ct_type_str << " are available."; |
| 316 | } |
| 317 | return nullptr; |
| 318 | } |
| 319 | |
| 320 | // Update the remaining reserved temps since we have now used them. |
| 321 | // Note that the code below is actually subtracting to remove them from reserve |
| 322 | // once they have been claimed. It is careful to not go below zero. |
| 323 | if (reserved_temps_for_backend_ >= 1) { |
| 324 | reserved_temps_for_backend_--; |
| 325 | } |
| 326 | if (wide && reserved_temps_for_backend_ >= 1) { |
| 327 | reserved_temps_for_backend_--; |
| 328 | } |
| 329 | |
| 330 | // The new non-special compiler temp must receive a unique v_reg. |
| 331 | compiler_temp->v_reg = GetFirstNonSpecialTempVR() + num_non_special_compiler_temps_; |
| 332 | num_non_special_compiler_temps_++; |
| 333 | } else if (ct_type == kCompilerTempVR) { |
| 334 | // Once we start giving out BE temps, we don't allow anymore ME temps to be requested. |
| 335 | // This is done in order to prevent problems with ssa since these structures are allocated |
| 336 | // and managed by the ME. |
| 337 | DCHECK_EQ(requested_backend_temp_, false); |
| 338 | |
| 339 | // There is a limit to the number of non-special temps so check to make sure it wasn't exceeded. |
| 340 | size_t available_temps = GetNumAvailableVRTemps(); |
| 341 | if (available_temps <= 0 || (available_temps <= 1 && wide)) { |
| 342 | if (verbose) { |
| 343 | LOG(INFO) << "CompilerTemps: Not enough temp(s) of type " << ct_type_str << " are available."; |
| 344 | } |
| 345 | return nullptr; |
| 346 | } |
| 347 | |
| 348 | // The new non-special compiler temp must receive a unique v_reg. |
| 349 | compiler_temp->v_reg = GetFirstNonSpecialTempVR() + num_non_special_compiler_temps_; |
| 350 | num_non_special_compiler_temps_++; |
Razvan A Lupusoru | da7a69b | 2014-01-08 15:09:50 -0800 | [diff] [blame] | 351 | } else { |
Razvan A Lupusoru | 8d0d03e | 2014-06-06 17:04:52 -0700 | [diff] [blame] | 352 | UNIMPLEMENTED(FATAL) << "No handling for compiler temp type " << ct_type_str << "."; |
| 353 | } |
Razvan A Lupusoru | da7a69b | 2014-01-08 15:09:50 -0800 | [diff] [blame] | 354 | |
Razvan A Lupusoru | 8d0d03e | 2014-06-06 17:04:52 -0700 | [diff] [blame] | 355 | // We allocate an sreg as well to make developer life easier. |
| 356 | // However, if this is requested from an ME pass that will recalculate ssa afterwards, |
| 357 | // this sreg is no longer valid. The caller should be aware of this. |
| 358 | compiler_temp->s_reg_low = AddNewSReg(compiler_temp->v_reg); |
| 359 | |
| 360 | if (verbose) { |
| 361 | LOG(INFO) << "CompilerTemps: New temp of type " << ct_type_str << " with v" << compiler_temp->v_reg |
| 362 | << " and s" << compiler_temp->s_reg_low << " has been created."; |
| 363 | } |
| 364 | |
| 365 | if (wide) { |
| 366 | // Only non-special temps are handled as wide for now. |
| 367 | // Note that the number of non special temps is incremented below. |
| 368 | DCHECK(ct_type == kCompilerTempBackend || ct_type == kCompilerTempVR); |
| 369 | |
| 370 | // Ensure that the two registers are consecutive. |
| 371 | int ssa_reg_low = compiler_temp->s_reg_low; |
| 372 | int ssa_reg_high = AddNewSReg(compiler_temp->v_reg + 1); |
Razvan A Lupusoru | da7a69b | 2014-01-08 15:09:50 -0800 | [diff] [blame] | 373 | num_non_special_compiler_temps_++; |
| 374 | |
Razvan A Lupusoru | 8d0d03e | 2014-06-06 17:04:52 -0700 | [diff] [blame] | 375 | if (verbose) { |
| 376 | LOG(INFO) << "CompilerTemps: The wide part of temp of type " << ct_type_str << " is v" |
| 377 | << compiler_temp->v_reg + 1 << " and s" << ssa_reg_high << "."; |
| 378 | } |
Chao-ying Fu | 54d36b6 | 2014-05-22 17:25:02 -0700 | [diff] [blame] | 379 | |
Razvan A Lupusoru | 8d0d03e | 2014-06-06 17:04:52 -0700 | [diff] [blame] | 380 | if (reg_location_ != nullptr) { |
| 381 | reg_location_[ssa_reg_high] = temp_loc; |
| 382 | reg_location_[ssa_reg_high].high_word = true; |
| 383 | reg_location_[ssa_reg_high].s_reg_low = ssa_reg_low; |
| 384 | reg_location_[ssa_reg_high].wide = true; |
Razvan A Lupusoru | da7a69b | 2014-01-08 15:09:50 -0800 | [diff] [blame] | 385 | } |
| 386 | } |
| 387 | |
Razvan A Lupusoru | 8d0d03e | 2014-06-06 17:04:52 -0700 | [diff] [blame] | 388 | // If the register locations have already been allocated, add the information |
| 389 | // about the temp. We will not overflow because they have been initialized |
| 390 | // to support the maximum number of temps. For ME temps that have multiple |
| 391 | // ssa versions, the structures below will be expanded on the post pass cleanup. |
Razvan A Lupusoru | da7a69b | 2014-01-08 15:09:50 -0800 | [diff] [blame] | 392 | if (reg_location_ != nullptr) { |
| 393 | int ssa_reg_low = compiler_temp->s_reg_low; |
| 394 | reg_location_[ssa_reg_low] = temp_loc; |
| 395 | reg_location_[ssa_reg_low].s_reg_low = ssa_reg_low; |
| 396 | reg_location_[ssa_reg_low].wide = wide; |
Razvan A Lupusoru | da7a69b | 2014-01-08 15:09:50 -0800 | [diff] [blame] | 397 | } |
| 398 | |
Razvan A Lupusoru | da7a69b | 2014-01-08 15:09:50 -0800 | [diff] [blame] | 399 | return compiler_temp; |
| 400 | } |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 401 | |
Vladimir Marko | 7ab2fce | 2014-11-28 13:38:28 +0000 | [diff] [blame] | 402 | static bool EvaluateBranch(Instruction::Code opcode, int32_t src1, int32_t src2) { |
| 403 | bool is_taken; |
| 404 | switch (opcode) { |
| 405 | case Instruction::IF_EQ: is_taken = (src1 == src2); break; |
| 406 | case Instruction::IF_NE: is_taken = (src1 != src2); break; |
| 407 | case Instruction::IF_LT: is_taken = (src1 < src2); break; |
| 408 | case Instruction::IF_GE: is_taken = (src1 >= src2); break; |
| 409 | case Instruction::IF_GT: is_taken = (src1 > src2); break; |
| 410 | case Instruction::IF_LE: is_taken = (src1 <= src2); break; |
| 411 | case Instruction::IF_EQZ: is_taken = (src1 == 0); break; |
| 412 | case Instruction::IF_NEZ: is_taken = (src1 != 0); break; |
| 413 | case Instruction::IF_LTZ: is_taken = (src1 < 0); break; |
| 414 | case Instruction::IF_GEZ: is_taken = (src1 >= 0); break; |
| 415 | case Instruction::IF_GTZ: is_taken = (src1 > 0); break; |
| 416 | case Instruction::IF_LEZ: is_taken = (src1 <= 0); break; |
| 417 | default: |
| 418 | LOG(FATAL) << "Unexpected opcode " << opcode; |
| 419 | UNREACHABLE(); |
| 420 | } |
| 421 | return is_taken; |
| 422 | } |
| 423 | |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 424 | /* Do some MIR-level extended basic block optimizations */ |
Brian Carlstrom | 2ce745c | 2013-07-17 17:44:30 -0700 | [diff] [blame] | 425 | bool MIRGraph::BasicBlockOpt(BasicBlock* bb) { |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 426 | if (bb->block_type == kDead) { |
| 427 | return true; |
| 428 | } |
Vladimir Marko | 415ac88 | 2014-09-30 18:09:14 +0100 | [diff] [blame] | 429 | bool use_lvn = bb->use_lvn && (cu_->disable_opt & (1u << kLocalValueNumbering)) == 0u; |
Vladimir Marko | 2ac01fc | 2014-05-22 12:09:08 +0100 | [diff] [blame] | 430 | std::unique_ptr<ScopedArenaAllocator> allocator; |
Vladimir Marko | 95a0597 | 2014-05-30 10:01:32 +0100 | [diff] [blame] | 431 | std::unique_ptr<GlobalValueNumbering> global_valnum; |
Ian Rogers | 700a402 | 2014-05-19 16:49:03 -0700 | [diff] [blame] | 432 | std::unique_ptr<LocalValueNumbering> local_valnum; |
buzbee | 1da1e2f | 2013-11-15 13:37:01 -0800 | [diff] [blame] | 433 | if (use_lvn) { |
Vladimir Marko | 2ac01fc | 2014-05-22 12:09:08 +0100 | [diff] [blame] | 434 | allocator.reset(ScopedArenaAllocator::Create(&cu_->arena_stack)); |
Vladimir Marko | 415ac88 | 2014-09-30 18:09:14 +0100 | [diff] [blame] | 435 | global_valnum.reset(new (allocator.get()) GlobalValueNumbering(cu_, allocator.get(), |
| 436 | GlobalValueNumbering::kModeLvn)); |
Vladimir Marko | b19955d | 2014-07-29 12:04:10 +0100 | [diff] [blame] | 437 | local_valnum.reset(new (allocator.get()) LocalValueNumbering(global_valnum.get(), bb->id, |
| 438 | allocator.get())); |
buzbee | 1da1e2f | 2013-11-15 13:37:01 -0800 | [diff] [blame] | 439 | } |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 440 | while (bb != NULL) { |
| 441 | for (MIR* mir = bb->first_mir_insn; mir != NULL; mir = mir->next) { |
| 442 | // TUNING: use the returned value number for CSE. |
buzbee | 1da1e2f | 2013-11-15 13:37:01 -0800 | [diff] [blame] | 443 | if (use_lvn) { |
| 444 | local_valnum->GetValueNumber(mir); |
| 445 | } |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 446 | // Look for interesting opcodes, skip otherwise |
| 447 | Instruction::Code opcode = mir->dalvikInsn.opcode; |
| 448 | switch (opcode) { |
Vladimir Marko | 7ab2fce | 2014-11-28 13:38:28 +0000 | [diff] [blame] | 449 | case Instruction::IF_EQ: |
| 450 | case Instruction::IF_NE: |
| 451 | case Instruction::IF_LT: |
| 452 | case Instruction::IF_GE: |
| 453 | case Instruction::IF_GT: |
| 454 | case Instruction::IF_LE: |
| 455 | if (!IsConst(mir->ssa_rep->uses[1])) { |
| 456 | break; |
| 457 | } |
| 458 | FALLTHROUGH_INTENDED; |
| 459 | case Instruction::IF_EQZ: |
| 460 | case Instruction::IF_NEZ: |
| 461 | case Instruction::IF_LTZ: |
| 462 | case Instruction::IF_GEZ: |
| 463 | case Instruction::IF_GTZ: |
| 464 | case Instruction::IF_LEZ: |
| 465 | // Result known at compile time? |
| 466 | if (IsConst(mir->ssa_rep->uses[0])) { |
| 467 | int32_t rhs = (mir->ssa_rep->num_uses == 2) ? ConstantValue(mir->ssa_rep->uses[1]) : 0; |
| 468 | bool is_taken = EvaluateBranch(opcode, ConstantValue(mir->ssa_rep->uses[0]), rhs); |
| 469 | BasicBlockId edge_to_kill = is_taken ? bb->fall_through : bb->taken; |
| 470 | if (is_taken) { |
| 471 | // Replace with GOTO. |
| 472 | bb->fall_through = NullBasicBlockId; |
| 473 | mir->dalvikInsn.opcode = Instruction::GOTO; |
| 474 | mir->dalvikInsn.vA = |
| 475 | IsInstructionIfCc(opcode) ? mir->dalvikInsn.vC : mir->dalvikInsn.vB; |
| 476 | } else { |
| 477 | // Make NOP. |
| 478 | bb->taken = NullBasicBlockId; |
| 479 | mir->dalvikInsn.opcode = static_cast<Instruction::Code>(kMirOpNop); |
| 480 | } |
| 481 | mir->ssa_rep->num_uses = 0; |
| 482 | BasicBlock* successor_to_unlink = GetBasicBlock(edge_to_kill); |
| 483 | successor_to_unlink->ErasePredecessor(bb->id); |
| 484 | if (successor_to_unlink->predecessors.empty()) { |
| 485 | successor_to_unlink->KillUnreachable(this); |
| 486 | } |
| 487 | } |
| 488 | break; |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 489 | case Instruction::CMPL_FLOAT: |
| 490 | case Instruction::CMPL_DOUBLE: |
| 491 | case Instruction::CMPG_FLOAT: |
| 492 | case Instruction::CMPG_DOUBLE: |
| 493 | case Instruction::CMP_LONG: |
buzbee | 1fd3346 | 2013-03-25 13:40:45 -0700 | [diff] [blame] | 494 | if ((cu_->disable_opt & (1 << kBranchFusing)) != 0) { |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 495 | // Bitcode doesn't allow this optimization. |
| 496 | break; |
| 497 | } |
| 498 | if (mir->next != NULL) { |
| 499 | MIR* mir_next = mir->next; |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 500 | // Make sure result of cmp is used by next insn and nowhere else |
Jean Christophe Beyler | c26efa8 | 2014-06-01 11:39:39 -0700 | [diff] [blame] | 501 | if (IsInstructionIfCcZ(mir_next->dalvikInsn.opcode) && |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 502 | (mir->ssa_rep->defs[0] == mir_next->ssa_rep->uses[0]) && |
| 503 | (GetSSAUseCount(mir->ssa_rep->defs[0]) == 1)) { |
Vladimir Marko | a1a7074 | 2014-03-03 10:28:05 +0000 | [diff] [blame] | 504 | mir_next->meta.ccode = ConditionCodeForIfCcZ(mir_next->dalvikInsn.opcode); |
Brian Carlstrom | df62950 | 2013-07-17 22:39:56 -0700 | [diff] [blame] | 505 | switch (opcode) { |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 506 | case Instruction::CMPL_FLOAT: |
| 507 | mir_next->dalvikInsn.opcode = |
| 508 | static_cast<Instruction::Code>(kMirOpFusedCmplFloat); |
| 509 | break; |
| 510 | case Instruction::CMPL_DOUBLE: |
| 511 | mir_next->dalvikInsn.opcode = |
| 512 | static_cast<Instruction::Code>(kMirOpFusedCmplDouble); |
| 513 | break; |
| 514 | case Instruction::CMPG_FLOAT: |
| 515 | mir_next->dalvikInsn.opcode = |
| 516 | static_cast<Instruction::Code>(kMirOpFusedCmpgFloat); |
| 517 | break; |
| 518 | case Instruction::CMPG_DOUBLE: |
| 519 | mir_next->dalvikInsn.opcode = |
| 520 | static_cast<Instruction::Code>(kMirOpFusedCmpgDouble); |
| 521 | break; |
| 522 | case Instruction::CMP_LONG: |
| 523 | mir_next->dalvikInsn.opcode = |
| 524 | static_cast<Instruction::Code>(kMirOpFusedCmpLong); |
| 525 | break; |
| 526 | default: LOG(ERROR) << "Unexpected opcode: " << opcode; |
| 527 | } |
| 528 | mir->dalvikInsn.opcode = static_cast<Instruction::Code>(kMirOpNop); |
Jean Christophe Beyler | c26efa8 | 2014-06-01 11:39:39 -0700 | [diff] [blame] | 529 | // Copy the SSA information that is relevant. |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 530 | mir_next->ssa_rep->num_uses = mir->ssa_rep->num_uses; |
| 531 | mir_next->ssa_rep->uses = mir->ssa_rep->uses; |
| 532 | mir_next->ssa_rep->fp_use = mir->ssa_rep->fp_use; |
| 533 | mir_next->ssa_rep->num_defs = 0; |
| 534 | mir->ssa_rep->num_uses = 0; |
| 535 | mir->ssa_rep->num_defs = 0; |
Jean Christophe Beyler | c26efa8 | 2014-06-01 11:39:39 -0700 | [diff] [blame] | 536 | // Copy in the decoded instruction information for potential SSA re-creation. |
| 537 | mir_next->dalvikInsn.vA = mir->dalvikInsn.vB; |
| 538 | mir_next->dalvikInsn.vB = mir->dalvikInsn.vC; |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 539 | } |
| 540 | } |
| 541 | break; |
Vladimir Marko | 26e7d45 | 2014-11-24 14:09:46 +0000 | [diff] [blame] | 542 | case Instruction::RETURN_VOID: |
| 543 | case Instruction::RETURN: |
| 544 | case Instruction::RETURN_WIDE: |
| 545 | case Instruction::RETURN_OBJECT: |
| 546 | if (bb->GetFirstNonPhiInsn() == mir) { |
| 547 | // This is a simple return BB. Eliminate suspend checks on predecessor back-edges. |
| 548 | for (BasicBlockId pred_id : bb->predecessors) { |
| 549 | BasicBlock* pred_bb = GetBasicBlock(pred_id); |
| 550 | DCHECK(pred_bb != nullptr); |
| 551 | if (IsBackedge(pred_bb, bb->id) && pred_bb->last_mir_insn != nullptr && |
| 552 | (IsInstructionIfCc(pred_bb->last_mir_insn->dalvikInsn.opcode) || |
| 553 | IsInstructionIfCcZ(pred_bb->last_mir_insn->dalvikInsn.opcode) || |
| 554 | IsInstructionGoto(pred_bb->last_mir_insn->dalvikInsn.opcode))) { |
| 555 | pred_bb->last_mir_insn->optimization_flags |= MIR_IGNORE_SUSPEND_CHECK; |
| 556 | if (cu_->verbose) { |
| 557 | LOG(INFO) << "Suppressed suspend check on branch to return at 0x" << std::hex |
| 558 | << pred_bb->last_mir_insn->offset; |
| 559 | } |
| 560 | } |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 561 | } |
| 562 | } |
| 563 | break; |
| 564 | default: |
| 565 | break; |
| 566 | } |
| 567 | // Is this the select pattern? |
Razvan A Lupusoru | e27b3bf | 2014-01-23 09:41:45 -0800 | [diff] [blame] | 568 | // TODO: flesh out support for Mips. NOTE: llvm's select op doesn't quite work here. |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 569 | // TUNING: expand to support IF_xx compare & branches |
Nicolas Geoffray | b34f69a | 2014-03-07 15:28:39 +0000 | [diff] [blame] | 570 | if (!cu_->compiler->IsPortable() && |
Serban Constantinescu | 05e27ff | 2014-05-28 13:21:45 +0100 | [diff] [blame] | 571 | (cu_->instruction_set == kArm64 || cu_->instruction_set == kThumb2 || |
| 572 | cu_->instruction_set == kX86 || cu_->instruction_set == kX86_64) && |
Vladimir Marko | a1a7074 | 2014-03-03 10:28:05 +0000 | [diff] [blame] | 573 | IsInstructionIfCcZ(mir->dalvikInsn.opcode)) { |
buzbee | 0d82948 | 2013-10-11 15:24:55 -0700 | [diff] [blame] | 574 | BasicBlock* ft = GetBasicBlock(bb->fall_through); |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 575 | DCHECK(ft != NULL); |
buzbee | 0d82948 | 2013-10-11 15:24:55 -0700 | [diff] [blame] | 576 | BasicBlock* ft_ft = GetBasicBlock(ft->fall_through); |
| 577 | BasicBlock* ft_tk = GetBasicBlock(ft->taken); |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 578 | |
buzbee | 0d82948 | 2013-10-11 15:24:55 -0700 | [diff] [blame] | 579 | BasicBlock* tk = GetBasicBlock(bb->taken); |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 580 | DCHECK(tk != NULL); |
buzbee | 0d82948 | 2013-10-11 15:24:55 -0700 | [diff] [blame] | 581 | BasicBlock* tk_ft = GetBasicBlock(tk->fall_through); |
| 582 | BasicBlock* tk_tk = GetBasicBlock(tk->taken); |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 583 | |
| 584 | /* |
| 585 | * In the select pattern, the taken edge goes to a block that unconditionally |
| 586 | * transfers to the rejoin block and the fall_though edge goes to a block that |
| 587 | * unconditionally falls through to the rejoin block. |
| 588 | */ |
| 589 | if ((tk_ft == NULL) && (ft_tk == NULL) && (tk_tk == ft_ft) && |
| 590 | (Predecessors(tk) == 1) && (Predecessors(ft) == 1)) { |
| 591 | /* |
| 592 | * Okay - we have the basic diamond shape. At the very least, we can eliminate the |
| 593 | * suspend check on the taken-taken branch back to the join point. |
| 594 | */ |
| 595 | if (SelectKind(tk->last_mir_insn) == kSelectGoto) { |
| 596 | tk->last_mir_insn->optimization_flags |= (MIR_IGNORE_SUSPEND_CHECK); |
| 597 | } |
Serban Constantinescu | 05e27ff | 2014-05-28 13:21:45 +0100 | [diff] [blame] | 598 | |
| 599 | // TODO: Add logic for LONG. |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 600 | // Are the block bodies something we can handle? |
| 601 | if ((ft->first_mir_insn == ft->last_mir_insn) && |
| 602 | (tk->first_mir_insn != tk->last_mir_insn) && |
| 603 | (tk->first_mir_insn->next == tk->last_mir_insn) && |
| 604 | ((SelectKind(ft->first_mir_insn) == kSelectMove) || |
| 605 | (SelectKind(ft->first_mir_insn) == kSelectConst)) && |
| 606 | (SelectKind(ft->first_mir_insn) == SelectKind(tk->first_mir_insn)) && |
| 607 | (SelectKind(tk->last_mir_insn) == kSelectGoto)) { |
| 608 | // Almost there. Are the instructions targeting the same vreg? |
| 609 | MIR* if_true = tk->first_mir_insn; |
| 610 | MIR* if_false = ft->first_mir_insn; |
| 611 | // It's possible that the target of the select isn't used - skip those (rare) cases. |
| 612 | MIR* phi = FindPhi(tk_tk, if_true->ssa_rep->defs[0]); |
| 613 | if ((phi != NULL) && (if_true->dalvikInsn.vA == if_false->dalvikInsn.vA)) { |
| 614 | /* |
| 615 | * We'll convert the IF_EQZ/IF_NEZ to a SELECT. We need to find the |
| 616 | * Phi node in the merge block and delete it (while using the SSA name |
| 617 | * of the merge as the target of the SELECT. Delete both taken and |
| 618 | * fallthrough blocks, and set fallthrough to merge block. |
| 619 | * NOTE: not updating other dataflow info (no longer used at this point). |
| 620 | * If this changes, need to update i_dom, etc. here (and in CombineBlocks). |
| 621 | */ |
Vladimir Marko | a1a7074 | 2014-03-03 10:28:05 +0000 | [diff] [blame] | 622 | mir->meta.ccode = ConditionCodeForIfCcZ(mir->dalvikInsn.opcode); |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 623 | mir->dalvikInsn.opcode = static_cast<Instruction::Code>(kMirOpSelect); |
| 624 | bool const_form = (SelectKind(if_true) == kSelectConst); |
| 625 | if ((SelectKind(if_true) == kSelectMove)) { |
| 626 | if (IsConst(if_true->ssa_rep->uses[0]) && |
| 627 | IsConst(if_false->ssa_rep->uses[0])) { |
| 628 | const_form = true; |
| 629 | if_true->dalvikInsn.vB = ConstantValue(if_true->ssa_rep->uses[0]); |
| 630 | if_false->dalvikInsn.vB = ConstantValue(if_false->ssa_rep->uses[0]); |
| 631 | } |
| 632 | } |
| 633 | if (const_form) { |
Razvan A Lupusoru | e27b3bf | 2014-01-23 09:41:45 -0800 | [diff] [blame] | 634 | /* |
| 635 | * TODO: If both constants are the same value, then instead of generating |
| 636 | * a select, we should simply generate a const bytecode. This should be |
| 637 | * considered after inlining which can lead to CFG of this form. |
| 638 | */ |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 639 | // "true" set val in vB |
| 640 | mir->dalvikInsn.vB = if_true->dalvikInsn.vB; |
| 641 | // "false" set val in vC |
| 642 | mir->dalvikInsn.vC = if_false->dalvikInsn.vB; |
| 643 | } else { |
| 644 | DCHECK_EQ(SelectKind(if_true), kSelectMove); |
| 645 | DCHECK_EQ(SelectKind(if_false), kSelectMove); |
buzbee | 862a760 | 2013-04-05 10:58:54 -0700 | [diff] [blame] | 646 | int* src_ssa = |
Vladimir Marko | 83cc7ae | 2014-02-12 18:02:05 +0000 | [diff] [blame] | 647 | static_cast<int*>(arena_->Alloc(sizeof(int) * 3, kArenaAllocDFInfo)); |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 648 | src_ssa[0] = mir->ssa_rep->uses[0]; |
| 649 | src_ssa[1] = if_true->ssa_rep->uses[0]; |
| 650 | src_ssa[2] = if_false->ssa_rep->uses[0]; |
| 651 | mir->ssa_rep->uses = src_ssa; |
| 652 | mir->ssa_rep->num_uses = 3; |
| 653 | } |
| 654 | mir->ssa_rep->num_defs = 1; |
buzbee | 862a760 | 2013-04-05 10:58:54 -0700 | [diff] [blame] | 655 | mir->ssa_rep->defs = |
Vladimir Marko | 83cc7ae | 2014-02-12 18:02:05 +0000 | [diff] [blame] | 656 | static_cast<int*>(arena_->Alloc(sizeof(int) * 1, kArenaAllocDFInfo)); |
buzbee | 862a760 | 2013-04-05 10:58:54 -0700 | [diff] [blame] | 657 | mir->ssa_rep->fp_def = |
Vladimir Marko | 83cc7ae | 2014-02-12 18:02:05 +0000 | [diff] [blame] | 658 | static_cast<bool*>(arena_->Alloc(sizeof(bool) * 1, kArenaAllocDFInfo)); |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 659 | mir->ssa_rep->fp_def[0] = if_true->ssa_rep->fp_def[0]; |
buzbee | 817e45a | 2013-05-30 18:59:12 -0700 | [diff] [blame] | 660 | // Match type of uses to def. |
| 661 | mir->ssa_rep->fp_use = |
Mathieu Chartier | f6c4b3b | 2013-08-24 16:11:37 -0700 | [diff] [blame] | 662 | static_cast<bool*>(arena_->Alloc(sizeof(bool) * mir->ssa_rep->num_uses, |
Vladimir Marko | 83cc7ae | 2014-02-12 18:02:05 +0000 | [diff] [blame] | 663 | kArenaAllocDFInfo)); |
buzbee | 817e45a | 2013-05-30 18:59:12 -0700 | [diff] [blame] | 664 | for (int i = 0; i < mir->ssa_rep->num_uses; i++) { |
| 665 | mir->ssa_rep->fp_use[i] = mir->ssa_rep->fp_def[0]; |
| 666 | } |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 667 | /* |
| 668 | * There is usually a Phi node in the join block for our two cases. If the |
| 669 | * Phi node only contains our two cases as input, we will use the result |
| 670 | * SSA name of the Phi node as our select result and delete the Phi. If |
| 671 | * the Phi node has more than two operands, we will arbitrarily use the SSA |
| 672 | * name of the "true" path, delete the SSA name of the "false" path from the |
| 673 | * Phi node (and fix up the incoming arc list). |
| 674 | */ |
| 675 | if (phi->ssa_rep->num_uses == 2) { |
| 676 | mir->ssa_rep->defs[0] = phi->ssa_rep->defs[0]; |
| 677 | phi->dalvikInsn.opcode = static_cast<Instruction::Code>(kMirOpNop); |
| 678 | } else { |
| 679 | int dead_def = if_false->ssa_rep->defs[0]; |
| 680 | int live_def = if_true->ssa_rep->defs[0]; |
| 681 | mir->ssa_rep->defs[0] = live_def; |
buzbee | 0d82948 | 2013-10-11 15:24:55 -0700 | [diff] [blame] | 682 | BasicBlockId* incoming = phi->meta.phi_incoming; |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 683 | for (int i = 0; i < phi->ssa_rep->num_uses; i++) { |
| 684 | if (phi->ssa_rep->uses[i] == live_def) { |
| 685 | incoming[i] = bb->id; |
| 686 | } |
| 687 | } |
| 688 | for (int i = 0; i < phi->ssa_rep->num_uses; i++) { |
| 689 | if (phi->ssa_rep->uses[i] == dead_def) { |
| 690 | int last_slot = phi->ssa_rep->num_uses - 1; |
| 691 | phi->ssa_rep->uses[i] = phi->ssa_rep->uses[last_slot]; |
| 692 | incoming[i] = incoming[last_slot]; |
| 693 | } |
| 694 | } |
| 695 | } |
| 696 | phi->ssa_rep->num_uses--; |
buzbee | 0d82948 | 2013-10-11 15:24:55 -0700 | [diff] [blame] | 697 | bb->taken = NullBasicBlockId; |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 698 | tk->block_type = kDead; |
| 699 | for (MIR* tmir = ft->first_mir_insn; tmir != NULL; tmir = tmir->next) { |
| 700 | tmir->dalvikInsn.opcode = static_cast<Instruction::Code>(kMirOpNop); |
| 701 | } |
| 702 | } |
| 703 | } |
| 704 | } |
| 705 | } |
| 706 | } |
buzbee | 1da1e2f | 2013-11-15 13:37:01 -0800 | [diff] [blame] | 707 | bb = ((cu_->disable_opt & (1 << kSuppressExceptionEdges)) != 0) ? NextDominatedBlock(bb) : NULL; |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 708 | } |
Vladimir Marko | 95a0597 | 2014-05-30 10:01:32 +0100 | [diff] [blame] | 709 | if (use_lvn && UNLIKELY(!global_valnum->Good())) { |
Vladimir Marko | 2ac01fc | 2014-05-22 12:09:08 +0100 | [diff] [blame] | 710 | LOG(WARNING) << "LVN overflow in " << PrettyMethod(cu_->method_idx, *cu_->dex_file); |
| 711 | } |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 712 | |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 713 | return true; |
| 714 | } |
| 715 | |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 716 | /* Collect stats on number of checks removed */ |
Ian Rogers | 6a3c1fc | 2014-10-31 00:33:20 -0700 | [diff] [blame] | 717 | void MIRGraph::CountChecks(class BasicBlock* bb) { |
buzbee | 862a760 | 2013-04-05 10:58:54 -0700 | [diff] [blame] | 718 | if (bb->data_flow_info != NULL) { |
| 719 | for (MIR* mir = bb->first_mir_insn; mir != NULL; mir = mir->next) { |
| 720 | if (mir->ssa_rep == NULL) { |
| 721 | continue; |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 722 | } |
Jean Christophe Beyler | cc794c3 | 2014-05-02 09:34:13 -0700 | [diff] [blame] | 723 | uint64_t df_attributes = GetDataFlowAttributes(mir); |
buzbee | 862a760 | 2013-04-05 10:58:54 -0700 | [diff] [blame] | 724 | if (df_attributes & DF_HAS_NULL_CHKS) { |
| 725 | checkstats_->null_checks++; |
| 726 | if (mir->optimization_flags & MIR_IGNORE_NULL_CHECK) { |
| 727 | checkstats_->null_checks_eliminated++; |
| 728 | } |
| 729 | } |
| 730 | if (df_attributes & DF_HAS_RANGE_CHKS) { |
| 731 | checkstats_->range_checks++; |
| 732 | if (mir->optimization_flags & MIR_IGNORE_RANGE_CHECK) { |
| 733 | checkstats_->range_checks_eliminated++; |
| 734 | } |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 735 | } |
| 736 | } |
| 737 | } |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 738 | } |
| 739 | |
Jean Christophe Beyler | 75bcc37 | 2014-09-04 08:15:11 -0700 | [diff] [blame] | 740 | /* Try to make common case the fallthrough path. */ |
buzbee | 0d82948 | 2013-10-11 15:24:55 -0700 | [diff] [blame] | 741 | bool MIRGraph::LayoutBlocks(BasicBlock* bb) { |
Jean Christophe Beyler | 75bcc37 | 2014-09-04 08:15:11 -0700 | [diff] [blame] | 742 | // TODO: For now, just looking for direct throws. Consider generalizing for profile feedback. |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 743 | if (!bb->explicit_throw) { |
| 744 | return false; |
| 745 | } |
Jean Christophe Beyler | 75bcc37 | 2014-09-04 08:15:11 -0700 | [diff] [blame] | 746 | |
| 747 | // If we visited it, we are done. |
| 748 | if (bb->visited) { |
| 749 | return false; |
| 750 | } |
| 751 | bb->visited = true; |
| 752 | |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 753 | BasicBlock* walker = bb; |
| 754 | while (true) { |
Jean Christophe Beyler | 75bcc37 | 2014-09-04 08:15:11 -0700 | [diff] [blame] | 755 | // Check termination conditions. |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 756 | if ((walker->block_type == kEntryBlock) || (Predecessors(walker) != 1)) { |
| 757 | break; |
| 758 | } |
Vladimir Marko | e39c54e | 2014-09-22 14:50:02 +0100 | [diff] [blame] | 759 | DCHECK(!walker->predecessors.empty()); |
| 760 | BasicBlock* prev = GetBasicBlock(walker->predecessors[0]); |
Jean Christophe Beyler | 75bcc37 | 2014-09-04 08:15:11 -0700 | [diff] [blame] | 761 | |
| 762 | // If we visited the predecessor, we are done. |
| 763 | if (prev->visited) { |
| 764 | return false; |
| 765 | } |
| 766 | prev->visited = true; |
| 767 | |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 768 | if (prev->conditional_branch) { |
buzbee | 0d82948 | 2013-10-11 15:24:55 -0700 | [diff] [blame] | 769 | if (GetBasicBlock(prev->fall_through) == walker) { |
Jean Christophe Beyler | 75bcc37 | 2014-09-04 08:15:11 -0700 | [diff] [blame] | 770 | // Already done - return. |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 771 | break; |
| 772 | } |
buzbee | 0d82948 | 2013-10-11 15:24:55 -0700 | [diff] [blame] | 773 | DCHECK_EQ(walker, GetBasicBlock(prev->taken)); |
Jean Christophe Beyler | 75bcc37 | 2014-09-04 08:15:11 -0700 | [diff] [blame] | 774 | // Got one. Flip it and exit. |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 775 | Instruction::Code opcode = prev->last_mir_insn->dalvikInsn.opcode; |
| 776 | switch (opcode) { |
| 777 | case Instruction::IF_EQ: opcode = Instruction::IF_NE; break; |
| 778 | case Instruction::IF_NE: opcode = Instruction::IF_EQ; break; |
| 779 | case Instruction::IF_LT: opcode = Instruction::IF_GE; break; |
| 780 | case Instruction::IF_GE: opcode = Instruction::IF_LT; break; |
| 781 | case Instruction::IF_GT: opcode = Instruction::IF_LE; break; |
| 782 | case Instruction::IF_LE: opcode = Instruction::IF_GT; break; |
| 783 | case Instruction::IF_EQZ: opcode = Instruction::IF_NEZ; break; |
| 784 | case Instruction::IF_NEZ: opcode = Instruction::IF_EQZ; break; |
| 785 | case Instruction::IF_LTZ: opcode = Instruction::IF_GEZ; break; |
| 786 | case Instruction::IF_GEZ: opcode = Instruction::IF_LTZ; break; |
| 787 | case Instruction::IF_GTZ: opcode = Instruction::IF_LEZ; break; |
| 788 | case Instruction::IF_LEZ: opcode = Instruction::IF_GTZ; break; |
| 789 | default: LOG(FATAL) << "Unexpected opcode " << opcode; |
| 790 | } |
| 791 | prev->last_mir_insn->dalvikInsn.opcode = opcode; |
buzbee | 0d82948 | 2013-10-11 15:24:55 -0700 | [diff] [blame] | 792 | BasicBlockId t_bb = prev->taken; |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 793 | prev->taken = prev->fall_through; |
| 794 | prev->fall_through = t_bb; |
| 795 | break; |
| 796 | } |
| 797 | walker = prev; |
Jean Christophe Beyler | 75bcc37 | 2014-09-04 08:15:11 -0700 | [diff] [blame] | 798 | |
| 799 | if (walker->visited) { |
| 800 | break; |
| 801 | } |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 802 | } |
| 803 | return false; |
| 804 | } |
| 805 | |
| 806 | /* Combine any basic blocks terminated by instructions that we now know can't throw */ |
Ian Rogers | 6a3c1fc | 2014-10-31 00:33:20 -0700 | [diff] [blame] | 807 | void MIRGraph::CombineBlocks(class BasicBlock* bb) { |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 808 | // Loop here to allow combining a sequence of blocks |
Vladimir Marko | 312eb25 | 2014-10-07 15:01:57 +0100 | [diff] [blame] | 809 | while ((bb->block_type == kDalvikByteCode) && |
| 810 | (bb->last_mir_insn != nullptr) && |
| 811 | (static_cast<int>(bb->last_mir_insn->dalvikInsn.opcode) == kMirOpCheck)) { |
| 812 | MIR* mir = bb->last_mir_insn; |
| 813 | DCHECK(bb->first_mir_insn != nullptr); |
| 814 | |
| 815 | // Grab the attributes from the paired opcode. |
| 816 | MIR* throw_insn = mir->meta.throw_insn; |
| 817 | uint64_t df_attributes = GetDataFlowAttributes(throw_insn); |
| 818 | |
| 819 | // Don't combine if the throw_insn can still throw NPE. |
| 820 | if ((df_attributes & DF_HAS_NULL_CHKS) != 0 && |
| 821 | (throw_insn->optimization_flags & MIR_IGNORE_NULL_CHECK) == 0) { |
| 822 | break; |
| 823 | } |
| 824 | // Now whitelist specific instructions. |
| 825 | bool ok = false; |
| 826 | if ((df_attributes & DF_IFIELD) != 0) { |
| 827 | // Combine only if fast, otherwise weird things can happen. |
| 828 | const MirIFieldLoweringInfo& field_info = GetIFieldLoweringInfo(throw_insn); |
Serguei Katkov | 08794a9 | 2014-11-06 13:56:13 +0600 | [diff] [blame] | 829 | ok = (df_attributes & DF_DA) ? field_info.FastGet() : field_info.FastPut(); |
Vladimir Marko | 312eb25 | 2014-10-07 15:01:57 +0100 | [diff] [blame] | 830 | } else if ((df_attributes & DF_SFIELD) != 0) { |
| 831 | // Combine only if fast, otherwise weird things can happen. |
| 832 | const MirSFieldLoweringInfo& field_info = GetSFieldLoweringInfo(throw_insn); |
Serguei Katkov | 08794a9 | 2014-11-06 13:56:13 +0600 | [diff] [blame] | 833 | bool fast = ((df_attributes & DF_DA) ? field_info.FastGet() : field_info.FastPut()); |
Vladimir Marko | 312eb25 | 2014-10-07 15:01:57 +0100 | [diff] [blame] | 834 | // Don't combine if the SGET/SPUT can call <clinit>(). |
Vladimir Marko | 66c6d7b | 2014-10-16 15:41:48 +0100 | [diff] [blame] | 835 | bool clinit = !field_info.IsClassInitialized() && |
| 836 | (throw_insn->optimization_flags & MIR_CLASS_IS_INITIALIZED) == 0; |
Vladimir Marko | 312eb25 | 2014-10-07 15:01:57 +0100 | [diff] [blame] | 837 | ok = fast && !clinit; |
| 838 | } else if ((df_attributes & DF_HAS_RANGE_CHKS) != 0) { |
| 839 | // Only AGET/APUT have range checks. We have processed the AGET/APUT null check above. |
| 840 | DCHECK_NE(throw_insn->optimization_flags & MIR_IGNORE_NULL_CHECK, 0); |
| 841 | ok = ((throw_insn->optimization_flags & MIR_IGNORE_RANGE_CHECK) != 0); |
| 842 | } else if ((throw_insn->dalvikInsn.FlagsOf() & Instruction::kThrow) == 0) { |
| 843 | // We can encounter a non-throwing insn here thanks to inlining or other optimizations. |
| 844 | ok = true; |
| 845 | } else if (throw_insn->dalvikInsn.opcode == Instruction::ARRAY_LENGTH || |
| 846 | throw_insn->dalvikInsn.opcode == Instruction::FILL_ARRAY_DATA || |
| 847 | static_cast<int>(throw_insn->dalvikInsn.opcode) == kMirOpNullCheck) { |
| 848 | // No more checks for these (null check was processed above). |
| 849 | ok = true; |
| 850 | } |
| 851 | if (!ok) { |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 852 | break; |
| 853 | } |
| 854 | |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 855 | // OK - got one. Combine |
buzbee | 0d82948 | 2013-10-11 15:24:55 -0700 | [diff] [blame] | 856 | BasicBlock* bb_next = GetBasicBlock(bb->fall_through); |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 857 | DCHECK(!bb_next->catch_entry); |
Vladimir Marko | 312eb25 | 2014-10-07 15:01:57 +0100 | [diff] [blame] | 858 | DCHECK_EQ(bb_next->predecessors.size(), 1u); |
Razvan A Lupusoru | c7a77bf | 2014-10-29 18:42:27 -0700 | [diff] [blame] | 859 | |
| 860 | // Now move instructions from bb_next to bb. Start off with doing a sanity check |
| 861 | // that kMirOpCheck's throw instruction is first one in the bb_next. |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 862 | DCHECK_EQ(bb_next->first_mir_insn, throw_insn); |
Razvan A Lupusoru | c7a77bf | 2014-10-29 18:42:27 -0700 | [diff] [blame] | 863 | // Now move all instructions (throw instruction to last one) from bb_next to bb. |
| 864 | MIR* last_to_move = bb_next->last_mir_insn; |
| 865 | bb_next->RemoveMIRList(throw_insn, last_to_move); |
| 866 | bb->InsertMIRListAfter(bb->last_mir_insn, throw_insn, last_to_move); |
| 867 | // The kMirOpCheck instruction is not needed anymore. |
| 868 | mir->dalvikInsn.opcode = static_cast<Instruction::Code>(kMirOpNop); |
| 869 | bb->RemoveMIR(mir); |
| 870 | |
Vladimir Marko | 312eb25 | 2014-10-07 15:01:57 +0100 | [diff] [blame] | 871 | // Before we overwrite successors, remove their predecessor links to bb. |
| 872 | bb_next->ErasePredecessor(bb->id); |
| 873 | if (bb->taken != NullBasicBlockId) { |
| 874 | DCHECK_EQ(bb->successor_block_list_type, kNotUsed); |
| 875 | BasicBlock* bb_taken = GetBasicBlock(bb->taken); |
| 876 | // bb->taken will be overwritten below. |
| 877 | DCHECK_EQ(bb_taken->block_type, kExceptionHandling); |
| 878 | DCHECK_EQ(bb_taken->predecessors.size(), 1u); |
| 879 | DCHECK_EQ(bb_taken->predecessors[0], bb->id); |
| 880 | bb_taken->predecessors.clear(); |
| 881 | bb_taken->block_type = kDead; |
| 882 | DCHECK(bb_taken->data_flow_info == nullptr); |
| 883 | } else { |
| 884 | DCHECK_EQ(bb->successor_block_list_type, kCatch); |
| 885 | for (SuccessorBlockInfo* succ_info : bb->successor_blocks) { |
| 886 | if (succ_info->block != NullBasicBlockId) { |
| 887 | BasicBlock* succ_bb = GetBasicBlock(succ_info->block); |
| 888 | DCHECK(succ_bb->catch_entry); |
| 889 | succ_bb->ErasePredecessor(bb->id); |
| 890 | if (succ_bb->predecessors.empty()) { |
| 891 | succ_bb->KillUnreachable(this); |
| 892 | } |
| 893 | } |
| 894 | } |
| 895 | } |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 896 | // Use the successor info from the next block |
buzbee | 0d82948 | 2013-10-11 15:24:55 -0700 | [diff] [blame] | 897 | bb->successor_block_list_type = bb_next->successor_block_list_type; |
Vladimir Marko | e39c54e | 2014-09-22 14:50:02 +0100 | [diff] [blame] | 898 | bb->successor_blocks.swap(bb_next->successor_blocks); // Swap instead of copying. |
Vladimir Marko | 312eb25 | 2014-10-07 15:01:57 +0100 | [diff] [blame] | 899 | bb_next->successor_block_list_type = kNotUsed; |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 900 | // Use the ending block linkage from the next block |
| 901 | bb->fall_through = bb_next->fall_through; |
Vladimir Marko | 312eb25 | 2014-10-07 15:01:57 +0100 | [diff] [blame] | 902 | bb_next->fall_through = NullBasicBlockId; |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 903 | bb->taken = bb_next->taken; |
Vladimir Marko | 312eb25 | 2014-10-07 15:01:57 +0100 | [diff] [blame] | 904 | bb_next->taken = NullBasicBlockId; |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 905 | /* |
Junmo Park | f1770fd | 2014-08-12 09:34:54 +0900 | [diff] [blame] | 906 | * If lower-half of pair of blocks to combine contained |
| 907 | * a return or a conditional branch or an explicit throw, |
| 908 | * move the flag to the newly combined block. |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 909 | */ |
| 910 | bb->terminated_by_return = bb_next->terminated_by_return; |
Junmo Park | f1770fd | 2014-08-12 09:34:54 +0900 | [diff] [blame] | 911 | bb->conditional_branch = bb_next->conditional_branch; |
| 912 | bb->explicit_throw = bb_next->explicit_throw; |
Vladimir Marko | 312eb25 | 2014-10-07 15:01:57 +0100 | [diff] [blame] | 913 | // Merge the use_lvn flag. |
| 914 | bb->use_lvn |= bb_next->use_lvn; |
| 915 | |
| 916 | // Kill the unused block. |
| 917 | bb_next->data_flow_info = nullptr; |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 918 | |
| 919 | /* |
| 920 | * NOTE: we aren't updating all dataflow info here. Should either make sure this pass |
| 921 | * happens after uses of i_dominated, dom_frontier or update the dataflow info here. |
Vladimir Marko | 312eb25 | 2014-10-07 15:01:57 +0100 | [diff] [blame] | 922 | * NOTE: GVN uses bb->data_flow_info->live_in_v which is unaffected by the block merge. |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 923 | */ |
| 924 | |
Vladimir Marko | 312eb25 | 2014-10-07 15:01:57 +0100 | [diff] [blame] | 925 | // Kill bb_next and remap now-dead id to parent. |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 926 | bb_next->block_type = kDead; |
Vladimir Marko | 312eb25 | 2014-10-07 15:01:57 +0100 | [diff] [blame] | 927 | bb_next->data_flow_info = nullptr; // Must be null for dead blocks. (Relied on by the GVN.) |
buzbee | 1fd3346 | 2013-03-25 13:40:45 -0700 | [diff] [blame] | 928 | block_id_map_.Overwrite(bb_next->id, bb->id); |
Vladimir Marko | 312eb25 | 2014-10-07 15:01:57 +0100 | [diff] [blame] | 929 | // Update predecessors in children. |
| 930 | ChildBlockIterator iter(bb, this); |
| 931 | for (BasicBlock* child = iter.Next(); child != nullptr; child = iter.Next()) { |
| 932 | child->UpdatePredecessor(bb_next->id, bb->id); |
| 933 | } |
| 934 | |
| 935 | // DFS orders are not up to date anymore. |
| 936 | dfs_orders_up_to_date_ = false; |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 937 | |
| 938 | // Now, loop back and see if we can keep going |
| 939 | } |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 940 | } |
| 941 | |
Vladimir Marko | 67c72b8 | 2014-10-09 12:26:10 +0100 | [diff] [blame] | 942 | bool MIRGraph::EliminateNullChecksGate() { |
| 943 | if ((cu_->disable_opt & (1 << kNullCheckElimination)) != 0 || |
| 944 | (merged_df_flags_ & DF_HAS_NULL_CHKS) == 0) { |
| 945 | return false; |
Vladimir Marko | bfea9c2 | 2014-01-17 17:49:33 +0000 | [diff] [blame] | 946 | } |
Vladimir Marko | 67c72b8 | 2014-10-09 12:26:10 +0100 | [diff] [blame] | 947 | |
Vladimir Marko | 67c72b8 | 2014-10-09 12:26:10 +0100 | [diff] [blame] | 948 | DCHECK(temp_scoped_alloc_.get() == nullptr); |
| 949 | temp_scoped_alloc_.reset(ScopedArenaAllocator::Create(&cu_->arena_stack)); |
Razvan A Lupusoru | c7a77bf | 2014-10-29 18:42:27 -0700 | [diff] [blame] | 950 | temp_.nce.num_vregs = GetNumOfCodeAndTempVRs(); |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 951 | temp_.nce.work_vregs_to_check = new (temp_scoped_alloc_.get()) ArenaBitVector( |
| 952 | temp_scoped_alloc_.get(), temp_.nce.num_vregs, false, kBitMapNullCheck); |
| 953 | temp_.nce.ending_vregs_to_check_matrix = static_cast<ArenaBitVector**>( |
Vladimir Marko | 5229cf1 | 2014-10-09 14:57:59 +0100 | [diff] [blame] | 954 | temp_scoped_alloc_->Alloc(sizeof(ArenaBitVector*) * GetNumBlocks(), kArenaAllocMisc)); |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 955 | std::fill_n(temp_.nce.ending_vregs_to_check_matrix, GetNumBlocks(), nullptr); |
Yevgeny Rouban | 423b137 | 2014-10-15 17:32:25 +0700 | [diff] [blame] | 956 | |
| 957 | // reset MIR_MARK |
| 958 | AllNodesIterator iter(this); |
| 959 | for (BasicBlock* bb = iter.Next(); bb != nullptr; bb = iter.Next()) { |
| 960 | for (MIR* mir = bb->first_mir_insn; mir != NULL; mir = mir->next) { |
| 961 | mir->optimization_flags &= ~MIR_MARK; |
| 962 | } |
| 963 | } |
| 964 | |
Vladimir Marko | 67c72b8 | 2014-10-09 12:26:10 +0100 | [diff] [blame] | 965 | return true; |
Vladimir Marko | bfea9c2 | 2014-01-17 17:49:33 +0000 | [diff] [blame] | 966 | } |
| 967 | |
buzbee | 1da1e2f | 2013-11-15 13:37:01 -0800 | [diff] [blame] | 968 | /* |
Vladimir Marko | 67c72b8 | 2014-10-09 12:26:10 +0100 | [diff] [blame] | 969 | * Eliminate unnecessary null checks for a basic block. |
buzbee | 1da1e2f | 2013-11-15 13:37:01 -0800 | [diff] [blame] | 970 | */ |
Vladimir Marko | 67c72b8 | 2014-10-09 12:26:10 +0100 | [diff] [blame] | 971 | bool MIRGraph::EliminateNullChecks(BasicBlock* bb) { |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 972 | if (bb->block_type != kDalvikByteCode && bb->block_type != kEntryBlock) { |
| 973 | // Ignore the kExitBlock as well. |
| 974 | DCHECK(bb->first_mir_insn == nullptr); |
| 975 | return false; |
| 976 | } |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 977 | |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 978 | ArenaBitVector* vregs_to_check = temp_.nce.work_vregs_to_check; |
Vladimir Marko | 67c72b8 | 2014-10-09 12:26:10 +0100 | [diff] [blame] | 979 | /* |
| 980 | * Set initial state. Catch blocks don't need any special treatment. |
| 981 | */ |
| 982 | if (bb->block_type == kEntryBlock) { |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 983 | vregs_to_check->ClearAllBits(); |
Vladimir Marko | 67c72b8 | 2014-10-09 12:26:10 +0100 | [diff] [blame] | 984 | // Assume all ins are objects. |
| 985 | for (uint16_t in_reg = GetFirstInVR(); |
| 986 | in_reg < GetNumOfCodeVRs(); in_reg++) { |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 987 | vregs_to_check->SetBit(in_reg); |
Vladimir Marko | 67c72b8 | 2014-10-09 12:26:10 +0100 | [diff] [blame] | 988 | } |
| 989 | if ((cu_->access_flags & kAccStatic) == 0) { |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 990 | // If non-static method, mark "this" as non-null. |
Vladimir Marko | 67c72b8 | 2014-10-09 12:26:10 +0100 | [diff] [blame] | 991 | int this_reg = GetFirstInVR(); |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 992 | vregs_to_check->ClearBit(this_reg); |
Vladimir Marko | 67c72b8 | 2014-10-09 12:26:10 +0100 | [diff] [blame] | 993 | } |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 994 | } else { |
| 995 | DCHECK_EQ(bb->block_type, kDalvikByteCode); |
| 996 | // Starting state is union of all incoming arcs. |
| 997 | bool copied_first = false; |
| 998 | for (BasicBlockId pred_id : bb->predecessors) { |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 999 | if (temp_.nce.ending_vregs_to_check_matrix[pred_id] == nullptr) { |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 1000 | continue; |
| 1001 | } |
| 1002 | BasicBlock* pred_bb = GetBasicBlock(pred_id); |
| 1003 | DCHECK(pred_bb != nullptr); |
| 1004 | MIR* null_check_insn = nullptr; |
| 1005 | if (pred_bb->block_type == kDalvikByteCode) { |
| 1006 | // Check to see if predecessor had an explicit null-check. |
| 1007 | MIR* last_insn = pred_bb->last_mir_insn; |
| 1008 | if (last_insn != nullptr) { |
| 1009 | Instruction::Code last_opcode = last_insn->dalvikInsn.opcode; |
| 1010 | if ((last_opcode == Instruction::IF_EQZ && pred_bb->fall_through == bb->id) || |
| 1011 | (last_opcode == Instruction::IF_NEZ && pred_bb->taken == bb->id)) { |
| 1012 | // Remember the null check insn if there's no other predecessor requiring null check. |
| 1013 | if (!copied_first || !vregs_to_check->IsBitSet(last_insn->dalvikInsn.vA)) { |
| 1014 | null_check_insn = last_insn; |
| 1015 | } |
buzbee | 1da1e2f | 2013-11-15 13:37:01 -0800 | [diff] [blame] | 1016 | } |
Ian Rogers | 22fd6a0 | 2013-06-13 15:06:54 -0700 | [diff] [blame] | 1017 | } |
| 1018 | } |
Vladimir Marko | 67c72b8 | 2014-10-09 12:26:10 +0100 | [diff] [blame] | 1019 | if (!copied_first) { |
| 1020 | copied_first = true; |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1021 | vregs_to_check->Copy(temp_.nce.ending_vregs_to_check_matrix[pred_id]); |
Vladimir Marko | 67c72b8 | 2014-10-09 12:26:10 +0100 | [diff] [blame] | 1022 | } else { |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1023 | vregs_to_check->Union(temp_.nce.ending_vregs_to_check_matrix[pred_id]); |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 1024 | } |
| 1025 | if (null_check_insn != nullptr) { |
| 1026 | vregs_to_check->ClearBit(null_check_insn->dalvikInsn.vA); |
Vladimir Marko | 67c72b8 | 2014-10-09 12:26:10 +0100 | [diff] [blame] | 1027 | } |
| 1028 | } |
| 1029 | DCHECK(copied_first); // At least one predecessor must have been processed before this bb. |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 1030 | } |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 1031 | // At this point, vregs_to_check shows which sregs have an object definition with |
Vladimir Marko | 67c72b8 | 2014-10-09 12:26:10 +0100 | [diff] [blame] | 1032 | // no intervening uses. |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 1033 | |
| 1034 | // Walk through the instruction in the block, updating as necessary |
| 1035 | for (MIR* mir = bb->first_mir_insn; mir != NULL; mir = mir->next) { |
Jean Christophe Beyler | cc794c3 | 2014-05-02 09:34:13 -0700 | [diff] [blame] | 1036 | uint64_t df_attributes = GetDataFlowAttributes(mir); |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 1037 | |
Razvan A Lupusoru | c7a77bf | 2014-10-29 18:42:27 -0700 | [diff] [blame] | 1038 | if ((df_attributes & DF_NULL_TRANSFER_N) != 0u) { |
| 1039 | // The algorithm was written in a phi agnostic way. |
| 1040 | continue; |
| 1041 | } |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 1042 | |
Bill Buzbee | 0b1191c | 2013-10-28 22:11:59 +0000 | [diff] [blame] | 1043 | // Might need a null check? |
| 1044 | if (df_attributes & DF_HAS_NULL_CHKS) { |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 1045 | int src_vreg; |
| 1046 | if (df_attributes & DF_NULL_CHK_OUT0) { |
| 1047 | DCHECK_NE(df_attributes & DF_IS_INVOKE, 0u); |
| 1048 | src_vreg = mir->dalvikInsn.vC; |
| 1049 | } else if (df_attributes & DF_NULL_CHK_B) { |
| 1050 | DCHECK_NE(df_attributes & DF_REF_B, 0u); |
| 1051 | src_vreg = mir->dalvikInsn.vB; |
Bill Buzbee | 0b1191c | 2013-10-28 22:11:59 +0000 | [diff] [blame] | 1052 | } else { |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 1053 | DCHECK_NE(df_attributes & DF_NULL_CHK_A, 0u); |
| 1054 | DCHECK_NE(df_attributes & DF_REF_A, 0u); |
| 1055 | src_vreg = mir->dalvikInsn.vA; |
Bill Buzbee | 0b1191c | 2013-10-28 22:11:59 +0000 | [diff] [blame] | 1056 | } |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 1057 | if (!vregs_to_check->IsBitSet(src_vreg)) { |
Bill Buzbee | 0b1191c | 2013-10-28 22:11:59 +0000 | [diff] [blame] | 1058 | // Eliminate the null check. |
Yevgeny Rouban | 423b137 | 2014-10-15 17:32:25 +0700 | [diff] [blame] | 1059 | mir->optimization_flags |= MIR_MARK; |
Bill Buzbee | 0b1191c | 2013-10-28 22:11:59 +0000 | [diff] [blame] | 1060 | } else { |
| 1061 | // Do the null check. |
Yevgeny Rouban | 423b137 | 2014-10-15 17:32:25 +0700 | [diff] [blame] | 1062 | mir->optimization_flags &= ~MIR_MARK; |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 1063 | // Mark src_vreg as null-checked. |
| 1064 | vregs_to_check->ClearBit(src_vreg); |
Bill Buzbee | 0b1191c | 2013-10-28 22:11:59 +0000 | [diff] [blame] | 1065 | } |
| 1066 | } |
| 1067 | |
| 1068 | if ((df_attributes & DF_A_WIDE) || |
| 1069 | (df_attributes & (DF_REF_A | DF_SETS_CONST | DF_NULL_TRANSFER)) == 0) { |
| 1070 | continue; |
| 1071 | } |
| 1072 | |
| 1073 | /* |
| 1074 | * First, mark all object definitions as requiring null check. |
| 1075 | * Note: we can't tell if a CONST definition might be used as an object, so treat |
| 1076 | * them all as object definitions. |
| 1077 | */ |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 1078 | if ((df_attributes & (DF_DA | DF_REF_A)) == (DF_DA | DF_REF_A) || |
Bill Buzbee | 0b1191c | 2013-10-28 22:11:59 +0000 | [diff] [blame] | 1079 | (df_attributes & DF_SETS_CONST)) { |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 1080 | vregs_to_check->SetBit(mir->dalvikInsn.vA); |
buzbee | 4db179d | 2013-10-23 12:16:39 -0700 | [diff] [blame] | 1081 | } |
| 1082 | |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 1083 | // Then, remove mark from all object definitions we know are non-null. |
Bill Buzbee | 0b1191c | 2013-10-28 22:11:59 +0000 | [diff] [blame] | 1084 | if (df_attributes & DF_NON_NULL_DST) { |
| 1085 | // Mark target of NEW* as non-null |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 1086 | DCHECK_NE(df_attributes & DF_REF_A, 0u); |
| 1087 | vregs_to_check->ClearBit(mir->dalvikInsn.vA); |
Bill Buzbee | 0b1191c | 2013-10-28 22:11:59 +0000 | [diff] [blame] | 1088 | } |
| 1089 | |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 1090 | // Mark non-null returns from invoke-style NEW* |
| 1091 | if (df_attributes & DF_NON_NULL_RET) { |
| 1092 | MIR* next_mir = mir->next; |
| 1093 | // Next should be an MOVE_RESULT_OBJECT |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 1094 | if (UNLIKELY(next_mir == nullptr)) { |
| 1095 | // The MethodVerifier makes sure there's no MOVE_RESULT at the catch entry or branch |
| 1096 | // target, so the MOVE_RESULT cannot be broken away into another block. |
| 1097 | LOG(WARNING) << "Unexpected end of block following new"; |
| 1098 | } else if (UNLIKELY(next_mir->dalvikInsn.opcode != Instruction::MOVE_RESULT_OBJECT)) { |
| 1099 | LOG(WARNING) << "Unexpected opcode following new: " << next_mir->dalvikInsn.opcode; |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 1100 | } else { |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 1101 | // Mark as null checked. |
| 1102 | vregs_to_check->ClearBit(next_mir->dalvikInsn.vA); |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 1103 | } |
| 1104 | } |
| 1105 | |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 1106 | // Propagate null check state on register copies. |
| 1107 | if (df_attributes & DF_NULL_TRANSFER_0) { |
| 1108 | DCHECK_EQ(df_attributes | ~(DF_DA | DF_REF_A | DF_UB | DF_REF_B), static_cast<uint64_t>(-1)); |
| 1109 | if (vregs_to_check->IsBitSet(mir->dalvikInsn.vB)) { |
| 1110 | vregs_to_check->SetBit(mir->dalvikInsn.vA); |
Bill Buzbee | 0b1191c | 2013-10-28 22:11:59 +0000 | [diff] [blame] | 1111 | } else { |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 1112 | vregs_to_check->ClearBit(mir->dalvikInsn.vA); |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 1113 | } |
| 1114 | } |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 1115 | } |
| 1116 | |
| 1117 | // Did anything change? |
Vladimir Marko | bfea9c2 | 2014-01-17 17:49:33 +0000 | [diff] [blame] | 1118 | bool nce_changed = false; |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1119 | ArenaBitVector* old_ending_ssa_regs_to_check = temp_.nce.ending_vregs_to_check_matrix[bb->id]; |
Vladimir Marko | 5229cf1 | 2014-10-09 14:57:59 +0100 | [diff] [blame] | 1120 | if (old_ending_ssa_regs_to_check == nullptr) { |
Vladimir Marko | 67c72b8 | 2014-10-09 12:26:10 +0100 | [diff] [blame] | 1121 | DCHECK(temp_scoped_alloc_.get() != nullptr); |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 1122 | nce_changed = vregs_to_check->GetHighestBitSet() != -1; |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1123 | temp_.nce.ending_vregs_to_check_matrix[bb->id] = vregs_to_check; |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 1124 | // Create a new vregs_to_check for next BB. |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1125 | temp_.nce.work_vregs_to_check = new (temp_scoped_alloc_.get()) ArenaBitVector( |
| 1126 | temp_scoped_alloc_.get(), temp_.nce.num_vregs, false, kBitMapNullCheck); |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 1127 | } else if (!vregs_to_check->SameBitsSet(old_ending_ssa_regs_to_check)) { |
Vladimir Marko | 67c72b8 | 2014-10-09 12:26:10 +0100 | [diff] [blame] | 1128 | nce_changed = true; |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1129 | temp_.nce.ending_vregs_to_check_matrix[bb->id] = vregs_to_check; |
| 1130 | temp_.nce.work_vregs_to_check = old_ending_ssa_regs_to_check; // Reuse for next BB. |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 1131 | } |
Vladimir Marko | 67c72b8 | 2014-10-09 12:26:10 +0100 | [diff] [blame] | 1132 | return nce_changed; |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 1133 | } |
| 1134 | |
Vladimir Marko | 67c72b8 | 2014-10-09 12:26:10 +0100 | [diff] [blame] | 1135 | void MIRGraph::EliminateNullChecksEnd() { |
| 1136 | // Clean up temporaries. |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1137 | temp_.nce.num_vregs = 0u; |
| 1138 | temp_.nce.work_vregs_to_check = nullptr; |
| 1139 | temp_.nce.ending_vregs_to_check_matrix = nullptr; |
Vladimir Marko | 67c72b8 | 2014-10-09 12:26:10 +0100 | [diff] [blame] | 1140 | DCHECK(temp_scoped_alloc_.get() != nullptr); |
| 1141 | temp_scoped_alloc_.reset(); |
Yevgeny Rouban | 423b137 | 2014-10-15 17:32:25 +0700 | [diff] [blame] | 1142 | |
| 1143 | // converge MIR_MARK with MIR_IGNORE_NULL_CHECK |
Yevgeny Rouban | 423b137 | 2014-10-15 17:32:25 +0700 | [diff] [blame] | 1144 | AllNodesIterator iter(this); |
| 1145 | for (BasicBlock* bb = iter.Next(); bb != nullptr; bb = iter.Next()) { |
| 1146 | for (MIR* mir = bb->first_mir_insn; mir != NULL; mir = mir->next) { |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 1147 | constexpr int kMarkToIgnoreNullCheckShift = kMIRMark - kMIRIgnoreNullCheck; |
Andreas Gampe | 785d2f2 | 2014-11-03 22:57:30 -0800 | [diff] [blame] | 1148 | static_assert(kMarkToIgnoreNullCheckShift > 0, "Not a valid right-shift"); |
Yevgeny Rouban | 423b137 | 2014-10-15 17:32:25 +0700 | [diff] [blame] | 1149 | uint16_t mirMarkAdjustedToIgnoreNullCheck = |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 1150 | (mir->optimization_flags & MIR_MARK) >> kMarkToIgnoreNullCheckShift; |
Yevgeny Rouban | 423b137 | 2014-10-15 17:32:25 +0700 | [diff] [blame] | 1151 | mir->optimization_flags |= mirMarkAdjustedToIgnoreNullCheck; |
| 1152 | } |
| 1153 | } |
Vladimir Marko | 67c72b8 | 2014-10-09 12:26:10 +0100 | [diff] [blame] | 1154 | } |
| 1155 | |
| 1156 | /* |
| 1157 | * Perform type and size inference for a basic block. |
| 1158 | */ |
| 1159 | bool MIRGraph::InferTypes(BasicBlock* bb) { |
| 1160 | if (bb->data_flow_info == nullptr) return false; |
| 1161 | |
| 1162 | bool infer_changed = false; |
| 1163 | for (MIR* mir = bb->first_mir_insn; mir != NULL; mir = mir->next) { |
| 1164 | if (mir->ssa_rep == NULL) { |
| 1165 | continue; |
| 1166 | } |
| 1167 | |
| 1168 | // Propagate type info. |
| 1169 | infer_changed = InferTypeAndSize(bb, mir, infer_changed); |
| 1170 | } |
| 1171 | |
| 1172 | return infer_changed; |
Vladimir Marko | bfea9c2 | 2014-01-17 17:49:33 +0000 | [diff] [blame] | 1173 | } |
| 1174 | |
| 1175 | bool MIRGraph::EliminateClassInitChecksGate() { |
| 1176 | if ((cu_->disable_opt & (1 << kClassInitCheckElimination)) != 0 || |
Vladimir Marko | 66c6d7b | 2014-10-16 15:41:48 +0100 | [diff] [blame] | 1177 | (merged_df_flags_ & DF_CLINIT) == 0) { |
Vladimir Marko | bfea9c2 | 2014-01-17 17:49:33 +0000 | [diff] [blame] | 1178 | return false; |
| 1179 | } |
| 1180 | |
Vladimir Marko | bfea9c2 | 2014-01-17 17:49:33 +0000 | [diff] [blame] | 1181 | DCHECK(temp_scoped_alloc_.get() == nullptr); |
| 1182 | temp_scoped_alloc_.reset(ScopedArenaAllocator::Create(&cu_->arena_stack)); |
| 1183 | |
| 1184 | // Each insn we use here has at least 2 code units, offset/2 will be a unique index. |
Razvan A Lupusoru | 7503597 | 2014-09-11 15:24:59 -0700 | [diff] [blame] | 1185 | const size_t end = (GetNumDalvikInsns() + 1u) / 2u; |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1186 | temp_.cice.indexes = static_cast<uint16_t*>( |
| 1187 | temp_scoped_alloc_->Alloc(end * sizeof(*temp_.cice.indexes), kArenaAllocGrowableArray)); |
| 1188 | std::fill_n(temp_.cice.indexes, end, 0xffffu); |
Vladimir Marko | bfea9c2 | 2014-01-17 17:49:33 +0000 | [diff] [blame] | 1189 | |
| 1190 | uint32_t unique_class_count = 0u; |
| 1191 | { |
| 1192 | // Get unique_class_count and store indexes in temp_insn_data_ using a map on a nested |
| 1193 | // ScopedArenaAllocator. |
| 1194 | |
| 1195 | // Embed the map value in the entry to save space. |
| 1196 | struct MapEntry { |
| 1197 | // Map key: the class identified by the declaring dex file and type index. |
| 1198 | const DexFile* declaring_dex_file; |
| 1199 | uint16_t declaring_class_idx; |
| 1200 | // Map value: index into bit vectors of classes requiring initialization checks. |
| 1201 | uint16_t index; |
| 1202 | }; |
| 1203 | struct MapEntryComparator { |
| 1204 | bool operator()(const MapEntry& lhs, const MapEntry& rhs) const { |
| 1205 | if (lhs.declaring_class_idx != rhs.declaring_class_idx) { |
| 1206 | return lhs.declaring_class_idx < rhs.declaring_class_idx; |
| 1207 | } |
| 1208 | return lhs.declaring_dex_file < rhs.declaring_dex_file; |
| 1209 | } |
| 1210 | }; |
| 1211 | |
Vladimir Marko | bfea9c2 | 2014-01-17 17:49:33 +0000 | [diff] [blame] | 1212 | ScopedArenaAllocator allocator(&cu_->arena_stack); |
Vladimir Marko | 69f08ba | 2014-04-11 12:28:11 +0100 | [diff] [blame] | 1213 | ScopedArenaSet<MapEntry, MapEntryComparator> class_to_index_map(MapEntryComparator(), |
| 1214 | allocator.Adapter()); |
Vladimir Marko | bfea9c2 | 2014-01-17 17:49:33 +0000 | [diff] [blame] | 1215 | |
| 1216 | // First, find all SGET/SPUTs that may need class initialization checks, record INVOKE_STATICs. |
| 1217 | AllNodesIterator iter(this); |
| 1218 | for (BasicBlock* bb = iter.Next(); bb != nullptr; bb = iter.Next()) { |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 1219 | if (bb->block_type == kDalvikByteCode) { |
| 1220 | for (MIR* mir = bb->first_mir_insn; mir != nullptr; mir = mir->next) { |
Vladimir Marko | af6925b | 2014-10-31 16:37:32 +0000 | [diff] [blame] | 1221 | if (IsInstructionSGetOrSPut(mir->dalvikInsn.opcode)) { |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 1222 | const MirSFieldLoweringInfo& field_info = GetSFieldLoweringInfo(mir); |
Vladimir Marko | 66c6d7b | 2014-10-16 15:41:48 +0100 | [diff] [blame] | 1223 | if (!field_info.IsReferrersClass()) { |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 1224 | DCHECK_LT(class_to_index_map.size(), 0xffffu); |
| 1225 | MapEntry entry = { |
| 1226 | // Treat unresolved fields as if each had its own class. |
| 1227 | field_info.IsResolved() ? field_info.DeclaringDexFile() |
| 1228 | : nullptr, |
| 1229 | field_info.IsResolved() ? field_info.DeclaringClassIndex() |
| 1230 | : field_info.FieldIndex(), |
| 1231 | static_cast<uint16_t>(class_to_index_map.size()) |
| 1232 | }; |
Vladimir Marko | 66c6d7b | 2014-10-16 15:41:48 +0100 | [diff] [blame] | 1233 | uint16_t index = class_to_index_map.insert(entry).first->index; |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1234 | // Using offset/2 for index into temp_.cice.indexes. |
| 1235 | temp_.cice.indexes[mir->offset / 2u] = index; |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 1236 | } |
Vladimir Marko | af6925b | 2014-10-31 16:37:32 +0000 | [diff] [blame] | 1237 | } else if (IsInstructionInvokeStatic(mir->dalvikInsn.opcode)) { |
Vladimir Marko | 66c6d7b | 2014-10-16 15:41:48 +0100 | [diff] [blame] | 1238 | const MirMethodLoweringInfo& method_info = GetMethodLoweringInfo(mir); |
| 1239 | DCHECK(method_info.IsStatic()); |
| 1240 | if (method_info.FastPath() && !method_info.IsReferrersClass()) { |
| 1241 | MapEntry entry = { |
| 1242 | method_info.DeclaringDexFile(), |
| 1243 | method_info.DeclaringClassIndex(), |
| 1244 | static_cast<uint16_t>(class_to_index_map.size()) |
| 1245 | }; |
| 1246 | uint16_t index = class_to_index_map.insert(entry).first->index; |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1247 | // Using offset/2 for index into temp_.cice.indexes. |
| 1248 | temp_.cice.indexes[mir->offset / 2u] = index; |
Vladimir Marko | 66c6d7b | 2014-10-16 15:41:48 +0100 | [diff] [blame] | 1249 | } |
Vladimir Marko | bfea9c2 | 2014-01-17 17:49:33 +0000 | [diff] [blame] | 1250 | } |
Vladimir Marko | bfea9c2 | 2014-01-17 17:49:33 +0000 | [diff] [blame] | 1251 | } |
| 1252 | } |
| 1253 | } |
| 1254 | unique_class_count = static_cast<uint32_t>(class_to_index_map.size()); |
| 1255 | } |
| 1256 | |
| 1257 | if (unique_class_count == 0u) { |
| 1258 | // All SGET/SPUTs refer to initialized classes. Nothing to do. |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1259 | temp_.cice.indexes = nullptr; |
Vladimir Marko | bfea9c2 | 2014-01-17 17:49:33 +0000 | [diff] [blame] | 1260 | temp_scoped_alloc_.reset(); |
| 1261 | return false; |
| 1262 | } |
| 1263 | |
Vladimir Marko | 66c6d7b | 2014-10-16 15:41:48 +0100 | [diff] [blame] | 1264 | // 2 bits for each class: is class initialized, is class in dex cache. |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1265 | temp_.cice.num_class_bits = 2u * unique_class_count; |
| 1266 | temp_.cice.work_classes_to_check = new (temp_scoped_alloc_.get()) ArenaBitVector( |
| 1267 | temp_scoped_alloc_.get(), temp_.cice.num_class_bits, false, kBitMapClInitCheck); |
| 1268 | temp_.cice.ending_classes_to_check_matrix = static_cast<ArenaBitVector**>( |
Vladimir Marko | 5229cf1 | 2014-10-09 14:57:59 +0100 | [diff] [blame] | 1269 | temp_scoped_alloc_->Alloc(sizeof(ArenaBitVector*) * GetNumBlocks(), kArenaAllocMisc)); |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1270 | std::fill_n(temp_.cice.ending_classes_to_check_matrix, GetNumBlocks(), nullptr); |
| 1271 | DCHECK_GT(temp_.cice.num_class_bits, 0u); |
Vladimir Marko | bfea9c2 | 2014-01-17 17:49:33 +0000 | [diff] [blame] | 1272 | return true; |
| 1273 | } |
| 1274 | |
| 1275 | /* |
| 1276 | * Eliminate unnecessary class initialization checks for a basic block. |
| 1277 | */ |
| 1278 | bool MIRGraph::EliminateClassInitChecks(BasicBlock* bb) { |
| 1279 | DCHECK_EQ((cu_->disable_opt & (1 << kClassInitCheckElimination)), 0u); |
Vladimir Marko | 7baa6f8 | 2014-10-09 18:01:24 +0100 | [diff] [blame] | 1280 | if (bb->block_type != kDalvikByteCode && bb->block_type != kEntryBlock) { |
| 1281 | // Ignore the kExitBlock as well. |
| 1282 | DCHECK(bb->first_mir_insn == nullptr); |
Vladimir Marko | bfea9c2 | 2014-01-17 17:49:33 +0000 | [diff] [blame] | 1283 | return false; |
| 1284 | } |
| 1285 | |
| 1286 | /* |
Vladimir Marko | 0a810d2 | 2014-07-11 14:44:36 +0100 | [diff] [blame] | 1287 | * Set initial state. Catch blocks don't need any special treatment. |
Vladimir Marko | bfea9c2 | 2014-01-17 17:49:33 +0000 | [diff] [blame] | 1288 | */ |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1289 | ArenaBitVector* classes_to_check = temp_.cice.work_classes_to_check; |
Vladimir Marko | bfea9c2 | 2014-01-17 17:49:33 +0000 | [diff] [blame] | 1290 | DCHECK(classes_to_check != nullptr); |
Vladimir Marko | 0a810d2 | 2014-07-11 14:44:36 +0100 | [diff] [blame] | 1291 | if (bb->block_type == kEntryBlock) { |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1292 | classes_to_check->SetInitialBits(temp_.cice.num_class_bits); |
Vladimir Marko | bfea9c2 | 2014-01-17 17:49:33 +0000 | [diff] [blame] | 1293 | } else { |
Vladimir Marko | e39c54e | 2014-09-22 14:50:02 +0100 | [diff] [blame] | 1294 | // Starting state is union of all incoming arcs. |
| 1295 | bool copied_first = false; |
| 1296 | for (BasicBlockId pred_id : bb->predecessors) { |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1297 | if (temp_.cice.ending_classes_to_check_matrix[pred_id] == nullptr) { |
Vladimir Marko | bfea9c2 | 2014-01-17 17:49:33 +0000 | [diff] [blame] | 1298 | continue; |
| 1299 | } |
Vladimir Marko | e39c54e | 2014-09-22 14:50:02 +0100 | [diff] [blame] | 1300 | if (!copied_first) { |
| 1301 | copied_first = true; |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1302 | classes_to_check->Copy(temp_.cice.ending_classes_to_check_matrix[pred_id]); |
Vladimir Marko | e39c54e | 2014-09-22 14:50:02 +0100 | [diff] [blame] | 1303 | } else { |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1304 | classes_to_check->Union(temp_.cice.ending_classes_to_check_matrix[pred_id]); |
Vladimir Marko | e39c54e | 2014-09-22 14:50:02 +0100 | [diff] [blame] | 1305 | } |
Vladimir Marko | bfea9c2 | 2014-01-17 17:49:33 +0000 | [diff] [blame] | 1306 | } |
Vladimir Marko | e39c54e | 2014-09-22 14:50:02 +0100 | [diff] [blame] | 1307 | DCHECK(copied_first); // At least one predecessor must have been processed before this bb. |
Vladimir Marko | bfea9c2 | 2014-01-17 17:49:33 +0000 | [diff] [blame] | 1308 | } |
| 1309 | // At this point, classes_to_check shows which classes need clinit checks. |
| 1310 | |
| 1311 | // Walk through the instruction in the block, updating as necessary |
| 1312 | for (MIR* mir = bb->first_mir_insn; mir != nullptr; mir = mir->next) { |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1313 | uint16_t index = temp_.cice.indexes[mir->offset / 2u]; |
Vladimir Marko | 66c6d7b | 2014-10-16 15:41:48 +0100 | [diff] [blame] | 1314 | if (index != 0xffffu) { |
| 1315 | bool check_initialization = false; |
| 1316 | bool check_dex_cache = false; |
| 1317 | |
| 1318 | // NOTE: index != 0xffff does not guarantee that this is an SGET/SPUT/INVOKE_STATIC. |
| 1319 | // Dex instructions with width 1 can have the same offset/2. |
| 1320 | |
Vladimir Marko | af6925b | 2014-10-31 16:37:32 +0000 | [diff] [blame] | 1321 | if (IsInstructionSGetOrSPut(mir->dalvikInsn.opcode)) { |
Vladimir Marko | 66c6d7b | 2014-10-16 15:41:48 +0100 | [diff] [blame] | 1322 | check_initialization = true; |
| 1323 | check_dex_cache = true; |
Vladimir Marko | af6925b | 2014-10-31 16:37:32 +0000 | [diff] [blame] | 1324 | } else if (IsInstructionInvokeStatic(mir->dalvikInsn.opcode)) { |
Vladimir Marko | 66c6d7b | 2014-10-16 15:41:48 +0100 | [diff] [blame] | 1325 | check_initialization = true; |
| 1326 | // NOTE: INVOKE_STATIC doesn't guarantee that the type will be in the dex cache. |
| 1327 | } |
| 1328 | |
| 1329 | if (check_dex_cache) { |
| 1330 | uint32_t check_dex_cache_index = 2u * index + 1u; |
| 1331 | if (!classes_to_check->IsBitSet(check_dex_cache_index)) { |
| 1332 | // Eliminate the class init check. |
| 1333 | mir->optimization_flags |= MIR_CLASS_IS_IN_DEX_CACHE; |
| 1334 | } else { |
| 1335 | // Do the class init check. |
| 1336 | mir->optimization_flags &= ~MIR_CLASS_IS_IN_DEX_CACHE; |
| 1337 | } |
| 1338 | classes_to_check->ClearBit(check_dex_cache_index); |
| 1339 | } |
| 1340 | if (check_initialization) { |
| 1341 | uint32_t check_clinit_index = 2u * index; |
| 1342 | if (!classes_to_check->IsBitSet(check_clinit_index)) { |
| 1343 | // Eliminate the class init check. |
| 1344 | mir->optimization_flags |= MIR_CLASS_IS_INITIALIZED; |
| 1345 | } else { |
| 1346 | // Do the class init check. |
| 1347 | mir->optimization_flags &= ~MIR_CLASS_IS_INITIALIZED; |
Vladimir Marko | bfea9c2 | 2014-01-17 17:49:33 +0000 | [diff] [blame] | 1348 | } |
| 1349 | // Mark the class as initialized. |
Vladimir Marko | 66c6d7b | 2014-10-16 15:41:48 +0100 | [diff] [blame] | 1350 | classes_to_check->ClearBit(check_clinit_index); |
Vladimir Marko | bfea9c2 | 2014-01-17 17:49:33 +0000 | [diff] [blame] | 1351 | } |
| 1352 | } |
| 1353 | } |
| 1354 | |
| 1355 | // Did anything change? |
| 1356 | bool changed = false; |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1357 | ArenaBitVector* old_ending_classes_to_check = temp_.cice.ending_classes_to_check_matrix[bb->id]; |
Vladimir Marko | 5229cf1 | 2014-10-09 14:57:59 +0100 | [diff] [blame] | 1358 | if (old_ending_classes_to_check == nullptr) { |
Vladimir Marko | bfea9c2 | 2014-01-17 17:49:33 +0000 | [diff] [blame] | 1359 | DCHECK(temp_scoped_alloc_.get() != nullptr); |
Vladimir Marko | bfea9c2 | 2014-01-17 17:49:33 +0000 | [diff] [blame] | 1360 | changed = classes_to_check->GetHighestBitSet() != -1; |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1361 | temp_.cice.ending_classes_to_check_matrix[bb->id] = classes_to_check; |
Vladimir Marko | 5229cf1 | 2014-10-09 14:57:59 +0100 | [diff] [blame] | 1362 | // Create a new classes_to_check for next BB. |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1363 | temp_.cice.work_classes_to_check = new (temp_scoped_alloc_.get()) ArenaBitVector( |
| 1364 | temp_scoped_alloc_.get(), temp_.cice.num_class_bits, false, kBitMapClInitCheck); |
Vladimir Marko | 5229cf1 | 2014-10-09 14:57:59 +0100 | [diff] [blame] | 1365 | } else if (!classes_to_check->Equal(old_ending_classes_to_check)) { |
Vladimir Marko | bfea9c2 | 2014-01-17 17:49:33 +0000 | [diff] [blame] | 1366 | changed = true; |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1367 | temp_.cice.ending_classes_to_check_matrix[bb->id] = classes_to_check; |
| 1368 | temp_.cice.work_classes_to_check = old_ending_classes_to_check; // Reuse for next BB. |
Vladimir Marko | bfea9c2 | 2014-01-17 17:49:33 +0000 | [diff] [blame] | 1369 | } |
| 1370 | return changed; |
| 1371 | } |
| 1372 | |
| 1373 | void MIRGraph::EliminateClassInitChecksEnd() { |
| 1374 | // Clean up temporaries. |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1375 | temp_.cice.num_class_bits = 0u; |
| 1376 | temp_.cice.work_classes_to_check = nullptr; |
| 1377 | temp_.cice.ending_classes_to_check_matrix = nullptr; |
| 1378 | DCHECK(temp_.cice.indexes != nullptr); |
| 1379 | temp_.cice.indexes = nullptr; |
Vladimir Marko | bfea9c2 | 2014-01-17 17:49:33 +0000 | [diff] [blame] | 1380 | DCHECK(temp_scoped_alloc_.get() != nullptr); |
| 1381 | temp_scoped_alloc_.reset(); |
| 1382 | } |
| 1383 | |
Vladimir Marko | 95a0597 | 2014-05-30 10:01:32 +0100 | [diff] [blame] | 1384 | bool MIRGraph::ApplyGlobalValueNumberingGate() { |
Vladimir Marko | 415ac88 | 2014-09-30 18:09:14 +0100 | [diff] [blame] | 1385 | if (GlobalValueNumbering::Skip(cu_)) { |
Vladimir Marko | 95a0597 | 2014-05-30 10:01:32 +0100 | [diff] [blame] | 1386 | return false; |
| 1387 | } |
| 1388 | |
| 1389 | DCHECK(temp_scoped_alloc_ == nullptr); |
| 1390 | temp_scoped_alloc_.reset(ScopedArenaAllocator::Create(&cu_->arena_stack)); |
Vladimir Marko | af6925b | 2014-10-31 16:37:32 +0000 | [diff] [blame] | 1391 | temp_.gvn.ifield_ids_ = |
| 1392 | GlobalValueNumbering::PrepareGvnFieldIds(temp_scoped_alloc_.get(), ifield_lowering_infos_); |
| 1393 | temp_.gvn.sfield_ids_ = |
| 1394 | GlobalValueNumbering::PrepareGvnFieldIds(temp_scoped_alloc_.get(), sfield_lowering_infos_); |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1395 | DCHECK(temp_.gvn.gvn == nullptr); |
| 1396 | temp_.gvn.gvn = new (temp_scoped_alloc_.get()) GlobalValueNumbering( |
| 1397 | cu_, temp_scoped_alloc_.get(), GlobalValueNumbering::kModeGvn); |
Vladimir Marko | 95a0597 | 2014-05-30 10:01:32 +0100 | [diff] [blame] | 1398 | return true; |
| 1399 | } |
| 1400 | |
| 1401 | bool MIRGraph::ApplyGlobalValueNumbering(BasicBlock* bb) { |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1402 | DCHECK(temp_.gvn.gvn != nullptr); |
| 1403 | LocalValueNumbering* lvn = temp_.gvn.gvn->PrepareBasicBlock(bb); |
Vladimir Marko | 95a0597 | 2014-05-30 10:01:32 +0100 | [diff] [blame] | 1404 | if (lvn != nullptr) { |
| 1405 | for (MIR* mir = bb->first_mir_insn; mir != nullptr; mir = mir->next) { |
| 1406 | lvn->GetValueNumber(mir); |
| 1407 | } |
| 1408 | } |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1409 | bool change = (lvn != nullptr) && temp_.gvn.gvn->FinishBasicBlock(bb); |
Vladimir Marko | 95a0597 | 2014-05-30 10:01:32 +0100 | [diff] [blame] | 1410 | return change; |
| 1411 | } |
| 1412 | |
| 1413 | void MIRGraph::ApplyGlobalValueNumberingEnd() { |
| 1414 | // Perform modifications. |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1415 | DCHECK(temp_.gvn.gvn != nullptr); |
| 1416 | if (temp_.gvn.gvn->Good()) { |
Vladimir Marko | 415ac88 | 2014-09-30 18:09:14 +0100 | [diff] [blame] | 1417 | if (max_nested_loops_ != 0u) { |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1418 | temp_.gvn.gvn->StartPostProcessing(); |
Vladimir Marko | 415ac88 | 2014-09-30 18:09:14 +0100 | [diff] [blame] | 1419 | TopologicalSortIterator iter(this); |
| 1420 | for (BasicBlock* bb = iter.Next(); bb != nullptr; bb = iter.Next()) { |
| 1421 | ScopedArenaAllocator allocator(&cu_->arena_stack); // Reclaim memory after each LVN. |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1422 | LocalValueNumbering* lvn = temp_.gvn.gvn->PrepareBasicBlock(bb, &allocator); |
Vladimir Marko | 415ac88 | 2014-09-30 18:09:14 +0100 | [diff] [blame] | 1423 | if (lvn != nullptr) { |
| 1424 | for (MIR* mir = bb->first_mir_insn; mir != nullptr; mir = mir->next) { |
| 1425 | lvn->GetValueNumber(mir); |
| 1426 | } |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1427 | bool change = temp_.gvn.gvn->FinishBasicBlock(bb); |
Vladimir Marko | 415ac88 | 2014-09-30 18:09:14 +0100 | [diff] [blame] | 1428 | DCHECK(!change) << PrettyMethod(cu_->method_idx, *cu_->dex_file); |
Vladimir Marko | 95a0597 | 2014-05-30 10:01:32 +0100 | [diff] [blame] | 1429 | } |
Vladimir Marko | 95a0597 | 2014-05-30 10:01:32 +0100 | [diff] [blame] | 1430 | } |
| 1431 | } |
Vladimir Marko | 415ac88 | 2014-09-30 18:09:14 +0100 | [diff] [blame] | 1432 | // GVN was successful, running the LVN would be useless. |
| 1433 | cu_->disable_opt |= (1u << kLocalValueNumbering); |
Vladimir Marko | 95a0597 | 2014-05-30 10:01:32 +0100 | [diff] [blame] | 1434 | } else { |
| 1435 | LOG(WARNING) << "GVN failed for " << PrettyMethod(cu_->method_idx, *cu_->dex_file); |
| 1436 | } |
| 1437 | |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1438 | delete temp_.gvn.gvn; |
| 1439 | temp_.gvn.gvn = nullptr; |
Vladimir Marko | af6925b | 2014-10-31 16:37:32 +0000 | [diff] [blame] | 1440 | temp_.gvn.ifield_ids_ = nullptr; |
| 1441 | temp_.gvn.sfield_ids_ = nullptr; |
Vladimir Marko | 95a0597 | 2014-05-30 10:01:32 +0100 | [diff] [blame] | 1442 | DCHECK(temp_scoped_alloc_ != nullptr); |
| 1443 | temp_scoped_alloc_.reset(); |
| 1444 | } |
| 1445 | |
Vladimir Marko | 9820b7c | 2014-01-02 16:40:37 +0000 | [diff] [blame] | 1446 | void MIRGraph::ComputeInlineIFieldLoweringInfo(uint16_t field_idx, MIR* invoke, MIR* iget_or_iput) { |
| 1447 | uint32_t method_index = invoke->meta.method_lowering_info; |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1448 | if (temp_.smi.processed_indexes->IsBitSet(method_index)) { |
| 1449 | iget_or_iput->meta.ifield_lowering_info = temp_.smi.lowering_infos[method_index]; |
Vladimir Marko | 9820b7c | 2014-01-02 16:40:37 +0000 | [diff] [blame] | 1450 | DCHECK_EQ(field_idx, GetIFieldLoweringInfo(iget_or_iput).FieldIndex()); |
| 1451 | return; |
| 1452 | } |
| 1453 | |
| 1454 | const MirMethodLoweringInfo& method_info = GetMethodLoweringInfo(invoke); |
| 1455 | MethodReference target = method_info.GetTargetMethod(); |
| 1456 | DexCompilationUnit inlined_unit( |
| 1457 | cu_, cu_->class_loader, cu_->class_linker, *target.dex_file, |
| 1458 | nullptr /* code_item not used */, 0u /* class_def_idx not used */, target.dex_method_index, |
| 1459 | 0u /* access_flags not used */, nullptr /* verified_method not used */); |
Vladimir Marko | af6925b | 2014-10-31 16:37:32 +0000 | [diff] [blame] | 1460 | DexMemAccessType type = IGetOrIPutMemAccessType(iget_or_iput->dalvikInsn.opcode); |
| 1461 | MirIFieldLoweringInfo inlined_field_info(field_idx, type); |
Vladimir Marko | 9820b7c | 2014-01-02 16:40:37 +0000 | [diff] [blame] | 1462 | MirIFieldLoweringInfo::Resolve(cu_->compiler_driver, &inlined_unit, &inlined_field_info, 1u); |
| 1463 | DCHECK(inlined_field_info.IsResolved()); |
| 1464 | |
Vladimir Marko | e39c54e | 2014-09-22 14:50:02 +0100 | [diff] [blame] | 1465 | uint32_t field_info_index = ifield_lowering_infos_.size(); |
| 1466 | ifield_lowering_infos_.push_back(inlined_field_info); |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1467 | temp_.smi.processed_indexes->SetBit(method_index); |
| 1468 | temp_.smi.lowering_infos[method_index] = field_info_index; |
Vladimir Marko | 9820b7c | 2014-01-02 16:40:37 +0000 | [diff] [blame] | 1469 | iget_or_iput->meta.ifield_lowering_info = field_info_index; |
| 1470 | } |
| 1471 | |
Razvan A Lupusoru | cb80474 | 2014-07-09 16:42:19 -0700 | [diff] [blame] | 1472 | bool MIRGraph::InlineSpecialMethodsGate() { |
Vladimir Marko | 9820b7c | 2014-01-02 16:40:37 +0000 | [diff] [blame] | 1473 | if ((cu_->disable_opt & (1 << kSuppressMethodInlining)) != 0 || |
Vladimir Marko | e39c54e | 2014-09-22 14:50:02 +0100 | [diff] [blame] | 1474 | method_lowering_infos_.size() == 0u) { |
Vladimir Marko | 9820b7c | 2014-01-02 16:40:37 +0000 | [diff] [blame] | 1475 | return false; |
| 1476 | } |
| 1477 | if (cu_->compiler_driver->GetMethodInlinerMap() == nullptr) { |
| 1478 | // This isn't the Quick compiler. |
| 1479 | return false; |
| 1480 | } |
| 1481 | return true; |
| 1482 | } |
| 1483 | |
Razvan A Lupusoru | cb80474 | 2014-07-09 16:42:19 -0700 | [diff] [blame] | 1484 | void MIRGraph::InlineSpecialMethodsStart() { |
Vladimir Marko | 9820b7c | 2014-01-02 16:40:37 +0000 | [diff] [blame] | 1485 | // Prepare for inlining getters/setters. Since we're inlining at most 1 IGET/IPUT from |
| 1486 | // each INVOKE, we can index the data by the MIR::meta::method_lowering_info index. |
| 1487 | |
| 1488 | DCHECK(temp_scoped_alloc_.get() == nullptr); |
| 1489 | temp_scoped_alloc_.reset(ScopedArenaAllocator::Create(&cu_->arena_stack)); |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1490 | temp_.smi.num_indexes = method_lowering_infos_.size(); |
| 1491 | temp_.smi.processed_indexes = new (temp_scoped_alloc_.get()) ArenaBitVector( |
| 1492 | temp_scoped_alloc_.get(), temp_.smi.num_indexes, false, kBitMapMisc); |
| 1493 | temp_.smi.processed_indexes->ClearAllBits(); |
| 1494 | temp_.smi.lowering_infos = static_cast<uint16_t*>(temp_scoped_alloc_->Alloc( |
| 1495 | temp_.smi.num_indexes * sizeof(*temp_.smi.lowering_infos), kArenaAllocGrowableArray)); |
Vladimir Marko | 9820b7c | 2014-01-02 16:40:37 +0000 | [diff] [blame] | 1496 | } |
| 1497 | |
Razvan A Lupusoru | cb80474 | 2014-07-09 16:42:19 -0700 | [diff] [blame] | 1498 | void MIRGraph::InlineSpecialMethods(BasicBlock* bb) { |
Vladimir Marko | 9820b7c | 2014-01-02 16:40:37 +0000 | [diff] [blame] | 1499 | if (bb->block_type != kDalvikByteCode) { |
| 1500 | return; |
| 1501 | } |
| 1502 | for (MIR* mir = bb->first_mir_insn; mir != NULL; mir = mir->next) { |
Jean Christophe Beyler | 2ab40eb | 2014-06-02 09:03:14 -0700 | [diff] [blame] | 1503 | if (MIR::DecodedInstruction::IsPseudoMirOp(mir->dalvikInsn.opcode)) { |
buzbee | 35ba7f3 | 2014-05-31 08:59:01 -0700 | [diff] [blame] | 1504 | continue; |
| 1505 | } |
Jean Christophe Beyler | fb0ea2d | 2014-07-29 13:20:42 -0700 | [diff] [blame] | 1506 | if (!(mir->dalvikInsn.FlagsOf() & Instruction::kInvoke)) { |
Vladimir Marko | 9820b7c | 2014-01-02 16:40:37 +0000 | [diff] [blame] | 1507 | continue; |
| 1508 | } |
| 1509 | const MirMethodLoweringInfo& method_info = GetMethodLoweringInfo(mir); |
| 1510 | if (!method_info.FastPath()) { |
| 1511 | continue; |
| 1512 | } |
Razvan A Lupusoru | c80605d | 2014-09-11 14:12:17 -0700 | [diff] [blame] | 1513 | |
Vladimir Marko | 9820b7c | 2014-01-02 16:40:37 +0000 | [diff] [blame] | 1514 | InvokeType sharp_type = method_info.GetSharpType(); |
Razvan A Lupusoru | c80605d | 2014-09-11 14:12:17 -0700 | [diff] [blame] | 1515 | if ((sharp_type != kDirect) && (sharp_type != kStatic)) { |
Vladimir Marko | 9820b7c | 2014-01-02 16:40:37 +0000 | [diff] [blame] | 1516 | continue; |
| 1517 | } |
Razvan A Lupusoru | c80605d | 2014-09-11 14:12:17 -0700 | [diff] [blame] | 1518 | |
| 1519 | if (sharp_type == kStatic) { |
Vladimir Marko | 66c6d7b | 2014-10-16 15:41:48 +0100 | [diff] [blame] | 1520 | bool needs_clinit = !method_info.IsClassInitialized() && |
| 1521 | ((mir->optimization_flags & MIR_CLASS_IS_INITIALIZED) == 0); |
Razvan A Lupusoru | c80605d | 2014-09-11 14:12:17 -0700 | [diff] [blame] | 1522 | if (needs_clinit) { |
| 1523 | continue; |
| 1524 | } |
| 1525 | } |
| 1526 | |
Vladimir Marko | 9820b7c | 2014-01-02 16:40:37 +0000 | [diff] [blame] | 1527 | DCHECK(cu_->compiler_driver->GetMethodInlinerMap() != nullptr); |
| 1528 | MethodReference target = method_info.GetTargetMethod(); |
| 1529 | if (cu_->compiler_driver->GetMethodInlinerMap()->GetMethodInliner(target.dex_file) |
| 1530 | ->GenInline(this, bb, mir, target.dex_method_index)) { |
Razvan A Lupusoru | cb80474 | 2014-07-09 16:42:19 -0700 | [diff] [blame] | 1531 | if (cu_->verbose || cu_->print_pass) { |
| 1532 | LOG(INFO) << "SpecialMethodInliner: Inlined " << method_info.GetInvokeType() << " (" |
| 1533 | << sharp_type << ") call to \"" << PrettyMethod(target.dex_method_index, *target.dex_file) |
| 1534 | << "\" from \"" << PrettyMethod(cu_->method_idx, *cu_->dex_file) |
| 1535 | << "\" @0x" << std::hex << mir->offset; |
Vladimir Marko | 9820b7c | 2014-01-02 16:40:37 +0000 | [diff] [blame] | 1536 | } |
| 1537 | } |
| 1538 | } |
| 1539 | } |
| 1540 | |
Razvan A Lupusoru | cb80474 | 2014-07-09 16:42:19 -0700 | [diff] [blame] | 1541 | void MIRGraph::InlineSpecialMethodsEnd() { |
Vladimir Marko | f585e54 | 2014-11-21 13:41:32 +0000 | [diff] [blame] | 1542 | // Clean up temporaries. |
| 1543 | DCHECK(temp_.smi.lowering_infos != nullptr); |
| 1544 | temp_.smi.lowering_infos = nullptr; |
| 1545 | temp_.smi.num_indexes = 0u; |
| 1546 | DCHECK(temp_.smi.processed_indexes != nullptr); |
| 1547 | temp_.smi.processed_indexes = nullptr; |
Vladimir Marko | 9820b7c | 2014-01-02 16:40:37 +0000 | [diff] [blame] | 1548 | DCHECK(temp_scoped_alloc_.get() != nullptr); |
| 1549 | temp_scoped_alloc_.reset(); |
| 1550 | } |
| 1551 | |
Brian Carlstrom | 2ce745c | 2013-07-17 17:44:30 -0700 | [diff] [blame] | 1552 | void MIRGraph::DumpCheckStats() { |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 1553 | Checkstats* stats = |
Vladimir Marko | 83cc7ae | 2014-02-12 18:02:05 +0000 | [diff] [blame] | 1554 | static_cast<Checkstats*>(arena_->Alloc(sizeof(Checkstats), kArenaAllocDFInfo)); |
buzbee | 1fd3346 | 2013-03-25 13:40:45 -0700 | [diff] [blame] | 1555 | checkstats_ = stats; |
buzbee | 56c7178 | 2013-09-05 17:13:19 -0700 | [diff] [blame] | 1556 | AllNodesIterator iter(this); |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 1557 | for (BasicBlock* bb = iter.Next(); bb != NULL; bb = iter.Next()) { |
| 1558 | CountChecks(bb); |
| 1559 | } |
| 1560 | if (stats->null_checks > 0) { |
| 1561 | float eliminated = static_cast<float>(stats->null_checks_eliminated); |
| 1562 | float checks = static_cast<float>(stats->null_checks); |
| 1563 | LOG(INFO) << "Null Checks: " << PrettyMethod(cu_->method_idx, *cu_->dex_file) << " " |
| 1564 | << stats->null_checks_eliminated << " of " << stats->null_checks << " -> " |
| 1565 | << (eliminated/checks) * 100.0 << "%"; |
| 1566 | } |
| 1567 | if (stats->range_checks > 0) { |
| 1568 | float eliminated = static_cast<float>(stats->range_checks_eliminated); |
| 1569 | float checks = static_cast<float>(stats->range_checks); |
| 1570 | LOG(INFO) << "Range Checks: " << PrettyMethod(cu_->method_idx, *cu_->dex_file) << " " |
| 1571 | << stats->range_checks_eliminated << " of " << stats->range_checks << " -> " |
| 1572 | << (eliminated/checks) * 100.0 << "%"; |
| 1573 | } |
| 1574 | } |
| 1575 | |
Ian Rogers | 6a3c1fc | 2014-10-31 00:33:20 -0700 | [diff] [blame] | 1576 | bool MIRGraph::BuildExtendedBBList(class BasicBlock* bb) { |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 1577 | if (bb->visited) return false; |
| 1578 | if (!((bb->block_type == kEntryBlock) || (bb->block_type == kDalvikByteCode) |
| 1579 | || (bb->block_type == kExitBlock))) { |
| 1580 | // Ignore special blocks |
| 1581 | bb->visited = true; |
| 1582 | return false; |
| 1583 | } |
| 1584 | // Must be head of extended basic block. |
| 1585 | BasicBlock* start_bb = bb; |
buzbee | 0d82948 | 2013-10-11 15:24:55 -0700 | [diff] [blame] | 1586 | extended_basic_blocks_.push_back(bb->id); |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 1587 | bool terminated_by_return = false; |
buzbee | 1da1e2f | 2013-11-15 13:37:01 -0800 | [diff] [blame] | 1588 | bool do_local_value_numbering = false; |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 1589 | // Visit blocks strictly dominated by this head. |
| 1590 | while (bb != NULL) { |
| 1591 | bb->visited = true; |
| 1592 | terminated_by_return |= bb->terminated_by_return; |
buzbee | 1da1e2f | 2013-11-15 13:37:01 -0800 | [diff] [blame] | 1593 | do_local_value_numbering |= bb->use_lvn; |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 1594 | bb = NextDominatedBlock(bb); |
| 1595 | } |
buzbee | 1da1e2f | 2013-11-15 13:37:01 -0800 | [diff] [blame] | 1596 | if (terminated_by_return || do_local_value_numbering) { |
| 1597 | // Do lvn for all blocks in this extended set. |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 1598 | bb = start_bb; |
| 1599 | while (bb != NULL) { |
buzbee | 1da1e2f | 2013-11-15 13:37:01 -0800 | [diff] [blame] | 1600 | bb->use_lvn = do_local_value_numbering; |
| 1601 | bb->dominates_return = terminated_by_return; |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 1602 | bb = NextDominatedBlock(bb); |
| 1603 | } |
| 1604 | } |
Brian Carlstrom | 7934ac2 | 2013-07-26 10:54:15 -0700 | [diff] [blame] | 1605 | return false; // Not iterative - return value will be ignored |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 1606 | } |
| 1607 | |
Brian Carlstrom | 2ce745c | 2013-07-17 17:44:30 -0700 | [diff] [blame] | 1608 | void MIRGraph::BasicBlockOptimization() { |
Vladimir Marko | af6925b | 2014-10-31 16:37:32 +0000 | [diff] [blame] | 1609 | if ((cu_->disable_opt & (1 << kLocalValueNumbering)) == 0) { |
| 1610 | temp_scoped_alloc_.reset(ScopedArenaAllocator::Create(&cu_->arena_stack)); |
| 1611 | temp_.gvn.ifield_ids_ = |
| 1612 | GlobalValueNumbering::PrepareGvnFieldIds(temp_scoped_alloc_.get(), ifield_lowering_infos_); |
| 1613 | temp_.gvn.sfield_ids_ = |
| 1614 | GlobalValueNumbering::PrepareGvnFieldIds(temp_scoped_alloc_.get(), sfield_lowering_infos_); |
| 1615 | } |
| 1616 | |
Jean Christophe Beyler | 4e97c53 | 2014-01-07 10:07:18 -0800 | [diff] [blame] | 1617 | if ((cu_->disable_opt & (1 << kSuppressExceptionEdges)) != 0) { |
| 1618 | ClearAllVisitedFlags(); |
| 1619 | PreOrderDfsIterator iter2(this); |
| 1620 | for (BasicBlock* bb = iter2.Next(); bb != NULL; bb = iter2.Next()) { |
| 1621 | BuildExtendedBBList(bb); |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 1622 | } |
Jean Christophe Beyler | 4e97c53 | 2014-01-07 10:07:18 -0800 | [diff] [blame] | 1623 | // Perform extended basic block optimizations. |
| 1624 | for (unsigned int i = 0; i < extended_basic_blocks_.size(); i++) { |
| 1625 | BasicBlockOpt(GetBasicBlock(extended_basic_blocks_[i])); |
| 1626 | } |
| 1627 | } else { |
| 1628 | PreOrderDfsIterator iter(this); |
| 1629 | for (BasicBlock* bb = iter.Next(); bb != NULL; bb = iter.Next()) { |
| 1630 | BasicBlockOpt(bb); |
| 1631 | } |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 1632 | } |
Vladimir Marko | af6925b | 2014-10-31 16:37:32 +0000 | [diff] [blame] | 1633 | |
| 1634 | // Clean up after LVN. |
| 1635 | temp_.gvn.ifield_ids_ = nullptr; |
| 1636 | temp_.gvn.sfield_ids_ = nullptr; |
| 1637 | temp_scoped_alloc_.reset(); |
buzbee | 311ca16 | 2013-02-28 15:56:43 -0800 | [diff] [blame] | 1638 | } |
| 1639 | |
| 1640 | } // namespace art |