Faster 64-bit right-shift for the ia32 compiler.

runtime/vm/flow_graph_optimizer.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/flow_graph_optimizer.h"
 
 #include "vm/bit_vector.h"
 #include "vm/cha.h"
 #include "vm/flow_graph_builder.h"
 #include "vm/flow_graph_compiler.h"
@@ skipping 130 matching lines @@
 
 void FlowGraphOptimizer::SelectRepresentations() {
   // Convervatively unbox all phis that were proven to be of type Double.
   for (intptr_t i = 0; i < block_order_.length(); ++i) {
     JoinEntryInstr* join_entry = block_order_[i]->AsJoinEntry();
     if (join_entry == NULL) continue;
 
     if (join_entry->phis() != NULL) {
       for (intptr_t i = 0; i < join_entry->phis()->length(); ++i) {
         PhiInstr* phi = (*join_entry->phis())[i];
-        if ((phi != NULL) && (phi->GetPropagatedCid() == kDoubleCid)) {
+        if (phi == NULL) continue;
+        if (phi->GetPropagatedCid() == kDoubleCid) {
           phi->set_representation(kUnboxedDouble);
         }
       }
     }
   }
 
   // Process all instructions and insert conversions where needed.
   GraphEntryInstr* graph_entry = block_order_[0]->AsGraphEntry();
 
   // Visit incoming parameters and constants.
@@ skipping 99 matching lines @@
   if (ic_data.NumberOfChecks() == 1) {
     return ICDataHasReceiverClassId(ic_data, kSmiCid)
         || ICDataHasReceiverClassId(ic_data, kMintCid);
   }
   return (ic_data.NumberOfChecks() == 2)
       && ICDataHasReceiverClassId(ic_data, kSmiCid)
       && ICDataHasReceiverClassId(ic_data, kMintCid);
 }
 
 
-static bool HasOnlyTwoSmi(const ICData& ic_data) {
+static bool HasOnlyTwoSmis(const ICData& ic_data) {
   return (ic_data.NumberOfChecks() == 1) &&
       ICDataHasReceiverArgumentClassIds(ic_data, kSmiCid, kSmiCid);
 }
 
 
 // Returns false if the ICData contains anything other than the 4 combinations
 // of Mint and Smi for the receiver and argument classes.
 static bool HasTwoMintOrSmi(const ICData& ic_data) {
   GrowableArray<intptr_t> class_ids(2);
   class_ids.Add(kSmiCid);
@@ skipping 185 matching lines @@
 
 
 bool FlowGraphOptimizer::TryReplaceWithBinaryOp(InstanceCallInstr* call,
                                                 Token::Kind op_kind) {
   intptr_t operands_type = kIllegalCid;
   ASSERT(call->HasICData());
   const ICData& ic_data = *call->ic_data();
   switch (op_kind) {
     case Token::kADD:
     case Token::kSUB:
-      if (HasOnlyTwoSmi(ic_data)) {
+      if (HasOnlyTwoSmis(ic_data)) {
         operands_type = kSmiCid;
       } else if (HasTwoMintOrSmi(ic_data) &&
                  FlowGraphCompiler::SupportsUnboxedMints()) {
         operands_type = kMintCid;
       } else if (ShouldSpecializeForDouble(ic_data)) {
         operands_type = kDoubleCid;
       } else {
         return false;
       }
       break;
     case Token::kMUL:
-      if (HasOnlyTwoSmi(ic_data)) {
+      if (HasOnlyTwoSmis(ic_data)) {
         operands_type = kSmiCid;
       } else if (ShouldSpecializeForDouble(ic_data)) {
         operands_type = kDoubleCid;
       } else {
         return false;
       }
       break;
     case Token::kDIV:
       if (ShouldSpecializeForDouble(ic_data)) {
         operands_type = kDoubleCid;
       } else {
         return false;
       }
       break;
     case Token::kMOD:
-      if (HasOnlyTwoSmi(ic_data)) {
+      if (HasOnlyTwoSmis(ic_data)) {
         operands_type = kSmiCid;
       } else {
         return false;
       }
       break;
     case Token::kBIT_AND:
     case Token::kBIT_OR:
     case Token::kBIT_XOR:
-      if (HasOnlyTwoSmi(ic_data)) {
+      if (HasOnlyTwoSmis(ic_data)) {
         operands_type = kSmiCid;
       } else if (HasTwoMintOrSmi(ic_data) &&
                  FlowGraphCompiler::SupportsUnboxedMints()) {
         operands_type = kMintCid;
       } else {
         return false;
       }
       break;
+    case Token::kSHR:
+      if (HasOnlyTwoSmis(ic_data)) {
+        operands_type = kSmiCid;
+      } else if (HasTwoMintOrSmi(ic_data) &&
+                 FlowGraphCompiler::SupportsUnboxedMints()) {
+        operands_type = kMintCid;
+      } else {
+        return false;
+      }
+      break;
     case Token::kTRUNCDIV:
-    case Token::kSHR:
     case Token::kSHL:
-      if (HasOnlyTwoSmi(ic_data)) {
+      if (HasOnlyTwoSmis(ic_data)) {
         operands_type = kSmiCid;
       } else {
         return false;
       }
       break;
     default:
       UNREACHABLE();
   };
 
   ASSERT(call->ArgumentCount() == 2);
@@ skipping 10 matching lines @@
                  call->env(),
                  Definition::kEffect);
 
     BinaryDoubleOpInstr* double_bin_op =
         new BinaryDoubleOpInstr(op_kind, left->Copy(), right->Copy(), call);
     call->ReplaceWith(double_bin_op, current_iterator());
     RemovePushArguments(call);
   } else if (operands_type == kMintCid) {
     Value* left = call->ArgumentAt(0)->value();
     Value* right = call->ArgumentAt(1)->value();
-    BinaryMintOpInstr* bin_op =
-        new BinaryMintOpInstr(op_kind, left, right, call);
-    call->ReplaceWith(bin_op, current_iterator());
+    if (op_kind == Token::kSHR) {
+      ShiftMintOpInstr* shift_op =
+          new ShiftMintOpInstr(op_kind, left, right, call);
+      call->ReplaceWith(shift_op, current_iterator());
+    } else {
+      BinaryMintOpInstr* bin_op =
+          new BinaryMintOpInstr(op_kind, left, right, call);
+      call->ReplaceWith(bin_op, current_iterator());
+    }
     RemovePushArguments(call);
   } else if (op_kind == Token::kMOD) {
     // TODO(vegorov): implement fast path code for modulo.
     ASSERT(operands_type == kSmiCid);
     if (!call->ArgumentAt(1)->value()->BindsToConstant()) return false;
     const Object& obj = call->ArgumentAt(1)->value()->BoundConstant();
     if (!obj.IsSmi()) return false;
     const intptr_t value = Smi::Cast(obj).Value();
     if ((value > 0) && Utils::IsPowerOfTwo(value)) {
       Value* left = call->ArgumentAt(0)->value();
@@ skipping 465 matching lines @@
                                RelationalOpInstr* comp,
                                Instruction* instr) {
   if (!comp->HasICData()) return;
 
   const ICData& ic_data = *comp->ic_data();
   if (ic_data.NumberOfChecks() == 0) return;
   // TODO(srdjan): Add multiple receiver type support.
   if (ic_data.NumberOfChecks() != 1) return;
   ASSERT(ic_data.HasOneTarget());
 
-  if (HasOnlyTwoSmi(ic_data)) {
+  if (HasOnlyTwoSmis(ic_data)) {
     optimizer->InsertBefore(
         instr,
         new CheckSmiInstr(comp->left()->Copy(), comp->deopt_id()),
         instr->env(),
         Definition::kEffect);
     optimizer->InsertBefore(
         instr,
         new CheckSmiInstr(comp->right()->Copy(), comp->deopt_id()),
         instr->env(),
         Definition::kEffect);
@@ skipping 1920 matching lines @@
 }
 
 
 void ConstantPropagator::VisitBinaryMintOp(
     BinaryMintOpInstr* instr) {
   // TODO(kmillikin): Handle binary operations.
   SetValue(instr, non_constant_);
 }
 
 
+void ConstantPropagator::VisitShiftMintOp(
+    ShiftMintOpInstr* instr) {
+  // TODO(kmillikin): Handle shift operations.
+  SetValue(instr, non_constant_);
+}
+
+
 void ConstantPropagator::VisitUnaryMintOp(
     UnaryMintOpInstr* instr) {
   // TODO(kmillikin): Handle unary operations.
   SetValue(instr, non_constant_);
 }
 
 
 void ConstantPropagator::VisitUnarySmiOp(UnarySmiOpInstr* instr) {
   const Object& value = instr->value()->definition()->constant_value();
   if (IsNonConstant(value)) {
@@ skipping 230 matching lines @@
 
   if (FLAG_trace_constant_propagation) {
     OS::Print("\n==== After constant propagation ====\n");
     FlowGraphPrinter printer(*graph_);
     printer.PrintBlocks();
   }
 }
 
 
 }  // namespace dart