Reviewers: Benedikt Meurer,
Description:
[turbofan] Make context specialization into a reducer.
[email protected]
BUG=
Please review this at https://codereview.chromium.org/771713002/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+29, -47 lines):
M src/compiler/js-context-specialization.h
M src/compiler/js-context-specialization.cc
M src/compiler/pipeline.cc
M test/cctest/compiler/test-js-context-specialization.cc
Index: src/compiler/js-context-specialization.cc
diff --git a/src/compiler/js-context-specialization.cc
b/src/compiler/js-context-specialization.cc
index
d11bc6671188e5a6de74ee678fc02f48e46b069b..4545343d1430d8f71f14c8f3319b2ac9b526b9dc
100644
--- a/src/compiler/js-context-specialization.cc
+++ b/src/compiler/js-context-specialization.cc
@@ -6,7 +6,6 @@
#include "src/compiler/graph-inl.h"
#include "src/compiler/js-context-specialization.h"
#include "src/compiler/js-operator.h"
-#include "src/compiler/node-aux-data-inl.h"
#include "src/compiler/node-matchers.h"
#include "src/compiler/node-properties-inl.h"
@@ -14,45 +13,20 @@ namespace v8 {
namespace internal {
namespace compiler {
-class ContextSpecializationVisitor : public NullNodeVisitor {
- public:
- explicit ContextSpecializationVisitor(JSContextSpecializer* spec)
- : spec_(spec) {}
-
- void Post(Node* node) {
- switch (node->opcode()) {
- case IrOpcode::kJSLoadContext: {
- Reduction r = spec_->ReduceJSLoadContext(node);
- if (r.Changed() && r.replacement() != node) {
- NodeProperties::ReplaceWithValue(node, r.replacement());
- node->RemoveAllInputs();
- }
- break;
- }
- case IrOpcode::kJSStoreContext: {
- Reduction r = spec_->ReduceJSStoreContext(node);
- if (r.Changed() && r.replacement() != node) {
- NodeProperties::ReplaceWithValue(node, r.replacement());
- node->RemoveAllInputs();
- }
- break;
- }
- default:
- break;
- }
- }
-
- private:
- JSContextSpecializer* spec_;
-};
-
-void JSContextSpecializer::SpecializeToContext() {
- NodeProperties::ReplaceWithValue(context_,
- jsgraph_->Constant(info_->context()));
-
- ContextSpecializationVisitor visitor(this);
- jsgraph_->graph()->VisitNodeInputsFromEnd(&visitor);
+Reduction JSContextSpecializer::Reduce(Node* node) {
+ if (node == context_) {
+ Node* constant = jsgraph_->Constant(info_->context());
+ NodeProperties::ReplaceWithValue(node, constant);
+ return Replace(constant);
+ }
+ if (node->opcode() == IrOpcode::kJSLoadContext) {
+ return ReduceJSLoadContext(node);
+ }
+ if (node->opcode() == IrOpcode::kJSStoreContext) {
+ return ReduceJSStoreContext(node);
+ }
+ return NoChange();
}
@@ -100,7 +74,9 @@ Reduction
JSContextSpecializer::ReduceJSLoadContext(Node* node) {
// Success. The context load can be replaced with the constant.
// TODO(titzer): record the specialization for sharing code across
multiple
// contexts that have the same value in the corresponding context slot.
- return Reducer::Replace(jsgraph_->Constant(value));
+ Node* constant = jsgraph_->Constant(value);
+ NodeProperties::ReplaceWithValue(node, constant);
+ return Reducer::Replace(constant);
}
Index: src/compiler/js-context-specialization.h
diff --git a/src/compiler/js-context-specialization.h
b/src/compiler/js-context-specialization.h
index
b8b50ed6c36a1dbbf0f2a575892e8328c4500f36..1c0b54ffb0e5cb5acbcaf838a5a1abaa3db8cfe5
100644
--- a/src/compiler/js-context-specialization.h
+++ b/src/compiler/js-context-specialization.h
@@ -16,12 +16,14 @@ namespace compiler {
// Specializes a given JSGraph to a given context, potentially constant
folding
// some {LoadContext} nodes or strength reducing some {StoreContext} nodes.
-class JSContextSpecializer {
+class JSContextSpecializer : public Reducer {
public:
JSContextSpecializer(CompilationInfo* info, JSGraph* jsgraph, Node*
context)
: info_(info), jsgraph_(jsgraph), context_(context) {}
- void SpecializeToContext();
+ virtual Reduction Reduce(Node* node) OVERRIDE;
+
+ // Visible for unit testing.
Reduction ReduceJSLoadContext(Node* node);
Reduction ReduceJSStoreContext(Node* node);
Index: src/compiler/pipeline.cc
diff --git a/src/compiler/pipeline.cc b/src/compiler/pipeline.cc
index
281c9994b70dc2ebc118e9339c0284d02a1a4b65..82be26821b30c92d94515393a013ef90945dfa1d
100644
--- a/src/compiler/pipeline.cc
+++ b/src/compiler/pipeline.cc
@@ -352,14 +352,16 @@ struct GraphBuilderPhase {
struct ContextSpecializerPhase {
- static const char* phase_name() { return nullptr; }
+ static const char* phase_name() { return "context specializing"; }
void Run(PipelineData* data, Zone* temp_zone) {
SourcePositionTable::Scope pos(data->source_positions(),
SourcePosition::Unknown());
JSContextSpecializer spec(data->info(), data->jsgraph(),
data->context_node());
- spec.SpecializeToContext();
+ GraphReducer graph_reducer(data->graph(), temp_zone);
+ graph_reducer.AddReducer(&spec);
+ graph_reducer.ReduceGraph();
}
};
Index: test/cctest/compiler/test-js-context-specialization.cc
diff --git a/test/cctest/compiler/test-js-context-specialization.cc
b/test/cctest/compiler/test-js-context-specialization.cc
index
f04e3279d320a97581fcfbf8ca740058c8ae78cb..fb7bd946f2dc57ade0db28f9f8c27613fa63f3bc
100644
--- a/test/cctest/compiler/test-js-context-specialization.cc
+++ b/test/cctest/compiler/test-js-context-specialization.cc
@@ -203,7 +203,7 @@ TEST(SpecializeToContext) {
JSContextSpecializer spec(t.info(), t.jsgraph(), const_context);
{
- // Check that SpecializeToContext() replaces values and forwards
effects
+ // Check that specialization replaces values and forwards effects
// correctly, and folds values from constant and non-constant contexts
Node* effect_in = start;
Node* load = t.NewNode(t.javascript()->LoadContext(0, slot, true),
@@ -229,8 +229,10 @@ TEST(SpecializeToContext) {
CheckEffectInput(effect_in, load);
CheckEffectInput(load, effect_use);
- // Perform the substitution on the entire graph.
- spec.SpecializeToContext();
+ // Perform the reduction on the entire graph.
+ GraphReducer graph_reducer(t.graph(), t.main_zone());
+ graph_reducer.AddReducer(&spec);
+ graph_reducer.ReduceGraph();
// Effects should have been forwarded (not replaced with a value).
CheckEffectInput(effect_in, effect_use);
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
