*** old/src/share/vm/opto/vectornode.cpp	Fri Jul 20 14:40:35 2012
--- new/src/share/vm/opto/vectornode.cpp	Fri Jul 20 14:40:35 2012

*** 67,76 ****
--- 67,85 ----
      assert(bt == T_FLOAT, "must be");
      return Op_SubVF;
    case Op_SubD:
      assert(bt == T_DOUBLE, "must be");
      return Op_SubVD;
+   case Op_MulI:
+     switch (bt) {
+     case T_BOOLEAN:
+     case T_BYTE:   return 0;   // Unimplemented
+     case T_CHAR:
+     case T_SHORT:  return Op_MulVS;
+     case T_INT:    return Matcher::match_rule_supported(Op_MulVI) ? Op_MulVI : 0; // SSE4_1
+     }
+     ShouldNotReachHere();
    case Op_MulF:
      assert(bt == T_FLOAT, "must be");
      return Op_MulVF;
    case Op_MulD:
      assert(bt == T_DOUBLE, "must be");

*** 88,106 ****
--- 97,133 ----
      case T_CHAR:
      case T_SHORT:  return Op_LShiftVS;
      case T_INT:    return Op_LShiftVI;
      }
      ShouldNotReachHere();
+   case Op_LShiftL:
+     assert(bt == T_LONG, "must be");
+     return Op_LShiftVL;
    case Op_RShiftI:
      switch (bt) {
      case T_BOOLEAN:
      case T_BYTE:   return Op_RShiftVB;
      case T_CHAR:
      case T_SHORT:  return Op_RShiftVS;
      case T_INT:    return Op_RShiftVI;
      }
      ShouldNotReachHere();
+   case Op_RShiftL:
+     assert(bt == T_LONG, "must be");
+     return Op_RShiftVL;
+   case Op_URShiftI:
+     switch (bt) {
+     case T_BOOLEAN:
+     case T_BYTE:   return Op_URShiftVB;
+     case T_CHAR:
+     case T_SHORT:  return Op_URShiftVS;
+     case T_INT:    return Op_URShiftVI;
+     }
+     ShouldNotReachHere();
+   case Op_URShiftL:
+     assert(bt == T_LONG, "must be");
+     return Op_URShiftVL;
    case Op_AndI:
    case Op_AndL:
      return Op_AndV;
    case Op_OrI:
    case Op_OrL:

*** 138,147 ****
--- 165,190 ----
      return vopc > 0 && Matcher::has_match_rule(vopc);
    }
    return false;
  }
  
+ // Check if input should be vectorized.
+ bool VectorNode::needs_vector_input(Node* n, int opd_idx) {
+   // Only shift vector instructions don't need a vector for a shift value.
+   if (opd_idx != 2) return true;
+   switch (n->Opcode()) {
+   case Op_LShiftI:
+   case Op_LShiftL:
+   case Op_RShiftI:
+   case Op_RShiftL:
+   case Op_URShiftI:
+   case Op_URShiftL:
+     return false;
+   }
+   return true;
+ }
+ 
  // Return the vector version of a scalar operation node.
  VectorNode* VectorNode::make(Compile* C, int opc, Node* n1, Node* n2, uint vlen, BasicType bt) {
    const TypeVect* vt = TypeVect::make(bt, vlen);
    int vopc = VectorNode::opcode(opc, vlen, bt);
  

*** 158,181 ****
--- 201,233 ----
    case Op_SubVI: return new (C, 3) SubVINode(n1, n2, vt);
    case Op_SubVL: return new (C, 3) SubVLNode(n1, n2, vt);
    case Op_SubVF: return new (C, 3) SubVFNode(n1, n2, vt);
    case Op_SubVD: return new (C, 3) SubVDNode(n1, n2, vt);
  
+   case Op_MulVS: return new (C, 3) MulVSNode(n1, n2, vt);
+   case Op_MulVI: return new (C, 3) MulVINode(n1, n2, vt);
    case Op_MulVF: return new (C, 3) MulVFNode(n1, n2, vt);
    case Op_MulVD: return new (C, 3) MulVDNode(n1, n2, vt);
  
    case Op_DivVF: return new (C, 3) DivVFNode(n1, n2, vt);
    case Op_DivVD: return new (C, 3) DivVDNode(n1, n2, vt);
  
    case Op_LShiftVB: return new (C, 3) LShiftVBNode(n1, n2, vt);
    case Op_LShiftVS: return new (C, 3) LShiftVSNode(n1, n2, vt);
    case Op_LShiftVI: return new (C, 3) LShiftVINode(n1, n2, vt);
+   case Op_LShiftVL: return new (C, 3) LShiftVLNode(n1, n2, vt);
  
    case Op_RShiftVB: return new (C, 3) RShiftVBNode(n1, n2, vt);
    case Op_RShiftVS: return new (C, 3) RShiftVSNode(n1, n2, vt);
    case Op_RShiftVI: return new (C, 3) RShiftVINode(n1, n2, vt);
+   case Op_RShiftVL: return new (C, 3) RShiftVLNode(n1, n2, vt);
  
+   case Op_URShiftVB: return new (C, 3) URShiftVBNode(n1, n2, vt);
+   case Op_URShiftVS: return new (C, 3) URShiftVSNode(n1, n2, vt);
+   case Op_URShiftVI: return new (C, 3) URShiftVINode(n1, n2, vt);
+   case Op_URShiftVL: return new (C, 3) URShiftVLNode(n1, n2, vt);
+ 
    case Op_AndV: return new (C, 3) AndVNode(n1, n2, vt);
    case Op_OrV:  return new (C, 3) OrVNode (n1, n2, vt);
    case Op_XorV: return new (C, 3) XorVNode(n1, n2, vt);
    }
    ShouldNotReachHere();