Commit d673d890 authored by mstarzinger's avatar mstarzinger Committed by Commit bot

[turbofan] Rename {CheckPoint} to {Checkpoint} everywhere.

R=bmeurer@chromium.org
BUG=v8:5021

Review-Url: https://codereview.chromium.org/2022033004
Cr-Commit-Position: refs/heads/master@{#36637}
parent 886b259e
...@@ -18,11 +18,11 @@ namespace { ...@@ -18,11 +18,11 @@ namespace {
// The given checkpoint is redundant if it is effect-wise dominated by another // The given checkpoint is redundant if it is effect-wise dominated by another
// checkpoint and there is no observable write in between. For now we consider // checkpoint and there is no observable write in between. For now we consider
// a linear effect chain only instead of true effect-wise dominance. // a linear effect chain only instead of true effect-wise dominance.
bool IsRedundantCheckPoint(Node* node) { bool IsRedundantCheckpoint(Node* node) {
Node* effect = NodeProperties::GetEffectInput(node); Node* effect = NodeProperties::GetEffectInput(node);
while (effect->op()->HasProperty(Operator::kNoWrite) && while (effect->op()->HasProperty(Operator::kNoWrite) &&
effect->op()->EffectInputCount() == 1) { effect->op()->EffectInputCount() == 1) {
if (effect->opcode() == IrOpcode::kCheckPoint) return true; if (effect->opcode() == IrOpcode::kCheckpoint) return true;
effect = NodeProperties::GetEffectInput(effect); effect = NodeProperties::GetEffectInput(effect);
} }
return false; return false;
...@@ -31,8 +31,8 @@ bool IsRedundantCheckPoint(Node* node) { ...@@ -31,8 +31,8 @@ bool IsRedundantCheckPoint(Node* node) {
} // namespace } // namespace
Reduction CheckpointElimination::Reduce(Node* node) { Reduction CheckpointElimination::Reduce(Node* node) {
if (node->opcode() != IrOpcode::kCheckPoint) return NoChange(); if (node->opcode() != IrOpcode::kCheckpoint) return NoChange();
if (IsRedundantCheckPoint(node)) { if (IsRedundantCheckpoint(node)) {
return Replace(NodeProperties::GetEffectInput(node)); return Replace(NodeProperties::GetEffectInput(node));
} }
return NoChange(); return NoChange();
......
...@@ -179,7 +179,7 @@ std::ostream& operator<<(std::ostream& os, ...@@ -179,7 +179,7 @@ std::ostream& operator<<(std::ostream& os,
V(Terminate, Operator::kKontrol, 0, 1, 1, 0, 0, 1) \ V(Terminate, Operator::kKontrol, 0, 1, 1, 0, 0, 1) \
V(OsrNormalEntry, Operator::kFoldable, 0, 1, 1, 0, 1, 1) \ V(OsrNormalEntry, Operator::kFoldable, 0, 1, 1, 0, 1, 1) \
V(OsrLoopEntry, Operator::kFoldable, 0, 1, 1, 0, 1, 1) \ V(OsrLoopEntry, Operator::kFoldable, 0, 1, 1, 0, 1, 1) \
V(CheckPoint, Operator::kKontrol, 1, 1, 1, 0, 1, 0) \ V(Checkpoint, Operator::kKontrol, 1, 1, 1, 0, 1, 0) \
V(BeginRegion, Operator::kNoThrow, 0, 1, 0, 0, 1, 0) \ V(BeginRegion, Operator::kNoThrow, 0, 1, 0, 0, 1, 0) \
V(FinishRegion, Operator::kNoThrow, 1, 1, 0, 1, 1, 0) V(FinishRegion, Operator::kNoThrow, 1, 1, 0, 1, 1, 0)
......
...@@ -186,7 +186,7 @@ class CommonOperatorBuilder final : public ZoneObject { ...@@ -186,7 +186,7 @@ class CommonOperatorBuilder final : public ZoneObject {
const Operator* Phi(MachineRepresentation representation, const Operator* Phi(MachineRepresentation representation,
int value_input_count); int value_input_count);
const Operator* EffectPhi(int effect_input_count); const Operator* EffectPhi(int effect_input_count);
const Operator* CheckPoint(); const Operator* Checkpoint();
const Operator* BeginRegion(); const Operator* BeginRegion();
const Operator* FinishRegion(); const Operator* FinishRegion();
const Operator* StateValues(int arguments); const Operator* StateValues(int arguments);
......
...@@ -293,9 +293,9 @@ void EffectControlLinearizer::ProcessNode(Node* node, Node** effect, ...@@ -293,9 +293,9 @@ void EffectControlLinearizer::ProcessNode(Node* node, Node** effect,
return RemoveRegionNode(node); return RemoveRegionNode(node);
} }
// Special treatment for CheckPoint nodes. // Special treatment for checkpoint nodes.
// TODO(epertoso): Pickup the current frame state. // TODO(epertoso): Pickup the current frame state.
if (node->opcode() == IrOpcode::kCheckPoint) { if (node->opcode() == IrOpcode::kCheckpoint) {
// Unlink the check point; effect uses will be updated to the incoming // Unlink the check point; effect uses will be updated to the incoming
// effect that is passed. // effect that is passed.
node->Kill(); node->Kill();
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
V(Select) \ V(Select) \
V(Phi) \ V(Phi) \
V(EffectPhi) \ V(EffectPhi) \
V(CheckPoint) \ V(Checkpoint) \
V(BeginRegion) \ V(BeginRegion) \
V(FinishRegion) \ V(FinishRegion) \
V(FrameState) \ V(FrameState) \
......
...@@ -705,7 +705,7 @@ Type* Typer::Visitor::TypeTypeGuard(Node* node) { ...@@ -705,7 +705,7 @@ Type* Typer::Visitor::TypeTypeGuard(Node* node) {
return Type::Intersect(input_type, guard_type, zone()); return Type::Intersect(input_type, guard_type, zone());
} }
Type* Typer::Visitor::TypeCheckPoint(Node* node) { Type* Typer::Visitor::TypeCheckpoint(Node* node) {
UNREACHABLE(); UNREACHABLE();
return nullptr; return nullptr;
} }
......
...@@ -420,7 +420,7 @@ void Verifier::Visitor::Check(Node* node) { ...@@ -420,7 +420,7 @@ void Verifier::Visitor::Check(Node* node) {
case IrOpcode::kTypeGuard: case IrOpcode::kTypeGuard:
// TODO(bmeurer): what are the constraints on these? // TODO(bmeurer): what are the constraints on these?
break; break;
case IrOpcode::kCheckPoint: case IrOpcode::kCheckpoint:
// Type is empty. // Type is empty.
CheckNotTyped(node); CheckNotTyped(node);
break; break;
......
...@@ -39,15 +39,15 @@ const Operator kOpNoWrite(0, Operator::kNoWrite, "OpNoWrite", 0, 1, 0, 0, 1, 0); ...@@ -39,15 +39,15 @@ const Operator kOpNoWrite(0, Operator::kNoWrite, "OpNoWrite", 0, 1, 0, 0, 1, 0);
} // namespace } // namespace
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// CheckPoint // Checkpoint
TEST_F(CheckpointEliminationTest, CheckPointChain) { TEST_F(CheckpointEliminationTest, CheckpointChain) {
Node* const control = graph()->start(); Node* const control = graph()->start();
Node* frame_state = EmptyFrameState(); Node* frame_state = EmptyFrameState();
Node* checkpoint1 = graph()->NewNode(common()->CheckPoint(), frame_state, Node* checkpoint1 = graph()->NewNode(common()->Checkpoint(), frame_state,
graph()->start(), control); graph()->start(), control);
Node* effect_link = graph()->NewNode(&kOpNoWrite, checkpoint1); Node* effect_link = graph()->NewNode(&kOpNoWrite, checkpoint1);
Node* checkpoint2 = graph()->NewNode(common()->CheckPoint(), frame_state, Node* checkpoint2 = graph()->NewNode(common()->Checkpoint(), frame_state,
effect_link, control); effect_link, control);
Reduction r = Reduce(checkpoint2); Reduction r = Reduce(checkpoint2);
ASSERT_TRUE(r.Changed()); ASSERT_TRUE(r.Changed());
......
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