AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[turboprop] Refactor minimorphic-polymorphic dynamic map checks

Browse Source 
For minimorphic-polymorphic checks, instead of loading the feedback
vector in an inlined unrolled loop, just inline the maps present in
the feedback vector at compile time and call out to the builtin if
these map checks fail.

Change-Id: I4672bc2c774027935aa245382625b9aa64be1d10
Bug: v8:10582
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2460812
Reviewed-by: Jakob Gruber <jgruber@chromium.org>
Reviewed-by: Mythri Alle <mythria@chromium.org>
Commit-Queue: Sathya Gunasekaran  <gsathya@chromium.org>
Cr-Commit-Position: refs/heads/master@{#70981}
This commit is contained in:
Sathya Gunasekaran 2020-11-03 10:51:11 +00:00 committed by Commit Bot
parent 4adc7c7f2d
commit 5f1a742ebe
6 changed files with 75 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

197
src/compiler/effect-control-linearizer.cc
View File

@ -288,10 +288,11 @@ class EffectControlLinearizer {
DeoptimizeReason reason);
// Helper functions used in LowerDynamicCheckMaps
void PerformPolymorphicCheckInline(Node* expected_polymorphic_array,
Node* actual_map, Node* actual_handler,
GraphAssemblerLabel<0>* done,
Node* frame_state);
void BuildCallDynamicMapChecksBuiltin(Node* actual_value,
Node* actual_handler,
int feedback_slot_index,
GraphAssemblerLabel<0>* done,
Node* frame_state);
bool should_maintain_schedule() const {
return maintain_schedule_ == MaintainSchedule::kMaintain;
}
@ -1888,105 +1889,27 @@ void EffectControlLinearizer::LowerCheckMaps(Node* node, Node* frame_state) {
}
}
void EffectControlLinearizer::PerformPolymorphicCheckInline(
Node* expected_polymorphic_array, Node* actual_map, Node* actual_handler,
void EffectControlLinearizer::BuildCallDynamicMapChecksBuiltin(
Node* actual_value, Node* actual_handler, int feedback_slot_index,
GraphAssemblerLabel<0>* done, Node* frame_state) {
Node* expected_polymorphic_array_map =
__ LoadField(AccessBuilder::ForMap(), expected_polymorphic_array);
Node* is_weak_fixed_array = __ TaggedEqual(expected_polymorphic_array_map,
__ WeakFixedArrayMapConstant());
__ DeoptimizeIfNot(DeoptimizeReason::kTransitionedToMegamorphicIC,
FeedbackSource(), is_weak_fixed_array, frame_state,
IsSafetyCheck::kCriticalSafetyCheck);
Node* polymorphic_array = expected_polymorphic_array;
// This is now a weak pointer that we're holding in the register, we
// need to be careful about spilling and reloading it (as it could
// get cleared in between). There's no runtime call here that could
// cause a spill so we should be safe.
Node* weak_actual_map = MakeWeakForComparison(actual_map);
Node* length = ChangeSmiToInt32(__ LoadField(
AccessBuilder::ForWeakFixedArrayLength(), polymorphic_array));
auto do_handler_check = __ MakeLabel(MachineRepresentation::kWord32);
GraphAssemblerLabel<0> labels[] = {__ MakeLabel(), __ MakeLabel(),
__ MakeLabel(), __ MakeLabel()};
STATIC_ASSERT(FLAG_max_minimorphic_map_checks == arraysize(labels));
DCHECK_GE(FLAG_max_minimorphic_map_checks,
FLAG_max_valid_polymorphic_map_count);
// The following generates a switch based on the length of the
// array:
//
// if length >= 4: goto labels[3]
// if length == 3: goto labels[2]
// if length == 2: goto labels[1]
// if length == 1: goto labels[0]
__ GotoIf(__ Int32LessThanOrEqual(
__ Int32Constant(FeedbackIterator::SizeFor(4)), length),
&labels[3]);
__ GotoIf(
__ Word32Equal(length, __ Int32Constant(FeedbackIterator::SizeFor(3))),
&labels[2]);
__ GotoIf(
__ Word32Equal(length, __ Int32Constant(FeedbackIterator::SizeFor(2))),
&labels[1]);
__ GotoIf(
__ Word32Equal(length, __ Int32Constant(FeedbackIterator::SizeFor(1))),
&labels[0]);
// We should never have an polymorphic feedback array of size 0.
Node* slot_index = __ IntPtrConstant(feedback_slot_index);
Operator::Properties properties = Operator::kNoDeopt | Operator::kNoThrow;
auto builtin = Builtins::kDynamicMapChecks;
Node* result = CallBuiltin(builtin, properties, slot_index, actual_value,
actual_handler);
__ GotoIf(__ WordEqual(result, __ IntPtrConstant(static_cast<int>(
DynamicMapChecksStatus::kSuccess))),
done);
__ DeoptimizeIf(DeoptimizeKind::kBailout, DeoptimizeReason::kMissingMap,
FeedbackSource(),
__ WordEqual(result, __ IntPtrConstant(static_cast<int>(
DynamicMapChecksStatus::kBailout))),
frame_state, IsSafetyCheck::kCriticalSafetyCheck);
__ DeoptimizeIf(DeoptimizeReason::kWrongHandler, FeedbackSource(),
__ WordEqual(result, __ IntPtrConstant(static_cast<int>(
DynamicMapChecksStatus::kDeopt))),
frame_state, IsSafetyCheck::kCriticalSafetyCheck);
__ Unreachable(done);
// This loop generates code like this to do the dynamic map check:
//
// labels[3]:
// maybe_map = load(polymorphic_array, i)
// if weak_actual_map == maybe_map goto handler_check
// goto labels[2]
// labels[2]:
// maybe_map = load(polymorphic_array, i - 1)
// if weak_actual_map == maybe_map goto handler_check
// goto labels[1]
// labels[1]:
// maybe_map = load(polymorphic_array, i - 2)
// if weak_actual_map == maybe_map goto handler_check
// goto labels[0]
// labels[0]:
// maybe_map = load(polymorphic_array, i - 3)
// if weak_actual_map == maybe_map goto handler_check
// bailout
for (int i = arraysize(labels) - 1; i >= 0; i--) {
__ Bind(&labels[i]);
Node* maybe_map = __ LoadField(AccessBuilder::ForWeakFixedArraySlot(
FeedbackIterator::MapIndexForEntry(i)),
polymorphic_array);
Node* map_check = __ TaggedEqual(maybe_map, weak_actual_map);
int handler_index = FeedbackIterator::HandlerIndexForEntry(i);
__ GotoIf(map_check, &do_handler_check, __ Int32Constant(handler_index));
if (i > 0) {
__ Goto(&labels[i - 1]);
} else {
// TODO(turbofan): Add support for gasm->Deoptimize.
__ DeoptimizeIf(DeoptimizeKind::kBailout, DeoptimizeReason::kMissingMap,
FeedbackSource(), __ IntPtrConstant(1),
FrameState(frame_state));
__ Unreachable(done);
}
}
__ Bind(&do_handler_check);
Node* handler_index = do_handler_check.PhiAt(0);
Node* maybe_handler =
__ LoadElement(AccessBuilder::ForWeakFixedArrayElement(),
polymorphic_array, handler_index);
__ DeoptimizeIfNot(DeoptimizeReason::kWrongHandler, FeedbackSource(),
__ TaggedEqual(maybe_handler, actual_handler), frame_state,
IsSafetyCheck::kCriticalSafetyCheck);
__ Goto(done);
}
void EffectControlLinearizer::LowerDynamicCheckMaps(Node* node,
@ -2003,56 +1926,28 @@ void EffectControlLinearizer::LowerDynamicCheckMaps(Node* node,
: __ HeapConstant(Handle<HeapObject>::cast(p.handler()));
auto done = __ MakeLabel();
auto call_builtin = __ MakeDeferredLabel();
// Emit monomorphic checks only if current state is monomorphic. In
// case the current state is polymorphic, and if we ever go back to
// monomorphic start, we will deopt and reoptimize the code.
if (p.state() == DynamicCheckMapsParameters::kMonomorphic) {
Node* expected_map = __ HeapConstant(p.map().ToHandleChecked());
Node* mono_check = __ TaggedEqual(expected_map, actual_value_map);
auto call_builtin = __ MakeDeferredLabel();
__ BranchWithHint(mono_check, &done, &call_builtin, BranchHint::kTrue);
__ Bind(&call_builtin);
{
Node* slot_index = __ IntPtrConstant(feedback.index());
Operator::Properties properties = Operator::kNoDeopt | Operator::kNoThrow;
auto builtin = Builtins::kDynamicMapChecks;
Node* result = CallBuiltin(builtin, properties, slot_index, actual_value,
actual_handler);
__ GotoIf(__ WordEqual(result, __ IntPtrConstant(static_cast<int>(
DynamicMapChecksStatus::kSuccess))),
&done);
__ DeoptimizeIf(
DeoptimizeKind::kBailout, DeoptimizeReason::kMissingMap,
FeedbackSource(),
__ WordEqual(result, __ IntPtrConstant(static_cast<int>(
DynamicMapChecksStatus::kBailout))),
frame_state, IsSafetyCheck::kCriticalSafetyCheck);
__ DeoptimizeIf(
DeoptimizeReason::kWrongHandler, FeedbackSource(),
__ WordEqual(result, __ IntPtrConstant(static_cast<int>(
DynamicMapChecksStatus::kDeopt))),
frame_state, IsSafetyCheck::kCriticalSafetyCheck);
__ Unreachable(&done);
ZoneHandleSet<Map> maps = p.maps();
size_t const map_count = maps.size();
for (size_t i = 0; i < map_count; ++i) {
Node* map = __ HeapConstant(maps[i]);
Node* check = __ TaggedEqual(actual_value_map, map);
if (i == map_count - 1) {
__ BranchWithCriticalSafetyCheck(check, &done, &call_builtin);
} else {
auto next_map = __ MakeLabel();
__ BranchWithCriticalSafetyCheck(check, &done, &next_map);
__ Bind(&next_map);
}
} else {
DCHECK_EQ(p.state(), DynamicCheckMapsParameters::kPolymorphic);
Node* feedback_vector = __ HeapConstant(feedback.vector);
Node* feedback_slot =
__ LoadField(AccessBuilder::ForFeedbackVectorSlot(feedback.index()),
feedback_vector);
// If the IC state at code generation time is not monomorphic, we don't
// handle monomorphic states and just deoptimize if IC transitions to
// monomorphic. For polymorphic ICs it is not required to migrate deprecated
// maps since ICs don't discard deprecated maps from feedback.
Node* is_poly_or_megamorphic = BuildIsStrongReference(feedback_slot);
__ DeoptimizeIfNot(DeoptimizeReason::kTransitionedToMonomorphicIC,
FeedbackSource(), is_poly_or_megamorphic, frame_state,
IsSafetyCheck::kCriticalSafetyCheck);
PerformPolymorphicCheckInline(feedback_slot, actual_value_map,
actual_handler, &done, frame_state);
}
__ Bind(&call_builtin);
{
BuildCallDynamicMapChecksBuiltin(actual_value, actual_handler,
feedback.index(), &done, frame_state);
}
__ Bind(&done);
}
@ -6465,9 +6360,9 @@ Node* EffectControlLinearizer::LowerFindOrderedHashMapEntryForInt32Key(
auto if_match = __ MakeLabel();
auto if_notmatch = __ MakeLabel();
auto if_notsmi = __ MakeDeferredLabel();
__ GotoIfNot(ObjectIsSmi(candidate_key), &if_notsmi);
__ Branch(__ Word32Equal(ChangeSmiToInt32(candidate_key), key), &if_match,
&if_notmatch);
__ GotoIfNot(ObjectIsSmi(candidate_key), &if_notsmi);
__ Branch(__ Word32Equal(ChangeSmiToInt32(candidate_key), key), &if_match,
&if_notmatch);
__ Bind(&if_notsmi);
__ GotoIfNot(

13
src/compiler/js-heap-broker.cc
View File

@ -4637,11 +4637,11 @@ bool ElementAccessFeedback::HasOnlyStringMaps(JSHeapBroker* broker) const {
MinimorphicLoadPropertyAccessFeedback::MinimorphicLoadPropertyAccessFeedback(
NameRef const& name, FeedbackSlotKind slot_kind, Handle<Object> handler,
MaybeHandle<Map> maybe_map, bool has_migration_target_maps)
ZoneVector<Handle<Map>> const& maps, bool has_migration_target_maps)
: ProcessedFeedback(kMinimorphicPropertyAccess, slot_kind),
name_(name),
handler_(handler),
maybe_map_(maybe_map),
maps_(maps),
has_migration_target_maps_(has_migration_target_maps) {
DCHECK(IsLoadICKind(slot_kind));
}
@ -4795,13 +4795,10 @@ ProcessedFeedback const& JSHeapBroker::ReadFeedbackForPropertyAccess(
maps_and_handlers, kind, target_native_context().object(),
is_turboprop());
if (!handler.is_null()) {
MaybeHandle<Map> maybe_map;
if (nexus.ic_state() == MONOMORPHIC) {
DCHECK_EQ(maps.size(), 1);
maybe_map = maps[0];
}
return *zone()->New<MinimorphicLoadPropertyAccessFeedback>(
*name, kind, handler.object(), maybe_map, HasMigrationTargets(maps));
*name, kind, handler.object(),
ZoneVector<Handle<Map>>(maps.begin(), maps.end(), zone()),
HasMigrationTargets(maps));
}
FilterRelevantReceiverMaps(isolate(), &maps);

13
src/compiler/js-native-context-specialization.cc
View File

@ -1081,10 +1081,15 @@ Reduction JSNativeContextSpecialization::ReduceMinimorphicPropertyAccess(
if (feedback.has_migration_target_maps()) {
flags |= CheckMapsFlag::kTryMigrateInstance;
}
effect =
graph()->NewNode(simplified()->DynamicCheckMaps(flags, feedback.handler(),
feedback.map(), source),
receiver, effect, control);
ZoneHandleSet<Map> maps;
for (Handle<Map> map : feedback.maps()) {
maps.insert(map, graph()->zone());
}
effect = graph()->NewNode(
simplified()->DynamicCheckMaps(flags, feedback.handler(), maps, source),
receiver, effect, control);
value = access_builder.BuildMinimorphicLoadDataField(
feedback.name(), access_info, receiver, &effect, &control);

8
src/compiler/processed-feedback.h
View File

@ -178,19 +178,19 @@ class MinimorphicLoadPropertyAccessFeedback : public ProcessedFeedback {
MinimorphicLoadPropertyAccessFeedback(NameRef const& name,
FeedbackSlotKind slot_kind,
Handle<Object> handler,
MaybeHandle<Map> maybe_map,
ZoneVector<Handle<Map>> const& maps,
bool has_migration_target_maps);
NameRef const& name() const { return name_; }
bool is_monomorphic() const { return !maybe_map_.is_null(); }
bool is_monomorphic() const { return maps_.size() == 1; }
Handle<Object> handler() const { return handler_; }
MaybeHandle<Map> map() const { return maybe_map_; }
ZoneVector<Handle<Map>> const& maps() const { return maps_; }
bool has_migration_target_maps() const { return has_migration_target_maps_; }
private:
NameRef const name_;
Handle<Object> const handler_;
MaybeHandle<Map> const maybe_map_;
ZoneVector<Handle<Map>> const maps_;
bool const has_migration_target_maps_;
};

11
src/compiler/simplified-operator.cc
View File

@ -294,7 +294,7 @@ bool operator==(DynamicCheckMapsParameters const& lhs,
DCHECK_IMPLIES(lhs.feedback() == rhs.feedback(),
lhs.flags() == rhs.flags() && lhs.state() == rhs.state() &&
lhs.handler().address() == rhs.handler().address() &&
lhs.map().address() == rhs.map().address());
lhs.maps() == rhs.maps());
return lhs.feedback() == rhs.feedback();
}
@ -308,7 +308,7 @@ size_t hash_value(DynamicCheckMapsParameters const& p) {
std::ostream& operator<<(std::ostream& os,
DynamicCheckMapsParameters const& p) {
return os << p.handler() << ", " << p.feedback() << "," << p.state() << ","
<< p.flags() << "," << p.map().address();
<< p.flags() << "," << p.maps();
}
DynamicCheckMapsParameters const& DynamicCheckMapsParametersOf(
@ -1487,10 +1487,9 @@ const Operator* SimplifiedOperatorBuilder::CheckMaps(
}
const Operator* SimplifiedOperatorBuilder::DynamicCheckMaps(
CheckMapsFlags flags, Handle<Object> handler, MaybeHandle<Map> maybe_map,
const FeedbackSource& feedback) {
DynamicCheckMapsParameters const parameters(flags, handler, maybe_map,
feedback);
CheckMapsFlags flags, Handle<Object> handler,
ZoneHandleSet<Map> const& maps, const FeedbackSource& feedback) {
DynamicCheckMapsParameters const parameters(flags, handler, maps, feedback);
return zone()->New<Operator1<DynamicCheckMapsParameters>>( // --
IrOpcode::kDynamicCheckMaps, // opcode
Operator::kNoThrow | Operator::kNoWrite, // flags

15
src/compiler/simplified-operator.h
View File

@ -445,25 +445,22 @@ class DynamicCheckMapsParameters final {
enum ICState { kMonomorphic, kPolymorphic };
DynamicCheckMapsParameters(CheckMapsFlags flags, Handle<Object> handler,
MaybeHandle<Map> maybe_map,
ZoneHandleSet<Map> const& maps,
const FeedbackSource& feedback)
: flags_(flags),
handler_(handler),
maybe_map_(maybe_map),
feedback_(feedback) {}
: flags_(flags), handler_(handler), maps_(maps), feedback_(feedback) {}
CheckMapsFlags flags() const { return flags_; }
Handle<Object> handler() const { return handler_; }
MaybeHandle<Map> map() const { return maybe_map_; }
ZoneHandleSet<Map> const& maps() const { return maps_; }
FeedbackSource const& feedback() const { return feedback_; }
ICState state() const {
return maybe_map_.is_null() ? ICState::kPolymorphic : ICState::kMonomorphic;
return maps_.size() == 1 ? ICState::kMonomorphic : ICState::kPolymorphic;
}
private:
CheckMapsFlags const flags_;
Handle<Object> const handler_;
MaybeHandle<Map> const maybe_map_;
ZoneHandleSet<Map> const maps_;
FeedbackSource const feedback_;
};
@ -901,7 +898,7 @@ class V8_EXPORT_PRIVATE SimplifiedOperatorBuilder final
const Operator* CheckMaps(CheckMapsFlags, ZoneHandleSet<Map>,
const FeedbackSource& = FeedbackSource());
const Operator* DynamicCheckMaps(CheckMapsFlags flags, Handle<Object> handler,
MaybeHandle<Map> map,
ZoneHandleSet<Map> const& maps,
const FeedbackSource& feedback);
const Operator* CheckNotTaggedHole();
const Operator* CheckNumber(const FeedbackSource& feedback);