Commit af1508c6 authored by mtrofin's avatar mtrofin Committed by Commit bot

[tubofan] Greedy: groupper -> grouper.

Small spelling fix.

Review URL: https://codereview.chromium.org/1352673002

Cr-Commit-Position: refs/heads/master@{#30784}
parent 1145090a
...@@ -176,9 +176,9 @@ void GreedyAllocator::PreallocateFixedRanges() { ...@@ -176,9 +176,9 @@ void GreedyAllocator::PreallocateFixedRanges() {
void GreedyAllocator::GroupLiveRanges() { void GreedyAllocator::GroupLiveRanges() {
CoalescedLiveRanges groupper(local_zone()); CoalescedLiveRanges grouper(local_zone());
for (TopLevelLiveRange* range : data()->live_ranges()) { for (TopLevelLiveRange* range : data()->live_ranges()) {
groupper.clear(); grouper.clear();
// Skip splinters, because we do not want to optimize for them, and moves // Skip splinters, because we do not want to optimize for them, and moves
// due to assigning them to different registers occur in deferred blocks. // due to assigning them to different registers occur in deferred blocks.
if (!CanProcessRange(range) || range->IsSplinter() || !range->is_phi()) { if (!CanProcessRange(range) || range->IsSplinter() || !range->is_phi()) {
...@@ -195,12 +195,12 @@ void GreedyAllocator::GroupLiveRanges() { ...@@ -195,12 +195,12 @@ void GreedyAllocator::GroupLiveRanges() {
: new (local_zone()) : new (local_zone())
LiveRangeGroup(local_zone()); LiveRangeGroup(local_zone());
// Populate the groupper. // Populate the grouper.
if (range->group() == nullptr) { if (range->group() == nullptr) {
groupper.AllocateRange(range); grouper.AllocateRange(range);
} else { } else {
for (LiveRange* member : range->group()->ranges()) { for (LiveRange* member : range->group()->ranges()) {
groupper.AllocateRange(member); grouper.AllocateRange(member);
} }
} }
for (int j : data()->GetPhiMapValueFor(range)->phi()->operands()) { for (int j : data()->GetPhiMapValueFor(range)->phi()->operands()) {
...@@ -221,7 +221,7 @@ void GreedyAllocator::GroupLiveRanges() { ...@@ -221,7 +221,7 @@ void GreedyAllocator::GroupLiveRanges() {
if (other_group != nullptr) { if (other_group != nullptr) {
bool can_merge = true; bool can_merge = true;
for (LiveRange* member : other_group->ranges()) { for (LiveRange* member : other_group->ranges()) {
if (groupper.GetConflicts(member).Current() != nullptr) { if (grouper.GetConflicts(member).Current() != nullptr) {
can_merge = false; can_merge = false;
break; break;
} }
...@@ -233,14 +233,14 @@ void GreedyAllocator::GroupLiveRanges() { ...@@ -233,14 +233,14 @@ void GreedyAllocator::GroupLiveRanges() {
other_group->ranges().begin(), other_group->ranges().begin(),
other_group->ranges().end()); other_group->ranges().end());
for (LiveRange* member : other_group->ranges()) { for (LiveRange* member : other_group->ranges()) {
groupper.AllocateRange(member); grouper.AllocateRange(member);
member->set_group(latest_grp); member->set_group(latest_grp);
} }
// Clear the other range, so we avoid scheduling it. // Clear the other range, so we avoid scheduling it.
other_group->ranges().clear(); other_group->ranges().clear();
} }
} else if (groupper.GetConflicts(other).Current() == nullptr) { } else if (grouper.GetConflicts(other).Current() == nullptr) {
groupper.AllocateRange(other); grouper.AllocateRange(other);
latest_grp->ranges().push_back(other); latest_grp->ranges().push_back(other);
other->set_group(latest_grp); other->set_group(latest_grp);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment