Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/compiler/change-lowering.cc

Issue 1926023002: [turbofan] Run everything after representation selection concurrently. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/compiler/change-lowering.h ('k') | src/compiler/common-node-cache.cc » ('j') | src/compiler/instruction.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/compiler/change-lowering.cc
diff --git a/src/compiler/change-lowering.cc b/src/compiler/change-lowering.cc
index 899300f5fd360f05184173fb07926f566708603a..9ba711a7915721a99cc413ce6caa5328d0da5590 100644
--- a/src/compiler/change-lowering.cc
+++ b/src/compiler/change-lowering.cc
@@ -24,30 +24,25 @@ Reduction ChangeLowering::Reduce(Node* node) {
Node* control = graph()->start();
switch (node->opcode()) {
case IrOpcode::kChangeBitToBool:
- return ChangeBitToBool(node->InputAt(0), control);
+ return ReduceChangeBitToBool(node->InputAt(0), control);
case IrOpcode::kChangeBoolToBit:
- return ChangeBoolToBit(node->InputAt(0));
+ return ReduceChangeBoolToBit(node->InputAt(0));
case IrOpcode::kChangeInt31ToTagged:
- return ChangeInt31ToTagged(node->InputAt(0), control);
+ return ReduceChangeInt31ToTagged(node->InputAt(0), control);
case IrOpcode::kChangeTaggedSignedToInt32:
- return ChangeTaggedSignedToInt32(node->InputAt(0));
+ return ReduceChangeTaggedSignedToInt32(node->InputAt(0));
case IrOpcode::kLoadField:
- return LoadField(node);
+ return ReduceLoadField(node);
case IrOpcode::kStoreField:
- return StoreField(node);
+ return ReduceStoreField(node);
case IrOpcode::kLoadElement:
- return LoadElement(node);
+ return ReduceLoadElement(node);
case IrOpcode::kStoreElement:
- return StoreElement(node);
+ return ReduceStoreElement(node);
case IrOpcode::kAllocate:
- return Allocate(node);
+ return ReduceAllocate(node);
case IrOpcode::kObjectIsSmi:
- return ObjectIsSmi(node);
- case IrOpcode::kChangeInt32ToTagged:
- case IrOpcode::kChangeUint32ToTagged:
- case IrOpcode::kChangeFloat64ToTagged:
- FATAL("Changes should be already lowered during effect linearization.");
- break;
+ return ReduceObjectIsSmi(node);
default:
return NoChange();
}
@@ -55,19 +50,10 @@ Reduction ChangeLowering::Reduce(Node* node) {
return NoChange();
}
-
-Node* ChangeLowering::HeapNumberValueIndexConstant() {
- return jsgraph()->IntPtrConstant(HeapNumber::kValueOffset - kHeapObjectTag);
-}
-
Node* ChangeLowering::SmiShiftBitsConstant() {
return jsgraph()->IntPtrConstant(kSmiShiftSize + kSmiTagSize);
}
-Node* ChangeLowering::ChangeInt32ToFloat64(Node* value) {
- return graph()->NewNode(machine()->ChangeInt32ToFloat64(), value);
-}
-
Node* ChangeLowering::ChangeInt32ToSmi(Node* value) {
if (machine()->Is64()) {
value = graph()->NewNode(machine()->ChangeInt32ToInt64(), value);
@@ -75,11 +61,6 @@ Node* ChangeLowering::ChangeInt32ToSmi(Node* value) {
return graph()->NewNode(machine()->WordShl(), value, SmiShiftBitsConstant());
}
-
-Node* ChangeLowering::ChangeSmiToFloat64(Node* value) {
- return ChangeInt32ToFloat64(ChangeSmiToWord32(value));
-}
-
Node* ChangeLowering::ChangeSmiToWord32(Node* value) {
value = graph()->NewNode(machine()->WordSar(), value, SmiShiftBitsConstant());
if (machine()->Is64()) {
@@ -93,112 +74,84 @@ Node* ChangeLowering::ChangeUint32ToFloat64(Node* value) {
return graph()->NewNode(machine()->ChangeUint32ToFloat64(), value);
}
-
-Node* ChangeLowering::ChangeUint32ToSmi(Node* value) {
- if (machine()->Is64()) {
- value = graph()->NewNode(machine()->ChangeUint32ToUint64(), value);
- }
- return graph()->NewNode(machine()->WordShl(), value, SmiShiftBitsConstant());
-}
-
-
-Node* ChangeLowering::LoadHeapNumberValue(Node* value, Node* control) {
- return graph()->NewNode(machine()->Load(MachineType::Float64()), value,
- HeapNumberValueIndexConstant(), graph()->start(),
- control);
-}
-
-
-Node* ChangeLowering::TestNotSmi(Node* value) {
- STATIC_ASSERT(kSmiTag == 0);
- STATIC_ASSERT(kSmiTagMask == 1);
- return graph()->NewNode(machine()->WordAnd(), value,
- jsgraph()->IntPtrConstant(kSmiTagMask));
-}
-
-
-Reduction ChangeLowering::ChangeBitToBool(Node* value, Node* control) {
+Reduction ChangeLowering::ReduceChangeBitToBool(Node* value, Node* control) {
return Replace(
graph()->NewNode(common()->Select(MachineRepresentation::kTagged), value,
jsgraph()->TrueConstant(), jsgraph()->FalseConstant()));
}
-
-Reduction ChangeLowering::ChangeBoolToBit(Node* value) {
+Reduction ChangeLowering::ReduceChangeBoolToBit(Node* value) {
return Replace(graph()->NewNode(machine()->WordEqual(), value,
jsgraph()->TrueConstant()));
}
-Reduction ChangeLowering::ChangeInt31ToTagged(Node* value, Node* control) {
+Reduction ChangeLowering::ReduceChangeInt31ToTagged(Node* value,
+ Node* control) {
return Replace(ChangeInt32ToSmi(value));
}
-Reduction ChangeLowering::ChangeTaggedSignedToInt32(Node* value) {
+Reduction ChangeLowering::ReduceChangeTaggedSignedToInt32(Node* value) {
return Replace(ChangeSmiToWord32(value));
}
namespace {
WriteBarrierKind ComputeWriteBarrierKind(BaseTaggedness base_is_tagged,
- MachineRepresentation representation,
- Type* field_type, Type* input_type) {
- if (field_type->Is(Type::TaggedSigned()) ||
- input_type->Is(Type::TaggedSigned())) {
- // Write barriers are only for writes of heap objects.
- return kNoWriteBarrier;
- }
- if (input_type->Is(Type::BooleanOrNullOrUndefined())) {
- // Write barriers are not necessary when storing true, false, null or
- // undefined, because these special oddballs are always in the root set.
- return kNoWriteBarrier;
- }
+ MachineRepresentation representation) {
+ // if (field_type->Is(Type::TaggedSigned()) ||
Michael Starzinger 2016/04/28 12:18:17 Can we at least leave a TODO here describing what
Benedikt Meurer 2016/04/28 12:20:52 Done
+ // input_type->Is(Type::TaggedSigned())) {
+ // // Write barriers are only for writes of heap objects.
+ // return kNoWriteBarrier;
+ // }
+ // if (input_type->Is(Type::BooleanOrNullOrUndefined())) {
+ // // Write barriers are not necessary when storing true, false, null or
+ // // undefined, because these special oddballs are always in the root
+ // set.
+ // return kNoWriteBarrier;
+ // }
if (base_is_tagged == kTaggedBase &&
representation == MachineRepresentation::kTagged) {
- if (input_type->IsConstant() &&
- input_type->AsConstant()->Value()->IsHeapObject()) {
- Handle<HeapObject> input =
- Handle<HeapObject>::cast(input_type->AsConstant()->Value());
- if (input->IsMap()) {
- // Write barriers for storing maps are cheaper.
- return kMapWriteBarrier;
- }
- Isolate* const isolate = input->GetIsolate();
- RootIndexMap root_index_map(isolate);
- int root_index = root_index_map.Lookup(*input);
- if (root_index != RootIndexMap::kInvalidRootIndex &&
- isolate->heap()->RootIsImmortalImmovable(root_index)) {
- // Write barriers are unnecessary for immortal immovable roots.
- return kNoWriteBarrier;
- }
- }
- if (field_type->Is(Type::TaggedPointer()) ||
- input_type->Is(Type::TaggedPointer())) {
- // Write barriers for heap objects don't need a Smi check.
- return kPointerWriteBarrier;
- }
+ // if (input_type->IsConstant() &&
+ // input_type->AsConstant()->Value()->IsHeapObject()) {
+ // Handle<HeapObject> input =
+ // Handle<HeapObject>::cast(input_type->AsConstant()->Value());
+ // if (input->IsMap()) {
+ // // Write barriers for storing maps are cheaper.
+ // return kMapWriteBarrier;
+ // }
+ // Isolate* const isolate = input->GetIsolate();
+ // RootIndexMap root_index_map(isolate);
+ // int root_index = root_index_map.Lookup(*input);
+ // if (root_index != RootIndexMap::kInvalidRootIndex &&
+ // isolate->heap()->RootIsImmortalImmovable(root_index)) {
+ // // Write barriers are unnecessary for immortal immovable roots.
+ // return kNoWriteBarrier;
+ // }
+ // }
+ // if (field_type->Is(Type::TaggedPointer()) ||
+ // input_type->Is(Type::TaggedPointer())) {
+ // // Write barriers for heap objects don't need a Smi check.
+ // return kPointerWriteBarrier;
+ // }
// Write barriers are only for writes into heap objects (i.e. tagged base).
return kFullWriteBarrier;
}
return kNoWriteBarrier;
}
-
WriteBarrierKind ComputeWriteBarrierKind(BaseTaggedness base_is_tagged,
MachineRepresentation representation,
- int field_offset, Type* field_type,
- Type* input_type) {
+ int field_offset) {
if (base_is_tagged == kTaggedBase && field_offset == HeapObject::kMapOffset) {
// Write barriers for storing maps are cheaper.
return kMapWriteBarrier;
}
- return ComputeWriteBarrierKind(base_is_tagged, representation, field_type,
- input_type);
+ return ComputeWriteBarrierKind(base_is_tagged, representation);
}
} // namespace
-
-Reduction ChangeLowering::LoadField(Node* node) {
+Reduction ChangeLowering::ReduceLoadField(Node* node) {
const FieldAccess& access = FieldAccessOf(node->op());
Node* offset = jsgraph()->IntPtrConstant(access.offset - access.tag());
node->InsertInput(graph()->zone(), 1, offset);
@@ -206,13 +159,11 @@ Reduction ChangeLowering::LoadField(Node* node) {
return Changed(node);
}
-
-Reduction ChangeLowering::StoreField(Node* node) {
+Reduction ChangeLowering::ReduceStoreField(Node* node) {
const FieldAccess& access = FieldAccessOf(node->op());
- Type* type = NodeProperties::GetType(node->InputAt(1));
WriteBarrierKind kind = ComputeWriteBarrierKind(
access.base_is_tagged, access.machine_type.representation(),
- access.offset, access.type, type);
+ access.offset);
Node* offset = jsgraph()->IntPtrConstant(access.offset - access.tag());
node->InsertInput(graph()->zone(), 1, offset);
NodeProperties::ChangeOp(node,
@@ -245,30 +196,26 @@ Node* ChangeLowering::ComputeIndex(const ElementAccess& access,
return index;
}
-
-Reduction ChangeLowering::LoadElement(Node* node) {
+Reduction ChangeLowering::ReduceLoadElement(Node* node) {
const ElementAccess& access = ElementAccessOf(node->op());
node->ReplaceInput(1, ComputeIndex(access, node->InputAt(1)));
NodeProperties::ChangeOp(node, machine()->Load(access.machine_type));
return Changed(node);
}
-
-Reduction ChangeLowering::StoreElement(Node* node) {
+Reduction ChangeLowering::ReduceStoreElement(Node* node) {
const ElementAccess& access = ElementAccessOf(node->op());
- Type* type = NodeProperties::GetType(node->InputAt(2));
node->ReplaceInput(1, ComputeIndex(access, node->InputAt(1)));
NodeProperties::ChangeOp(
- node, machine()->Store(StoreRepresentation(
- access.machine_type.representation(),
- ComputeWriteBarrierKind(access.base_is_tagged,
- access.machine_type.representation(),
- access.type, type))));
+ node,
+ machine()->Store(StoreRepresentation(
+ access.machine_type.representation(),
+ ComputeWriteBarrierKind(access.base_is_tagged,
+ access.machine_type.representation()))));
return Changed(node);
}
-
-Reduction ChangeLowering::Allocate(Node* node) {
+Reduction ChangeLowering::ReduceAllocate(Node* node) {
PretenureFlag pretenure = OpParameter<PretenureFlag>(node->op());
Callable callable = CodeFactory::Allocate(isolate(), pretenure);
Node* target = jsgraph()->HeapConstant(callable.code());
@@ -282,36 +229,7 @@ Reduction ChangeLowering::Allocate(Node* node) {
return Changed(node);
}
-Node* ChangeLowering::IsSmi(Node* value) {
- return graph()->NewNode(
- machine()->WordEqual(),
- graph()->NewNode(machine()->WordAnd(), value,
- jsgraph()->IntPtrConstant(kSmiTagMask)),
- jsgraph()->IntPtrConstant(kSmiTag));
-}
-
-Node* ChangeLowering::LoadHeapObjectMap(Node* object, Node* control) {
- return graph()->NewNode(
- machine()->Load(MachineType::AnyTagged()), object,
- jsgraph()->IntPtrConstant(HeapObject::kMapOffset - kHeapObjectTag),
- graph()->start(), control);
-}
-
-Node* ChangeLowering::LoadMapBitField(Node* map) {
- return graph()->NewNode(
- machine()->Load(MachineType::Uint8()), map,
- jsgraph()->IntPtrConstant(Map::kBitFieldOffset - kHeapObjectTag),
- graph()->start(), graph()->start());
-}
-
-Node* ChangeLowering::LoadMapInstanceType(Node* map) {
- return graph()->NewNode(
- machine()->Load(MachineType::Uint8()), map,
- jsgraph()->IntPtrConstant(Map::kInstanceTypeOffset - kHeapObjectTag),
- graph()->start(), graph()->start());
-}
-
-Reduction ChangeLowering::ObjectIsSmi(Node* node) {
+Reduction ChangeLowering::ReduceObjectIsSmi(Node* node) {
node->ReplaceInput(0,
graph()->NewNode(machine()->WordAnd(), node->InputAt(0),
jsgraph()->IntPtrConstant(kSmiTagMask)));
« no previous file with comments | « src/compiler/change-lowering.h ('k') | src/compiler/common-node-cache.cc » ('j') | src/compiler/instruction.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698