remove new canonicalizer

Author: newling

mlir/lib/Dialect/Vector/IR/VectorOps.cpp

@@ -5554,18 +5554,10 @@ OpFoldResult ShapeCastOp::fold(FoldAdaptor adaptor) {
   }
 
   // Y = shape_cast(broadcast(X))
-  //      -> X, if X and Y have same type, else
-  //      -> shape_cast(X) if X is a vector and the broadcast preserves
-  //         number of elements.
+  //      -> X, if X and Y have same type
   if (auto bcastOp = getSource().getDefiningOp<BroadcastOp>()) {
     if (bcastOp.getSourceType() == resultType)
       return bcastOp.getSource();
-    if (auto bcastSrcType = dyn_cast<VectorType>(bcastOp.getSourceType())) {
-      if (bcastSrcType.getNumElements() == resultType.getNumElements()) {
-        setOperand(bcastOp.getSource());
-        return getResult();
-      }
-    }
   }
 
   // shape_cast(constant) -> constant

mlir/test/Dialect/Vector/canonicalize.mlir

@@ -972,18 +972,6 @@ func.func @fold_broadcast_shapecast(%arg0: vector<4xf32>) -> vector<4xf32> {
 
 // -----
 
-// CHECK-LABEL: func @fold_count_preserving_broadcast_shapecast
-//  CHECK-SAME: (%[[V:.+]]: vector<4xf32>)
-//       CHECK:   %[[SHAPECAST:.*]] = vector.shape_cast %[[V]] : vector<4xf32> to vector<2x2xf32>
-//       CHECK:   return %[[SHAPECAST]] : vector<2x2xf32>
-func.func @fold_count_preserving_broadcast_shapecast(%arg0: vector<4xf32>) -> vector<2x2xf32> {
-    %0 = vector.broadcast %arg0 : vector<4xf32> to vector<1x1x4xf32>
-    %1 = vector.shape_cast %0 : vector<1x1x4xf32> to vector<2x2xf32>
-    return %1 : vector<2x2xf32>
-}
-
-// -----
-
 // CHECK-LABEL: func @canonicalize_broadcast_shapecast_scalar
 //       CHECK:   vector.broadcast
 //   CHECK-NOT:   vector.shape_cast