Commit 8e50bdb8 authored by Jakob Linke's avatar Jakob Linke Committed by V8 LUCI CQ

[maglev] Implement function context specialization

See also Turbofan's JSContextSpecialization reducer.

For all context loads and stores, this CL implements:

1) depth reduction through graph walks (even without FCS)
2) conversion from the context node to a heap constant
3) if possible, conversion of a load of an immutable context slot load
   to a heap constant

Bug: v8:7700
Change-Id: Ie4d1acd0ff206f25dd5373a860d23b006a31dcee
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3904914Reviewed-by: 's avatarLeszek Swirski <leszeks@chromium.org>
Commit-Queue: Jakob Linke <jgruber@chromium.org>
Cr-Commit-Position: refs/heads/main@{#83418}
parent 985aec31
...@@ -477,7 +477,7 @@ DEFINE_BOOL(trace_maglev_graph_building, false, "trace maglev graph building") ...@@ -477,7 +477,7 @@ DEFINE_BOOL(trace_maglev_graph_building, false, "trace maglev graph building")
DEFINE_BOOL(trace_maglev_regalloc, false, "trace maglev register allocation") DEFINE_BOOL(trace_maglev_regalloc, false, "trace maglev register allocation")
// TODO(v8:7700): Remove once stable. // TODO(v8:7700): Remove once stable.
DEFINE_BOOL(maglev_function_context_specialization, false, DEFINE_BOOL(maglev_function_context_specialization, true,
"enable function context specialization in maglev") "enable function context specialization in maglev")
#if ENABLE_SPARKPLUG #if ENABLE_SPARKPLUG
......
...@@ -31,10 +31,59 @@ ...@@ -31,10 +31,59 @@
#include "src/objects/property-details.h" #include "src/objects/property-details.h"
#include "src/objects/slots-inl.h" #include "src/objects/slots-inl.h"
namespace v8 { namespace v8::internal::maglev {
namespace internal {
namespace maglev { namespace {
ValueNode* TryGetParentContext(ValueNode* node) {
if (CreateFunctionContext* n = node->TryCast<CreateFunctionContext>()) {
return n->context().node();
}
if (CallRuntime* n = node->TryCast<CallRuntime>()) {
switch (n->function_id()) {
case Runtime::kPushBlockContext:
case Runtime::kPushCatchContext:
case Runtime::kNewFunctionContext:
return n->context().node();
default:
break;
}
}
return nullptr;
}
// Attempts to walk up the context chain through the graph in order to reduce
// depth and thus the number of runtime loads.
void MinimizeContextChainDepth(ValueNode** context, size_t* depth) {
while (*depth > 0) {
ValueNode* parent_context = TryGetParentContext(*context);
if (parent_context == nullptr) return;
*context = parent_context;
(*depth)--;
}
}
class FunctionContextSpecialization final : public AllStatic {
public:
static base::Optional<compiler::ContextRef> TryToRef(
const MaglevCompilationUnit* unit, ValueNode* context, size_t* depth) {
DCHECK(unit->info()->specialize_to_function_context());
base::Optional<compiler::ContextRef> ref;
if (InitialValue* n = context->TryCast<InitialValue>()) {
if (n->source().is_current_context()) {
ref = unit->function().context();
}
} else if (Constant* n = context->TryCast<Constant>()) {
ref = n->ref().AsContext();
}
if (!ref.has_value()) return {};
return ref->previous(depth);
}
};
} // namespace
MaglevGraphBuilder::MaglevGraphBuilder(LocalIsolate* local_isolate, MaglevGraphBuilder::MaglevGraphBuilder(LocalIsolate* local_isolate,
MaglevCompilationUnit* compilation_unit, MaglevCompilationUnit* compilation_unit,
...@@ -614,12 +663,69 @@ void MaglevGraphBuilder::VisitLdaConstant() { ...@@ -614,12 +663,69 @@ void MaglevGraphBuilder::VisitLdaConstant() {
SetAccumulator(GetConstant(GetRefOperand<HeapObject>(0))); SetAccumulator(GetConstant(GetRefOperand<HeapObject>(0)));
} }
void MaglevGraphBuilder::VisitLdaContextSlot() { bool MaglevGraphBuilder::TrySpecializeLoadContextSlotToFunctionContext(
ValueNode* context = LoadRegisterTagged(0); ValueNode** context, size_t* depth, int slot_index,
int slot_index = iterator_.GetIndexOperand(1); ContextSlotMutability slot_mutability) {
int depth = iterator_.GetUnsignedImmediateOperand(2); DCHECK(compilation_unit_->info()->specialize_to_function_context());
size_t new_depth = *depth;
base::Optional<compiler::ContextRef> maybe_context_ref =
FunctionContextSpecialization::TryToRef(compilation_unit_, *context,
&new_depth);
if (!maybe_context_ref.has_value()) return false;
compiler::ContextRef context_ref = maybe_context_ref.value();
if (slot_mutability == kMutable || new_depth != 0) {
*depth = new_depth;
*context = GetConstant(context_ref);
return false;
}
base::Optional<compiler::ObjectRef> maybe_slot_value =
context_ref.get(slot_index);
if (!maybe_slot_value.has_value()) {
*depth = new_depth;
*context = GetConstant(context_ref);
return false;
}
compiler::ObjectRef slot_value = maybe_slot_value.value();
if (slot_value.IsHeapObject()) {
// Even though the context slot is immutable, the context might have escaped
// before the function to which it belongs has initialized the slot. We
// must be conservative and check if the value in the slot is currently the
// hole or undefined. Only if it is neither of these, can we be sure that it
// won't change anymore.
//
// See also: JSContextSpecialization::ReduceJSLoadContext.
compiler::OddballType oddball_type =
slot_value.AsHeapObject().map().oddball_type();
if (oddball_type == compiler::OddballType::kUndefined ||
oddball_type == compiler::OddballType::kHole) {
*depth = new_depth;
*context = GetConstant(context_ref);
return false;
}
}
for (int i = 0; i < depth; ++i) { // Fold the load of the immutable slot.
SetAccumulator(GetConstant(slot_value));
return true;
}
void MaglevGraphBuilder::BuildLoadContextSlot(
ValueNode* context, size_t depth, int slot_index,
ContextSlotMutability slot_mutability) {
MinimizeContextChainDepth(&context, &depth);
if (compilation_unit_->info()->specialize_to_function_context() &&
TrySpecializeLoadContextSlotToFunctionContext(
&context, &depth, slot_index, slot_mutability)) {
return; // Our work here is done.
}
for (size_t i = 0; i < depth; ++i) {
context = AddNewNode<LoadTaggedField>( context = AddNewNode<LoadTaggedField>(
{context}, Context::OffsetOfElementAt(Context::PREVIOUS_INDEX)); {context}, Context::OffsetOfElementAt(Context::PREVIOUS_INDEX));
} }
...@@ -627,28 +733,47 @@ void MaglevGraphBuilder::VisitLdaContextSlot() { ...@@ -627,28 +733,47 @@ void MaglevGraphBuilder::VisitLdaContextSlot() {
SetAccumulator(AddNewNode<LoadTaggedField>( SetAccumulator(AddNewNode<LoadTaggedField>(
{context}, Context::OffsetOfElementAt(slot_index))); {context}, Context::OffsetOfElementAt(slot_index)));
} }
void MaglevGraphBuilder::VisitLdaContextSlot() {
ValueNode* context = LoadRegisterTagged(0);
int slot_index = iterator_.GetIndexOperand(1);
size_t depth = iterator_.GetUnsignedImmediateOperand(2);
BuildLoadContextSlot(context, depth, slot_index, kMutable);
}
void MaglevGraphBuilder::VisitLdaImmutableContextSlot() { void MaglevGraphBuilder::VisitLdaImmutableContextSlot() {
// TODO(leszeks): Consider context specialising. ValueNode* context = LoadRegisterTagged(0);
VisitLdaContextSlot(); int slot_index = iterator_.GetIndexOperand(1);
size_t depth = iterator_.GetUnsignedImmediateOperand(2);
BuildLoadContextSlot(context, depth, slot_index, kImmutable);
} }
void MaglevGraphBuilder::VisitLdaCurrentContextSlot() { void MaglevGraphBuilder::VisitLdaCurrentContextSlot() {
ValueNode* context = GetContext(); ValueNode* context = GetContext();
int slot_index = iterator_.GetIndexOperand(0); int slot_index = iterator_.GetIndexOperand(0);
BuildLoadContextSlot(context, 0, slot_index, kMutable);
SetAccumulator(AddNewNode<LoadTaggedField>(
{context}, Context::OffsetOfElementAt(slot_index)));
} }
void MaglevGraphBuilder::VisitLdaImmutableCurrentContextSlot() { void MaglevGraphBuilder::VisitLdaImmutableCurrentContextSlot() {
// TODO(leszeks): Consider context specialising. ValueNode* context = GetContext();
VisitLdaCurrentContextSlot(); int slot_index = iterator_.GetIndexOperand(0);
BuildLoadContextSlot(context, 0, slot_index, kImmutable);
} }
void MaglevGraphBuilder::VisitStaContextSlot() { void MaglevGraphBuilder::VisitStaContextSlot() {
ValueNode* context = LoadRegisterTagged(0); ValueNode* context = LoadRegisterTagged(0);
int slot_index = iterator_.GetIndexOperand(1); int slot_index = iterator_.GetIndexOperand(1);
int depth = iterator_.GetUnsignedImmediateOperand(2); size_t depth = iterator_.GetUnsignedImmediateOperand(2);
MinimizeContextChainDepth(&context, &depth);
if (compilation_unit_->info()->specialize_to_function_context()) {
base::Optional<compiler::ContextRef> maybe_ref =
FunctionContextSpecialization::TryToRef(compilation_unit_, context,
&depth);
if (maybe_ref.has_value()) {
context = GetConstant(maybe_ref.value());
}
}
for (int i = 0; i < depth; ++i) { for (size_t i = 0; i < depth; ++i) {
context = AddNewNode<LoadTaggedField>( context = AddNewNode<LoadTaggedField>(
{context}, Context::OffsetOfElementAt(Context::PREVIOUS_INDEX)); {context}, Context::OffsetOfElementAt(Context::PREVIOUS_INDEX));
} }
...@@ -979,7 +1104,7 @@ void MaglevGraphBuilder::BuildMapCheck(ValueNode* object, ...@@ -979,7 +1104,7 @@ void MaglevGraphBuilder::BuildMapCheck(ValueNode* object,
} }
map_of_maps.emplace(object, map); map_of_maps.emplace(object, map);
if (map.is_stable()) { if (map.is_stable()) {
compilation_unit_->broker()->dependencies()->DependOnStableMap(map); broker()->dependencies()->DependOnStableMap(map);
} }
known_info->type = NodeType::kHeapObjectWithKnownMap; known_info->type = NodeType::kHeapObjectWithKnownMap;
} }
...@@ -1377,10 +1502,21 @@ void MaglevGraphBuilder::VisitGetKeyedProperty() { ...@@ -1377,10 +1502,21 @@ void MaglevGraphBuilder::VisitGetKeyedProperty() {
void MaglevGraphBuilder::VisitLdaModuleVariable() { void MaglevGraphBuilder::VisitLdaModuleVariable() {
// LdaModuleVariable <cell_index> <depth> // LdaModuleVariable <cell_index> <depth>
int cell_index = iterator_.GetImmediateOperand(0); int cell_index = iterator_.GetImmediateOperand(0);
int depth = iterator_.GetUnsignedImmediateOperand(1); size_t depth = iterator_.GetUnsignedImmediateOperand(1);
ValueNode* context = GetContext(); ValueNode* context = GetContext();
for (int i = 0; i < depth; i++) { MinimizeContextChainDepth(&context, &depth);
if (compilation_unit_->info()->specialize_to_function_context()) {
base::Optional<compiler::ContextRef> maybe_ref =
FunctionContextSpecialization::TryToRef(compilation_unit_, context,
&depth);
if (maybe_ref.has_value()) {
context = GetConstant(maybe_ref.value());
}
}
for (size_t i = 0; i < depth; i++) {
context = AddNewNode<LoadTaggedField>( context = AddNewNode<LoadTaggedField>(
{context}, Context::OffsetOfElementAt(Context::PREVIOUS_INDEX)); {context}, Context::OffsetOfElementAt(Context::PREVIOUS_INDEX));
} }
...@@ -1411,9 +1547,21 @@ void MaglevGraphBuilder::VisitStaModuleVariable() { ...@@ -1411,9 +1547,21 @@ void MaglevGraphBuilder::VisitStaModuleVariable() {
AbortReason::kUnsupportedModuleOperation))}); AbortReason::kUnsupportedModuleOperation))});
return; return;
} }
ValueNode* context = GetContext(); ValueNode* context = GetContext();
int depth = iterator_.GetUnsignedImmediateOperand(1); size_t depth = iterator_.GetUnsignedImmediateOperand(1);
for (int i = 0; i < depth; i++) { MinimizeContextChainDepth(&context, &depth);
if (compilation_unit_->info()->specialize_to_function_context()) {
base::Optional<compiler::ContextRef> maybe_ref =
FunctionContextSpecialization::TryToRef(compilation_unit_, context,
&depth);
if (maybe_ref.has_value()) {
context = GetConstant(maybe_ref.value());
}
}
for (size_t i = 0; i < depth; i++) {
context = AddNewNode<LoadTaggedField>( context = AddNewNode<LoadTaggedField>(
{context}, Context::OffsetOfElementAt(Context::PREVIOUS_INDEX)); {context}, Context::OffsetOfElementAt(Context::PREVIOUS_INDEX));
} }
...@@ -2563,6 +2711,8 @@ void MaglevGraphBuilder::VisitCreateClosure() { ...@@ -2563,6 +2711,8 @@ void MaglevGraphBuilder::VisitCreateClosure() {
void MaglevGraphBuilder::VisitCreateBlockContext() { void MaglevGraphBuilder::VisitCreateBlockContext() {
// TODO(v8:7700): Inline allocation when context is small. // TODO(v8:7700): Inline allocation when context is small.
// TODO(v8:7700): Update TryGetParentContext if this ever emits its own Node
// type.
// CreateBlockContext <scope_info_idx> // CreateBlockContext <scope_info_idx>
ValueNode* scope_info = GetConstant(GetRefOperand<ScopeInfo>(0)); ValueNode* scope_info = GetConstant(GetRefOperand<ScopeInfo>(0));
SetAccumulator(BuildCallRuntime(Runtime::kPushBlockContext, {scope_info})); SetAccumulator(BuildCallRuntime(Runtime::kPushBlockContext, {scope_info}));
...@@ -2570,6 +2720,8 @@ void MaglevGraphBuilder::VisitCreateBlockContext() { ...@@ -2570,6 +2720,8 @@ void MaglevGraphBuilder::VisitCreateBlockContext() {
void MaglevGraphBuilder::VisitCreateCatchContext() { void MaglevGraphBuilder::VisitCreateCatchContext() {
// TODO(v8:7700): Inline allocation when context is small. // TODO(v8:7700): Inline allocation when context is small.
// TODO(v8:7700): Update TryGetParentContext if this ever emits its own Node
// type.
// CreateCatchContext <exception> <scope_info_idx> // CreateCatchContext <exception> <scope_info_idx>
ValueNode* exception = LoadRegisterTagged(0); ValueNode* exception = LoadRegisterTagged(0);
ValueNode* scope_info = GetConstant(GetRefOperand<ScopeInfo>(1)); ValueNode* scope_info = GetConstant(GetRefOperand<ScopeInfo>(1));
...@@ -2585,6 +2737,8 @@ void MaglevGraphBuilder::VisitCreateFunctionContext() { ...@@ -2585,6 +2737,8 @@ void MaglevGraphBuilder::VisitCreateFunctionContext() {
} }
void MaglevGraphBuilder::VisitCreateEvalContext() { void MaglevGraphBuilder::VisitCreateEvalContext() {
// TODO(v8:7700): Update TryGetParentContext if this ever emits its own Node
// type.
compiler::ScopeInfoRef info = GetRefOperand<ScopeInfo>(0); compiler::ScopeInfoRef info = GetRefOperand<ScopeInfo>(0);
uint32_t slot_count = iterator_.GetUnsignedImmediateOperand(1); uint32_t slot_count = iterator_.GetUnsignedImmediateOperand(1);
if (slot_count <= static_cast<uint32_t>( if (slot_count <= static_cast<uint32_t>(
...@@ -3153,6 +3307,4 @@ DEBUG_BREAK_BYTECODE_LIST(DEBUG_BREAK) ...@@ -3153,6 +3307,4 @@ DEBUG_BREAK_BYTECODE_LIST(DEBUG_BREAK)
#undef DEBUG_BREAK #undef DEBUG_BREAK
void MaglevGraphBuilder::VisitIllegal() { UNREACHABLE(); } void MaglevGraphBuilder::VisitIllegal() { UNREACHABLE(); }
} // namespace maglev } // namespace v8::internal::maglev
} // namespace internal
} // namespace v8
...@@ -408,6 +408,13 @@ class MaglevGraphBuilder { ...@@ -408,6 +408,13 @@ class MaglevGraphBuilder {
return node; return node;
} }
enum ContextSlotMutability { kImmutable, kMutable };
bool TrySpecializeLoadContextSlotToFunctionContext(
ValueNode** context, size_t* depth, int slot_index,
ContextSlotMutability slot_mutability);
void BuildLoadContextSlot(ValueNode* context, size_t depth, int slot_index,
ContextSlotMutability slot_mutability);
template <Builtin kBuiltin> template <Builtin kBuiltin>
CallBuiltin* BuildCallBuiltin(std::initializer_list<ValueNode*> inputs) { CallBuiltin* BuildCallBuiltin(std::initializer_list<ValueNode*> inputs) {
using Descriptor = typename CallInterfaceDescriptorFor<kBuiltin>::type; using Descriptor = typename CallInterfaceDescriptorFor<kBuiltin>::type;
......
...@@ -2253,6 +2253,8 @@ class Constant : public FixedInputValueNodeT<0, Constant> { ...@@ -2253,6 +2253,8 @@ class Constant : public FixedInputValueNodeT<0, Constant> {
void DoLoadToRegister(MaglevAssembler*, OutputRegister); void DoLoadToRegister(MaglevAssembler*, OutputRegister);
Handle<Object> DoReify(LocalIsolate* isolate); Handle<Object> DoReify(LocalIsolate* isolate);
const compiler::HeapObjectRef& ref() const { return object_; }
private: private:
const compiler::HeapObjectRef object_; const compiler::HeapObjectRef object_;
}; };
......
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