diff options
Diffstat (limited to 'src/compiler/codegen/ralloc_util.cc')
| -rw-r--r-- | src/compiler/codegen/ralloc_util.cc | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/compiler/codegen/ralloc_util.cc b/src/compiler/codegen/ralloc_util.cc index afd49768d0..1d5f3aca86 100644 --- a/src/compiler/codegen/ralloc_util.cc +++ b/src/compiler/codegen/ralloc_util.cc @@ -64,7 +64,7 @@ void CompilerInitPool(RegisterInfo* regs, int* reg_nums, int num) } } -static void DumpRegPool(RegisterInfo* p, int num_regs) +void DumpRegPool(RegisterInfo* p, int num_regs) { LOG(INFO) << "================================================"; for (int i = 0; i < num_regs; i++) { @@ -1091,21 +1091,14 @@ static void CountRefs(CompilationUnit *cu, BasicBlock* bb, RefCounts* core_count RegLocation loc = cu->reg_location[i]; RefCounts* counts = loc.fp ? fp_counts : core_counts; int p_map_idx = SRegToPMap(cu, loc.s_reg_low); - int sample_reg = loc.fp ? cu->reg_pool->FPRegs[0].reg : cu->reg_pool->core_regs[0].reg; - bool simple_immediate = loc.is_const && - !cu->cg->InexpensiveConstant(sample_reg, cu->constant_values[loc.orig_sreg]); - if (loc.defined) { - // Don't count easily regenerated immediates - if (!simple_immediate) { - counts[p_map_idx].count += cu->use_counts.elem_list[i]; - } + //Don't count easily regenerated immediates + if (loc.fp || loc.wide || !IsInexpensiveConstant(cu, loc)) { + counts[p_map_idx].count += cu->use_counts.elem_list[i]; } if (loc.wide) { - if (loc.defined) { - if (loc.fp && !simple_immediate) { - counts[p_map_idx].double_start = true; - counts[p_map_idx+1].count += cu->use_counts.elem_list[i+1]; - } + if (loc.fp) { + counts[p_map_idx].double_start = true; + counts[p_map_idx+1].count += cu->use_counts.elem_list[i+1]; } i += 2; } else { |