X87: Revert of [turbofan] Take the immediate size in account when narrowing ia32/x64 word compariso…

src/compiler/x87/instruction-selector-x87.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/base/adapters.h"
 #include "src/compiler/instruction-selector-impl.h"
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/node-properties.h"
 
 namespace v8 {
@@ skipping 1156 matching lines @@
 void VisitCompare(InstructionSelector* selector, InstructionCode opcode,
                   Node* left, Node* right, FlagsContinuation* cont,
                   bool commutative) {
   X87OperandGenerator g(selector);
   if (commutative && g.CanBeBetterLeftOperand(right)) {
     std::swap(left, right);
   }
   VisitCompare(selector, opcode, g.UseRegister(left), g.Use(right), cont);
 }
 
-bool InferMachineRepresentation(Node* node,
-                                MachineRepresentation* representation) {
-  if (node->opcode() == IrOpcode::kLoad) {
-    *representation = LoadRepresentationOf(node->op()).representation();
-    return true;
-  }
-  if (node->opcode() != IrOpcode::kInt32Constant) {
-    return false;
-  }
-  int32_t value = OpParameter<int32_t>(node->op());
-  if (is_int8(value)) {
-    *representation = MachineRepresentation::kWord8;
-  } else if (is_int16(value)) {
-    *representation = MachineRepresentation::kWord16;
-  } else {
-    *representation = MachineRepresentation::kWord32;
-  }
-  return true;
-}
-
 // Tries to match the size of the given opcode to that of the operands, if
 // possible.
 InstructionCode TryNarrowOpcodeSize(InstructionCode opcode, Node* left,
                                     Node* right) {
   if (opcode != kX87Cmp && opcode != kX87Test) {
     return opcode;
   }
-  // We only do this if at least one of the two operands is a load.
-  // TODO(epertoso): we can probably get some size information out of phi nodes.
-  if (left->opcode() != IrOpcode::kLoad && right->opcode() != IrOpcode::kLoad) {
+  // 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;
   }
-  MachineRepresentation left_representation, right_representation;
-  if (!InferMachineRepresentation(left, &left_representation) ||
-      !InferMachineRepresentation(right, &right_representation)) {
+  // If the load representations don't match, both operands will be
+  // zero/sign-extended to 32bit.
+  LoadRepresentation left_representation = LoadRepresentationOf(left->op());
+  if (left_representation != LoadRepresentationOf(right->op())) {
     return opcode;
   }
-  // If the representations don't match, both operands will be
-  // zero/sign-extended to 32bit.
-  if (left_representation != right_representation) {
-    return opcode;
-  }
-  switch (left_representation) {
+  switch (left_representation.representation()) {
     case MachineRepresentation::kBit:
     case MachineRepresentation::kWord8:
       return opcode == kX87Cmp ? kX87Cmp8 : kX87Test8;
     case MachineRepresentation::kWord16:
       return opcode == kX87Cmp ? kX87Cmp16 : kX87Test16;
     default:
       return opcode;
   }
 }
 
@@ skipping 51 matching lines @@
   // if one of the two inputs is a memory operand, make sure it's on the left.
   if ((!g.CanBeImmediate(right) && g.CanBeImmediate(left)) ||
       (g.CanBeMemoryOperand(narrowed_opcode, node, right) &&
        !g.CanBeMemoryOperand(narrowed_opcode, node, left))) {
     if (!node->op()->HasProperty(Operator::kCommutative)) cont->Commute();
     std::swap(left, right);
   }
 
   // Match immediates on right side of comparison.
   if (g.CanBeImmediate(right)) {
-    if (g.CanBeMemoryOperand(narrowed_opcode, node, left)) {
-      // If we're truncating the immediate (32 bits to 16 or 8), comparison
-      // semantics should take the signedness/unsignedness of the op into
-      // account.
-      if (narrowed_opcode != opcode &&
-          LoadRepresentationOf(left->op()).IsUnsigned()) {
-        switch (cont->condition()) {
-          case FlagsCondition::kSignedLessThan:
-            cont->OverwriteAndNegateIfEqual(FlagsCondition::kUnsignedLessThan);
-            break;
-          case FlagsCondition::kSignedGreaterThan:
-            cont->OverwriteAndNegateIfEqual(
-                FlagsCondition::kUnsignedGreaterThan);
-            break;
-          case FlagsCondition::kSignedLessThanOrEqual:
-            cont->OverwriteAndNegateIfEqual(
-                FlagsCondition::kUnsignedLessThanOrEqual);
-            break;
-          case FlagsCondition::kSignedGreaterThanOrEqual:
-            cont->OverwriteAndNegateIfEqual(
-                FlagsCondition::kUnsignedGreaterThanOrEqual);
-            break;
-          default:
-            break;
-        }
-      }
-      return VisitCompareWithMemoryOperand(selector, narrowed_opcode, left,
+    if (g.CanBeMemoryOperand(opcode, node, left)) {
+      // TODO(epertoso): we should use `narrowed_opcode' here once we match
+      // immediates too.
+      return VisitCompareWithMemoryOperand(selector, opcode, left,
                                            g.UseImmediate(right), cont);
     }
     return VisitCompare(selector, opcode, g.Use(left), g.UseImmediate(right),
                         cont);
   }
 
   // Match memory operands on left side of comparison.
   if (g.CanBeMemoryOperand(narrowed_opcode, node, left)) {
     bool needs_byte_register =
         narrowed_opcode == kX87Test8 || narrowed_opcode == kX87Cmp8;
@@ skipping 373 matching lines @@
            MachineOperatorBuilder::kFloat32RoundTruncate |
            MachineOperatorBuilder::kFloat64RoundTruncate |
            MachineOperatorBuilder::kFloat32RoundTiesEven |
            MachineOperatorBuilder::kFloat64RoundTiesEven;
   return flags;
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8