diff --git a/mlir/lib/Conversion/TosaToLinalg/TosaToLinalg.cpp b/mlir/lib/Conversion/TosaToLinalg/TosaToLinalg.cpp --- a/mlir/lib/Conversion/TosaToLinalg/TosaToLinalg.cpp +++ b/mlir/lib/Conversion/TosaToLinalg/TosaToLinalg.cpp @@ -963,11 +963,6 @@ reshape, "Cannot collapse dynamic dims to more than one dimension"); } - if (operandTy == resultTy) { - rewriter.replaceOp(reshape, adaptor.getOperands()[0]); - return success(); - } - SmallVector reassociationMap; if (!createReassociationMapsForCollapse(rewriter, operandTy.getShape(), resultTy.getShape(), @@ -1001,11 +996,6 @@ ShapedType resultTy = reshape.getType().template cast(); bool isDynamic = !operandTy.hasStaticShape(); - if (operandTy == resultTy) { - rewriter.replaceOp(reshape, adaptor.getOperands()[0]); - return success(); - } - if (isDynamic && operandTy.getRank() != 1) { return rewriter.notifyMatchFailure( reshape, "Cannot expand dynamic dims from more than one dimension"); @@ -1045,11 +1035,6 @@ ShapedType resultTy = reshape.getType().template cast(); bool isDynamic = !operandTy.hasStaticShape(); - if (operandTy == resultTy) { - rewriter.replaceOp(reshape, adaptor.getOperands()[0]); - return success(); - } - SmallVector intermediateShape; if (!findIntermediateShape(resultTy.getShape(), operandTy.getShape(), intermediateShape, isDynamic)) { @@ -2310,6 +2295,13 @@ patterns->add(patterns->getContext(), /*benefit=*/300); + patterns->add(patterns->getContext(), + /*benefit=*/100); + patterns->add(patterns->getContext(), + /*benefit=*/200); + patterns->add(patterns->getContext(), + /*benefit=*/300); + patterns->add< // clang-format off PointwiseConverter, @@ -2357,9 +2349,6 @@ ArgMaxConverter, ConcatConverter, GatherConverter, - ReshapeConverterCollapse, - ReshapeConverterExpand, - ReshapeConverterCollapseExpand, RescaleConverter, ReverseConverter, TableConverter,