diff options
Diffstat (limited to 'deps/v8/src/compiler/mips/instruction-selector-mips.cc')
-rw-r--r-- | deps/v8/src/compiler/mips/instruction-selector-mips.cc | 171 |
1 files changed, 117 insertions, 54 deletions
diff --git a/deps/v8/src/compiler/mips/instruction-selector-mips.cc b/deps/v8/src/compiler/mips/instruction-selector-mips.cc index 5e8e3b1d43..d723453c01 100644 --- a/deps/v8/src/compiler/mips/instruction-selector-mips.cc +++ b/deps/v8/src/compiler/mips/instruction-selector-mips.cc @@ -5,6 +5,7 @@ #include "src/base/bits.h" #include "src/compiler/instruction-selector-impl.h" #include "src/compiler/node-matchers.h" +#include "src/compiler/node-properties.h" namespace v8 { namespace internal { @@ -22,7 +23,7 @@ class MipsOperandGenerator FINAL : public OperandGenerator { explicit MipsOperandGenerator(InstructionSelector* selector) : OperandGenerator(selector) {} - InstructionOperand* UseOperand(Node* node, InstructionCode opcode) { + InstructionOperand UseOperand(Node* node, InstructionCode opcode) { if (CanBeImmediate(node, opcode)) { return UseImmediate(node); } @@ -90,9 +91,9 @@ static void VisitBinop(InstructionSelector* selector, Node* node, InstructionCode opcode, FlagsContinuation* cont) { MipsOperandGenerator g(selector); Int32BinopMatcher m(node); - InstructionOperand* inputs[4]; + InstructionOperand inputs[4]; size_t input_count = 0; - InstructionOperand* outputs[2]; + InstructionOperand outputs[2]; size_t output_count = 0; inputs[input_count++] = g.UseRegister(m.left().node()); @@ -108,8 +109,8 @@ static void VisitBinop(InstructionSelector* selector, Node* node, outputs[output_count++] = g.DefineAsRegister(cont->result()); } - DCHECK_NE(0, input_count); - DCHECK_NE(0, output_count); + DCHECK_NE(0u, input_count); + DCHECK_NE(0u, output_count); DCHECK_GE(arraysize(inputs), input_count); DCHECK_GE(arraysize(outputs), output_count); @@ -161,7 +162,7 @@ void InstructionSelector::VisitLoad(Node* node) { Emit(opcode | AddressingModeField::encode(kMode_MRI), g.DefineAsRegister(node), g.UseRegister(base), g.UseImmediate(index)); } else { - InstructionOperand* addr_reg = g.TempRegister(); + InstructionOperand addr_reg = g.TempRegister(); Emit(kMipsAdd | AddressingModeField::encode(kMode_None), addr_reg, g.UseRegister(index), g.UseRegister(base)); // Emit desired load opcode, using temp addr_reg. @@ -184,8 +185,8 @@ void InstructionSelector::VisitStore(Node* node) { // TODO(dcarney): refactor RecordWrite function to take temp registers // and pass them here instead of using fixed regs // TODO(dcarney): handle immediate indices. - InstructionOperand* temps[] = {g.TempRegister(t1), g.TempRegister(t2)}; - Emit(kMipsStoreWriteBarrier, NULL, g.UseFixed(base, t0), + InstructionOperand temps[] = {g.TempRegister(t1), g.TempRegister(t2)}; + Emit(kMipsStoreWriteBarrier, g.NoOutput(), g.UseFixed(base, t0), g.UseFixed(index, t1), g.UseFixed(value, t2), arraysize(temps), temps); return; } @@ -216,15 +217,15 @@ void InstructionSelector::VisitStore(Node* node) { } if (g.CanBeImmediate(index, opcode)) { - Emit(opcode | AddressingModeField::encode(kMode_MRI), NULL, + Emit(opcode | AddressingModeField::encode(kMode_MRI), g.NoOutput(), g.UseRegister(base), g.UseImmediate(index), g.UseRegister(value)); } else { - InstructionOperand* addr_reg = g.TempRegister(); + InstructionOperand addr_reg = g.TempRegister(); Emit(kMipsAdd | AddressingModeField::encode(kMode_None), addr_reg, g.UseRegister(index), g.UseRegister(base)); // Emit desired store opcode, using temp addr_reg. - Emit(opcode | AddressingModeField::encode(kMode_MRI), NULL, addr_reg, - g.TempImmediate(0), g.UseRegister(value)); + Emit(opcode | AddressingModeField::encode(kMode_MRI), g.NoOutput(), + addr_reg, g.TempImmediate(0), g.UseRegister(value)); } } @@ -289,7 +290,7 @@ void InstructionSelector::VisitInt32Mul(Node* node) { return; } if (base::bits::IsPowerOfTwo32(value - 1)) { - InstructionOperand* temp = g.TempRegister(); + InstructionOperand temp = g.TempRegister(); Emit(kMipsShl | AddressingModeField::encode(kMode_None), temp, g.UseRegister(m.left().node()), g.TempImmediate(WhichPowerOf2(value - 1))); @@ -298,7 +299,7 @@ void InstructionSelector::VisitInt32Mul(Node* node) { return; } if (base::bits::IsPowerOfTwo32(value + 1)) { - InstructionOperand* temp = g.TempRegister(); + InstructionOperand temp = g.TempRegister(); Emit(kMipsShl | AddressingModeField::encode(kMode_None), temp, g.UseRegister(m.left().node()), g.TempImmediate(WhichPowerOf2(value + 1))); @@ -465,13 +466,13 @@ void InstructionSelector::VisitCall(Node* node) { // Possibly align stack here for functions. int push_count = buffer.pushed_nodes.size(); if (push_count > 0) { - Emit(kMipsStackClaim | MiscField::encode(push_count), NULL); + Emit(kMipsStackClaim | MiscField::encode(push_count), g.NoOutput()); } int slot = buffer.pushed_nodes.size() - 1; - for (NodeVectorRIter input = buffer.pushed_nodes.rbegin(); - input != buffer.pushed_nodes.rend(); input++) { - Emit(kMipsStoreToStackSlot | MiscField::encode(slot), NULL, - g.UseRegister(*input)); + for (auto i = buffer.pushed_nodes.rbegin(); i != buffer.pushed_nodes.rend(); + ++i) { + Emit(kMipsStoreToStackSlot | MiscField::encode(slot), g.NoOutput(), + g.UseRegister(*i)); slot--; } @@ -492,7 +493,7 @@ void InstructionSelector::VisitCall(Node* node) { opcode |= MiscField::encode(descriptor->flags()); // Emit the call instruction. - InstructionOperand** first_output = + InstructionOperand* first_output = buffer.outputs.size() > 0 ? &buffer.outputs.front() : NULL; Instruction* call_instr = Emit(opcode, buffer.outputs.size(), first_output, @@ -529,15 +530,15 @@ void InstructionSelector::VisitCheckedLoad(Node* node) { UNREACHABLE(); return; } - InstructionOperand* offset_operand = g.CanBeImmediate(offset, opcode) - ? g.UseImmediate(offset) - : g.UseRegister(offset); + InstructionOperand offset_operand = g.CanBeImmediate(offset, opcode) + ? g.UseImmediate(offset) + : g.UseRegister(offset); - InstructionOperand* length_operand = - (!g.CanBeImmediate(offset, opcode)) ? g.CanBeImmediate(length, opcode) - ? g.UseImmediate(length) - : g.UseRegister(length) - : g.UseRegister(length); + InstructionOperand length_operand = (!g.CanBeImmediate(offset, opcode)) + ? g.CanBeImmediate(length, opcode) + ? g.UseImmediate(length) + : g.UseRegister(length) + : g.UseRegister(length); Emit(opcode | AddressingModeField::encode(kMode_MRI), g.DefineAsRegister(node), offset_operand, length_operand, @@ -573,18 +574,19 @@ void InstructionSelector::VisitCheckedStore(Node* node) { UNREACHABLE(); return; } - InstructionOperand* offset_operand = g.CanBeImmediate(offset, opcode) - ? g.UseImmediate(offset) - : g.UseRegister(offset); - - InstructionOperand* length_operand = - (!g.CanBeImmediate(offset, opcode)) ? g.CanBeImmediate(length, opcode) - ? g.UseImmediate(length) - : g.UseRegister(length) - : g.UseRegister(length); - - Emit(opcode | AddressingModeField::encode(kMode_MRI), nullptr, offset_operand, - length_operand, g.UseRegister(value), g.UseRegister(buffer)); + InstructionOperand offset_operand = g.CanBeImmediate(offset, opcode) + ? g.UseImmediate(offset) + : g.UseRegister(offset); + + InstructionOperand length_operand = (!g.CanBeImmediate(offset, opcode)) + ? g.CanBeImmediate(length, opcode) + ? g.UseImmediate(length) + : g.UseRegister(length) + : g.UseRegister(length); + + Emit(opcode | AddressingModeField::encode(kMode_MRI), g.NoOutput(), + offset_operand, length_operand, g.UseRegister(value), + g.UseRegister(buffer)); } @@ -592,12 +594,13 @@ namespace { // Shared routine for multiple compare operations. static void VisitCompare(InstructionSelector* selector, InstructionCode opcode, - InstructionOperand* left, InstructionOperand* right, + InstructionOperand left, InstructionOperand right, FlagsContinuation* cont) { MipsOperandGenerator g(selector); opcode = cont->Encode(opcode); if (cont->IsBranch()) { - selector->Emit(opcode, NULL, left, right, g.Label(cont->true_block()), + selector->Emit(opcode, g.NoOutput(), left, right, + g.Label(cont->true_block()), g.Label(cont->false_block()))->MarkAsControl(); } else { DCHECK(cont->IsSet()); @@ -680,25 +683,25 @@ void VisitWordCompareZero(InstructionSelector* selector, Node* user, cont->OverwriteAndNegateIfEqual(kUnsignedLessThanOrEqual); return VisitWordCompare(selector, value, cont); case IrOpcode::kFloat64Equal: - cont->OverwriteAndNegateIfEqual(kUnorderedEqual); + cont->OverwriteAndNegateIfEqual(kEqual); return VisitFloat64Compare(selector, value, cont); case IrOpcode::kFloat64LessThan: - cont->OverwriteAndNegateIfEqual(kUnorderedLessThan); + cont->OverwriteAndNegateIfEqual(kUnsignedLessThan); return VisitFloat64Compare(selector, value, cont); case IrOpcode::kFloat64LessThanOrEqual: - cont->OverwriteAndNegateIfEqual(kUnorderedLessThanOrEqual); + cont->OverwriteAndNegateIfEqual(kUnsignedLessThanOrEqual); return VisitFloat64Compare(selector, value, cont); case IrOpcode::kProjection: // Check if this is the overflow output projection of an // <Operation>WithOverflow node. - if (OpParameter<size_t>(value) == 1u) { + if (ProjectionIndexOf(value->op()) == 1u) { // We cannot combine the <Operation>WithOverflow with this branch // unless the 0th projection (the use of the actual value of the // <Operation> is either NULL, which means there's no use of the // actual value, or was already defined, which means it is scheduled // *AFTER* this branch). Node* const node = value->InputAt(0); - Node* const result = node->FindProjection(0); + Node* const result = NodeProperties::FindProjection(node, 0); if (!result || selector->IsDefined(result)) { switch (node->opcode()) { case IrOpcode::kInt32AddWithOverflow: @@ -724,9 +727,9 @@ void VisitWordCompareZero(InstructionSelector* selector, Node* user, // Continuation could not be combined with a compare, emit compare against 0. MipsOperandGenerator g(selector); InstructionCode const opcode = cont->Encode(kMipsCmp); - InstructionOperand* const value_operand = g.UseRegister(value); + InstructionOperand const value_operand = g.UseRegister(value); if (cont->IsBranch()) { - selector->Emit(opcode, nullptr, value_operand, g.TempImmediate(0), + selector->Emit(opcode, g.NoOutput(), value_operand, g.TempImmediate(0), g.Label(cont->true_block()), g.Label(cont->false_block()))->MarkAsControl(); } else { @@ -743,6 +746,66 @@ void InstructionSelector::VisitBranch(Node* branch, BasicBlock* tbranch, } +void InstructionSelector::VisitSwitch(Node* node, BasicBlock* default_branch, + BasicBlock** case_branches, + int32_t* case_values, size_t case_count, + int32_t min_value, int32_t max_value) { + MipsOperandGenerator g(this); + InstructionOperand value_operand = g.UseRegister(node->InputAt(0)); + InstructionOperand default_operand = g.Label(default_branch); + + // Note that {value_range} can be 0 if {min_value} is -2^31 and {max_value} + // is 2^31-1, so don't assume that it's non-zero below. + size_t value_range = + 1u + bit_cast<uint32_t>(max_value) - bit_cast<uint32_t>(min_value); + + // Determine whether to issue an ArchTableSwitch or an ArchLookupSwitch + // instruction. + size_t table_space_cost = 9 + value_range; + size_t table_time_cost = 9; + size_t lookup_space_cost = 2 + 2 * case_count; + size_t lookup_time_cost = case_count; + if (case_count > 0 && + table_space_cost + 3 * table_time_cost <= + lookup_space_cost + 3 * lookup_time_cost && + min_value > std::numeric_limits<int32_t>::min()) { + InstructionOperand index_operand = value_operand; + if (min_value) { + index_operand = g.TempRegister(); + Emit(kMipsSub, index_operand, value_operand, g.TempImmediate(min_value)); + } + size_t input_count = 2 + value_range; + auto* inputs = zone()->NewArray<InstructionOperand>(input_count); + inputs[0] = index_operand; + std::fill(&inputs[1], &inputs[input_count], default_operand); + for (size_t index = 0; index < case_count; ++index) { + size_t value = case_values[index] - min_value; + BasicBlock* branch = case_branches[index]; + DCHECK_LE(0u, value); + DCHECK_LT(value + 2, input_count); + inputs[value + 2] = g.Label(branch); + } + Emit(kArchTableSwitch, 0, nullptr, input_count, inputs, 0, nullptr) + ->MarkAsControl(); + return; + } + + // Generate a sequence of conditional jumps. + size_t input_count = 2 + case_count * 2; + auto* inputs = zone()->NewArray<InstructionOperand>(input_count); + inputs[0] = value_operand; + inputs[1] = default_operand; + for (size_t index = 0; index < case_count; ++index) { + int32_t value = case_values[index]; + BasicBlock* branch = case_branches[index]; + inputs[index * 2 + 2 + 0] = g.TempImmediate(value); + inputs[index * 2 + 2 + 1] = g.Label(branch); + } + Emit(kArchLookupSwitch, 0, nullptr, input_count, inputs, 0, nullptr) + ->MarkAsControl(); +} + + void InstructionSelector::VisitWord32Equal(Node* const node) { FlagsContinuation cont(kEqual, node); Int32BinopMatcher m(node); @@ -778,7 +841,7 @@ void InstructionSelector::VisitUint32LessThanOrEqual(Node* node) { void InstructionSelector::VisitInt32AddWithOverflow(Node* node) { - if (Node* ovf = node->FindProjection(1)) { + if (Node* ovf = NodeProperties::FindProjection(node, 1)) { FlagsContinuation cont(kOverflow, ovf); return VisitBinop(this, node, kMipsAddOvf, &cont); } @@ -788,7 +851,7 @@ void InstructionSelector::VisitInt32AddWithOverflow(Node* node) { void InstructionSelector::VisitInt32SubWithOverflow(Node* node) { - if (Node* ovf = node->FindProjection(1)) { + if (Node* ovf = NodeProperties::FindProjection(node, 1)) { FlagsContinuation cont(kOverflow, ovf); return VisitBinop(this, node, kMipsSubOvf, &cont); } @@ -798,19 +861,19 @@ void InstructionSelector::VisitInt32SubWithOverflow(Node* node) { void InstructionSelector::VisitFloat64Equal(Node* node) { - FlagsContinuation cont(kUnorderedEqual, node); + FlagsContinuation cont(kEqual, node); VisitFloat64Compare(this, node, &cont); } void InstructionSelector::VisitFloat64LessThan(Node* node) { - FlagsContinuation cont(kUnorderedLessThan, node); + FlagsContinuation cont(kUnsignedLessThan, node); VisitFloat64Compare(this, node, &cont); } void InstructionSelector::VisitFloat64LessThanOrEqual(Node* node) { - FlagsContinuation cont(kUnorderedLessThanOrEqual, node); + FlagsContinuation cont(kUnsignedLessThanOrEqual, node); VisitFloat64Compare(this, node, &cont); } |