Skip to content

V
V8
Commit 21cf5bb2 authored by titzer@chromium.org's avatar titzer@chromium.org
Browse files
Options

Remove PhiReducer. 

R=mstarzinger@chromium.org
BUG=

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

Cr-Commit-Position: refs/heads/master@{#25262}
git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@25262 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent e712c3d2
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 276 deletions
BUILD.gn
View file @ 21cf5bb2
......@@ -563,7 +563,6 @@ source_set("v8_base") {
"src/compiler/operator-properties.h",
"src/compiler/operator.cc",
"src/compiler/operator.h",
"src/compiler/phi-reducer.h",
"src/compiler/pipeline.cc",
"src/compiler/pipeline.h",
"src/compiler/pipeline-statistics.cc",
......
src/compiler/phi-reducer.h deleted 100644 → 0
View file @ e712c3d2
// Copyright 2014 the V8 project authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef V8_COMPILER_PHI_REDUCER_H_
#define V8_COMPILER_PHI_REDUCER_H_
#include "src/compiler/generic-node-inl.h"
#include "src/compiler/graph-reducer.h"
namespace v8 {
namespace internal {
namespace compiler {
// Replaces redundant phis if all the inputs are the same or the phi itself.
class PhiReducer FINAL : public Reducer {
public:
virtual Reduction Reduce(Node* node) OVERRIDE {
if (node->opcode() != IrOpcode::kPhi &&
node->opcode() != IrOpcode::kEffectPhi)
return NoChange();
int n = node->op()->InputCount();
if (n == 1) return Replace(node->InputAt(0));
Node* replacement = NULL;
Node::Inputs inputs = node->inputs();
for (InputIter it = inputs.begin(); n > 0; --n, ++it) {
Node* input = *it;
if (input != node && input != replacement) {
if (replacement != NULL) return NoChange();
replacement = input;
}
}
DCHECK_NE(node, replacement);
return Replace(replacement);
}
};
}
}
} // namespace v8::internal::compiler
#endif // V8_COMPILER_PHI_REDUCER_H_
test/cctest/cctest.gyp
View file @ 21cf5bb2
......@@ -72,7 +72,6 @@
'compiler/test-node-cache.cc',
'compiler/test-node.cc',
'compiler/test-operator.cc',
'compiler/test-phi-reducer.cc',
'compiler/test-pipeline.cc',
'compiler/test-representation-change.cc',
'compiler/test-run-deopt.cc',
......
test/cctest/compiler/test-phi-reducer.cc deleted 100644 → 0
View file @ e712c3d2
// Copyright 2014 the V8 project authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "src/v8.h"
#include "test/cctest/cctest.h"
#include "src/compiler/common-operator.h"
#include "src/compiler/graph-inl.h"
#include "src/compiler/phi-reducer.h"
using namespace v8::internal;
using namespace v8::internal::compiler;
class PhiReducerTester : HandleAndZoneScope {
public:
explicit PhiReducerTester(int num_parameters = 0)
: isolate(main_isolate()),
common(main_zone()),
graph(main_zone()),
self(graph.NewNode(common.Start(num_parameters))),
dead(graph.NewNode(common.Dead())) {
graph.SetStart(self);
}
Isolate* isolate;
CommonOperatorBuilder common;
Graph graph;
Node* self;
Node* dead;
void CheckReduce(Node* expect, Node* phi) {
PhiReducer reducer;
Reduction reduction = reducer.Reduce(phi);
if (expect == phi) {
CHECK(!reduction.Changed());
} else {
CHECK(reduction.Changed());
CHECK_EQ(expect, reduction.replacement());
}
}
Node* Int32Constant(int32_t val) {
return graph.NewNode(common.Int32Constant(val));
}
Node* Float64Constant(double val) {
return graph.NewNode(common.Float64Constant(val));
}
Node* Parameter(int32_t index = 0) {
return graph.NewNode(common.Parameter(index), graph.start());
}
Node* Phi(Node* a) {
return SetSelfReferences(graph.NewNode(common.Phi(kMachAnyTagged, 1), a));
}
Node* Phi(Node* a, Node* b) {
return SetSelfReferences(
graph.NewNode(common.Phi(kMachAnyTagged, 2), a, b));
}
Node* Phi(Node* a, Node* b, Node* c) {
return SetSelfReferences(
graph.NewNode(common.Phi(kMachAnyTagged, 3), a, b, c));
}
Node* Phi(Node* a, Node* b, Node* c, Node* d) {
return SetSelfReferences(
graph.NewNode(common.Phi(kMachAnyTagged, 4), a, b, c, d));
}
Node* PhiWithControl(Node* a, Node* control) {
return SetSelfReferences(
graph.NewNode(common.Phi(kMachAnyTagged, 1), a, control));
}
Node* PhiWithControl(Node* a, Node* b, Node* control) {
return SetSelfReferences(
graph.NewNode(common.Phi(kMachAnyTagged, 2), a, b, control));
}
Node* SetSelfReferences(Node* node) {
Node::Inputs inputs = node->inputs();
for (Node::Inputs::iterator iter(inputs.begin()); iter != inputs.end();
++iter) {
Node* input = *iter;
if (input == self) node->ReplaceInput(iter.index(), node);
}
return node;
}
};
TEST(PhiReduce1) {
PhiReducerTester R;
Node* zero = R.Int32Constant(0);
Node* one = R.Int32Constant(1);
Node* oneish = R.Float64Constant(1.1);
Node* param = R.Parameter();
Node* singles[] = {zero, one, oneish, param};
for (size_t i = 0; i < arraysize(singles); i++) {
R.CheckReduce(singles[i], R.Phi(singles[i]));
}
}
TEST(PhiReduce2) {
PhiReducerTester R;
Node* zero = R.Int32Constant(0);
Node* one = R.Int32Constant(1);
Node* oneish = R.Float64Constant(1.1);
Node* param = R.Parameter();
Node* singles[] = {zero, one, oneish, param};
for (size_t i = 0; i < arraysize(singles); i++) {
Node* a = singles[i];
R.CheckReduce(a, R.Phi(a, a));
}
for (size_t i = 0; i < arraysize(singles); i++) {
Node* a = singles[i];
R.CheckReduce(a, R.Phi(R.self, a));
R.CheckReduce(a, R.Phi(a, R.self));
}
for (size_t i = 1; i < arraysize(singles); i++) {
Node* a = singles[i], *b = singles[0];
Node* phi1 = R.Phi(b, a);
R.CheckReduce(phi1, phi1);
Node* phi2 = R.Phi(a, b);
R.CheckReduce(phi2, phi2);
}
}
TEST(PhiReduce3) {
PhiReducerTester R;
Node* zero = R.Int32Constant(0);
Node* one = R.Int32Constant(1);
Node* oneish = R.Float64Constant(1.1);
Node* param = R.Parameter();
Node* singles[] = {zero, one, oneish, param};
for (size_t i = 0; i < arraysize(singles); i++) {
Node* a = singles[i];
R.CheckReduce(a, R.Phi(a, a, a));
}
for (size_t i = 0; i < arraysize(singles); i++) {
Node* a = singles[i];
R.CheckReduce(a, R.Phi(R.self, a, a));
R.CheckReduce(a, R.Phi(a, R.self, a));
R.CheckReduce(a, R.Phi(a, a, R.self));
}
for (size_t i = 1; i < arraysize(singles); i++) {
Node* a = singles[i], *b = singles[0];
Node* phi1 = R.Phi(b, a, a);
R.CheckReduce(phi1, phi1);
Node* phi2 = R.Phi(a, b, a);
R.CheckReduce(phi2, phi2);
Node* phi3 = R.Phi(a, a, b);
R.CheckReduce(phi3, phi3);
}
}
TEST(PhiReduce4) {
PhiReducerTester R;
Node* zero = R.Int32Constant(0);
Node* one = R.Int32Constant(1);
Node* oneish = R.Float64Constant(1.1);
Node* param = R.Parameter();
Node* singles[] = {zero, one, oneish, param};
for (size_t i = 0; i < arraysize(singles); i++) {
Node* a = singles[i];
R.CheckReduce(a, R.Phi(a, a, a, a));
}
for (size_t i = 0; i < arraysize(singles); i++) {
Node* a = singles[i];
R.CheckReduce(a, R.Phi(R.self, a, a, a));
R.CheckReduce(a, R.Phi(a, R.self, a, a));
R.CheckReduce(a, R.Phi(a, a, R.self, a));
R.CheckReduce(a, R.Phi(a, a, a, R.self));
R.CheckReduce(a, R.Phi(R.self, R.self, a, a));
R.CheckReduce(a, R.Phi(a, R.self, R.self, a));
R.CheckReduce(a, R.Phi(a, a, R.self, R.self));
R.CheckReduce(a, R.Phi(R.self, a, a, R.self));
}
for (size_t i = 1; i < arraysize(singles); i++) {
Node* a = singles[i], *b = singles[0];
Node* phi1 = R.Phi(b, a, a, a);
R.CheckReduce(phi1, phi1);
Node* phi2 = R.Phi(a, b, a, a);
R.CheckReduce(phi2, phi2);
Node* phi3 = R.Phi(a, a, b, a);
R.CheckReduce(phi3, phi3);
Node* phi4 = R.Phi(a, a, a, b);
R.CheckReduce(phi4, phi4);
}
}
TEST(PhiReduceShouldIgnoreControlNodes) {
PhiReducerTester R;
Node* zero = R.Int32Constant(0);
Node* one = R.Int32Constant(1);
Node* oneish = R.Float64Constant(1.1);
Node* param = R.Parameter();
Node* singles[] = {zero, one, oneish, param};
for (size_t i = 0; i < arraysize(singles); ++i) {
R.CheckReduce(singles[i], R.PhiWithControl(singles[i], R.dead));
R.CheckReduce(singles[i], R.PhiWithControl(R.self, singles[i], R.dead));
R.CheckReduce(singles[i], R.PhiWithControl(singles[i], R.self, R.dead));
}
}
tools/gyp/v8.gyp
View file @ 21cf5bb2
......@@ -476,7 +476,6 @@
'../../src/compiler/operator-properties.h',
'../../src/compiler/operator.cc',
'../../src/compiler/operator.h',
'../../src/compiler/phi-reducer.h',
'../../src/compiler/pipeline.cc',
'../../src/compiler/pipeline.h',
'../../src/compiler/pipeline-statistics.cc',
......
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