Skip to content

V
V8
Commit 40f3b1ba authored by bmeurer@chromium.org's avatar bmeurer@chromium.org
Browse files
Options

Revert "Improve inobject field tracking during GVN." 

This reverts commit r19427 for breaking the build. Will reland with
fix.

TBR=mstarzinger@chromium.org

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

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@19248 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent cd1b7df6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 382 additions and 481 deletions
src/hydrogen-check-elimination.cc
View file @ 40f3b1ba
...@@ -103,8 +103,8 @@ class HCheckTable : public ZoneObject { ...@@ -103,8 +103,8 @@ class HCheckTable : public ZoneObject {
} }
default: { default: {
// If the instruction changes maps uncontrollably, drop everything. // If the instruction changes maps uncontrollably, drop everything.
if (instr->CheckChangesFlag(kMaps) || if (instr->CheckGVNFlag(kChangesMaps) ||
instr->CheckChangesFlag(kOsrEntries)) { instr->CheckGVNFlag(kChangesOsrEntries)) {
Kill(); Kill();
} }
} }
...@@ -387,7 +387,7 @@ class HCheckTable : public ZoneObject { ...@@ -387,7 +387,7 @@ class HCheckTable : public ZoneObject {
Insert(object, MapConstant(instr->value())); Insert(object, MapConstant(instr->value()));
} else { } else {
// If the instruction changes maps, it should be handled above. // If the instruction changes maps, it should be handled above.
CHECK(!instr->CheckChangesFlag(kMaps)); CHECK(!instr->CheckGVNFlag(kChangesMaps));
} }
} }
...@@ -571,8 +571,8 @@ class HCheckMapsEffects : public ZoneObject { ...@@ -571,8 +571,8 @@ class HCheckMapsEffects : public ZoneObject {
maps_stored_ = true; maps_stored_ = true;
} }
default: { default: {
maps_stored_ |= (instr->CheckChangesFlag(kMaps) | maps_stored_ |= (instr->CheckGVNFlag(kChangesMaps) |
instr->CheckChangesFlag(kElementsKind)); instr->CheckGVNFlag(kChangesElementsKind));
} }
} }
} }
......
src/hydrogen-gvn.cc
View file @ 40f3b1ba
This diff is collapsed.
src/hydrogen-gvn.h
View file @ 40f3b1ba
...@@ -36,76 +36,15 @@ ...@@ -36,76 +36,15 @@
namespace v8 { namespace v8 {
namespace internal { namespace internal {
// This class extends GVNFlagSet with additional "special" dynamic side effects,
// which can be used to represent side effects that cannot be expressed using
// the GVNFlags of an HInstruction. These special side effects are tracked by a
// SideEffectsTracker (see below).
class SideEffects V8_FINAL {
public:
static const int kNumberOfSpecials = 64 - kNumberOfFlags;
SideEffects() : bits_(0) {}
explicit SideEffects(GVNFlagSet flags) : bits_(flags.ToIntegral()) {}
bool IsEmpty() const { return bits_ == 0; }
bool ContainsFlag(GVNFlag flag) const {
return (bits_ & MaskFlag(flag)) != 0;
}
bool ContainsSpecial(int special) const {
return (bits_ & MaskSpecial(special)) != 0;
}
bool ContainsAnyOf(SideEffects set) const { return (bits_ & set.bits_) != 0; }
void Add(SideEffects set) { bits_ |= set.bits_; }
void AddSpecial(int special) { bits_ |= MaskSpecial(special); }
void AddAllSpecial() { bits_ |= ~static_cast<uint64_t>(0) << kNumberOfFlags; }
void RemoveFlag(GVNFlag flag) { bits_ &= ~MaskFlag(flag); }
void RemoveAll() { bits_ = 0; }
uint64_t ToIntegral() const { return bits_; }
void PrintTo(StringStream* stream) const;
private:
uint64_t MaskFlag(GVNFlag flag) const {
return static_cast<uint64_t>(1) << static_cast<unsigned>(flag);
}
uint64_t MaskSpecial(int special) const {
ASSERT(special >= 0);
ASSERT(special < kNumberOfSpecials);
return static_cast<uint64_t>(1) << static_cast<unsigned>(
special + kNumberOfFlags);
}
uint64_t bits_;
STATIC_ASSERT(kNumberOfFlags + kNumberOfSpecials == sizeof(bits_) * CHAR_BIT);
};
// Tracks inobject field loads/stores in a fine grained fashion, and represents
// them using the "special" dynamic side effects of the SideEffects class (see
// above). This way unrelated inobject field stores don't prevent hoisting and
// merging of inobject field loads.
class SideEffectsTracker V8_FINAL BASE_EMBEDDED {
public:
SideEffectsTracker() : num_inobject_fields_(0) {}
SideEffects ComputeChanges(HInstruction* instr);
SideEffects ComputeDependsOn(HInstruction* instr);
void PrintSideEffectsTo(StringStream* stream, SideEffects side_effects) const;
private:
bool ComputeInobjectField(HObjectAccess access, int* index);
HObjectAccess inobject_fields_[SideEffects::kNumberOfSpecials];
int num_inobject_fields_;
};
// Perform common subexpression elimination and loop-invariant code motion. // Perform common subexpression elimination and loop-invariant code motion.
class HGlobalValueNumberingPhase V8_FINAL : public HPhase { class HGlobalValueNumberingPhase : public HPhase {
public: public:
explicit HGlobalValueNumberingPhase(HGraph* graph); explicit HGlobalValueNumberingPhase(HGraph* graph);
void Run(); void Run();
private: private:
SideEffects CollectSideEffectsOnPathsToDominatedBlock( GVNFlagSet CollectSideEffectsOnPathsToDominatedBlock(
HBasicBlock* dominator, HBasicBlock* dominator,
HBasicBlock* dominated); HBasicBlock* dominated);
void AnalyzeGraph(); void AnalyzeGraph();
...@@ -113,18 +52,17 @@ class HGlobalValueNumberingPhase V8_FINAL : public HPhase { ...@@ -113,18 +52,17 @@ class HGlobalValueNumberingPhase V8_FINAL : public HPhase {
void LoopInvariantCodeMotion(); void LoopInvariantCodeMotion();
void ProcessLoopBlock(HBasicBlock* block, void ProcessLoopBlock(HBasicBlock* block,
HBasicBlock* before_loop, HBasicBlock* before_loop,
SideEffects loop_kills); GVNFlagSet loop_kills);
bool AllowCodeMotion(); bool AllowCodeMotion();
bool ShouldMove(HInstruction* instr, HBasicBlock* loop_header); bool ShouldMove(HInstruction* instr, HBasicBlock* loop_header);
SideEffectsTracker side_effects_tracker_;
bool removed_side_effects_; bool removed_side_effects_;
// A map of block IDs to their side effects. // A map of block IDs to their side effects.
ZoneList<SideEffects> block_side_effects_; ZoneList<GVNFlagSet> block_side_effects_;
// A map of loop header block IDs to their loop's side effects. // A map of loop header block IDs to their loop's side effects.
ZoneList<SideEffects> loop_side_effects_; ZoneList<GVNFlagSet> loop_side_effects_;
// Used when collecting side effects on paths from dominator to // Used when collecting side effects on paths from dominator to
// dominated. // dominated.
...@@ -133,6 +71,7 @@ class HGlobalValueNumberingPhase V8_FINAL : public HPhase { ...@@ -133,6 +71,7 @@ class HGlobalValueNumberingPhase V8_FINAL : public HPhase {
DISALLOW_COPY_AND_ASSIGN(HGlobalValueNumberingPhase); DISALLOW_COPY_AND_ASSIGN(HGlobalValueNumberingPhase);
}; };
} } // namespace v8::internal } } // namespace v8::internal
#endif // V8_HYDROGEN_GVN_H_ #endif // V8_HYDROGEN_GVN_H_
src/hydrogen-instructions.cc
View file @ 40f3b1ba
...@@ -604,11 +604,11 @@ void HValue::PrintChangesTo(StringStream* stream) { ...@@ -604,11 +604,11 @@ void HValue::PrintChangesTo(StringStream* stream) {
stream->Add("*"); stream->Add("*");
} else { } else {
bool add_comma = false; bool add_comma = false;
#define PRINT_DO(Type) \ #define PRINT_DO(type) \
if (changes_flags.Contains(k##Type)) { \ if (changes_flags.Contains(kChanges##type)) { \
if (add_comma) stream->Add(","); \ if (add_comma) stream->Add(","); \
add_comma = true; \ add_comma = true; \
stream->Add(#Type); \ stream->Add(#type); \
} }
GVN_TRACKED_FLAG_LIST(PRINT_DO); GVN_TRACKED_FLAG_LIST(PRINT_DO);
GVN_UNTRACKED_FLAG_LIST(PRINT_DO); GVN_UNTRACKED_FLAG_LIST(PRINT_DO);
...@@ -1516,7 +1516,7 @@ void HCheckInstanceType::GetCheckMaskAndTag(uint8_t* mask, uint8_t* tag) { ...@@ -1516,7 +1516,7 @@ void HCheckInstanceType::GetCheckMaskAndTag(uint8_t* mask, uint8_t* tag) {
bool HCheckMaps::HandleSideEffectDominator(GVNFlag side_effect, bool HCheckMaps::HandleSideEffectDominator(GVNFlag side_effect,
HValue* dominator) { HValue* dominator) {
ASSERT(side_effect == kMaps); ASSERT(side_effect == kChangesMaps);
// TODO(mstarzinger): For now we specialize on HStoreNamedField, but once // TODO(mstarzinger): For now we specialize on HStoreNamedField, but once
// type information is rich enough we should generalize this to any HType // type information is rich enough we should generalize this to any HType
// for which the map is known. // for which the map is known.
...@@ -1624,7 +1624,7 @@ Range* HChange::InferRange(Zone* zone) { ...@@ -1624,7 +1624,7 @@ Range* HChange::InferRange(Zone* zone) {
input_range != NULL && input_range != NULL &&
input_range->IsInSmiRange()))) { input_range->IsInSmiRange()))) {
set_type(HType::Smi()); set_type(HType::Smi());
ClearChangesFlag(kNewSpacePromotion); ClearGVNFlag(kChangesNewSpacePromotion);
} }
Range* result = (input_range != NULL) Range* result = (input_range != NULL)
? input_range->Copy(zone) ? input_range->Copy(zone)
...@@ -3412,7 +3412,7 @@ Representation HUnaryMathOperation::RepresentationFromInputs() { ...@@ -3412,7 +3412,7 @@ Representation HUnaryMathOperation::RepresentationFromInputs() {
bool HAllocate::HandleSideEffectDominator(GVNFlag side_effect, bool HAllocate::HandleSideEffectDominator(GVNFlag side_effect,
HValue* dominator) { HValue* dominator) {
ASSERT(side_effect == kNewSpacePromotion); ASSERT(side_effect == kChangesNewSpacePromotion);
Zone* zone = block()->zone(); Zone* zone = block()->zone();
if (!FLAG_use_allocation_folding) return false; if (!FLAG_use_allocation_folding) return false;
...@@ -4394,76 +4394,52 @@ void HObjectAccess::SetGVNFlags(HValue *instr, PropertyAccessType access_type) { ...@@ -4394,76 +4394,52 @@ void HObjectAccess::SetGVNFlags(HValue *instr, PropertyAccessType access_type) {
// set the appropriate GVN flags for a given load or store instruction // set the appropriate GVN flags for a given load or store instruction
if (access_type == STORE) { if (access_type == STORE) {
// track dominating allocations in order to eliminate write barriers // track dominating allocations in order to eliminate write barriers
instr->SetDependsOnFlag(::v8::internal::kNewSpacePromotion); instr->SetGVNFlag(kDependsOnNewSpacePromotion);
instr->SetFlag(HValue::kTrackSideEffectDominators); instr->SetFlag(HValue::kTrackSideEffectDominators);
} else { } else {
// try to GVN loads, but don't hoist above map changes // try to GVN loads, but don't hoist above map changes
instr->SetFlag(HValue::kUseGVN); instr->SetFlag(HValue::kUseGVN);
instr->SetDependsOnFlag(::v8::internal::kMaps); instr->SetGVNFlag(kDependsOnMaps);
} }
switch (portion()) { switch (portion()) {
case kArrayLengths: case kArrayLengths:
if (access_type == STORE) { instr->SetGVNFlag(access_type == STORE
instr->SetChangesFlag(::v8::internal::kArrayLengths); ? kChangesArrayLengths : kDependsOnArrayLengths);
} else {
instr->SetDependsOnFlag(::v8::internal::kArrayLengths);
}
break; break;
case kStringLengths: case kStringLengths:
if (access_type == STORE) { instr->SetGVNFlag(access_type == STORE
instr->SetChangesFlag(::v8::internal::kStringLengths); ? kChangesStringLengths : kDependsOnStringLengths);
} else {
instr->SetDependsOnFlag(::v8::internal::kStringLengths);
}
break; break;
case kInobject: case kInobject:
if (access_type == STORE) { instr->SetGVNFlag(access_type == STORE
instr->SetChangesFlag(::v8::internal::kInobjectFields); ? kChangesInobjectFields : kDependsOnInobjectFields);
} else {
instr->SetDependsOnFlag(::v8::internal::kInobjectFields);
}
break; break;
case kDouble: case kDouble:
if (access_type == STORE) { instr->SetGVNFlag(access_type == STORE
instr->SetChangesFlag(::v8::internal::kDoubleFields); ? kChangesDoubleFields : kDependsOnDoubleFields);
} else {
instr->SetDependsOnFlag(::v8::internal::kDoubleFields);
}
break; break;
case kBackingStore: case kBackingStore:
if (access_type == STORE) { instr->SetGVNFlag(access_type == STORE
instr->SetChangesFlag(::v8::internal::kBackingStoreFields); ? kChangesBackingStoreFields : kDependsOnBackingStoreFields);
} else {
instr->SetDependsOnFlag(::v8::internal::kBackingStoreFields);
}
break; break;
case kElementsPointer: case kElementsPointer:
if (access_type == STORE) { instr->SetGVNFlag(access_type == STORE
instr->SetChangesFlag(::v8::internal::kElementsPointer); ? kChangesElementsPointer : kDependsOnElementsPointer);
} else {
instr->SetDependsOnFlag(::v8::internal::kElementsPointer);
}
break; break;
case kMaps: case kMaps:
if (access_type == STORE) { instr->SetGVNFlag(access_type == STORE
instr->SetChangesFlag(::v8::internal::kMaps); ? kChangesMaps : kDependsOnMaps);
} else {
instr->SetDependsOnFlag(::v8::internal::kMaps);
}
break; break;
case kExternalMemory: case kExternalMemory:
if (access_type == STORE) { instr->SetGVNFlag(access_type == STORE
instr->SetChangesFlag(::v8::internal::kExternalMemory); ? kChangesExternalMemory : kDependsOnExternalMemory);
} else {
instr->SetDependsOnFlag(::v8::internal::kExternalMemory);
}
break; break;
} }
} }
void HObjectAccess::PrintTo(StringStream* stream) const { void HObjectAccess::PrintTo(StringStream* stream) {
stream->Add("."); stream->Add(".");
switch (portion()) { switch (portion()) {
......
src/hydrogen-instructions.h
View file @ 40f3b1ba
This diff is collapsed.
src/hydrogen-load-elimination.cc
View file @ 40f3b1ba
...@@ -99,25 +99,25 @@ class HLoadEliminationTable : public ZoneObject { ...@@ -99,25 +99,25 @@ class HLoadEliminationTable : public ZoneObject {
break; break;
} }
default: { default: {
if (instr->CheckChangesFlag(kInobjectFields)) { if (instr->CheckGVNFlag(kChangesInobjectFields)) {
TRACE((" kill-all i%d\n", instr->id())); TRACE((" kill-all i%d\n", instr->id()));
Kill(); Kill();
break; break;
} }
if (instr->CheckChangesFlag(kMaps)) { if (instr->CheckGVNFlag(kChangesMaps)) {
TRACE((" kill-maps i%d\n", instr->id())); TRACE((" kill-maps i%d\n", instr->id()));
KillOffset(JSObject::kMapOffset); KillOffset(JSObject::kMapOffset);
} }
if (instr->CheckChangesFlag(kElementsKind)) { if (instr->CheckGVNFlag(kChangesElementsKind)) {
TRACE((" kill-elements-kind i%d\n", instr->id())); TRACE((" kill-elements-kind i%d\n", instr->id()));
KillOffset(JSObject::kMapOffset); KillOffset(JSObject::kMapOffset);
KillOffset(JSObject::kElementsOffset); KillOffset(JSObject::kElementsOffset);
} }
if (instr->CheckChangesFlag(kElementsPointer)) { if (instr->CheckGVNFlag(kChangesElementsPointer)) {
TRACE((" kill-elements i%d\n", instr->id())); TRACE((" kill-elements i%d\n", instr->id()));
KillOffset(JSObject::kElementsOffset); KillOffset(JSObject::kElementsOffset);
} }
if (instr->CheckChangesFlag(kOsrEntries)) { if (instr->CheckGVNFlag(kChangesOsrEntries)) {
TRACE((" kill-osr i%d\n", instr->id())); TRACE((" kill-osr i%d\n", instr->id()));
Kill(); Kill();
} }
...@@ -454,11 +454,11 @@ class HLoadEliminationEffects : public ZoneObject { ...@@ -454,11 +454,11 @@ class HLoadEliminationEffects : public ZoneObject {
elements_stored_ = true; elements_stored_ = true;
} }
default: { default: {
fields_stored_ |= instr->CheckChangesFlag(kInobjectFields); fields_stored_ |= instr->CheckGVNFlag(kChangesInobjectFields);
maps_stored_ |= instr->CheckChangesFlag(kMaps); maps_stored_ |= instr->CheckGVNFlag(kChangesMaps);
maps_stored_ |= instr->CheckChangesFlag(kElementsKind); maps_stored_ |= instr->CheckGVNFlag(kChangesElementsKind);
elements_stored_ |= instr->CheckChangesFlag(kElementsKind); elements_stored_ |= instr->CheckGVNFlag(kChangesElementsKind);
elements_stored_ |= instr->CheckChangesFlag(kElementsPointer); elements_stored_ |= instr->CheckGVNFlag(kChangesElementsPointer);
} }
} }
} }
......
src/hydrogen.cc
View file @ 40f3b1ba
...@@ -2174,7 +2174,7 @@ HInstruction* HGraphBuilder::BuildUncheckedMonomorphicElementAccess( ...@@ -2174,7 +2174,7 @@ HInstruction* HGraphBuilder::BuildUncheckedMonomorphicElementAccess(
// generated store code. // generated store code.
if ((elements_kind == FAST_HOLEY_ELEMENTS) || if ((elements_kind == FAST_HOLEY_ELEMENTS) ||
(elements_kind == FAST_ELEMENTS && access_type == STORE)) { (elements_kind == FAST_ELEMENTS && access_type == STORE)) {
checked_object->ClearDependsOnFlag(kElementsKind); checked_object->ClearGVNFlag(kDependsOnElementsKind);
} }
bool fast_smi_only_elements = IsFastSmiElementsKind(elements_kind); bool fast_smi_only_elements = IsFastSmiElementsKind(elements_kind);
...@@ -2184,7 +2184,7 @@ HInstruction* HGraphBuilder::BuildUncheckedMonomorphicElementAccess( ...@@ -2184,7 +2184,7 @@ HInstruction* HGraphBuilder::BuildUncheckedMonomorphicElementAccess(
store_mode != STORE_NO_TRANSITION_HANDLE_COW) { store_mode != STORE_NO_TRANSITION_HANDLE_COW) {
HCheckMaps* check_cow_map = Add<HCheckMaps>( HCheckMaps* check_cow_map = Add<HCheckMaps>(
elements, isolate()->factory()->fixed_array_map(), top_info()); elements, isolate()->factory()->fixed_array_map(), top_info());
check_cow_map->ClearDependsOnFlag(kElementsKind); check_cow_map->ClearGVNFlag(kDependsOnElementsKind);
} }
HInstruction* length = NULL; HInstruction* length = NULL;
if (is_js_array) { if (is_js_array) {
...@@ -2258,7 +2258,7 @@ HInstruction* HGraphBuilder::BuildUncheckedMonomorphicElementAccess( ...@@ -2258,7 +2258,7 @@ HInstruction* HGraphBuilder::BuildUncheckedMonomorphicElementAccess(
} else { } else {
HCheckMaps* check_cow_map = Add<HCheckMaps>( HCheckMaps* check_cow_map = Add<HCheckMaps>(
elements, isolate()->factory()->fixed_array_map(), top_info()); elements, isolate()->factory()->fixed_array_map(), top_info());
check_cow_map->ClearDependsOnFlag(kElementsKind); check_cow_map->ClearGVNFlag(kDependsOnElementsKind);
} }
} }
} }
...@@ -5309,7 +5309,7 @@ HInstruction* HOptimizedGraphBuilder::BuildStoreNamedField( ...@@ -5309,7 +5309,7 @@ HInstruction* HOptimizedGraphBuilder::BuildStoreNamedField(
if (transition_to_field) { if (transition_to_field) {
HConstant* transition_constant = Add<HConstant>(info->transition()); HConstant* transition_constant = Add<HConstant>(info->transition());
instr->SetTransition(transition_constant, top_info()); instr->SetTransition(transition_constant, top_info());
instr->SetChangesFlag(kMaps); instr->SetGVNFlag(kChangesMaps);
} }
return instr; return instr;
} }
...@@ -6208,7 +6208,7 @@ HInstruction* HOptimizedGraphBuilder::BuildMonomorphicElementAccess( ...@@ -6208,7 +6208,7 @@ HInstruction* HOptimizedGraphBuilder::BuildMonomorphicElementAccess(
HCheckMaps* checked_object = Add<HCheckMaps>(object, map, top_info(), HCheckMaps* checked_object = Add<HCheckMaps>(object, map, top_info(),
dependency); dependency);
if (dependency) { if (dependency) {
checked_object->ClearDependsOnFlag(kElementsKind); checked_object->ClearGVNFlag(kDependsOnElementsKind);
} }
if (access_type == STORE && map->prototype()->IsJSObject()) { if (access_type == STORE && map->prototype()->IsJSObject()) {
...@@ -6688,7 +6688,7 @@ HInstruction* HGraphBuilder::BuildConstantMapCheck(Handle<JSObject> constant, ...@@ -6688,7 +6688,7 @@ HInstruction* HGraphBuilder::BuildConstantMapCheck(Handle<JSObject> constant,
AddInstruction(constant_value); AddInstruction(constant_value);
HCheckMaps* check = HCheckMaps* check =
Add<HCheckMaps>(constant_value, handle(constant->map()), info); Add<HCheckMaps>(constant_value, handle(constant->map()), info);
check->ClearDependsOnFlag(kElementsKind); check->ClearGVNFlag(kDependsOnElementsKind);
return check; return check;
} }
......
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