Index: src/compiler/ia32/instruction-selector-ia32.cc |
diff --git a/src/compiler/ia32/instruction-selector-ia32.cc b/src/compiler/ia32/instruction-selector-ia32.cc |
index 7d97360aeaa61f4bc3b73d59edc49d8a4659efdd..5548f55a1e2c88488fbbb840eaa8197858ebf02e 100644 |
--- a/src/compiler/ia32/instruction-selector-ia32.cc |
+++ b/src/compiler/ia32/instruction-selector-ia32.cc |
@@ -1251,21 +1251,54 @@ void VisitCompare(InstructionSelector* selector, InstructionCode opcode, |
VisitCompare(selector, opcode, g.UseRegister(left), g.Use(right), cont); |
} |
+MachineType MachineTypeForNarrow(Node* node, Node* hint_node) { |
+ if (hint_node->opcode() == IrOpcode::kLoad) { |
+ MachineType hint = LoadRepresentationOf(hint_node->op()); |
+ if (node->opcode() == IrOpcode::kInt32Constant || |
+ node->opcode() == IrOpcode::kInt64Constant) { |
+ int64_t constant = node->opcode() == IrOpcode::kInt32Constant |
+ ? OpParameter<int32_t>(node) |
+ : OpParameter<int64_t>(node); |
+ if (hint == MachineType::Int8()) { |
+ if (constant >= std::numeric_limits<int8_t>::min() && |
+ constant <= std::numeric_limits<int8_t>::max()) { |
+ return hint; |
+ } |
+ } else if (hint == MachineType::Uint8()) { |
+ if (constant >= std::numeric_limits<uint8_t>::min() && |
+ constant <= std::numeric_limits<uint8_t>::max()) { |
+ return hint; |
+ } |
+ } else if (hint == MachineType::Int16()) { |
+ if (constant >= std::numeric_limits<int16_t>::min() && |
+ constant <= std::numeric_limits<int16_t>::max()) { |
+ return hint; |
+ } |
+ } else if (hint == MachineType::Uint16()) { |
+ if (constant >= std::numeric_limits<uint16_t>::min() && |
+ constant <= std::numeric_limits<uint16_t>::max()) { |
+ return hint; |
+ } |
+ } else if (hint == MachineType::Int32()) { |
+ return hint; |
+ } else if (hint == MachineType::Uint32()) { |
+ if (constant >= 0) return hint; |
+ } |
+ } |
+ } |
+ return node->opcode() == IrOpcode::kLoad ? LoadRepresentationOf(node->op()) |
+ : MachineType::None(); |
+} |
+ |
// Tries to match the size of the given opcode to that of the operands, if |
// possible. |
InstructionCode TryNarrowOpcodeSize(InstructionCode opcode, Node* left, |
Node* right, FlagsContinuation* cont) { |
- // Currently, if one of the two operands is not a Load, we don't know what its |
- // machine representation is, so we bail out. |
- // TODO(epertoso): we can probably get some size information out of immediates |
- // and phi nodes. |
- if (left->opcode() != IrOpcode::kLoad || right->opcode() != IrOpcode::kLoad) { |
- return opcode; |
- } |
+ // TODO(epertoso): we can probably get some size information out of phi nodes. |
// If the load representations don't match, both operands will be |
// zero/sign-extended to 32bit. |
- MachineType left_type = LoadRepresentationOf(left->op()); |
- MachineType right_type = LoadRepresentationOf(right->op()); |
+ MachineType left_type = MachineTypeForNarrow(left, right); |
+ MachineType right_type = MachineTypeForNarrow(right, left); |
if (left_type == right_type) { |
switch (left_type.representation()) { |
case MachineRepresentation::kBit: |
@@ -1343,10 +1376,8 @@ void VisitWordCompare(InstructionSelector* selector, Node* node, |
// Match immediates on right side of comparison. |
if (g.CanBeImmediate(right)) { |
- if (g.CanBeMemoryOperand(opcode, node, left, effect_level)) { |
- // TODO(epertoso): we should use `narrowed_opcode' here once we match |
- // immediates too. |
- return VisitCompareWithMemoryOperand(selector, opcode, left, |
+ if (g.CanBeMemoryOperand(narrowed_opcode, node, left, effect_level)) { |
+ return VisitCompareWithMemoryOperand(selector, narrowed_opcode, left, |
g.UseImmediate(right), cont); |
} |
return VisitCompare(selector, opcode, g.Use(left), g.UseImmediate(right), |