Reviewers: Michael Starzinger,
Description:
[turbofan] Make inlining independent of typing.
The JSInliner used to load the context from the JSFunction node at
runtime, which introduced a HeapConstant (because we had to materialize
the JSFunction after context specialization) and a LoadField operation,
independent whether the inlinee actually uses the context. This is
rather cumbersome currently, and therefore this is now changed to just
embed the context constant instead. Once we do inlining based on
SharedFunctionInfo rather than JSFunction, we should reconsider this
decision and come up with a proper heuristic.
BUG=v8:3952
LOG=n
[email protected]
Please review this at https://codereview.chromium.org/994523002/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+15, -31 lines):
M src/compiler/js-inlining.cc
M src/flag-definitions.h
Index: src/compiler/js-inlining.cc
diff --git a/src/compiler/js-inlining.cc b/src/compiler/js-inlining.cc
index
d3e67b65eaead22ac94900b9d910541738fe4f8f..da22e7e59cc9d1f022a0b10540b903e5fcc37a9d
100644
--- a/src/compiler/js-inlining.cc
+++ b/src/compiler/js-inlining.cc
@@ -6,17 +6,13 @@
#include "src/ast.h"
#include "src/ast-numbering.h"
-#include "src/compiler/access-builder.h"
#include "src/compiler/all-nodes.h"
#include "src/compiler/ast-graph-builder.h"
#include "src/compiler/common-operator.h"
-#include "src/compiler/graph-visualizer.h"
#include "src/compiler/js-operator.h"
#include "src/compiler/node-matchers.h"
#include "src/compiler/node-properties.h"
#include "src/compiler/operator-properties.h"
-#include "src/compiler/simplified-operator.h"
-#include "src/compiler/typer.h"
#include "src/full-codegen.h"
#include "src/parser.h"
#include "src/rewriter.h"
@@ -103,7 +99,7 @@ class Inlinee {
// Inline this graph at {call}, use {jsgraph} and its zone to create
// any new nodes.
- Reduction InlineAtCall(JSGraph* jsgraph, Node* call);
+ Reduction InlineAtCall(JSGraph* jsgraph, Node* call, Node* context);
// Ensure that only a single return reaches the end node.
static void UnifyReturn(JSGraph* jsgraph);
@@ -216,18 +212,12 @@ class CopyVisitor {
};
-Reduction Inlinee::InlineAtCall(JSGraph* jsgraph, Node* call) {
+Reduction Inlinee::InlineAtCall(JSGraph* jsgraph, Node* call, Node*
context) {
// The scheduler is smart enough to place our code; we just ensure
{control}
- // becomes the control input of the start of the inlinee.
+ // becomes the control input of the start of the inlinee, and {effect}
becomes
+ // the effect input of the start of the inlinee.
Node* control = NodeProperties::GetControlInput(call);
-
- // The inlinee uses the context from the JSFunction object. This will
- // also be the effect dependency for the inlinee as it produces an
effect.
- SimplifiedOperatorBuilder simplified(jsgraph->zone());
- Node* context = jsgraph->graph()->NewNode(
- simplified.LoadField(AccessBuilder::ForJSFunctionContext()),
- NodeProperties::GetValueInput(call, 0),
- NodeProperties::GetEffectInput(call), control);
+ Node* effect = NodeProperties::GetEffectInput(call);
// Context is last argument.
int inlinee_context_index = static_cast<int>(total_parameters()) - 1;
@@ -259,7 +249,7 @@ Reduction Inlinee::InlineAtCall(JSGraph* jsgraph, Node*
call) {
}
default:
if (NodeProperties::IsEffectEdge(edge)) {
- edge.UpdateTo(context);
+ edge.UpdateTo(effect);
} else if (NodeProperties::IsControlEdge(edge)) {
edge.UpdateTo(control);
} else {
@@ -269,18 +259,8 @@ Reduction Inlinee::InlineAtCall(JSGraph* jsgraph,
Node* call) {
}
}
- for (Edge edge : call->use_edges()) {
- if (NodeProperties::IsControlEdge(edge)) {
- // TODO(turbofan): Handle kIfException uses.
- DCHECK_EQ(IrOpcode::kIfSuccess, edge.from()->opcode());
- edge.from()->ReplaceUses(control_output());
- edge.UpdateTo(nullptr);
- } else if (NodeProperties::IsEffectEdge(edge)) {
- edge.UpdateTo(effect_output());
- } else {
- edge.UpdateTo(value_output());
- }
- }
+ NodeProperties::ReplaceWithValue(call, value_output(), effect_output(),
+ control_output());
return Reducer::Replace(value_output());
}
@@ -387,7 +367,13 @@ Reduction JSInliner::Reduce(Node* node) {
}
}
- return inlinee.InlineAtCall(jsgraph_, node);
+ // The inlinee uses the context from the JSFunction object.
+ // TODO(turbofan): We might want to load the context from the JSFunction
at
+ // runtime in case we only know the SharedFunctionInfo once we have
dynamic
+ // type feedback in the compiler.
+ Node* context = jsgraph_->HeapConstant(handle(function->context()));
+
+ return inlinee.InlineAtCall(jsgraph_, node, context);
}
} // namespace compiler
Index: src/flag-definitions.h
diff --git a/src/flag-definitions.h b/src/flag-definitions.h
index
526303af8b88f02b7472e25527f4aac1f4ce3410..8d56edfaed4ceca83c13da51254ee4c7b7538797
100644
--- a/src/flag-definitions.h
+++ b/src/flag-definitions.h
@@ -411,8 +411,6 @@ DEFINE_BOOL(turbo_inlining, false, "enable inlining in
TurboFan")
DEFINE_BOOL(turbo_builtin_inlining, true, "enable builtin inlining in
TurboFan")
DEFINE_BOOL(trace_turbo_inlining, false, "trace TurboFan inlining")
DEFINE_BOOL(loop_assignment_analysis, true, "perform loop assignment
analysis")
-DEFINE_IMPLICATION(turbo_inlining, turbo_types)
-DEFINE_IMPLICATION(turbo_builtin_inlining, turbo_types)
DEFINE_BOOL(turbo_profiling, false, "enable profiling in TurboFan")
// TODO(dcarney): this is just for experimentation, remove when default.
DEFINE_BOOL(turbo_delay_ssa_decon, false,
--
--
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.
